kill traces of ltk, incorporate new sources

* xpdf/Makefile.am: kill traces of ltk, incorporate new sources

* Makefile.am, configure.in: don't build the ltk subdir

* ANNOUNCE, CHANGES, ChangeLog, README, aconf-dj.h, aconf-win32.h,
dj_make.bat, ms_make.bat, vms_make.com: update

* xpdf/LTKOutputDev.cc, xpdf/LTKOutputDev.h, xpdf/postscript.xbm,
xpdf/xpdf-flip.ltk, xpdf/xpdf-ltk.h, xpdf/xpdf-top.ltk,
xpdf/xpdf.ltk: remove.

* xpdf/Annot.cc, xpdf/Annot.h, xpdf/Array.cc, xpdf/Array.h,
xpdf/BuiltinFont.cc, xpdf/BuiltinFont.h,
xpdf/BuiltinFontTables.cc, xpdf/CMap.cc, xpdf/CMap.h,
xpdf/Catalog.cc, xpdf/Catalog.h, xpdf/CharCodeToUnicode.cc,
xpdf/CharCodeToUnicode.h, xpdf/Decrypt.cc, xpdf/Decrypt.h,
xpdf/Dict.cc, xpdf/Dict.h, xpdf/Error.cc, xpdf/Error.h,
xpdf/FTFont.cc, xpdf/FTFont.h, xpdf/FontFile.cc, xpdf/FontFile.h,
xpdf/Function.cc, xpdf/Function.h, xpdf/Gfx.cc, xpdf/Gfx.h,
xpdf/GfxFont.cc, xpdf/GfxFont.h, xpdf/GfxState.cc,
xpdf/GfxState.h, xpdf/GlobalParams.cc, xpdf/GlobalParams.h,
xpdf/ImageOutputDev.cc, xpdf/ImageOutputDev.h, xpdf/Lexer.cc,
xpdf/Lexer.h, xpdf/Link.cc, xpdf/Link.h, xpdf/NameToCharCode.cc,
xpdf/NameToCharCode.h, xpdf/NameToUnicodeTable.h, xpdf/Object.cc,
xpdf/Object.h, xpdf/OutputDev.cc, xpdf/OutputDev.h,
xpdf/PBMOutputDev.cc, xpdf/PBMOutputDev.h, xpdf/PDFDoc.cc,
xpdf/PDFDoc.h, xpdf/PSOutputDev.cc, xpdf/PSOutputDev.h,
xpdf/PSTokenizer.cc, xpdf/PSTokenizer.h, xpdf/Page.cc,
xpdf/Page.h, xpdf/Parser.cc, xpdf/Parser.h, xpdf/SFont.cc,
xpdf/SFont.h, xpdf/Stream.cc, xpdf/Stream.h, xpdf/T1Font.cc,
xpdf/T1Font.h, xpdf/TTFont.cc, xpdf/TTFont.h,
xpdf/TextOutputDev.cc, xpdf/TextOutputDev.h, xpdf/UnicodeMap.cc,
xpdf/UnicodeMap.h, xpdf/XOutputDev.cc, xpdf/XOutputDev.h,
xpdf/XRef.cc, xpdf/XRef.h, xpdf/config.h, xpdf/pdffonts.cc,
xpdf/pdfimages.cc, xpdf/pdfinfo.cc, xpdf/pdftopbm.cc,
xpdf/pdftops.cc, xpdf/pdftotext.cc, xpdf/vms_make.com,
xpdf/xpdf.cc: update.

* goo/GHash.cc, goo/GHash.h, goo/GList.cc, goo/GList.h,
goo/GString.cc, goo/GString.h: mostly Mac OS X gcc fixage.

* doc/pdffonts.1, doc/pdffonts.cat, doc/pdffonts.hlp,
doc/pdfimages.1, doc/pdfimages.cat, doc/pdfimages.hlp,
doc/pdfinfo.1, doc/pdfinfo.cat, doc/pdfinfo.hlp, doc/pdftopbm.1,
doc/pdftopbm.cat, doc/pdftopbm.hlp, doc/pdftops.1,
doc/pdftops.cat, doc/pdftops.hlp, doc/pdftotext.1,
doc/pdftotext.cat, doc/pdftotext.hlp, doc/xpdf.1, doc/xpdf.cat,
doc/xpdf.hlp, doc/xpdfrc.5, doc/xpdfrc.cat, doc/xpdfrc.hlp:
update docs.

1 files changed, 42 insertions, 9 deletions

diff --git a/pdf/xpdf/TextOutputDev.h b/pdf/xpdf/TextOutputDev.h
index daab3c4..f681ecf 100644
--- a/pdf/xpdf/TextOutputDev.h
+++ b/pdf/xpdf/TextOutputDev.h
@@ -9,7 +9,9 @@
 #ifndef TEXTOUTPUTDEV_H
 #define TEXTOUTPUTDEV_H
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
 
@@ -20,11 +22,16 @@
 
 class GfxState;
 class GString;
+class TextBlock;
+class TextLine;
+
+#undef TEXTOUT_DO_SYMBOLS
 
 //------------------------------------------------------------------------
 
 typedef void (*TextOutputFunc)(void *stream, char *text, int len);
 
+
 //------------------------------------------------------------------------
 // TextString
 //------------------------------------------------------------------------
@@ -33,7 +40,9 @@ class TextString {
 public:
 
   // Constructor.
-  TextString(GfxState *state, double fontSize);
+  TextString(GfxState *state, double x0, double y0,
+	     double fontSize);
+
 
   // Destructor.
   ~TextString();
@@ -46,15 +55,18 @@ private:
 
   double xMin, xMax;		// bounding box x coordinates
   double yMin, yMax;		// bounding box y coordinates
-  int col;			// starting column
+  union {
+    GBool marked;		// temporary flag used by coalesce()
+    GBool spaceAfter;		// insert a space after this string?
+  };
   Unicode *text;		// the text
   double *xRight;		// right-hand x coord of each char
   int len;			// length of text and xRight
   int size;			// size of text and xRight arrays
-  TextString *yxNext;		// next string in y-major order
-  TextString *xyNext;		// next string in x-major order
+  TextString *next;
 
   friend class TextPage;
+  friend class TextBlock;
 };
 
 //------------------------------------------------------------------------
@@ -73,8 +85,9 @@ public:
   // Update the current font.
   void updateFont(GfxState *state);
 
+
   // Begin a new string.
-  void beginString(GfxState *state);
+  void beginString(GfxState *state, double x0, double y0);
 
   // Add a character to the current string.
   void addChar(GfxState *state, double x, double y,
@@ -83,6 +96,10 @@ public:
   // End the current string, sorting it into the list of strings.
   void endString();
 
+  // Add a string, sorting it into the list of strings.
+  void addString(TextString *str);
+
+
   // Coalesce strings that look like parts of the same line.
   void coalesce();
 
@@ -108,16 +125,25 @@ public:
 
 private:
 
+  GBool xyBefore(TextString *str1, TextString *str2);
+  GBool xyBefore(TextBlock *blk1, TextBlock *blk2);
+  GBool yxBefore(TextBlock *blk1, TextBlock *blk2);
+  double coalesceFit(TextString *str1, TextString *str2);
+
   GBool rawOrder;		// keep strings in content stream order
 
   TextString *curStr;		// currently active string
   double fontSize;		// current font size
 
-  TextString *yxStrings;	// strings in y-major order
-  TextString *xyStrings;	// strings in x-major order
-  TextString *yxCur1, *yxCur2;	// cursors for yxStrings list
+  TextString *xyStrings;	// strings in x-major order (before
+				//   they're sorted into lines)
+  TextString *xyCur1, *xyCur2;	// cursors for xyStrings list
+  TextLine *lines;		// list of lines
 
   int nest;			// current nesting level (for Type 3 fonts)
+
+  int nTinyChars;		// number of "tiny" chars seen so far
+
 };
 
 //------------------------------------------------------------------------
@@ -177,6 +203,8 @@ public:
 			double originX, double originY,
 			CharCode c, Unicode *u, int uLen);
 
+  //----- path painting
+
   //----- special access
 
   // Find a string.  If <top> is true, starts looking at top of page;
@@ -189,6 +217,10 @@ public:
 		 double *xMin, double *yMin,
 		 double *xMax, double *yMax);
 
+  // Get the text which is inside the specified rectangle.
+  GString *getText(double xMin, double yMin,
+		   double xMax, double yMax);
+
 private:
 
   TextOutputFunc outputFunc;	// output function
@@ -198,6 +230,7 @@ private:
   TextPage *text;		// text for the current page
   GBool rawOrder;		// keep text in content stream order
   GBool ok;			// set up ok?
+
 };
 
 #endif