1 files changed, 53 insertions, 2 deletions

diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index 1f0a524..355d14d 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -1,12 +1,11 @@
 #include "names.h"
 
 #define NEWLINEBREAK
 #define INCREMENTALWIDTH
 
-#include "usenef.h"
 #include "BuffDoc.h"
 #include "config.h"
 #include "CDrawBuffer.h"
 #include "ZText.h"
 #include "ebookcodec.h"
 
@@ -18,12 +17,13 @@
 #include "plucker.h"
 #ifdef USENEF
 #include "nef.h"
 #include "arrierego.h"
 #endif
 #include "iSilo.h"
+#include "Reb.h"
 #endif
 
 
 linkType BuffDoc::hyperlink(unsigned int n, unsigned int noff, QString& wrd, QString& nm)
 {
     linkType bRet = eNone;
@@ -57,12 +57,24 @@ void BuffDoc::locate(unsigned int n)
 #endif
   //    tchar linebuf[1024];
   if (exp != NULL) filt->locate(n);
   //  //qDebug("BuffDoc:Located");
 }
 
+void BuffDoc::resetPos()
+{
+  //  //qDebug("BuffDoc:locating:%u",n);
+    lastword.empty();
+  lastsizes[0] = laststartline = exp->locate();
+#ifdef NEWLINEBREAK
+    lastispara = false;
+#else
+    lastispara = false;
+#endif
+}
+
 static bool isletter(unsigned short c)
 {
   if ('a' <= c && c <= 'z') return true;
   if ('A' <= c && c <= 'Z') return true;
   // Cyrillic letters
   if (0x400 <= c && c <= 0x52F) return true;
@@ -632,12 +644,19 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
 	ret = exp->openfile(src);
     }
     if (ret != 0)
     {
 	delete exp;
 	//qDebug("Trying ppms");
+	exp = new CReb;
+	ret = exp->openfile(src);
+    }
+    if (ret != 0)
+    {
+	delete exp;
+	//qDebug("Trying ppms");
 	exp = new ppm_expander;
 	ret = exp->openfile(src);
     }
     if (ret != 0)
     {
 	delete exp;
@@ -652,13 +671,23 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
 	delete exp;
 	QMessageBox::information(_parent, PROGNAME, "Unknown file compression type","Try another file");
 	return ret;
     }
     //        //qDebug("Doing final open:%x:%x",exp,filt);
 #else
-  QString codecpath(QTReaderUtil::getPluginPath());
+#ifdef USEQPE
+#ifdef OPIE
+  QString codecpath(getenv("OPIEDIR"));
+#else
+  QString codecpath(getenv("QTDIR"));
+#endif
+  codecpath += "/plugins/reader/codecs";
+#else
+  QString codecpath(getenv("READERDIR"));
+  codecpath += "/codecs";
+#endif
   QDir d(codecpath, "*.so");
 
   if (d.exists())
     {
 
       const QFileInfoList *list = d.entryInfoList();
@@ -703,6 +732,28 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
 }
 
 QString BuffDoc::about()
 {
   return QString("Buffered Decompressor (c) Tim Wentford\nHyphenation algorithm (c) Tim Wentford\n  (Cyrillic support by Konstantin Isakov\n")+filt->about();
 }
+
+int BuffDoc::getsentence(CBuffer& buff)
+{
+  tchar ch;
+  int i = 0;
+  bool intext = false;
+  while ((ch = getch()) != 10 && ch != UEOF)
+    {
+      buff[i++] = ch;
+      if (ch == '"' || ch == '\'' || ch == 0x2018 || ch == 0x2019 ||
+	  ch == 0x201a || ch == 0x201b || ch == 0x201c || ch == 0x201d)
+	{
+	  intext = !intext;
+	}
+      if (!intext && (ch == '.' || ch == '!' || ch == '?')) break;
+   }
+
+  buff[i] = '\0';
+  if (i == 0 && ch == UEOF) i = -1;
+  laststartline = exp->locate();
+  return i;
+}