From 307453997ef030ec4dfa1e876feaf0b8b8125bab Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Tue, 12 Apr 2011 14:17:47 +0000 Subject: check in luatex 0.66.0 git-svn-id: svn://tug.org/texlive/trunk@22059 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/Makefile.in | 2 + Build/source/texk/aclocal.m4 | 1 + Build/source/texk/afm2pl/configure | 9 +- Build/source/texk/bibtex8/configure | 9 +- Build/source/texk/bibtexu/configure | 11 +- Build/source/texk/cjkutils/configure | 9 +- Build/source/texk/configure | 30 +- Build/source/texk/detex/configure | 9 +- Build/source/texk/devnag/configure | 9 +- Build/source/texk/dtl/configure | 9 +- Build/source/texk/dvi2tty/configure | 9 +- Build/source/texk/dvidvi/configure | 9 +- Build/source/texk/dviljk/configure | 9 +- Build/source/texk/dvipdfmx/configure | 6 +- Build/source/texk/dvipng/configure | 9 +- Build/source/texk/dvipos/configure | 9 +- Build/source/texk/dvipsk/configure | 9 +- Build/source/texk/dvipsk/squeeze/configure | 4 +- Build/source/texk/dvisvgm/configure | 11 +- Build/source/texk/gsftopk/configure | 9 +- Build/source/texk/kpathsea/configure | 9 +- Build/source/texk/lacheck/configure | 9 +- Build/source/texk/lcdf-typetools/configure | 13 +- Build/source/texk/makeindexk/configure | 9 +- Build/source/texk/makejvf/configure | 9 +- Build/source/texk/mendexk/configure | 9 +- Build/source/texk/musixflx/configure | 6 +- Build/source/texk/ps2pkm/configure | 9 +- Build/source/texk/ptexenc/configure | 9 +- Build/source/texk/seetexk/configure | 9 +- Build/source/texk/tetex/configure | 4 +- Build/source/texk/tex4htk/configure | 9 +- Build/source/texk/texlive/configure | 4 +- Build/source/texk/ttf2pk/configure | 9 +- Build/source/texk/ttfdump/configure | 9 +- Build/source/texk/web2c/Makefile.am | 3 + Build/source/texk/web2c/Makefile.in | 354 +-- Build/source/texk/web2c/ac/web2c.ac | 2 +- Build/source/texk/web2c/aclocal.m4 | 108 +- Build/source/texk/web2c/configure | 195 +- Build/source/texk/web2c/configure.ac | 18 + Build/source/texk/web2c/doc/Makefile.in | 5 + Build/source/texk/web2c/lib/Makefile.in | 5 + Build/source/texk/web2c/luatexdir/ChangeLog | 4 + Build/source/texk/web2c/luatexdir/NEWS | 350 ++- Build/source/texk/web2c/luatexdir/am/liblua51.am | 2 +- Build/source/texk/web2c/luatexdir/am/libluatex.am | 55 +- .../source/texk/web2c/luatexdir/am/luafontforge.am | 3 +- Build/source/texk/web2c/luatexdir/am/luamisc.am | 2 +- Build/source/texk/web2c/luatexdir/am/luasocket.am | 2 +- Build/source/texk/web2c/luatexdir/am/luatex.am | 6 +- Build/source/texk/web2c/luatexdir/am/txt2zlib.am | 19 + Build/source/texk/web2c/luatexdir/dvi/dvigen.w | 7 +- Build/source/texk/web2c/luatexdir/font/dofont.w | 2 +- Build/source/texk/web2c/luatexdir/font/luafont.w | 93 +- .../source/texk/web2c/luatexdir/font/luatexfont.h | 6 +- Build/source/texk/web2c/luatexdir/font/mapfile.w | 10 +- Build/source/texk/web2c/luatexdir/font/pkin.w | 2 +- Build/source/texk/web2c/luatexdir/font/sfnt.h | 2 +- Build/source/texk/web2c/luatexdir/font/sfnt.w | 4 +- Build/source/texk/web2c/luatexdir/font/subfont.w | 8 +- Build/source/texk/web2c/luatexdir/font/texfont.h | 12 +- Build/source/texk/web2c/luatexdir/font/texfont.w | 14 +- Build/source/texk/web2c/luatexdir/font/tfmofm.w | 4 +- Build/source/texk/web2c/luatexdir/font/tounicode.w | 14 +- Build/source/texk/web2c/luatexdir/font/tt_glyf.w | 2 +- Build/source/texk/web2c/luatexdir/font/tt_table.w | 2 +- Build/source/texk/web2c/luatexdir/font/vfovf.w | 135 +- Build/source/texk/web2c/luatexdir/font/vfpacket.w | 8 +- Build/source/texk/web2c/luatexdir/font/writecff.w | 51 +- Build/source/texk/web2c/luatexdir/font/writeenc.w | 4 +- Build/source/texk/web2c/luatexdir/font/writefont.w | 18 +- Build/source/texk/web2c/luatexdir/font/writet1.w | 57 +- Build/source/texk/web2c/luatexdir/font/writet3.w | 7 +- Build/source/texk/web2c/luatexdir/font/writettf.w | 16 +- .../source/texk/web2c/luatexdir/font/writetype0.w | 10 +- .../source/texk/web2c/luatexdir/font/writetype2.w | 45 +- Build/source/texk/web2c/luatexdir/image/epdf.h | 47 +- Build/source/texk/web2c/luatexdir/image/image.h | 14 +- .../source/texk/web2c/luatexdir/image/pdftoepdf.cc | 328 ++- Build/source/texk/web2c/luatexdir/image/writeimg.w | 30 +- .../source/texk/web2c/luatexdir/image/writejbig2.h | 5 +- .../source/texk/web2c/luatexdir/image/writejbig2.w | 27 +- Build/source/texk/web2c/luatexdir/image/writejp2.h | 31 + Build/source/texk/web2c/luatexdir/image/writejp2.w | 282 ++ Build/source/texk/web2c/luatexdir/image/writejpg.w | 42 +- Build/source/texk/web2c/luatexdir/image/writepng.w | 61 +- Build/source/texk/web2c/luatexdir/lang/hyphen.w | 12 +- Build/source/texk/web2c/luatexdir/lang/texlang.w | 119 +- .../source/texk/web2c/luatexdir/lua/lcallbacklib.c | 11 +- Build/source/texk/web2c/luatexdir/lua/lepdflib.cc | 2684 +++++++++++++++++++- Build/source/texk/web2c/luatexdir/lua/lfontlib.c | 2 +- Build/source/texk/web2c/luatexdir/lua/limglib.c | 14 +- Build/source/texk/web2c/luatexdir/lua/liolib.c | 25 +- Build/source/texk/web2c/luatexdir/lua/lkpselib.c | 8 +- Build/source/texk/web2c/luatexdir/lua/llanglib.c | 2 +- Build/source/texk/web2c/luatexdir/lua/llfslibext.c | 173 ++ Build/source/texk/web2c/luatexdir/lua/llualib.c | 2 +- Build/source/texk/web2c/luatexdir/lua/lnodelib.c | 299 ++- Build/source/texk/web2c/luatexdir/lua/loslibext.c | 2 +- Build/source/texk/web2c/luatexdir/lua/lpdflib.c | 162 +- Build/source/texk/web2c/luatexdir/lua/lstatslib.c | 2 +- Build/source/texk/web2c/luatexdir/lua/ltexiolib.c | 2 +- Build/source/texk/web2c/luatexdir/lua/ltexlib.c | 368 ++- Build/source/texk/web2c/luatexdir/lua/ltokenlib.c | 2 +- Build/source/texk/web2c/luatexdir/lua/luagen.w | 2 +- Build/source/texk/web2c/luatexdir/lua/luainit.w | 16 +- Build/source/texk/web2c/luatexdir/lua/luanode.w | 108 +- Build/source/texk/web2c/luatexdir/lua/luastuff.w | 39 +- Build/source/texk/web2c/luatexdir/lua/luatex-api.h | 15 +- Build/source/texk/web2c/luatexdir/lua/luatoken.w | 13 +- Build/source/texk/web2c/luatexdir/lua/texluac.w | 2 +- Build/source/texk/web2c/luatexdir/lua51/lauxlib.c | 2 + Build/source/texk/web2c/luatexdir/lua51/luaconf.h | 2 +- .../texk/web2c/luatexdir/luafilesystem/Makefile | 4 +- .../texk/web2c/luatexdir/luafilesystem/README | 60 +- .../luatexdir/luafilesystem/doc/us/index.html | 27 +- .../luatexdir/luafilesystem/doc/us/manual.html | 22 +- .../texk/web2c/luatexdir/luafilesystem/src/lfs.c | 334 +-- .../texk/web2c/luatexdir/luafilesystem/src/lfs.def | 2 +- .../web2c/luatexdir/luafilesystem/tests/test.lua | 17 + .../luafontloader/fontforge/fontforge/nouiutil.c | 2 +- .../luafontloader/fontforge/fontforge/parsettf.c | 4 +- .../fontforge/fontforge/parsettfatt.c | 8 +- .../web2c/luatexdir/luafontloader/src/ffdummies.c | 10 +- .../web2c/luatexdir/luafontloader/src/luafflib.c | 1164 ++++++++- Build/source/texk/web2c/luatexdir/luapeg/lpeg.c | 3 +- .../texk/web2c/luatexdir/luascripts/pdflua.h | 34 + .../texk/web2c/luatexdir/luascripts/pdflua.lua | 25 + .../texk/web2c/luatexdir/luascripts/txt2zlib.w | 145 ++ Build/source/texk/web2c/luatexdir/luatex.c | 147 +- .../texk/web2c/luatexdir/luatex_svnversion.h | 2 +- Build/source/texk/web2c/luatexdir/pdf/pagetree.w | 10 +- Build/source/texk/web2c/luatexdir/pdf/pdfaction.h | 4 +- Build/source/texk/web2c/luatexdir/pdf/pdfaction.w | 4 +- Build/source/texk/web2c/luatexdir/pdf/pdfannot.w | 19 +- .../texk/web2c/luatexdir/pdf/pdfcolorstack.h | 5 +- .../texk/web2c/luatexdir/pdf/pdfcolorstack.w | 19 +- Build/source/texk/web2c/luatexdir/pdf/pdfdest.w | 15 +- Build/source/texk/web2c/luatexdir/pdf/pdffont.w | 25 +- Build/source/texk/web2c/luatexdir/pdf/pdfgen.h | 49 +- Build/source/texk/web2c/luatexdir/pdf/pdfgen.w | 688 ++--- Build/source/texk/web2c/luatexdir/pdf/pdfglyph.w | 17 +- Build/source/texk/web2c/luatexdir/pdf/pdfimage.w | 2 +- Build/source/texk/web2c/luatexdir/pdf/pdflink.w | 19 +- Build/source/texk/web2c/luatexdir/pdf/pdflistout.w | 16 +- Build/source/texk/web2c/luatexdir/pdf/pdfliteral.w | 28 +- Build/source/texk/web2c/luatexdir/pdf/pdfluaapi.h | 30 + Build/source/texk/web2c/luatexdir/pdf/pdfluaapi.w | 115 + Build/source/texk/web2c/luatexdir/pdf/pdfobj.h | 4 +- Build/source/texk/web2c/luatexdir/pdf/pdfobj.w | 44 +- Build/source/texk/web2c/luatexdir/pdf/pdfoutline.w | 25 +- Build/source/texk/web2c/luatexdir/pdf/pdfpage.w | 9 +- Build/source/texk/web2c/luatexdir/pdf/pdfrule.w | 2 +- .../texk/web2c/luatexdir/pdf/pdfsaverestore.w | 8 +- .../source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w | 10 +- Build/source/texk/web2c/luatexdir/pdf/pdfshipout.h | 6 +- Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w | 41 +- Build/source/texk/web2c/luatexdir/pdf/pdftables.h | 33 +- Build/source/texk/web2c/luatexdir/pdf/pdftables.w | 89 +- Build/source/texk/web2c/luatexdir/pdf/pdfthread.h | 3 +- Build/source/texk/web2c/luatexdir/pdf/pdfthread.w | 29 +- Build/source/texk/web2c/luatexdir/pdf/pdftypes.h | 32 +- Build/source/texk/web2c/luatexdir/pdf/pdfxform.w | 11 +- Build/source/texk/web2c/luatexdir/ptexlib.h | 25 +- Build/source/texk/web2c/luatexdir/tex/align.w | 16 +- Build/source/texk/web2c/luatexdir/tex/arithmetic.h | 6 +- Build/source/texk/web2c/luatexdir/tex/arithmetic.w | 2 +- Build/source/texk/web2c/luatexdir/tex/buildpage.w | 42 +- Build/source/texk/web2c/luatexdir/tex/commands.h | 17 +- Build/source/texk/web2c/luatexdir/tex/commands.w | 30 +- .../source/texk/web2c/luatexdir/tex/conditional.w | 6 +- Build/source/texk/web2c/luatexdir/tex/directions.h | 30 +- Build/source/texk/web2c/luatexdir/tex/directions.w | 2 +- Build/source/texk/web2c/luatexdir/tex/dumpdata.h | 8 +- Build/source/texk/web2c/luatexdir/tex/dumpdata.w | 19 +- .../source/texk/web2c/luatexdir/tex/equivalents.h | 21 +- .../source/texk/web2c/luatexdir/tex/equivalents.w | 6 +- Build/source/texk/web2c/luatexdir/tex/errors.w | 2 +- Build/source/texk/web2c/luatexdir/tex/expand.w | 6 +- Build/source/texk/web2c/luatexdir/tex/extensions.w | 8 +- Build/source/texk/web2c/luatexdir/tex/filename.w | 6 +- Build/source/texk/web2c/luatexdir/tex/inputstack.h | 8 +- Build/source/texk/web2c/luatexdir/tex/inputstack.w | 15 +- Build/source/texk/web2c/luatexdir/tex/linebreak.h | 6 +- Build/source/texk/web2c/luatexdir/tex/linebreak.w | 27 +- Build/source/texk/web2c/luatexdir/tex/mainbody.h | 18 +- Build/source/texk/web2c/luatexdir/tex/mainbody.w | 14 +- .../source/texk/web2c/luatexdir/tex/maincontrol.h | 3 +- .../source/texk/web2c/luatexdir/tex/maincontrol.w | 1460 +++++------ Build/source/texk/web2c/luatexdir/tex/mathcodes.w | 19 +- Build/source/texk/web2c/luatexdir/tex/memoryword.w | 2 +- Build/source/texk/web2c/luatexdir/tex/mlist.w | 91 +- Build/source/texk/web2c/luatexdir/tex/nesting.w | 4 +- Build/source/texk/web2c/luatexdir/tex/packaging.h | 12 +- Build/source/texk/web2c/luatexdir/tex/packaging.w | 12 +- .../texk/web2c/luatexdir/tex/postlinebreak.w | 32 +- Build/source/texk/web2c/luatexdir/tex/primitive.w | 18 +- Build/source/texk/web2c/luatexdir/tex/printing.w | 24 +- Build/source/texk/web2c/luatexdir/tex/scanning.h | 4 +- Build/source/texk/web2c/luatexdir/tex/scanning.w | 5 +- Build/source/texk/web2c/luatexdir/tex/stringpool.h | 3 +- Build/source/texk/web2c/luatexdir/tex/stringpool.w | 2 +- Build/source/texk/web2c/luatexdir/tex/texdeffont.w | 2 +- Build/source/texk/web2c/luatexdir/tex/texfileio.h | 4 +- Build/source/texk/web2c/luatexdir/tex/texfileio.w | 247 +- Build/source/texk/web2c/luatexdir/tex/texmath.w | 90 +- Build/source/texk/web2c/luatexdir/tex/texnodes.h | 18 +- Build/source/texk/web2c/luatexdir/tex/texnodes.w | 65 +- Build/source/texk/web2c/luatexdir/tex/textcodes.w | 4 +- Build/source/texk/web2c/luatexdir/tex/textoken.h | 6 +- Build/source/texk/web2c/luatexdir/tex/textoken.w | 72 +- Build/source/texk/web2c/luatexdir/utils/avlstuff.w | 2 +- .../source/texk/web2c/luatexdir/utils/managed-sa.w | 2 +- .../texk/web2c/luatexdir/utils/synctex-luatex.h | 13 +- Build/source/texk/web2c/luatexdir/utils/synctex.c | 52 +- Build/source/texk/web2c/luatexdir/utils/utils.w | 21 +- Build/source/texk/web2c/man/ChangeLog | 4 + Build/source/texk/web2c/man/Makefile.in | 5 + Build/source/texk/web2c/man/luatex.man | 2 +- Build/source/texk/web2c/omegafonts/Makefile.in | 5 + Build/source/texk/web2c/otps/Makefile.in | 5 + Build/source/texk/web2c/window/Makefile.in | 5 + Build/source/texk/xdv2pdf/configure | 16 +- Build/source/texk/xdvik/configure | 7 +- Build/source/texk/xdvik/squeeze/configure | 4 +- Build/source/texk/xdvipdfmx/configure | 9 +- 227 files changed, 9289 insertions(+), 3752 deletions(-) create mode 100644 Build/source/texk/web2c/luatexdir/am/txt2zlib.am create mode 100644 Build/source/texk/web2c/luatexdir/image/writejp2.h create mode 100644 Build/source/texk/web2c/luatexdir/image/writejp2.w create mode 100644 Build/source/texk/web2c/luatexdir/lua/llfslibext.c create mode 100644 Build/source/texk/web2c/luatexdir/luascripts/pdflua.h create mode 100644 Build/source/texk/web2c/luatexdir/luascripts/pdflua.lua create mode 100644 Build/source/texk/web2c/luatexdir/luascripts/txt2zlib.w create mode 100644 Build/source/texk/web2c/luatexdir/pdf/pdfluaapi.h create mode 100644 Build/source/texk/web2c/luatexdir/pdf/pdfluaapi.w (limited to 'Build/source/texk') diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index ca84e1c7717..f2e905132c2 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../m4/kpse-options.m4 \ $(top_srcdir)/../m4/kpse-pkgs.m4 \ + $(top_srcdir)/../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../m4/kpse-setup.m4 \ $(top_srcdir)/../m4/kpse-t1lib-flags.m4 \ @@ -122,6 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../libs/graphite/ac/withenable.ac \ $(top_srcdir)/../libs/zziplib/ac/withenable.ac \ $(top_srcdir)/../libs/xpdf/ac/withenable.ac \ + $(top_srcdir)/../libs/poppler/ac/withenable.ac \ $(top_srcdir)/../libs/gd/ac/withenable.ac \ $(top_srcdir)/../libs/freetype2/ac/withenable.ac \ $(top_srcdir)/../libs/freetype/ac/withenable.ac \ diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4 index 9eb7b6d1a8d..86d2a2ce443 100644 --- a/Build/source/texk/aclocal.m4 +++ b/Build/source/texk/aclocal.m4 @@ -1001,6 +1001,7 @@ m4_include([../m4/kpse-libpng-flags.m4]) m4_include([../m4/kpse-lt-hack.m4]) m4_include([../m4/kpse-options.m4]) m4_include([../m4/kpse-pkgs.m4]) +m4_include([../m4/kpse-poppler-flags.m4]) m4_include([../m4/kpse-ptexenc-flags.m4]) m4_include([../m4/kpse-setup.m4]) m4_include([../m4/kpse-t1lib-flags.m4]) diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure index 663714ce27a..62915400fa3 100755 --- a/Build/source/texk/afm2pl/configure +++ b/Build/source/texk/afm2pl/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14628,9 +14627,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure index a62cc898b86..171ab418d82 100755 --- a/Build/source/texk/bibtex8/configure +++ b/Build/source/texk/bibtex8/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14542,9 +14541,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/bibtexu/configure b/Build/source/texk/bibtexu/configure index f669f3b5cef..9fe363326a1 100755 --- a/Build/source/texk/bibtexu/configure +++ b/Build/source/texk/bibtexu/configure @@ -760,7 +760,6 @@ with_sysroot enable_libtool_lock enable_largefile enable_compiler_warnings -with_gnu_ld enable_cxx_runtime_hack with_system_kpathsea with_kpathsea_includes @@ -776,12 +775,8 @@ LDFLAGS LIBS CPPFLAGS CPP -CPPFLAGS CXX CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS CCC CXXCPP' @@ -18967,9 +18962,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure index 2e9f68243dc..d6f76480eab 100755 --- a/Build/source/texk/cjkutils/configure +++ b/Build/source/texk/cjkutils/configure @@ -768,8 +768,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14868,9 +14867,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 6940f5d27ac..a8cf420e523 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -771,6 +771,7 @@ with_graphite with_system_graphite with_system_zziplib with_system_xpdf +with_system_poppler with_system_gd with_gd_includes with_gd_libdir @@ -1610,6 +1611,8 @@ Optional Packages: pkg-config) --with-system-xpdf use installed poppler headers and library instead of xpdf (requires pkg-config) + --with-system-poppler use installed poppler headers and library instead of + poppler (requires pkg-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -3569,7 +3572,7 @@ case $enable_luatex in #( esac test "x$enable_web2c:$enable_luatex" = xyes:yes && { - need_xpdf=yes + need_poppler=yes need_libpng=yes need_obsdcompat=yes need_zziplib=yes @@ -4659,6 +4662,27 @@ $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} fi +## libs/poppler/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ +## configure options and TL libraries required for poppler + +# Check whether --with-system-poppler was given. +if test "${with_system_poppler+set}" = set; then : + withval=$with_system_poppler; +fi +if test "x$with_system_poppler" = x; then + if test -f $srcdir/../libs/poppler/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`poppler' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`poppler' headers and library from TL tree" >&6;} + with_system_poppler=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`poppler' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;} + with_system_poppler=yes + fi + ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'" +fi + + ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd @@ -6668,8 +6692,8 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure index 022bb190729..2acb6cbdf3d 100755 --- a/Build/source/texk/detex/configure +++ b/Build/source/texk/detex/configure @@ -762,8 +762,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14752,9 +14751,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/devnag/configure b/Build/source/texk/devnag/configure index fd861e69d92..2806fc14fb3 100755 --- a/Build/source/texk/devnag/configure +++ b/Build/source/texk/devnag/configure @@ -669,8 +669,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -4515,9 +4514,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure index 5a3989313e4..aad50ab7ad4 100755 --- a/Build/source/texk/dtl/configure +++ b/Build/source/texk/dtl/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14762,9 +14761,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure index 161d2a490ef..54f4d099ba7 100755 --- a/Build/source/texk/dvi2tty/configure +++ b/Build/source/texk/dvi2tty/configure @@ -759,8 +759,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14555,9 +14554,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure index 818dea113db..5296c4c47a6 100755 --- a/Build/source/texk/dvidvi/configure +++ b/Build/source/texk/dvidvi/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14518,9 +14517,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure index 7d360e40338..5760d04065c 100755 --- a/Build/source/texk/dviljk/configure +++ b/Build/source/texk/dviljk/configure @@ -760,8 +760,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14859,9 +14858,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index ada68009638..a8b21053d82 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -15884,9 +15884,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 0382766c876..f8f0be1d0ab 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -813,8 +813,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -17089,9 +17088,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure index d17e9007cc0..08960049fd4 100755 --- a/Build/source/texk/dvipos/configure +++ b/Build/source/texk/dvipos/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14608,9 +14607,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure index 6ea87da11ac..08a9ca8689c 100755 --- a/Build/source/texk/dvipsk/configure +++ b/Build/source/texk/dvipsk/configure @@ -760,8 +760,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' ac_subdirs_all='squeeze' # Initialize some variables set by options. @@ -14833,9 +14832,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvipsk/squeeze/configure b/Build/source/texk/dvipsk/squeeze/configure index 0d2597f81d1..329d08ff8b6 100755 --- a/Build/source/texk/dvipsk/squeeze/configure +++ b/Build/source/texk/dvipsk/squeeze/configure @@ -3948,8 +3948,8 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 47ef57a594c..d9f6dc4f2ba 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -772,7 +772,6 @@ enable_compiler_warnings with_system_libgs with_libgs_includes with_libgs_libdir -with_gnu_ld enable_cxx_runtime_hack with_system_kpathsea with_kpathsea_includes @@ -791,12 +790,8 @@ LDFLAGS LIBS CPPFLAGS CPP -CPPFLAGS CXX CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS CCC CXXCPP' @@ -19498,9 +19493,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure index 234502cbe93..008aa9ff78e 100755 --- a/Build/source/texk/gsftopk/configure +++ b/Build/source/texk/gsftopk/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14947,9 +14946,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure index 32f77eab1fd..b2c264e2728 100755 --- a/Build/source/texk/kpathsea/configure +++ b/Build/source/texk/kpathsea/configure @@ -765,8 +765,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -13463,9 +13462,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/lacheck/configure b/Build/source/texk/lacheck/configure index b5c8546f6f1..6acc07b287e 100755 --- a/Build/source/texk/lacheck/configure +++ b/Build/source/texk/lacheck/configure @@ -755,8 +755,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -13227,9 +13226,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 5410039e0f6..94451b19f37 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -764,7 +764,6 @@ with_sysroot enable_libtool_lock enable_largefile enable_compiler_warnings -with_gnu_ld enable_cxx_runtime_hack enable_cfftot1 enable_mmafm @@ -777,8 +776,6 @@ enable_t1rawafm enable_t1reencode enable_t1testpage enable_ttftotype42 -enable_cfftot1 -enable_ttftotype42 enable_updmap with_kpathsea with_system_kpathsea @@ -795,12 +792,8 @@ LDFLAGS LIBS CPPFLAGS CPP -CPPFLAGS CXX CXXFLAGS -LDFLAGS -LIBS -CPPFLAGS CCC CXXCPP' @@ -20438,9 +20431,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index 19f94d71021..a6c709e96c6 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -760,8 +760,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14634,9 +14633,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/makejvf/configure b/Build/source/texk/makejvf/configure index 5d3181151bf..66207ea352e 100755 --- a/Build/source/texk/makejvf/configure +++ b/Build/source/texk/makejvf/configure @@ -762,8 +762,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14610,9 +14609,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index 7df6c35c9f6..26933fda4a9 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -762,8 +762,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14610,9 +14609,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/musixflx/configure b/Build/source/texk/musixflx/configure index 2028a0ec768..9b158fe1771 100755 --- a/Build/source/texk/musixflx/configure +++ b/Build/source/texk/musixflx/configure @@ -3922,9 +3922,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pkm/configure index a8ced9b6342..bd4bb4f79fc 100755 --- a/Build/source/texk/ps2pkm/configure +++ b/Build/source/texk/ps2pkm/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14755,9 +14754,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure index 0033bb81d77..e2bca918db1 100755 --- a/Build/source/texk/ptexenc/configure +++ b/Build/source/texk/ptexenc/configure @@ -762,8 +762,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14735,9 +14734,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure index 7c9d4d5c486..11124bac098 100755 --- a/Build/source/texk/seetexk/configure +++ b/Build/source/texk/seetexk/configure @@ -758,8 +758,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14787,9 +14786,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/tetex/configure b/Build/source/texk/tetex/configure index e1ad58e1f7e..2401df12e42 100755 --- a/Build/source/texk/tetex/configure +++ b/Build/source/texk/tetex/configure @@ -3997,8 +3997,8 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index 1d132067373..393267a9a3b 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -762,8 +762,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14838,9 +14837,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure index f7854642805..0380c893a0f 100755 --- a/Build/source/texk/texlive/configure +++ b/Build/source/texk/texlive/configure @@ -3982,8 +3982,8 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure index d3666685613..011fea10fa3 100755 --- a/Build/source/texk/ttf2pk/configure +++ b/Build/source/texk/ttf2pk/configure @@ -765,8 +765,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -14680,9 +14679,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure index c94c1776122..d7ff0756565 100755 --- a/Build/source/texk/ttfdump/configure +++ b/Build/source/texk/ttfdump/configure @@ -751,8 +751,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -13564,9 +13563,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 7e112ade39c..af2a2844f8a 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -89,6 +89,8 @@ $(proglib): ${srcdir}/lib/*.c @LIBPNG_RULE@ ## Rebuild libxpdf & Co @XPDF_RULE@ +## Rebuild poppler +@POPPLER_RULE@ ## Rebuild libopenbsd-compat @OBSDCOMPAT_RULE@ ## Rebuild libzzip @@ -184,6 +186,7 @@ include $(srcdir)/luatexdir/am/luasocket.am include $(srcdir)/luatexdir/am/luamisc.am include $(srcdir)/luatexdir/am/luafontforge.am include $(srcdir)/luatexdir/am/libluatex.am +include $(srcdir)/luatexdir/am/txt2zlib.am ## XeTeX include $(srcdir)/xetexdir/am/xetex.am diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 06354f80f72..f495db44a18 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -48,7 +48,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \ $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \ $(am__EXEEXT_23) synctex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ - $(am__EXEEXT_31) + $(am__EXEEXT_31) txt2zlib$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \ $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \ $(am__EXEEXT_30) md5main$(EXEEXT) @@ -76,6 +76,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/luatexdir/am/luamisc.am \ $(srcdir)/luatexdir/am/luasocket.am \ $(srcdir)/luatexdir/am/luatex.am \ + $(srcdir)/luatexdir/am/txt2zlib.am \ $(srcdir)/mplibdir/am/libmplib.am \ $(srcdir)/mplibdir/am/mplib.am \ $(srcdir)/omegaware/am/omegaware.am \ @@ -245,6 +246,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ @@ -356,6 +358,7 @@ am_libluatex_a_OBJECTS = libluatex_a-pdftoepdf.$(OBJEXT) \ libluatex_a-lfontlib.$(OBJEXT) libluatex_a-limglib.$(OBJEXT) \ libluatex_a-lepdflib.$(OBJEXT) libluatex_a-lkpselib.$(OBJEXT) \ libluatex_a-llanglib.$(OBJEXT) libluatex_a-llualib.$(OBJEXT) \ + libluatex_a-llfslibext.$(OBJEXT) \ libluatex_a-lnodelib.$(OBJEXT) libluatex_a-loslibext.$(OBJEXT) \ libluatex_a-liolib.$(OBJEXT) libluatex_a-lpdflib.$(OBJEXT) \ libluatex_a-lstatslib.$(OBJEXT) \ @@ -374,15 +377,14 @@ nodist_libluatex_a_OBJECTS = libluatex_a-dvigen.$(OBJEXT) \ libluatex_a-writet1.$(OBJEXT) libluatex_a-writet3.$(OBJEXT) \ libluatex_a-writettf.$(OBJEXT) \ libluatex_a-writetype0.$(OBJEXT) \ - libluatex_a-writetype2.$(OBJEXT) libluatex_a-epdf.$(OBJEXT) \ + libluatex_a-writetype2.$(OBJEXT) \ libluatex_a-writeimg.$(OBJEXT) \ libluatex_a-writejbig2.$(OBJEXT) \ - libluatex_a-writejpg.$(OBJEXT) libluatex_a-writepng.$(OBJEXT) \ - libluatex_a-luagen.$(OBJEXT) libluatex_a-luainit.$(OBJEXT) \ - libluatex_a-luanode.$(OBJEXT) libluatex_a-luastuff.$(OBJEXT) \ - libluatex_a-luatoken.$(OBJEXT) libluatex_a-texluac.$(OBJEXT) \ - libluatex_a-ocp.$(OBJEXT) libluatex_a-ocplist.$(OBJEXT) \ - libluatex_a-readocp.$(OBJEXT) libluatex_a-runocp.$(OBJEXT) \ + libluatex_a-writejpg.$(OBJEXT) libluatex_a-writejp2.$(OBJEXT) \ + libluatex_a-writepng.$(OBJEXT) libluatex_a-luagen.$(OBJEXT) \ + libluatex_a-luainit.$(OBJEXT) libluatex_a-luanode.$(OBJEXT) \ + libluatex_a-luastuff.$(OBJEXT) libluatex_a-luatoken.$(OBJEXT) \ + libluatex_a-texluac.$(OBJEXT) libluatex_a-pdflua.$(OBJEXT) \ libluatex_a-texlang.$(OBJEXT) libluatex_a-hyphen.$(OBJEXT) \ libluatex_a-hnjalloc.$(OBJEXT) libluatex_a-pagetree.$(OBJEXT) \ libluatex_a-pdfaction.$(OBJEXT) libluatex_a-pdfannot.$(OBJEXT) \ @@ -391,7 +393,8 @@ nodist_libluatex_a_OBJECTS = libluatex_a-dvigen.$(OBJEXT) \ libluatex_a-pdfgen.$(OBJEXT) libluatex_a-pdfglyph.$(OBJEXT) \ libluatex_a-pdfimage.$(OBJEXT) libluatex_a-pdflink.$(OBJEXT) \ libluatex_a-pdflistout.$(OBJEXT) \ - libluatex_a-pdfliteral.$(OBJEXT) libluatex_a-pdfobj.$(OBJEXT) \ + libluatex_a-pdfliteral.$(OBJEXT) \ + libluatex_a-pdfluaapi.$(OBJEXT) libluatex_a-pdfobj.$(OBJEXT) \ libluatex_a-pdfoutline.$(OBJEXT) libluatex_a-pdfpage.$(OBJEXT) \ libluatex_a-pdfrule.$(OBJEXT) \ libluatex_a-pdfsaverestore.$(OBJEXT) \ @@ -805,6 +808,11 @@ tie_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am_ttf2afm_OBJECTS = ttf2afm-ttf2afm.$(OBJEXT) ttf2afm_OBJECTS = $(am_ttf2afm_OBJECTS) ttf2afm_LDADD = $(LDADD) +nodist_txt2zlib_OBJECTS = txt2zlib-txt2zlib.$(OBJEXT) +txt2zlib_OBJECTS = $(nodist_txt2zlib_OBJECTS) +txt2zlib_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(txt2zlib_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ nodist_vftovp_OBJECTS = vftovp.$(OBJEXT) vftovp_OBJECTS = $(nodist_vftovp_OBJECTS) vftovp_LDADD = $(LDADD) @@ -899,9 +907,10 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ $(dist_tex_SOURCES) $(nodist_tex_SOURCES) \ $(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \ $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \ - $(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \ - $(nodist_weave_SOURCES) $(dist_xetex_SOURCES) \ - $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES) + $(nodist_txt2zlib_SOURCES) $(nodist_vftovp_SOURCES) \ + $(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \ + $(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \ + $(nodist_EXTRA_xetex_SOURCES) DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \ $(liblua51_a_SOURCES) $(libluamisc_a_SOURCES) \ $(EXTRA_libluamisc_a_SOURCES) $(libluasocket_a_SOURCES) \ @@ -1098,6 +1107,9 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +POPPLER_DEPEND = @POPPLER_DEPEND@ +POPPLER_INCLUDES = @POPPLER_INCLUDES@ +POPPLER_LIBS = @POPPLER_LIBS@ PTEXENC_DEPEND = @PTEXENC_DEPEND@ PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ PTEXENC_LIBS = @PTEXENC_LIBS@ @@ -1112,6 +1124,7 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ +TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ @@ -1455,19 +1468,20 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \ eptex.pool eptex-tangle eptrip.diffs $(nodist_pdftex_SOURCES) \ pdftex.ch pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \ - $(nodist_libluatex_a_SOURCES) $(nodist_xetex_SOURCES) \ - xetex.web xetex-web2c xetex.p xetex.pool xetex-tangle \ - $(omegaware_programs:=.c) $(omegaware_programs:=.h) \ - $(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \ - omegaware/tests/xlevel1.ofm omegaware/tests/xlevel1.opl \ - ofont*vf omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \ - omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \ - omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \ - omegaware/tests/xOCherokee.* cftest.p \ - omegaware/tests/xrepeated.* omegaware/tests/specialhex.ofm \ - omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \ - omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \ - aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle + $(nodist_libluatex_a_SOURCES) txt2zlib.c \ + $(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \ + xetex.pool xetex-tangle $(omegaware_programs:=.c) \ + $(omegaware_programs:=.h) $(omegaware_programs:=.p) \ + $(omegaware_programs:=-web2c) omegaware/tests/xlevel1.ofm \ + omegaware/tests/xlevel1.opl ofont*vf omegaware/tests/xofont* \ + omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \ + omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \ + omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \ + cftest.p omegaware/tests/xrepeated.* \ + omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \ + omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \ + $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \ + aleph.pool aleph-tangle CLEANFILES = TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_24) \ $(am__append_29) $(am__append_35) $(am__append_40) @@ -1827,7 +1841,7 @@ pdftosrc_DEPENDENCIES = $(pdftex_dependencies) # Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \ - $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ + $(POPPLER_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \ -I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H` \ -I$(srcdir)/synctexdir \ @@ -1835,11 +1849,11 @@ luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \ luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a \ liblua51.a $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \ - $(XPDF_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a + $(POPPLER_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a luatex_LDFLAGS = -export-dynamic luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \ - $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) \ + $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(POPPLER_DEPEND) \ $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" @@ -1849,7 +1863,8 @@ call_luatex_LDADD = # luaTeX Tests # luatex_tests = luatexdir/luatex.test -liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_50) +liblua51_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/luatexdir/lua51 \ + $(am__append_50) liblua51_a_CFLAGS = # $(WARNING_CFLAGS) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ @@ -1907,7 +1922,7 @@ liblua51_a_SOURCES = \ luatexdir/lua51/lzio.h libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) liblua51.a -libluasocket_a_CPPFLAGS = \ +libluasocket_a_CPPFLAGS = $(AM_CPPFLAGS) \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51 libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) @@ -1942,7 +1957,7 @@ libluasocket_a_SOURCES = \ luatexdir/luasocket/src/usocket.h libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a -libluamisc_a_CPPFLAGS = \ +libluamisc_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(ZLIB_INCLUDES) \ $(ZZIPLIB_INCLUDES) \ -I$(top_srcdir)/luatexdir/lua51 @@ -1974,8 +1989,7 @@ libluamisc_a_SOURCES = \ EXTRA_libluamisc_a_SOURCES = luatexdir/slnunicode/slnudata.c libff_a_DEPENDENCIES = libluamisc.a -libff_a_CPPFLAGS = \ - $(AM_CPPFLAGS) \ +libff_a_CPPFLAGS = $(AM_CPPFLAGS) \ -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 \ -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DNODYNAMIC=1 \ -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 -UHAVE_LIBINTL_H \ @@ -2086,7 +2100,7 @@ libff_a_SOURCES = \ libluatex_a_DEPENDENCIES = libff.a libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ - $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) \ + $(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) $(OBSDCOMPAT_INCLUDES) \ -I$(srcdir)/libmd5 -I$(srcdir)/luatexdir \ -I$(srcdir)/luatexdir/lua51 -DpdfTeX -I$(srcdir)/synctexdir \ -DSYNCTEX_ENGINE_H='' @@ -2103,14 +2117,12 @@ libluatex_web = luatexdir/dvi/dvigen.w luatexdir/font/dofont.w \ luatexdir/font/writefont.w luatexdir/font/writet1.w \ luatexdir/font/writet3.w luatexdir/font/writettf.w \ luatexdir/font/writetype0.w luatexdir/font/writetype2.w \ - luatexdir/image/epdf.w luatexdir/image/writeimg.w \ - luatexdir/image/writejbig2.w luatexdir/image/writejpg.w \ + luatexdir/image/writeimg.w luatexdir/image/writejbig2.w \ + luatexdir/image/writejpg.w luatexdir/image/writejp2.w \ luatexdir/image/writepng.w luatexdir/lua/luagen.w \ luatexdir/lua/luainit.w luatexdir/lua/luanode.w \ luatexdir/lua/luastuff.w luatexdir/lua/luatoken.w \ - luatexdir/lua/texluac.w luatexdir/ocp/ocp.w \ - luatexdir/ocp/ocplist.w luatexdir/ocp/readocp.w \ - luatexdir/ocp/runocp.w luatexdir/lang/texlang.w \ + luatexdir/lua/texluac.w luatexdir/lang/texlang.w \ luatexdir/lang/hyphen.w luatexdir/lang/hnjalloc.w \ luatexdir/pdf/pagetree.w luatexdir/pdf/pdfaction.w \ luatexdir/pdf/pdfannot.w luatexdir/pdf/pdfcolorstack.w \ @@ -2118,53 +2130,53 @@ libluatex_web = luatexdir/dvi/dvigen.w luatexdir/font/dofont.w \ luatexdir/pdf/pdfgen.w luatexdir/pdf/pdfglyph.w \ luatexdir/pdf/pdfimage.w luatexdir/pdf/pdflink.w \ luatexdir/pdf/pdflistout.w luatexdir/pdf/pdfliteral.w \ - luatexdir/pdf/pdfobj.w luatexdir/pdf/pdfoutline.w \ - luatexdir/pdf/pdfpage.w luatexdir/pdf/pdfrule.w \ - luatexdir/pdf/pdfsaverestore.w luatexdir/pdf/pdfsetmatrix.w \ - luatexdir/pdf/pdfshipout.w luatexdir/pdf/pdftables.w \ - luatexdir/pdf/pdfthread.w luatexdir/pdf/pdfxform.w \ - luatexdir/tex/align.w luatexdir/tex/dumpdata.w \ - luatexdir/tex/expand.w luatexdir/tex/inputstack.w \ - luatexdir/tex/maincontrol.w luatexdir/tex/mlist.w \ - luatexdir/tex/postlinebreak.w luatexdir/tex/scanning.w \ - luatexdir/tex/texdeffont.w luatexdir/tex/texnodes.w \ - luatexdir/tex/arithmetic.w luatexdir/tex/conditional.w \ - luatexdir/tex/equivalents.w luatexdir/tex/extensions.w \ - luatexdir/tex/commands.w luatexdir/tex/linebreak.w \ - luatexdir/tex/mathcodes.w luatexdir/tex/nesting.w \ - luatexdir/tex/primitive.w luatexdir/tex/texfileio.w \ - luatexdir/tex/textcodes.w luatexdir/tex/buildpage.w \ - luatexdir/tex/directions.w luatexdir/tex/errors.w \ - luatexdir/tex/filename.w luatexdir/tex/mainbody.w \ - luatexdir/tex/memoryword.w luatexdir/tex/packaging.w \ - luatexdir/tex/printing.w luatexdir/tex/stringpool.w \ - luatexdir/tex/texmath.w luatexdir/tex/textoken.w \ - luatexdir/utils/utils.w luatexdir/utils/avlstuff.w \ - luatexdir/utils/managed-sa.w + luatexdir/pdf/pdfluaapi.w luatexdir/pdf/pdfobj.w \ + luatexdir/pdf/pdfoutline.w luatexdir/pdf/pdfpage.w \ + luatexdir/pdf/pdfrule.w luatexdir/pdf/pdfsaverestore.w \ + luatexdir/pdf/pdfsetmatrix.w luatexdir/pdf/pdfshipout.w \ + luatexdir/pdf/pdftables.w luatexdir/pdf/pdfthread.w \ + luatexdir/pdf/pdfxform.w luatexdir/tex/align.w \ + luatexdir/tex/dumpdata.w luatexdir/tex/expand.w \ + luatexdir/tex/inputstack.w luatexdir/tex/maincontrol.w \ + luatexdir/tex/mlist.w luatexdir/tex/postlinebreak.w \ + luatexdir/tex/scanning.w luatexdir/tex/texdeffont.w \ + luatexdir/tex/texnodes.w luatexdir/tex/arithmetic.w \ + luatexdir/tex/conditional.w luatexdir/tex/equivalents.w \ + luatexdir/tex/extensions.w luatexdir/tex/commands.w \ + luatexdir/tex/linebreak.w luatexdir/tex/mathcodes.w \ + luatexdir/tex/nesting.w luatexdir/tex/primitive.w \ + luatexdir/tex/texfileio.w luatexdir/tex/textcodes.w \ + luatexdir/tex/buildpage.w luatexdir/tex/directions.w \ + luatexdir/tex/errors.w luatexdir/tex/filename.w \ + luatexdir/tex/mainbody.w luatexdir/tex/memoryword.w \ + luatexdir/tex/packaging.w luatexdir/tex/printing.w \ + luatexdir/tex/stringpool.w luatexdir/tex/texmath.w \ + luatexdir/tex/textoken.w luatexdir/utils/utils.w \ + luatexdir/utils/avlstuff.w luatexdir/utils/managed-sa.w nodist_libluatex_a_SOURCES = dvigen.c dofont.c luafont.c mapfile.c \ pkin.c sfnt.c subfont.c texfont.c tfmofm.c tounicode.c \ tt_glyf.c tt_table.c vfovf.c vfpacket.c writecff.c writeenc.c \ writefont.c writet1.c writet3.c writettf.c writetype0.c \ - writetype2.c epdf.c writeimg.c writejbig2.c writejpg.c \ + writetype2.c writeimg.c writejbig2.c writejpg.c writejp2.c \ writepng.c luagen.c luainit.c luanode.c luastuff.c luatoken.c \ - texluac.c ocp.c ocplist.c readocp.c runocp.c texlang.c \ - hyphen.c hnjalloc.c pagetree.c pdfaction.c pdfannot.c \ - pdfcolorstack.c pdfdest.c pdffont.c pdfgen.c pdfglyph.c \ - pdfimage.c pdflink.c pdflistout.c pdfliteral.c pdfobj.c \ - pdfoutline.c pdfpage.c pdfrule.c pdfsaverestore.c \ - pdfsetmatrix.c pdfshipout.c pdftables.c pdfthread.c pdfxform.c \ - align.c dumpdata.c expand.c inputstack.c maincontrol.c mlist.c \ - postlinebreak.c scanning.c texdeffont.c texnodes.c \ - arithmetic.c conditional.c equivalents.c extensions.c \ - commands.c linebreak.c mathcodes.c nesting.c primitive.c \ - texfileio.c textcodes.c buildpage.c directions.c errors.c \ - filename.c mainbody.c memoryword.c packaging.c printing.c \ - stringpool.c texmath.c textoken.c utils.c avlstuff.c \ - managed-sa.c mplibdir/lmplib.c + texluac.c pdflua.c texlang.c hyphen.c hnjalloc.c pagetree.c \ + pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c \ + pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c \ + pdfliteral.c pdfluaapi.c pdfobj.c pdfoutline.c pdfpage.c \ + pdfrule.c pdfsaverestore.c pdfsetmatrix.c pdfshipout.c \ + pdftables.c pdfthread.c pdfxform.c align.c dumpdata.c expand.c \ + inputstack.c maincontrol.c mlist.c postlinebreak.c scanning.c \ + texdeffont.c texnodes.c arithmetic.c conditional.c \ + equivalents.c extensions.c commands.c linebreak.c mathcodes.c \ + nesting.c primitive.c texfileio.c textcodes.c buildpage.c \ + directions.c errors.c filename.c mainbody.c memoryword.c \ + packaging.c printing.c stringpool.c texmath.c textoken.c \ + utils.c avlstuff.c managed-sa.c mplibdir/lmplib.c luatex_font_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/font $(ctangle) luatex_image_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/image $(ctangle) luatex_lua_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/lua $(ctangle) -luatex_ocp_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/ocp $(ctangle) +luatex_luascripts_txt2zlib = $(TXTTOZLIB) +luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) luatex_lang_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/lang $(ctangle) luatex_pdf_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) luatex_tex_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/tex $(ctangle) @@ -2186,6 +2198,7 @@ libluatex_a_SOURCES = \ luatexdir/image/writeimg.h \ luatexdir/image/writejbig2.h \ luatexdir/image/writejpg.h \ + luatexdir/image/writejp2.h \ luatexdir/image/writepng.h \ luatexdir/lang/hnjalloc.h \ luatexdir/lang/hyphen.h \ @@ -2197,6 +2210,7 @@ libluatex_a_SOURCES = \ luatexdir/lua/lkpselib.c \ luatexdir/lua/llanglib.c \ luatexdir/lua/llualib.c \ + luatexdir/lua/llfslibext.c \ luatexdir/lua/lnodelib.c \ luatexdir/lua/loslibext.c \ luatexdir/lua/liolib.c \ @@ -2207,11 +2221,8 @@ libluatex_a_SOURCES = \ luatexdir/lua/ltokenlib.c \ luatexdir/lua/luagen.h \ luatexdir/lua/luatex-api.h \ + luatexdir/luascripts/pdflua.h \ luatexdir/luatex.h \ - luatexdir/ocp/ocp.h \ - luatexdir/ocp/ocplist.h \ - luatexdir/ocp/readocp.h \ - luatexdir/ocp/runocp.h \ luatexdir/pdf/pagetree.h \ luatexdir/pdf/pdfaction.h \ luatexdir/pdf/pdfannot.h \ @@ -2224,6 +2235,7 @@ libluatex_a_SOURCES = \ luatexdir/pdf/pdflink.h \ luatexdir/pdf/pdflistout.h \ luatexdir/pdf/pdfliteral.h \ + luatexdir/pdf/pdfluaapi.h \ luatexdir/pdf/pdfobj.h \ luatexdir/pdf/pdfoutline.h \ luatexdir/pdf/pdfpage.h \ @@ -2273,10 +2285,15 @@ libluatex_a_SOURCES = \ luatexdir/utils/managed-sa.h \ luatexdir/utils/synctex-common.h \ luatexdir/utils/synctex-luatex.h \ - luatexdir/utils/synctex.c \ luatexdir/utils/synctex.h \ + luatexdir/utils/synctex.c \ luatexdir/utils/utils.h +nodist_txt2zlib_SOURCES = txt2zlib.c +txt2zlib_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) +txt2zlib_DEPENDENCIES = $(ZLIB_DEPEND) +txt2zlib_CFLAGS = $(WARNING_CFLAGS) +txt2zlib_LDADD = $(ZLIB_LIBS) $(LDADD) # Force Automake to use CXXLD for linking nodist_EXTRA_xetex_SOURCES = dummy.cxx @@ -2493,7 +2510,7 @@ all: ff-config.h .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .o .obj .p .pin am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -2813,6 +2830,9 @@ tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) @rm -f ttf2afm$(EXEEXT) $(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) +txt2zlib$(EXEEXT): $(txt2zlib_OBJECTS) $(txt2zlib_DEPENDENCIES) + @rm -f txt2zlib$(EXEEXT) + $(txt2zlib_LINK) $(txt2zlib_OBJECTS) $(txt2zlib_LDADD) $(LIBS) vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) @rm -f vftovp$(EXEEXT) $(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) @@ -2988,7 +3008,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-dofont.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-dumpdata.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-dvigen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-epdf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-equivalents.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-errors.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-expand.Po@am__quote@ @@ -3005,6 +3024,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-liolib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-lkpselib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-llanglib.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-llfslibext.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-llualib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-lmplib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-lnodelib.Po@am__quote@ @@ -3028,8 +3048,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-memoryword.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mlist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-nesting.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-ocp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-ocplist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-packaging.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pagetree.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfaction.Po@am__quote@ @@ -3043,6 +3061,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdflink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdflistout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfliteral.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdflua.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfluaapi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfobj.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfoutline.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfpage.Po@am__quote@ @@ -3058,8 +3078,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-postlinebreak.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-primitive.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-printing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-readocp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-runocp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-scanning.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-sfnt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-stringpool.Po@am__quote@ @@ -3086,6 +3104,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writefont.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writeimg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writejbig2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writejp2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writejpg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writepng.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writet1.Po@am__quote@ @@ -3201,6 +3220,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tie-tie.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttf2afm-macnames.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttf2afm-ttf2afm.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt2zlib-txt2zlib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vftovp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vptovf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave.Po@am__quote@ @@ -4912,6 +4932,20 @@ libluatex_a-llualib.obj: luatexdir/lua/llualib.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-llualib.obj `if test -f 'luatexdir/lua/llualib.c'; then $(CYGPATH_W) 'luatexdir/lua/llualib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/llualib.c'; fi` +libluatex_a-llfslibext.o: luatexdir/lua/llfslibext.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-llfslibext.o -MD -MP -MF $(DEPDIR)/libluatex_a-llfslibext.Tpo -c -o libluatex_a-llfslibext.o `test -f 'luatexdir/lua/llfslibext.c' || echo '$(srcdir)/'`luatexdir/lua/llfslibext.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-llfslibext.Tpo $(DEPDIR)/libluatex_a-llfslibext.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/lua/llfslibext.c' object='libluatex_a-llfslibext.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-llfslibext.o `test -f 'luatexdir/lua/llfslibext.c' || echo '$(srcdir)/'`luatexdir/lua/llfslibext.c + +libluatex_a-llfslibext.obj: luatexdir/lua/llfslibext.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-llfslibext.obj -MD -MP -MF $(DEPDIR)/libluatex_a-llfslibext.Tpo -c -o libluatex_a-llfslibext.obj `if test -f 'luatexdir/lua/llfslibext.c'; then $(CYGPATH_W) 'luatexdir/lua/llfslibext.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/llfslibext.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-llfslibext.Tpo $(DEPDIR)/libluatex_a-llfslibext.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/lua/llfslibext.c' object='libluatex_a-llfslibext.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-llfslibext.obj `if test -f 'luatexdir/lua/llfslibext.c'; then $(CYGPATH_W) 'luatexdir/lua/llfslibext.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/llfslibext.c'; fi` + libluatex_a-lnodelib.o: luatexdir/lua/lnodelib.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lnodelib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lnodelib.Tpo -c -o libluatex_a-lnodelib.o `test -f 'luatexdir/lua/lnodelib.c' || echo '$(srcdir)/'`luatexdir/lua/lnodelib.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-lnodelib.Tpo $(DEPDIR)/libluatex_a-lnodelib.Po @@ -5360,20 +5394,6 @@ libluatex_a-writetype2.obj: writetype2.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writetype2.obj `if test -f 'writetype2.c'; then $(CYGPATH_W) 'writetype2.c'; else $(CYGPATH_W) '$(srcdir)/writetype2.c'; fi` -libluatex_a-epdf.o: epdf.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-epdf.o -MD -MP -MF $(DEPDIR)/libluatex_a-epdf.Tpo -c -o libluatex_a-epdf.o `test -f 'epdf.c' || echo '$(srcdir)/'`epdf.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-epdf.Tpo $(DEPDIR)/libluatex_a-epdf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='epdf.c' object='libluatex_a-epdf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-epdf.o `test -f 'epdf.c' || echo '$(srcdir)/'`epdf.c - -libluatex_a-epdf.obj: epdf.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-epdf.obj -MD -MP -MF $(DEPDIR)/libluatex_a-epdf.Tpo -c -o libluatex_a-epdf.obj `if test -f 'epdf.c'; then $(CYGPATH_W) 'epdf.c'; else $(CYGPATH_W) '$(srcdir)/epdf.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-epdf.Tpo $(DEPDIR)/libluatex_a-epdf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='epdf.c' object='libluatex_a-epdf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-epdf.obj `if test -f 'epdf.c'; then $(CYGPATH_W) 'epdf.c'; else $(CYGPATH_W) '$(srcdir)/epdf.c'; fi` - libluatex_a-writeimg.o: writeimg.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writeimg.o -MD -MP -MF $(DEPDIR)/libluatex_a-writeimg.Tpo -c -o libluatex_a-writeimg.o `test -f 'writeimg.c' || echo '$(srcdir)/'`writeimg.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-writeimg.Tpo $(DEPDIR)/libluatex_a-writeimg.Po @@ -5416,6 +5436,20 @@ libluatex_a-writejpg.obj: writejpg.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writejpg.obj `if test -f 'writejpg.c'; then $(CYGPATH_W) 'writejpg.c'; else $(CYGPATH_W) '$(srcdir)/writejpg.c'; fi` +libluatex_a-writejp2.o: writejp2.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writejp2.o -MD -MP -MF $(DEPDIR)/libluatex_a-writejp2.Tpo -c -o libluatex_a-writejp2.o `test -f 'writejp2.c' || echo '$(srcdir)/'`writejp2.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-writejp2.Tpo $(DEPDIR)/libluatex_a-writejp2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='writejp2.c' object='libluatex_a-writejp2.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writejp2.o `test -f 'writejp2.c' || echo '$(srcdir)/'`writejp2.c + +libluatex_a-writejp2.obj: writejp2.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writejp2.obj -MD -MP -MF $(DEPDIR)/libluatex_a-writejp2.Tpo -c -o libluatex_a-writejp2.obj `if test -f 'writejp2.c'; then $(CYGPATH_W) 'writejp2.c'; else $(CYGPATH_W) '$(srcdir)/writejp2.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-writejp2.Tpo $(DEPDIR)/libluatex_a-writejp2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='writejp2.c' object='libluatex_a-writejp2.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writejp2.obj `if test -f 'writejp2.c'; then $(CYGPATH_W) 'writejp2.c'; else $(CYGPATH_W) '$(srcdir)/writejp2.c'; fi` + libluatex_a-writepng.o: writepng.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writepng.o -MD -MP -MF $(DEPDIR)/libluatex_a-writepng.Tpo -c -o libluatex_a-writepng.o `test -f 'writepng.c' || echo '$(srcdir)/'`writepng.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-writepng.Tpo $(DEPDIR)/libluatex_a-writepng.Po @@ -5514,61 +5548,19 @@ libluatex_a-texluac.obj: texluac.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-texluac.obj `if test -f 'texluac.c'; then $(CYGPATH_W) 'texluac.c'; else $(CYGPATH_W) '$(srcdir)/texluac.c'; fi` -libluatex_a-ocp.o: ocp.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-ocp.o -MD -MP -MF $(DEPDIR)/libluatex_a-ocp.Tpo -c -o libluatex_a-ocp.o `test -f 'ocp.c' || echo '$(srcdir)/'`ocp.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-ocp.Tpo $(DEPDIR)/libluatex_a-ocp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ocp.c' object='libluatex_a-ocp.o' libtool=no @AMDEPBACKSLASH@ +libluatex_a-pdflua.o: pdflua.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdflua.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdflua.Tpo -c -o libluatex_a-pdflua.o `test -f 'pdflua.c' || echo '$(srcdir)/'`pdflua.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdflua.Tpo $(DEPDIR)/libluatex_a-pdflua.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdflua.c' object='libluatex_a-pdflua.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-ocp.o `test -f 'ocp.c' || echo '$(srcdir)/'`ocp.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdflua.o `test -f 'pdflua.c' || echo '$(srcdir)/'`pdflua.c -libluatex_a-ocp.obj: ocp.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-ocp.obj -MD -MP -MF $(DEPDIR)/libluatex_a-ocp.Tpo -c -o libluatex_a-ocp.obj `if test -f 'ocp.c'; then $(CYGPATH_W) 'ocp.c'; else $(CYGPATH_W) '$(srcdir)/ocp.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-ocp.Tpo $(DEPDIR)/libluatex_a-ocp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ocp.c' object='libluatex_a-ocp.obj' libtool=no @AMDEPBACKSLASH@ +libluatex_a-pdflua.obj: pdflua.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdflua.obj -MD -MP -MF $(DEPDIR)/libluatex_a-pdflua.Tpo -c -o libluatex_a-pdflua.obj `if test -f 'pdflua.c'; then $(CYGPATH_W) 'pdflua.c'; else $(CYGPATH_W) '$(srcdir)/pdflua.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdflua.Tpo $(DEPDIR)/libluatex_a-pdflua.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdflua.c' object='libluatex_a-pdflua.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-ocp.obj `if test -f 'ocp.c'; then $(CYGPATH_W) 'ocp.c'; else $(CYGPATH_W) '$(srcdir)/ocp.c'; fi` - -libluatex_a-ocplist.o: ocplist.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-ocplist.o -MD -MP -MF $(DEPDIR)/libluatex_a-ocplist.Tpo -c -o libluatex_a-ocplist.o `test -f 'ocplist.c' || echo '$(srcdir)/'`ocplist.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-ocplist.Tpo $(DEPDIR)/libluatex_a-ocplist.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ocplist.c' object='libluatex_a-ocplist.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-ocplist.o `test -f 'ocplist.c' || echo '$(srcdir)/'`ocplist.c - -libluatex_a-ocplist.obj: ocplist.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-ocplist.obj -MD -MP -MF $(DEPDIR)/libluatex_a-ocplist.Tpo -c -o libluatex_a-ocplist.obj `if test -f 'ocplist.c'; then $(CYGPATH_W) 'ocplist.c'; else $(CYGPATH_W) '$(srcdir)/ocplist.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-ocplist.Tpo $(DEPDIR)/libluatex_a-ocplist.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ocplist.c' object='libluatex_a-ocplist.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-ocplist.obj `if test -f 'ocplist.c'; then $(CYGPATH_W) 'ocplist.c'; else $(CYGPATH_W) '$(srcdir)/ocplist.c'; fi` - -libluatex_a-readocp.o: readocp.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-readocp.o -MD -MP -MF $(DEPDIR)/libluatex_a-readocp.Tpo -c -o libluatex_a-readocp.o `test -f 'readocp.c' || echo '$(srcdir)/'`readocp.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-readocp.Tpo $(DEPDIR)/libluatex_a-readocp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='readocp.c' object='libluatex_a-readocp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-readocp.o `test -f 'readocp.c' || echo '$(srcdir)/'`readocp.c - -libluatex_a-readocp.obj: readocp.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-readocp.obj -MD -MP -MF $(DEPDIR)/libluatex_a-readocp.Tpo -c -o libluatex_a-readocp.obj `if test -f 'readocp.c'; then $(CYGPATH_W) 'readocp.c'; else $(CYGPATH_W) '$(srcdir)/readocp.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-readocp.Tpo $(DEPDIR)/libluatex_a-readocp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='readocp.c' object='libluatex_a-readocp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-readocp.obj `if test -f 'readocp.c'; then $(CYGPATH_W) 'readocp.c'; else $(CYGPATH_W) '$(srcdir)/readocp.c'; fi` - -libluatex_a-runocp.o: runocp.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-runocp.o -MD -MP -MF $(DEPDIR)/libluatex_a-runocp.Tpo -c -o libluatex_a-runocp.o `test -f 'runocp.c' || echo '$(srcdir)/'`runocp.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-runocp.Tpo $(DEPDIR)/libluatex_a-runocp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runocp.c' object='libluatex_a-runocp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-runocp.o `test -f 'runocp.c' || echo '$(srcdir)/'`runocp.c - -libluatex_a-runocp.obj: runocp.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-runocp.obj -MD -MP -MF $(DEPDIR)/libluatex_a-runocp.Tpo -c -o libluatex_a-runocp.obj `if test -f 'runocp.c'; then $(CYGPATH_W) 'runocp.c'; else $(CYGPATH_W) '$(srcdir)/runocp.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-runocp.Tpo $(DEPDIR)/libluatex_a-runocp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runocp.c' object='libluatex_a-runocp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-runocp.obj `if test -f 'runocp.c'; then $(CYGPATH_W) 'runocp.c'; else $(CYGPATH_W) '$(srcdir)/runocp.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdflua.obj `if test -f 'pdflua.c'; then $(CYGPATH_W) 'pdflua.c'; else $(CYGPATH_W) '$(srcdir)/pdflua.c'; fi` libluatex_a-texlang.o: texlang.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-texlang.o -MD -MP -MF $(DEPDIR)/libluatex_a-texlang.Tpo -c -o libluatex_a-texlang.o `test -f 'texlang.c' || echo '$(srcdir)/'`texlang.c @@ -5780,6 +5772,20 @@ libluatex_a-pdfliteral.obj: pdfliteral.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdfliteral.obj `if test -f 'pdfliteral.c'; then $(CYGPATH_W) 'pdfliteral.c'; else $(CYGPATH_W) '$(srcdir)/pdfliteral.c'; fi` +libluatex_a-pdfluaapi.o: pdfluaapi.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdfluaapi.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdfluaapi.Tpo -c -o libluatex_a-pdfluaapi.o `test -f 'pdfluaapi.c' || echo '$(srcdir)/'`pdfluaapi.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdfluaapi.Tpo $(DEPDIR)/libluatex_a-pdfluaapi.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdfluaapi.c' object='libluatex_a-pdfluaapi.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdfluaapi.o `test -f 'pdfluaapi.c' || echo '$(srcdir)/'`pdfluaapi.c + +libluatex_a-pdfluaapi.obj: pdfluaapi.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdfluaapi.obj -MD -MP -MF $(DEPDIR)/libluatex_a-pdfluaapi.Tpo -c -o libluatex_a-pdfluaapi.obj `if test -f 'pdfluaapi.c'; then $(CYGPATH_W) 'pdfluaapi.c'; else $(CYGPATH_W) '$(srcdir)/pdfluaapi.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdfluaapi.Tpo $(DEPDIR)/libluatex_a-pdfluaapi.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdfluaapi.c' object='libluatex_a-pdfluaapi.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdfluaapi.obj `if test -f 'pdfluaapi.c'; then $(CYGPATH_W) 'pdfluaapi.c'; else $(CYGPATH_W) '$(srcdir)/pdfluaapi.c'; fi` + libluatex_a-pdfobj.o: pdfobj.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdfobj.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdfobj.Tpo -c -o libluatex_a-pdfobj.o `test -f 'pdfobj.c' || echo '$(srcdir)/'`pdfobj.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdfobj.Tpo $(DEPDIR)/libluatex_a-pdfobj.Po @@ -7670,6 +7676,20 @@ ttf2afm-macnames.obj: pdftexdir/macnames.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ttf2afm-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi` +txt2zlib-txt2zlib.o: txt2zlib.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -MT txt2zlib-txt2zlib.o -MD -MP -MF $(DEPDIR)/txt2zlib-txt2zlib.Tpo -c -o txt2zlib-txt2zlib.o `test -f 'txt2zlib.c' || echo '$(srcdir)/'`txt2zlib.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/txt2zlib-txt2zlib.Tpo $(DEPDIR)/txt2zlib-txt2zlib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='txt2zlib.c' object='txt2zlib-txt2zlib.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.o `test -f 'txt2zlib.c' || echo '$(srcdir)/'`txt2zlib.c + +txt2zlib-txt2zlib.obj: txt2zlib.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -MT txt2zlib-txt2zlib.obj -MD -MP -MF $(DEPDIR)/txt2zlib-txt2zlib.Tpo -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/txt2zlib-txt2zlib.Tpo $(DEPDIR)/txt2zlib-txt2zlib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='txt2zlib.c' object='txt2zlib-txt2zlib.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi` + xetex-xetexextra.o: xetexdir/xetexextra.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.o -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.o `test -f 'xetexdir/xetexextra.c' || echo '$(srcdir)/'`xetexdir/xetexextra.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po @@ -8780,6 +8800,7 @@ $(proglib): ${srcdir}/lib/*.c @ZLIB_RULE@ @LIBPNG_RULE@ @XPDF_RULE@ +@POPPLER_RULE@ @OBSDCOMPAT_RULE@ @ZZIPLIB_RULE@ @GRAPHITE_RULE@ @@ -9311,14 +9332,14 @@ writetype0.c: ctangle$(EXEEXT) luatexdir/font/writetype0.w writetype2.c: ctangle$(EXEEXT) luatexdir/font/writetype2.w $(luatex_font_ctangle) writetype2.w -epdf.c: ctangle$(EXEEXT) luatexdir/image/epdf.w - $(luatex_image_ctangle) epdf.w writeimg.c: ctangle$(EXEEXT) luatexdir/image/writeimg.w $(luatex_image_ctangle) writeimg.w writejbig2.c: ctangle$(EXEEXT) luatexdir/image/writejbig2.w $(luatex_image_ctangle) writejbig2.w writejpg.c: ctangle$(EXEEXT) luatexdir/image/writejpg.w $(luatex_image_ctangle) writejpg.w +writejp2.c: ctangle$(EXEEXT) luatexdir/image/writejp2.w + $(luatex_image_ctangle) writejp2.w writepng.c: ctangle$(EXEEXT) luatexdir/image/writepng.w $(luatex_image_ctangle) writepng.w @@ -9335,17 +9356,8 @@ luatoken.c: ctangle$(EXEEXT) luatexdir/lua/luatoken.w texluac.c: ctangle$(EXEEXT) luatexdir/lua/texluac.w $(luatex_lua_ctangle) texluac.w -ocp.c: ctangle$(EXEEXT) luatexdir/ocp/ocp.w - $(luatex_ocp_ctangle) ocp.w - -runocp.c: ctangle$(EXEEXT) luatexdir/ocp/runocp.w - $(luatex_ocp_ctangle) runocp.w - -readocp.c: ctangle$(EXEEXT) luatexdir/ocp/readocp.w - $(luatex_ocp_ctangle) readocp.w - -ocplist.c: ctangle$(EXEEXT) luatexdir/ocp/ocplist.w - $(luatex_ocp_ctangle) ocplist.w +pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua + $(luatex_luascripts_txt2zlib) $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c hnjalloc.c: ctangle$(EXEEXT) luatexdir/lang/hnjalloc.w $(luatex_lang_ctangle) hnjalloc.w @@ -9392,6 +9404,9 @@ pdflistout.c: ctangle$(EXEEXT) luatexdir/pdf/pdflistout.w pdfliteral.c: ctangle$(EXEEXT) luatexdir/pdf/pdfliteral.w $(luatex_pdf_ctangle) pdfliteral.w +pdfluaapi.c: ctangle$(EXEEXT) luatexdir/pdf/pdfluaapi.w + $(luatex_pdf_ctangle) pdfluaapi.w + pdfobj.c: ctangle$(EXEEXT) luatexdir/pdf/pdfobj.w $(luatex_pdf_ctangle) pdfobj.w @@ -9526,6 +9541,9 @@ avlstuff.c: ctangle$(EXEEXT) luatexdir/utils/avlstuff.w $(luatex_utils_ctangle) avlstuff.w $(libluatex_a_OBJECTS): libff.a libmplib.a + +txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w + $(luatex_luascripts_ctangle) txt2zlib.w $(xetex_OBJECTS): $(xetex_prereq) $(xetex_c_h): xetex-web2c diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index 933d05a7ecf..c88e73c5c6b 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -37,7 +37,7 @@ m4_define([kpse_tex_progs], [dnl [[eptex], [yes], [no], [e-pTeX], [ptexenc]], [[aleph], [yes], [no], [Aleph], []], [[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]], -[[luatex], [yes], [no], [luaTeX], [xpdf libpng obsdcompat zziplib]], +[[luatex], [yes], [no], [luaTeX], [poppler libpng obsdcompat zziplib]], [[xetex], [yes], [yes], [XeTeX], [xpdf libpng freetype2 icu-xetex teckit graphite]], ])[]dnl m4_foreach([Kpse_Prog], [kpse_tex_progs], diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4 index 8d89b6d7a1a..ff39f18ef22 100644 --- a/Build/source/texk/web2c/aclocal.m4 +++ b/Build/source/texk/web2c/aclocal.m4 @@ -19,113 +19,6 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# longlong.m4 serial 14 -dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_LONG_LONG_INT if 'long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. - -# Note: If the type 'long long int' exists but is only 32 bits large -# (as on some very old compilers), HAVE_LONG_LONG_INT will not be -# defined. In this case you can treat 'long long int' like 'long int'. - -AC_DEFUN([AC_TYPE_LONG_LONG_INT], -[ - AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. - dnl If cross compiling, assume the bug isn't important, since - dnl nobody cross compiles for this platform as far as we know. - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[@%:@include - @%:@ifndef LLONG_MAX - @%:@ define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - @%:@ define LLONG_MAX (HALF - 1 + HALF) - @%:@endif]], - [[long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0;]])], - [ac_cv_type_long_long_int=yes], - [ac_cv_type_long_long_int=no], - [ac_cv_type_long_long_int=yes])], - [ac_cv_type_long_long_int=no])]) - if test $ac_cv_type_long_long_int = yes; then - AC_DEFINE([HAVE_LONG_LONG_INT], [1], - [Define to 1 if the system has the type `long long int'.]) - fi -]) - -# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. - -# Note: If the type 'unsigned long long int' exists but is only 32 bits -# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT -# will not be defined. In this case you can treat 'unsigned long long int' -# like 'unsigned long int'. - -AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], -[ - AC_CACHE_CHECK([for unsigned long long int], - [ac_cv_type_unsigned_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [ac_cv_type_unsigned_long_long_int=yes], - [ac_cv_type_unsigned_long_long_int=no])]) - if test $ac_cv_type_unsigned_long_long_int = yes; then - AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], - [Define to 1 if the system has the type `unsigned long long int'.]) - fi -]) - -# Expands to a C program that can be used to test for simultaneous support -# of 'long long' and 'unsigned long long'. We don't want to say that -# 'long long' is available if 'unsigned long long' is not, or vice versa, -# because too many programs rely on the symmetry between signed and unsigned -# integer types (excluding 'bool'). -AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], -[ - AC_LANG_PROGRAM( - [[/* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63;]], - [[/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull));]]) -]) - # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -1111,6 +1004,7 @@ m4_include([../../m4/kpse-libpng-flags.m4]) m4_include([../../m4/kpse-lt-hack.m4]) m4_include([../../m4/kpse-macos-framework.m4]) m4_include([../../m4/kpse-obsdcompat-flags.m4]) +m4_include([../../m4/kpse-poppler-flags.m4]) m4_include([../../m4/kpse-ptexenc-flags.m4]) m4_include([../../m4/kpse-socket-libs.m4]) m4_include([../../m4/kpse-teckit-flags.m4]) diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 0ac3eee1d18..c9ad5135911 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -624,6 +624,7 @@ CTANGLE CTANGLEBOOT TANGLE TANGLEBOOT +TXTTOZLIB OBSDCOMPAT_RULE OBSDCOMPAT_DEPEND OBSDCOMPAT_LIBS @@ -649,6 +650,10 @@ ZZIPLIB_RULE ZZIPLIB_DEPEND ZZIPLIB_LIBS ZZIPLIB_INCLUDES +POPPLER_RULE +POPPLER_DEPEND +POPPLER_LIBS +POPPLER_INCLUDES XPDF_RULE XPDF_DEPEND XPDF_LIBS @@ -927,6 +932,7 @@ with_zlib_includes with_zlib_libdir with_system_libpng with_system_xpdf +with_system_poppler with_system_zziplib with_system_graphite with_system_freetype2 @@ -1655,6 +1661,8 @@ Optional Packages: pkg-config) --with-system-xpdf use installed poppler headers and library instead of xpdf (requires pkg-config) + --with-system-poppler use installed poppler headers and library instead of + poppler (requires pkg-config) --with-system-zziplib use installed zziplib headers and library (requires pkg-config) --with-system-graphite use installed silgraphite headers and library @@ -17347,7 +17355,7 @@ case $enable_luatex in #( esac test "x$enable_web2c:$enable_luatex" = xyes:yes && { - need_xpdf=yes + need_poppler=yes need_libpng=yes need_obsdcompat=yes need_zziplib=yes @@ -19757,18 +19765,18 @@ else /* end confdefs.h. */ /* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ /* Test literals. */ long long int ll = 9223372036854775807ll; long long int nll = -9223372036854775807LL; unsigned long long int ull = 18446744073709551615ULL; /* Test constant expressions. */ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; + ? 1 : -1)]; typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; + ? 1 : -1)]; int i = 63; int main () @@ -19777,40 +19785,40 @@ main () long long int llmax = 9223372036854775807ll; unsigned long long int ullmax = 18446744073709551615ull; return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : ac_cv_type_long_long_int=yes else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } @@ -21994,6 +22002,36 @@ ${top_builddir}/../../libs/xpdf/xpdf/Stream.h: cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags + +# Check whether --with-system-poppler was given. +if test "${with_system_poppler+set}" = set; then : + withval=$with_system_poppler; +fi +if test "x$with_system_poppler" = xyes; then + if $PKG_CONFIG poppler --atleast-version=0.10; then + POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' + POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" + POPPLER_LIBS=`$PKG_CONFIG poppler --libs` +elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then + as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5 +fi +else + POPPLER_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler' | sed \ + -e "s,SRC/,$kpse_SRC/,g" \ + -e "s,BLD/,$kpse_BLD/,g"` + POPPLER_LIBS=`echo 'BLD/libs/poppler/libpoppler.a' | sed \ + -e "s,BLD/,$kpse_BLD/,g"` + + POPPLER_DEPEND=`echo 'BLD/libs/poppler/libpoppler.a' | sed \ + -e 's,BLD/,${top_builddir}/../../,g'` + POPPLER_RULE='# Rebuild libpoppler +$(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/poppler/Stream.h + cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/poppler/poppler/Stream.h: + cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + ## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags # Check whether --with-system-zziplib was given. @@ -22297,6 +22335,58 @@ CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS +# Checks for xpdf (libpoppler) features. +eval CPPFLAGS=\"$POPPLER_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$POPPLER_LIBS \$LIBS\" + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_link="./libtool --mode=link --tag=CXX $ac_link" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDFDoc::getPDFMajorVersion" >&5 +$as_echo_n "checking for PDFDoc::getPDFMajorVersion... " >&6; } +if ${kpse_cv_have_getPDFMajorVersion+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion(); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + kpse_cv_have_getPDFMajorVersion=yes +else + kpse_cv_have_getPDFMajorVersion=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_getPDFMajorVersion" >&5 +$as_echo "$kpse_cv_have_getPDFMajorVersion" >&6; } +if test "x$kpse_cv_have_getPDFMajorVersion" = xyes; then : + +$as_echo "#define HAVE_GETPDFMAJORVERSION 1" >>confdefs.h + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_link="./libtool --mode=link --tag=CC $ac_link" + +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + + ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in" @@ -22305,6 +22395,55 @@ ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in" ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-config.in" +if test "x$cross_compiling" = xyes; then +# Extract the first word of "txt2zlib", so it can be a program name with args. +set dummy txt2zlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_TXTTOZLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $TXTTOZLIB in + [\\/]* | ?:[\\/]*) + ac_cv_path_TXTTOZLIB="$TXTTOZLIB" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_TXTTOZLIB="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +TXTTOZLIB=$ac_cv_path_TXTTOZLIB +if test -n "$TXTTOZLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TXTTOZLIB" >&5 +$as_echo "$TXTTOZLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test -z "${TXTTOZLIB}"; then + as_fn_error $? "txt2zlib was not found but is required when cross-compiling. + Install txt2zlib or set \$TXTTOZLIB to the full pathname." "$LINENO" 5 +fi +else + TXTTOZLIB=./txt2zlib +fi + # For cross-compilation. Put at the end so there is a fair chance # these are still visible when the configure script has finished. @@ -23337,9 +23476,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" +config_commands="`echo $ac_config_commands`" _ACEOF diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 95d5df2ee3d..68033caaf36 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -251,6 +251,7 @@ KPSE_PTEXENC_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS KPSE_XPDF_FLAGS +KPSE_POPPLER_FLAGS KPSE_ZZIPLIB_FLAGS KPSE_GRAPHITE_FLAGS KPSE_FREETYPE2_FLAGS @@ -273,6 +274,21 @@ AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes], AC_LANG_POP([C++]) KPSE_RESTORE_FLAGS +# Checks for xpdf (libpoppler) features. +KPSE_ADD_FLAGS([poppler]) +AC_LANG_PUSH([C++]) +AC_CACHE_CHECK([for PDFDoc::getPDFMajorVersion], + [kpse_cv_have_getPDFMajorVersion], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion();]])], + [kpse_cv_have_getPDFMajorVersion=yes], + [kpse_cv_have_getPDFMajorVersion=no])]) +AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes], + [AC_DEFINE([HAVE_GETPDFMAJORVERSION], 1, + [Define to 1 if class `PDFDoc' has the `getPDFMajorVersion' member.])]) +AC_LANG_POP([C++]) +KPSE_RESTORE_FLAGS + dnl Write output here, instead of putting a zillion -D's on the command line. AC_CONFIG_HEADERS([w2c/c-auto.h:c-auto.in], [sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ @@ -307,6 +323,8 @@ AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) dnl Additional config header for luaTeX AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in]) +dnl This is also for luatex +KPSE_CROSS_PATH_PROG([TXTTOZLIB], [txt2zlib], [./txt2zlib]) # For cross-compilation. Put at the end so there is a fair chance # these are still visible when the configure script has finished. diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 4d641ebd702..91ab9b87859 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ @@ -207,6 +208,9 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +POPPLER_DEPEND = @POPPLER_DEPEND@ +POPPLER_INCLUDES = @POPPLER_INCLUDES@ +POPPLER_LIBS = @POPPLER_LIBS@ PTEXENC_DEPEND = @PTEXENC_DEPEND@ PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ PTEXENC_LIBS = @PTEXENC_LIBS@ @@ -221,6 +225,7 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ +TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 905c4f71191..a3f4021445a 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ @@ -205,6 +206,9 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +POPPLER_DEPEND = @POPPLER_DEPEND@ +POPPLER_INCLUDES = @POPPLER_INCLUDES@ +POPPLER_LIBS = @POPPLER_LIBS@ PTEXENC_DEPEND = @PTEXENC_DEPEND@ PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ PTEXENC_LIBS = @PTEXENC_LIBS@ @@ -219,6 +223,7 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ +TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 968c39cff52..d6f92a87dc4 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-04-12 Taco Hoekwater + + * import of luatex 0.66.0, released version + 2011-03-28 Peter Breitenlohner * am/libluatex.am: Use AM_CFLAGS instead of libluatex_a_CFLAGS. diff --git a/Build/source/texk/web2c/luatexdir/NEWS b/Build/source/texk/web2c/luatexdir/NEWS index 8b3ebbd1f87..fad2afefcc8 100644 --- a/Build/source/texk/web2c/luatexdir/NEWS +++ b/Build/source/texk/web2c/luatexdir/NEWS @@ -1,6 +1,354 @@ This file is in the public domain. +============================================================== +Luatex beta-0.66.0 was released 20110512 +============================================================== + +News: + +* fixed: linebreak_filter doesn't do its default job when + tex.linebreak is used + +* fixed: \escapechar ignored by \meaning + +* fixed: wrong px default + +* fixed: font kern attribute inheritance + +* fixed: "nop" unrecognized in virtual fonts + +* fixed: assertion failure in dviluatex when font ptmr8t used + +* fixed: tex.settoks for with strings with embedded zeroes + +* fixed: an indexing problem with nonexistent font glyphs + +* fixed: some crashes and other bugs on the 'subtype' and 'prev' + fields (not all node types have those fields) + +* fixed: crash on token.csname_id ("") + +* fixed: initialize the statically allocated node's type ids + +* fixed: fencepost error in math parameter counting + +* fixed: math family numbers > 255 are allowed + +* fixed: compilation failure on Hurd + +* fixed: a small bug leading to displacements when reading + the AccentTop table + +* fixed: \directlua followed by \pdfximage generates error if + draft mode is active + +* fixed: a problem with \vadjust pre in alignments + +* fixed: a lua stack growing problem in the backend in 0.65.0, + resulting in an inability to create more than a few thousand + generated pages + +* fixed: inclusion of Scribus-generated pdfs + +* adapt: the default form margin is now zero (was 1bp before) + +* adapt: libpng 1.4.4, zzuplib 0.13.60, mplib 1.504 + +* adapt: small changes to the build system and new imports from + the texlive repository + +* feature: new function node.currentattr() queries the current + active attribute list + +* feature: Lua font loading; ignore unknown enumeration keys in + MathConstants + +* feature: JPEG 2000 image support + +* feature: continuing work on the 'epdf' library + +* doc: the 'epdf' lua library is now documented + +* doc: various other manual corrections + + +============================================================== +Luatex beta-0.65.0 was released 20101213 +============================================================== + +News: + +* The Aleph and Omega version primitives are deprecated. + +* The Apple Snow Leopard Truetype font collections now work + properly. + +* Libpng has been updated to 1.4.4, and zlib to 1.2.5. + +* New lua functions node.next() and node.prev(). + +* The already deprecated for some time node.protrusion_skipable() + function has been removed. + +* fontloader.apply_featurefile() and fontloader.apply_afmfile() + now return nil, on failure. + +* The various node list fields in the lua node interface have + been renamed from 'list' to 'head', e.g. tex.box[0].head, + and the 'list' name is deprecated. For now, the deprecation + is silent, as 'list' will stay for quite some time. Please + update your lua source as soon as possible, though. + +* The call node.type() now returns "node". The existing + functionality is otherwise unchanged. + +* Luafilesystem has been updated to 1.5.0. NOTE: there is an + incompatible change in the directory iterator method. + +* The restriction on linebreak_filter has been eased: at least one + horizontal box should be returned, but that is not necessarily + the last node any more. + +* Backward compatibility has been restored for \meaning\mathchar + +* node.first_character() has been renamed to node.first_glyph() + to better match its actual functionality. + +* The \Umathaccent primitive now supports both/bottom keywords, + and \Umathbotaccent / \Umathaccents are now deprecated. + +* The \Umathaccent primitive now also supports the fixed keyword, + which supports non-growing math accents even if the font says + there are extensible variants. + +* Ongoing work on the epdf library. + +Bugfixes: + +* Assignment to \dimen65535 was broken earlier. + +* .head.prev is now always initialized to null (0). + +* luatex -lua=