diff options
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 15 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/am/xetex.am | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/pdfimage.cpp | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.ch | 2 |
5 files changed, 21 insertions, 24 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 24bb3d9c8bb..36852f4ad82 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,14 @@ +2011-07-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * xetex.ch: Fix an off-by-one bug initializing mubyte_cswrite. + From Roderich Schupp <roderich.schupp@googlemail.com>, + Debian Bug#633011, tex-k mail Fri, 8 Jul 2011 15:56:23. + +2011-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * XeTeX_ext.c, pdfimage.cpp, am/xetex.am: Always use poppler + instead of xpdf. + 2011-04-19 Peter Breitenlohner <peb@mppmu.mpg.de> Avoid 'differ in signedness' warnings. diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index 1650e762e7e..3362adb0cd1 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -39,14 +39,7 @@ authorization from the copyright holders. #include <kpathsea/config.h> #ifdef XETEX_OTHER -#ifdef POPPLER_VERSION -#define xpdfVersion POPPLER_VERSION -#define xpdfString "poppler" #include "poppler-config.h" -#else -#define xpdfString "xpdf" -#include "xpdf/config.h" -#endif #include "png.h" #endif @@ -201,7 +194,7 @@ void initversionstring(char **versions) #else "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n" "Compiled with libpng version %s; using %s\n" - "Compiled with %s version %s\n" + "Compiled with poppler version %s\n" #endif ; @@ -212,8 +205,7 @@ void initversionstring(char **versions) #ifdef XETEX_OTHER + strlen(PNG_LIBPNG_VER_STRING) + strlen(png_libpng_ver) - + strlen(xpdfString) - + strlen(xpdfVersion) + + strlen(POPPLER_VERSION) + 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */ #endif + 6 * 3; /* for freetype version #s (ditto) */ @@ -237,8 +229,7 @@ void initversionstring(char **versions) , FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100, fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100, - PNG_LIBPNG_VER_STRING, png_libpng_ver, - xpdfString, xpdfVersion + PNG_LIBPNG_VER_STRING, png_libpng_ver, POPPLER_VERSION #endif ); } diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index 19b805736a6..db2960f187d 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -1,6 +1,6 @@ ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX. ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## XeTeX @@ -37,9 +37,9 @@ libxetex += libxetexmm.a else !XETEX_MACOSX xetex_cppflags += -DXETEX_OTHER -xetex_cppflags += $(XPDF_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES) -xetex_ldadd += $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) -xetex_dependencies += $(XPDF_DEPEND) $(LIBPNG_DEPEND) +xetex_cppflags += $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES) +xetex_ldadd += $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) +xetex_dependencies += $(POPPLER_DEPEND) $(LIBPNG_DEPEND) endif !XETEX_MACOSX diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp index af2a10686aa..126d62ae2ca 100644 --- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp +++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp @@ -32,16 +32,11 @@ authorization from the copyright holders. #include "pdfimage.h" -#ifdef POPPLER_VERSION #include <dirent.h> #include <poppler-config.h> #include <goo/GooString.h> #include <goo/gmem.h> #include <goo/gfile.h> -#define GString GooString -#else -#include "goo/GString.h" -#endif #include "PDFDoc.h" #include "Catalog.h" @@ -60,7 +55,7 @@ int pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box) /* return the box converted to TeX points */ { - GString* name = new GString(filename); + GooString* name = new GooString(filename); PDFDoc* doc = new PDFDoc(name); if (!doc) { @@ -119,7 +114,7 @@ int pdf_count_pages(char* filename) { int pages = 0; - GString* name = new GString(filename); + GooString* name = new GooString(filename); PDFDoc* doc = new PDFDoc(name); if (!doc) { diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch index 0139d24e8bb..562da5393b0 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.ch +++ b/Build/source/texk/web2c/xetexdir/xetex.ch @@ -328,7 +328,7 @@ for i:=@'177 to @'377 do xchr[i]:=i; {Initialize enc\TeX\ data.} for i:=0 to 255 do mubyte_read[i]:=null; for i:=0 to 255 do mubyte_write[i]:=0; -for i:=0 to 128 do mubyte_cswrite[i]:=null; +for i:=0 to 127 do mubyte_cswrite[i]:=null; mubyte_keep := 0; mubyte_start := false; write_noexpanding := false; cs_converting := false; special_printing := false; message_printing := false; |