diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/libluatex.am | 78 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luafontforge.am | 10 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luamisc.am | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luasocket.am | 20 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/printing.w | 1 |
7 files changed, 91 insertions, 53 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 514cb7e6340..f639b43746c 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,12 @@ +2014-02-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libluatex.am, am/luafontforge.am, am/luamisc.am, + am/luasocket.am, am/luatex.am: Prepare for LuaJITTeX. + +2014-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * tex/printing.w (print_cs): Bug fix from TeX 3.14159265. + 2014-01-02 Peter Breitenlohner <peb@mppmu.mpg.de> * image/writepng.w: Allow libpng >= 1.6.3 to read images with diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index f43a66131ec..70c2ec49a03 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/libluatex.am: Makefile fragment for libluatex. ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## liblua52 @@ -26,13 +26,17 @@ libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir/fake EXTRA_DIST += luatexdir/fake/StructTreeRoot.h +nodist_libluatex_a_SOURCES = \ + $(dist_libluatex_sources) \ + $(nodist_libluatex_sources) + ## from luatexdir ## libluatex_web = -nodist_libluatex_a_SOURCES = +nodist_libluatex_sources = -libluatex_a_SOURCES = \ +dist_libluatex_sources = \ luatexdir/luatexcallbackids.h \ luatexdir/luatex.h \ luatexdir/luatex-common.h \ @@ -47,9 +51,9 @@ dvigen.c: ctangle$(EXEEXT) luatexdir/dvi/dvigen.w libluatex_web += luatexdir/dvi/dvigen.w -nodist_libluatex_a_SOURCES += dvigen.c +nodist_libluatex_sources += dvigen.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/dvi/dvigen.h ## from luatexdir/font @@ -110,12 +114,12 @@ libluatex_web += luatexdir/font/writet1.w luatexdir/font/writet3.w libluatex_web += luatexdir/font/writettf.w luatexdir/font/writetype0.w libluatex_web += luatexdir/font/writetype2.w -nodist_libluatex_a_SOURCES += dofont.c luafont.c mapfile.c pkin.c sfnt.c subfont.c -nodist_libluatex_a_SOURCES += texfont.c tfmofm.c tounicode.c tt_glyf.c tt_table.c vfovf.c vfpacket.c -nodist_libluatex_a_SOURCES += writecff.c writeenc.c writefont.c writet1.c writet3.c writettf.c -nodist_libluatex_a_SOURCES += writetype0.c writetype2.c +nodist_libluatex_sources += dofont.c luafont.c mapfile.c pkin.c sfnt.c subfont.c +nodist_libluatex_sources += texfont.c tfmofm.c tounicode.c tt_glyf.c tt_table.c vfovf.c vfpacket.c +nodist_libluatex_sources += writecff.c writeenc.c writefont.c writet1.c writet3.c writettf.c +nodist_libluatex_sources += writetype0.c writetype2.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/font/luatexfont.h \ luatexdir/font/mapfile.h \ luatexdir/font/sfnt.h \ @@ -149,9 +153,9 @@ libluatex_web += luatexdir/image/writejp2.w libluatex_web += luatexdir/image/writepng.w libluatex_web += luatexdir/image/pdftoepdf.w -nodist_libluatex_a_SOURCES += writeimg.c writejbig2.c writejpg.c writejp2.c writepng.c pdftoepdf.cc +nodist_libluatex_sources += writeimg.c writejbig2.c writejpg.c writejp2.c writepng.c pdftoepdf.cc -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/image/epdf.h \ luatexdir/image/image.h \ luatexdir/image/pdftoepdf.h \ @@ -174,9 +178,9 @@ texlang.c: ctangle$(EXEEXT) luatexdir/lang/texlang.w libluatex_web += luatexdir/lang/texlang.w luatexdir/lang/hyphen.w luatexdir/lang/hnjalloc.w -nodist_libluatex_a_SOURCES += texlang.c hyphen.c hnjalloc.c +nodist_libluatex_sources += texlang.c hyphen.c hnjalloc.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/lang/hnjalloc.h \ luatexdir/lang/hyphen.h \ luatexdir/lang/texlang.h @@ -201,9 +205,9 @@ texluac.c: ctangle$(EXEEXT) luatexdir/lua/texluac.w libluatex_web += luatexdir/lua/luagen.w luatexdir/lua/luainit.w luatexdir/lua/luanode.w libluatex_web += luatexdir/lua/luastuff.w luatexdir/lua/luatoken.w luatexdir/lua/texluac.w -nodist_libluatex_a_SOURCES += luagen.c luainit.c luanode.c luastuff.c luatoken.c texluac.c +nodist_libluatex_sources += luagen.c luainit.c luanode.c luastuff.c luatoken.c texluac.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/lua/lcallbacklib.c \ luatexdir/lua/lfontlib.c \ luatexdir/lua/limglib.c \ @@ -286,12 +290,12 @@ libluatex_web += luatexdir/pdf/pdfsaverestore.w luatexdir/pdf/pdfsetmatrix.w libluatex_web += luatexdir/pdf/pdfshipout.w luatexdir/pdf/pdftables.w libluatex_web += luatexdir/pdf/pdfthread.w luatexdir/pdf/pdfxform.w -nodist_libluatex_a_SOURCES += pdfpagetree.c pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c -nodist_libluatex_a_SOURCES += pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c pdfliteral.c -nodist_libluatex_a_SOURCES += pdfluaapi.c pdfobj.c pdfoutline.c pdfpage.c pdfrule.c pdfsaverestore.c -nodist_libluatex_a_SOURCES += pdfsetmatrix.c pdfshipout.c pdftables.c pdfthread.c pdfxform.c +nodist_libluatex_sources += pdfpagetree.c pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c +nodist_libluatex_sources += pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c pdfliteral.c +nodist_libluatex_sources += pdfluaapi.c pdfobj.c pdfoutline.c pdfpage.c pdfrule.c pdfsaverestore.c +nodist_libluatex_sources += pdfsetmatrix.c pdfshipout.c pdftables.c pdfthread.c pdfxform.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/pdf/pdfpagetree.h \ luatexdir/pdf/pdfaction.h \ luatexdir/pdf/pdfannot.h \ @@ -343,9 +347,9 @@ pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua cp -f pdflua.c $(srcdir)/luatexdir/luascripts/pdflua.c endif !cross -nodist_libluatex_a_SOURCES += pdflua.c +nodist_libluatex_sources += pdflua.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/luascripts/pdflua.h ## from luatexdir/tex @@ -429,14 +433,14 @@ libluatex_web += luatexdir/tex/scanning.w luatexdir/tex/stringpool.w luatexdir/t libluatex_web += luatexdir/tex/texfileio.w luatexdir/tex/texmath.w luatexdir/tex/texnodes.w libluatex_web += luatexdir/tex/textcodes.w luatexdir/tex/textoken.w -nodist_libluatex_a_SOURCES += align.c arithmetic.c buildpage.c commands.c conditional.c directions.c -nodist_libluatex_a_SOURCES += dumpdata.c equivalents.c errors.c expand.c extensions.c filename.c -nodist_libluatex_a_SOURCES += inputstack.c linebreak.c mainbody.c maincontrol.c mathcodes.c -nodist_libluatex_a_SOURCES += memoryword.c mlist.c nesting.c packaging.c postlinebreak.c -nodist_libluatex_a_SOURCES += primitive.c printing.c scanning.c stringpool.c texdeffont.c -nodist_libluatex_a_SOURCES += texfileio.c texmath.c texnodes.c textcodes.c textoken.c +nodist_libluatex_sources += align.c arithmetic.c buildpage.c commands.c conditional.c directions.c +nodist_libluatex_sources += dumpdata.c equivalents.c errors.c expand.c extensions.c filename.c +nodist_libluatex_sources += inputstack.c linebreak.c mainbody.c maincontrol.c mathcodes.c +nodist_libluatex_sources += memoryword.c mlist.c nesting.c packaging.c postlinebreak.c +nodist_libluatex_sources += primitive.c printing.c scanning.c stringpool.c texdeffont.c +nodist_libluatex_sources += texfileio.c texmath.c texnodes.c textcodes.c textoken.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/tex/align.h \ luatexdir/tex/arithmetic.h \ luatexdir/tex/buildpage.h \ @@ -485,9 +489,9 @@ unistring.c: ctangle$(EXEEXT) luatexdir/utils/unistring.w libluatex_web += luatexdir/utils/avlstuff.w luatexdir/utils/managed-sa.w luatexdir/utils/utils.w luatexdir/utils/unistring.w -nodist_libluatex_a_SOURCES += avlstuff.c managed-sa.c utils.c unistring.c +nodist_libluatex_sources += avlstuff.c managed-sa.c utils.c unistring.c -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ luatexdir/utils/avl.c \ luatexdir/utils/avl.h \ luatexdir/utils/avlstuff.h \ @@ -497,7 +501,7 @@ libluatex_a_SOURCES += \ ## from ../synctexdir ## -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ synctexdir/synctex-common.h \ synctexdir/synctex-luatex.h \ synctexdir/synctex.c \ @@ -505,14 +509,16 @@ libluatex_a_SOURCES += \ ## from ../mplibdir ## -libluatex_a_SOURCES += \ +dist_libluatex_sources += \ mplibdir/lmplib.c $(libluatex_a_OBJECTS): libff.a libmplib.a $(POPPLER_DEPEND) -EXTRA_DIST += $(libluatex_web) +EXTRA_DIST += \ + $(dist_libluatex_sources) \ + $(libluatex_web) -DISTCLEANFILES += $(nodist_libluatex_a_SOURCES) +DISTCLEANFILES += $(nodist_libluatex_sources) EXTRA_DIST += \ luatexdir/ChangeLog \ diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am index e3a2c9e925a..78c73eb8f68 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/luafontforge.am: Makefile fragment for libff. ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## luafontforge @@ -21,7 +21,9 @@ libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge libff_a_CFLAGS = # $(WARNING_CFLAGS) -libff_a_SOURCES = \ +nodist_libff_a_SOURCES = $(libff_sources) + +libff_sources = \ luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \ luatexdir/luafontloader/fontforge/Unicode/alphabet.c \ luatexdir/luafontloader/fontforge/Unicode/backtrns.c \ @@ -121,6 +123,10 @@ libff_a_SOURCES = \ luatexdir/luafontloader/src/ffdummies.c \ luatexdir/luafontloader/src/luafflib.c +EXTRA_DIST += $(libff_sources) + +## Not used +## EXTRA_DIST += \ luatexdir/luafontloader/ChangeLog \ luatexdir/luafontloader/fontforge/AUTHORS \ diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index 3c66a0c01ff..8d29b861aa0 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -1,7 +1,7 @@ ## texk/web2c/luatexdir/am/luamisc.am: Makefile fragment for libluamisc ## (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, and slnunicode) ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, @@ -18,7 +18,9 @@ libluamisc_a_CPPFLAGS = \ $(LUA_INCLUDES) libluamisc_a_CFLAGS = # $(WARNING_CFLAGS) -libluamisc_a_SOURCES = \ +nodist_libluamisc_a_SOURCES = $(libluamisc_sources) + +libluamisc_sources = \ luatexdir/luafilesystem/src/lfs.c \ luatexdir/luafilesystem/src/lfs.h \ luatexdir/luamd5/md5.c \ @@ -43,8 +45,11 @@ libluamisc_a_SOURCES = \ luatexdir/luazlib/lzlib.c \ luatexdir/slnunicode/slnunico.c -## Included by slnunico.c -EXTRA_libluamisc_a_SOURCES = luatexdir/slnunicode/slnudata.c +## The file slnudata.c is included from slnunico.c +## +EXTRA_DIST += \ + $(libluamisc_sources) \ + luatexdir/slnunicode/slnudata.c ## Not used ## diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index 91f3e4e4e01..bec2e748cd7 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/luasocket.am: Makefile fragment for libluasocket. ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## luasocket @@ -15,7 +15,9 @@ libluasocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_INCLUDES) libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) -libluasocket_a_SOURCES = \ +nodist_libluasocket_a_SOURCES = $(libluasocket_sources) + +libluasocket_sources = \ luatexdir/luasocket/src/auxiliar.c \ luatexdir/luasocket/src/auxiliar.h \ luatexdir/luasocket/src/buffer.c \ @@ -46,18 +48,20 @@ libluasocket_a_SOURCES = \ luatexdir/luasocket/src/udp.h \ luatexdir/luasocket/src/usocket.h - +## The files *_lua.c are included from lua_preload.c +## EXTRA_DIST += \ - luatexdir/luasocket/src/socket_lua.c \ + $(libluasocket_sources) \ luatexdir/luasocket/src/ftp_lua.c \ luatexdir/luasocket/src/headers_lua.c \ luatexdir/luasocket/src/http_lua.c \ - luatexdir/luasocket/src/smtp_lua.c \ - luatexdir/luasocket/src/tp_lua.c \ - luatexdir/luasocket/src/url_lua.c \ luatexdir/luasocket/src/ltn12_lua.c \ luatexdir/luasocket/src/mbox_lua.c \ - luatexdir/luasocket/src/mime_lua.c + luatexdir/luasocket/src/mime_lua.c \ + luatexdir/luasocket/src/smtp_lua.c \ + luatexdir/luasocket/src/socket_lua.c \ + luatexdir/luasocket/src/tp_lua.c \ + luatexdir/luasocket/src/url_lua.c ## Not used ## diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index e276036c5d0..ce9d9c23a4c 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/luatex.am: Makefile fragment for luaTeX. ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## luaTeX @@ -40,9 +40,16 @@ luatex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a $(luatex_OBJECTS): libluatex.a -luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h +nodist_luatex_SOURCES = $(luatex_sources) -EXTRA_DIST += luatexdir/getluatexsvnversion.sh +luatex_sources = \ + luatexdir/luatex_svnversion.h \ + luatexdir/luatex.c \ + luatexdir/luatex.h + +EXTRA_DIST += \ + $(luatex_sources) \ + luatexdir/getluatexsvnversion.sh call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" nodist_call_luatex_SOURCES = callexe.c diff --git a/Build/source/texk/web2c/luatexdir/tex/printing.w b/Build/source/texk/web2c/luatexdir/tex/printing.w index fe011fa369c..685a278c14d 100644 --- a/Build/source/texk/web2c/luatexdir/tex/printing.w +++ b/Build/source/texk/web2c/luatexdir/tex/printing.w @@ -703,6 +703,7 @@ void print_cs(int p) if (p == null_cs) { tprint_esc("csname"); tprint_esc("endcsname"); + print_char(' '); } else { tprint_esc("IMPOSSIBLE."); } |