++ //----- config file base path
++
++ GString*path;
++
+ //----- static tables
+
+ NameToCharCode * // mapping from char name to
+--- SplashOutputDev.h 2006-11-12 12:07:22.000000000 +0100
++++ SplashOutputDev.h 2006-11-12 12:08:48.000000000 +0100
+@@ -70,7 +70,7 @@
+ //----- initialization and control
+
+ // Start a page.
+- virtual void startPage(int pageNum, GfxState *state);
++ virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
+
+ // End a page.
+ virtual void endPage();
+--- SplashOutputDev.cc 2006-11-12 12:07:06.000000000 +0100
++++ SplashOutputDev.cc 2006-11-12 12:09:36.000000000 +0100
+@@ -696,7 +696,7 @@
+ nT3Fonts = 0;
+ }
+
+-void SplashOutputDev::startPage(int pageNum, GfxState *state) {
++void SplashOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
+ int w, h;
+ double *ctm;
+ SplashCoord mat[6];
+--- TextOutputDev.h 2006-11-12 12:23:01.000000000 +0100
++++ TextOutputDev.h 2006-11-12 12:25:31.000000000 +0100
+@@ -578,7 +578,7 @@
+ //----- initialization and control
+
+ // Start a page.
+- virtual void startPage(int pageNum, GfxState *state);
++ virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
+
+ // End a page.
+ virtual void endPage();
+--- TextOutputDev.cc 2006-11-12 12:22:53.000000000 +0100
++++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100
+@@ -3805,7 +3805,7 @@
+ }
+ }
+
+-void TextOutputDev::startPage(int pageNum, GfxState *state) {
++void TextOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
+ text->startPage(state);
+ }
+
+--- CoreOutputDev.cc 2006-11-12 12:21:59.000000000 +0100
++++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100
+@@ -57,5 +57,5 @@
+
+ void CoreOutputDev::clear() {
+ startDoc(NULL);
+- startPage(0, NULL);
++ startPage(0, NULL, 0,0,0,0);
+ }
+--- SplashFTFontEngine.cc 2006-11-19 22:30:44.000000000 +0100
++++ SplashFTFontEngine.cc 2006-11-19 22:30:56.000000000 +0100
+@@ -13,9 +13,7 @@
+ #endif
+
+ #include <stdio.h>
+-#ifndef WIN32
+ # include <unistd.h>
+-#endif
+ #include "gmem.h"
+ #include "GString.h"
+ #include "gfile.h"
+--- SplashOutputDev.cc 2007-09-09 12:29:45.000000000 +0200
++++ SplashOutputDev.cc 2007-09-09 12:30:02.000000000 +0200
+@@ -13,6 +13,7 @@
+ #endif
+
+ #include <string.h>
++#include <unistd.h>
+ #include <math.h>
+ #include "gfile.h"
+ #include "GlobalParams.h"
+--- SplashFontFile.cc 2007-09-09 12:33:00.000000000 +0200
++++ SplashFontFile.cc 2007-09-09 12:33:07.000000000 +0200
+@@ -11,9 +11,7 @@
+ #endif
+
+ #include <stdio.h>
+-#ifndef WIN32
+-# include <unistd.h>
+-#endif
++#include <unistd.h>
+ #include "GString.h"
+ #include "SplashFontFile.h"
+ #include "SplashFontFileID.h"
+--- xpdf/SplashFont.h.orig 2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFont.h 2008-10-05 17:36:44.000000000 +0200
+@@ -73,6 +73,9 @@
+ virtual GBool makeGlyph(int c, int xFrac, int yFrac,
+ SplashGlyphBitmap *bitmap) = 0;
+
++ // return the number of characters in this font
++ virtual int getNumChars() = 0;
++
+ // Return the path for a glyph.
+ virtual SplashPath *getGlyphPath(int c) = 0;
+
+@@ -83,6 +86,9 @@
+ void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA)
+ { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; }
+
++ double ascender;
++ double descender;
++ double last_advance; //set after getGlyphPath()
+ protected:
+
+ SplashFontFile *fontFile;
+--- orig/GfxFont.h 2007-07-28 00:11:06.000000000 +0200
++++ GfxFont.h 2007-09-09 18:31:31.000000000 +0200
+@@ -164,6 +164,7 @@
+ virtual int getNextChar(char *s, int len, CharCode *code,
+ Unicode *u, int uSize, int *uLen,
+ double *dx, double *dy, double *ox, double *oy) = 0;
++ virtual CharCodeToUnicode* getCTU() = 0;
+
+ protected:
+
+@@ -204,6 +205,7 @@
+ virtual int getNextChar(char *s, int len, CharCode *code,
+ Unicode *u, int uSize, int *uLen,
+ double *dx, double *dy, double *ox, double *oy);
++ virtual CharCodeToUnicode* getCTU();
+
+ // Return the encoding.
+ char **getEncoding() { return enc; }
+@@ -266,6 +268,7 @@
+ virtual int getNextChar(char *s, int len, CharCode *code,
+ Unicode *u, int uSize, int *uLen,
+ double *dx, double *dy, double *ox, double *oy);
++ virtual CharCodeToUnicode* getCTU();
+
+ // Return the writing mode (0=horizontal, 1=vertical).
+ virtual int getWMode();
+--- orig/GfxFont.cc 2007-07-28 00:11:06.000000000 +0200
++++ GfxFont.cc 2007-09-09 18:33:37.000000000 +0200
+@@ -925,6 +925,10 @@
+ return 1;
+ }
+
++CharCodeToUnicode* Gfx8BitFont::getCTU() {
++ return ctu;
++}
++
+ CharCodeToUnicode *Gfx8BitFont::getToUnicode() {
+ ctu->incRefCnt();
+ return ctu;
+@@ -1417,6 +1421,10 @@
+ }
+ }
+
++CharCodeToUnicode* GfxCIDFont::getCTU() {
++ return ctu;
++}
++
+ int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
+ Unicode *u, int uSize, int *uLen,
+ double *dx, double *dy, double *ox, double *oy) {
+--- OutputDev.h Sat Jul 28 00:11:08 2007
++++ OutputDev.h Sun Sep 9 13:50:40 2007
+@@ -17,6 +17,7 @@
+
+ #include "gtypes.h"
+ #include "CharTypes.h"
++#include "Object.h"
+
+ class GString;
+ class Gfx;
+--- SplashOutputDev.h 2007-10-20 13:17:02.000000000 +0200
++++ SplashOutputDev.h 2007-10-20 13:17:23.000000000 +0200
+@@ -206,6 +206,7 @@
+ virtual void setVectorAntialias(GBool vaa);
+ #endif
+
++ void doUpdateFont(GfxState *state);
+ private:
+
+ void setupScreenParams(double hDPI, double vDPI);
+@@ -215,7 +216,6 @@
+ SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
+ #endif
+ SplashPath *convertPath(GfxState *state, GfxPath *path);
+- void doUpdateFont(GfxState *state);
+ void drawType3Glyph(T3FontCache *t3Font,
+ T3FontCacheTag *tag, Guchar *data);
+ static GBool imageMaskSrc(void *data, SplashColorPtr line);
+--- xpdf/GlobalParams.h 2007-10-20 13:18:03.000000000 +0200
++++ xpdf/GlobalParams.h 2007-10-20 13:25:52.000000000 +0200
+@@ -196,7 +196,7 @@
+ // file.
+ GlobalParams(char *cfgFileName);
+
+- ~GlobalParams();
++ virtual ~GlobalParams();
+
+ void setBaseDir(char *dir);
+ void setupBaseFonts(char *dir);
+--- xpdf/SplashOutputDev.h.orig 2007-10-21 17:43:29.000000000 +0200
++++ xpdf/SplashOutputDev.h 2007-11-19 10:07:27.000000000 +0100
+@@ -197,6 +197,8 @@
+ #endif
+
+ void doUpdateFont(GfxState *state);
++
++ SplashPath *convertPath(GfxState *state, GfxPath *path);
+ private:
+
+ void setupScreenParams(double hDPI, double vDPI);
+@@ -205,7 +207,6 @@