diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2024-02-10 08:13:48 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2024-02-10 08:13:48 +0000 |
commit | 90a8327e9b036ece000905d54a316b792d891e0b (patch) | |
tree | 45536c0f5666955912b04bcd20c14a57aad31872 /Build/source/libs/xpdf/xpdf-src/xpdf/TextOutputDev.h | |
parent | 0357cc55904fda095727bb30f07b68dbf3439f8e (diff) |
revert (xpdf 4.05 to xpdf 4.04)
git-svn-id: svn://tug.org/texlive/trunk@69766 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-src/xpdf/TextOutputDev.h')
-rw-r--r-- | Build/source/libs/xpdf/xpdf-src/xpdf/TextOutputDev.h | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/Build/source/libs/xpdf/xpdf-src/xpdf/TextOutputDev.h b/Build/source/libs/xpdf/xpdf-src/xpdf/TextOutputDev.h index fc7bcb616dd..302975cd5f1 100644 --- a/Build/source/libs/xpdf/xpdf-src/xpdf/TextOutputDev.h +++ b/Build/source/libs/xpdf/xpdf-src/xpdf/TextOutputDev.h @@ -11,6 +11,10 @@ #include <aconf.h> +#ifdef USE_GCC_PRAGMAS +#pragma interface +#endif + #include <stdio.h> #include "gtypes.h" #include "GfxFont.h" @@ -118,9 +122,6 @@ public: // Get the width of the 'm' character, if available. double getMWidth() { return mWidth; } - double getAscent() { return ascent; } - double getDescent() { return descent; } - Ref getFontID() { return fontID; } private: @@ -473,18 +474,10 @@ public: TextWordList *makeWordListForRect(double xMin, double yMin, double xMax, double yMax); - // Get the primary rotation of text on the page. - int getPrimaryRotation() { return primaryRot; } - // Returns true if the primary character direction is left-to-right, // false if it is right-to-left. GBool primaryDirectionIsLR(); - // Get the counter values. - int getNumVisibleChars() { return nVisibleChars; } - int getNumInvisibleChars() { return nInvisibleChars; } - int getNumRemovedDupChars() { return nRemovedDupChars; } - // Returns true if any of the fonts used on this page are likely to // be problematic when converting text to Unicode. GBool problematicForUnicode() { return problematic; } @@ -564,7 +557,7 @@ private: GList *separateOverlappingText(GList *charsA); TextColumn *buildOverlappingTextColumn(GList *overlappingChars); TextBlock *splitChars(GList *charsA); - TextBlock *split(GList *charsA, int rot); + TextBlock *split(GList *charsA, int rot, GBool vertOnly); GList *getChars(GList *charsA, double xMin, double yMin, double xMax, double yMax); void findGaps(GList *charsA, int rot, @@ -578,9 +571,7 @@ private: void insertLargeChars(GList *largeChars, TextBlock *blk); void insertLargeCharsInFirstLeaf(GList *largeChars, TextBlock *blk); void insertLargeCharInLeaf(TextChar *ch, TextBlock *blk); - void insertIntoTree(TextBlock *subtree, TextBlock *primaryTree, - GBool doReorder); - void reorderBlocks(TextBlock *blk); + void insertIntoTree(TextBlock *subtree, TextBlock *primaryTree); void insertColumnIntoTree(TextBlock *column, TextBlock *tree); void insertClippedChars(GList *clippedChars, TextBlock *tree); TextBlock *findClippedCharLeaf(TextChar *ch, TextBlock *tree); @@ -598,7 +589,6 @@ private: double xMin, double yMin, double xMax, double yMax); void getLineChars(TextBlock *blk, GList *charsA); double computeWordSpacingThreshold(GList *charsA, int rot); - void adjustCombiningChars(GList *charsA, int rot); int getCharDirection(TextChar *ch); int getCharDirection(TextChar *ch, TextChar *left, TextChar *right); int assignPhysLayoutPositions(GList *columns); @@ -650,15 +640,10 @@ private: GList *chars; // [TextChar] GList *fonts; // all font info objects used on this // page [TextFontInfo] - int primaryRot; // primary rotation GList *underlines; // [TextUnderline] GList *links; // [TextLink] - int nVisibleChars; // number of visible chars on the page - int nInvisibleChars; // number of invisible chars on the page - int nRemovedDupChars; // number of duplicate chars removed - GList *findCols; // text used by the findText**/findPoint** // functions [TextColumn] double lastFindXMin, // coordinates of the last "find" result @@ -740,8 +725,7 @@ public: virtual void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, - CharCode c, int nBytes, Unicode *u, int uLen, - GBool fill, GBool stroke, GBool makePath); + CharCode c, int nBytes, Unicode *u, int uLen); virtual void incCharCount(int nChars); virtual void beginActualText(GfxState *state, Unicode *u, int uLen); virtual void endActualText(GfxState *state); @@ -800,11 +784,6 @@ public: // Turn extra processing for HTML conversion on or off. void enableHTMLExtras(GBool html) { control.html = html; } - // Get the counter values. - int getNumVisibleChars() { return text->nVisibleChars; } - int getNumInvisibleChars() { return text->nInvisibleChars; } - int getNumRemovedDupChars() { return text->nRemovedDupChars; } - private: void generateBOM(); |