diff options
Diffstat (limited to 'Build/source')
28 files changed, 2906 insertions, 361 deletions
diff --git a/Build/source/configure b/Build/source/configure index 0b008e69f14..393472977cd 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -821,6 +821,8 @@ enable_pdftex_synctex enable_luatex enable_luajittex enable_mp +enable_pmp +enable_upmp enable_xetex enable_xetex_synctex enable_mf @@ -1631,6 +1633,8 @@ Optional Features: --disable-luatex do not compile and install LuaTeX --disable-luajittex do not compile and install LuaJITTeX --disable-mp do not compile and install MetaPost + --disable-pmp do not compile and install pMetaPost + --disable-upmp do not compile and install upMetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -4593,6 +4597,40 @@ test "x$enable_web2c:$enable_mp" = xyes:yes && { need_cairo=yes need_libpng=yes } +# Check whether --enable-pmp was given. +if test "${enable_pmp+set}" = set; then : + enableval=$enable_pmp; +fi +case $enable_pmp in #( + yes | no) : + ;; #( + *) : + enable_pmp=yes ;; +esac + +test "x$enable_web2c:$enable_pmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} +# Check whether --enable-upmp was given. +if test "${enable_upmp+set}" = set; then : + enableval=$enable_upmp; +fi +case $enable_upmp in #( + yes | no) : + ;; #( + *) : + enable_upmp=yes ;; +esac + +test "x$enable_web2c:$enable_upmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; diff --git a/Build/source/libs/configure b/Build/source/libs/configure index a4b6bdf3a80..d76238e40b2 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -733,6 +733,8 @@ enable_pdftex_synctex enable_luatex enable_luajittex enable_mp +enable_pmp +enable_upmp enable_xetex enable_xetex_synctex enable_mf @@ -1539,6 +1541,8 @@ Optional Features: --disable-luatex do not compile and install LuaTeX --disable-luajittex do not compile and install LuaJITTeX --disable-mp do not compile and install MetaPost + --disable-pmp do not compile and install pMetaPost + --disable-upmp do not compile and install upMetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -3845,6 +3849,40 @@ test "x$enable_web2c:$enable_mp" = xyes:yes && { need_cairo=yes need_libpng=yes } +# Check whether --enable-pmp was given. +if test "${enable_pmp+set}" = set; then : + enableval=$enable_pmp; +fi +case $enable_pmp in #( + yes | no) : + ;; #( + *) : + enable_pmp=yes ;; +esac + +test "x$enable_web2c:$enable_pmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} +# Check whether --enable-upmp was given. +if test "${enable_upmp+set}" = set; then : + enableval=$enable_upmp; +fi +case $enable_upmp in #( + yes | no) : + ;; #( + *) : + enable_upmp=yes ;; +esac + +test "x$enable_web2c:$enable_upmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 41ae58e8b60..7ba4bc1a9ac 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -733,6 +733,8 @@ enable_pdftex_synctex enable_luatex enable_luajittex enable_mp +enable_pmp +enable_upmp enable_xetex enable_xetex_synctex enable_mf @@ -1550,6 +1552,8 @@ Optional Features: --disable-luatex do not compile and install LuaTeX --disable-luajittex do not compile and install LuaJITTeX --disable-mp do not compile and install MetaPost + --disable-pmp do not compile and install pMetaPost + --disable-upmp do not compile and install upMetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -3856,6 +3860,40 @@ test "x$enable_web2c:$enable_mp" = xyes:yes && { need_cairo=yes need_libpng=yes } +# Check whether --enable-pmp was given. +if test "${enable_pmp+set}" = set; then : + enableval=$enable_pmp; +fi +case $enable_pmp in #( + yes | no) : + ;; #( + *) : + enable_pmp=yes ;; +esac + +test "x$enable_web2c:$enable_pmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} +# Check whether --enable-upmp was given. +if test "${enable_upmp+set}" = set; then : + enableval=$enable_upmp; +fi +case $enable_upmp in #( + yes | no) : + ;; #( + *) : + enable_upmp=yes ;; +esac + +test "x$enable_web2c:$enable_upmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 1bbea175c1f..3caff43c20c 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2014-09-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * texmf.cnf (TEX.upmpost): Added. + 2014-08-23 Peter Breitenlohner <peb@mppmu.mpg.de> * knj.c (win32_fputs): Drop unused variables. diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index 77bcfb98f82..f75f4651405 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -217,10 +217,11 @@ TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,plain,generic,}// TEX.pmpost = eptex -% (e)up(La)TeX. +% (e)up(La)TeX, and for upmpost. TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}// TEXINPUTS.uptex = .;$TEXMF/tex/{uptex,ptex,plain,generic,}// TEXINPUTS.euptex = .;$TEXMF/tex/{uptex,ptex,plain,generic}// +TEX.upmpost = euptex % pBibTeX bibliographies and style files. BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 3429c66cc88..59364986990 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2014-09-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Include fragments libmputil.am and pmpost.am. + * ac/web2c.ac: Add pMetaPost and upMetaPost. + * pmpostdir/ (new): Code for pMetaPost and upMetaPost. + 2014-08-22 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Drop redundant AM_CONDITIONAL MP. diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 7801f2a03ab..1b23f6cd5ac 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -185,7 +185,11 @@ include $(srcdir)/am/texmf.am ## MetaPost include $(srcdir)/mplibdir/am/mplib.am -## libmplib, used by MetaPost and luaTeX +## pMetaPost and upMetaPost +include $(srcdir)/pmpostdir/am/pmpost.am + +## libmputil, libmplib, used by MetaPost and luaTeX +include $(srcdir)/mplibdir/am/libmputil.am include $(srcdir)/mplibdir/am/libmplib.am ## e-TeX diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index cb31296d0f3..eeb6578a9b2 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -83,12 +83,12 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \ - mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \ - $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \ - euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ - pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \ - txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) \ - aleph$(EXEEXT) synctex$(EXEEXT) + mf-nowin$(EXEEXT) mpost$(EXEEXT) pmpost$(EXEEXT) \ + upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) $(am__EXEEXT_2) \ + eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) euptex$(EXEEXT) \ + pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \ + luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \ + xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \ ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \ $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ @@ -97,25 +97,28 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \ $(am__EXEEXT_16) $(am__EXEEXT_17) $(am__EXEEXT_18) \ $(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \ $(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \ - $(am__EXEEXT_25) + $(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ - $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \ - $(am__EXEEXT_38) -check_PROGRAMS = $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \ - $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) \ - $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \ + $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \ + $(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) +check_PROGRAMS = $(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30) \ + $(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \ + $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \ md5main$(EXEEXT) -TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \ +TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \ cwebdir/cweave.test tiedir/tie.test $(am__append_6) \ - $(am__append_14) $(am__append_23) $(am__append_28) \ - $(am__append_34) $(am__append_38) $(am__append_40) \ - $(am__append_46) $(am__append_50) $(am__append_52) \ - $(am__append_58) $(am__append_69) $(am__append_70) \ - $(am__append_78) $(am__append_80) $(am__append_83) \ - $(am__append_113) libmd5/md5.test + $(am__append_14) $(am__append_23) $(am__append_37) \ + $(am__append_38) $(am__append_40) $(am__append_46) \ + $(am__append_50) $(am__append_52) $(am__append_58) \ + $(am__append_62) $(am__append_64) $(am__append_70) \ + $(am__append_81) $(am__append_82) $(am__append_90) \ + $(am__append_92) $(am__append_95) $(am__append_125) \ + libmd5/md5.test DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \ $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am \ $(srcdir)/mplibdir/am/mplib.am \ + $(srcdir)/pmpostdir/am/pmpost.am \ + $(srcdir)/mplibdir/am/libmputil.am \ $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am \ $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am \ $(srcdir)/uptexdir/am/uptex.am \ @@ -183,162 +186,174 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \ @MP_TRUE@am__append_24 = pltotf tftopl @MP_TRUE@am__append_25 = mptrap.diffs @MP_TRUE@am__append_26 = mptrap-clean -@ETEX_TRUE@am__append_27 = etex -@ETEX_TRUE@am__append_28 = $(etex_tests) -@ETEX_TRUE@am__append_29 = dvitype pltotf tftopl -@ETEX_TRUE@am__append_30 = etrip.diffs -@ETEX_TRUE@am__append_31 = etrip-clean -@PTEX_TRUE@am__append_32 = ptex -@PWEB_TRUE@am__append_33 = $(pweb_programs) -@PTEX_TRUE@am__append_34 = $(ptex_tests) -@PTEX_TRUE@am__append_35 = dvitype pltotf tftopl -@PTEX_TRUE@am__append_36 = ptrip.diffs -@PTEX_TRUE@am__append_37 = ptrip-clean -@PWEB_TRUE@am__append_38 = $(pweb_tests) -@EPTEX_TRUE@am__append_39 = eptex -@EPTEX_TRUE@am__append_40 = $(eptex_tests) -@EPTEX_TRUE@am__append_41 = dvitype pltotf tftopl -@EPTEX_TRUE@am__append_42 = eptrip.diffs -@EPTEX_TRUE@am__append_43 = eptrip-clean -@UPTEX_TRUE@am__append_44 = uptex -@UPWEB_TRUE@am__append_45 = $(upweb_programs) -@UPTEX_TRUE@am__append_46 = $(uptex_tests) -@UPTEX_TRUE@am__append_47 = dvitype pltotf tftopl -@UPTEX_TRUE@am__append_48 = uptrip.diffs -@UPTEX_TRUE@am__append_49 = uptrip-clean -@UPWEB_TRUE@am__append_50 = $(upweb_tests) -@EUPTEX_TRUE@am__append_51 = euptex -@EUPTEX_TRUE@am__append_52 = $(euptex_tests) -@EUPTEX_TRUE@am__append_53 = dvitype pltotf tftopl -@EUPTEX_TRUE@am__append_54 = euptrip.diffs -@EUPTEX_TRUE@am__append_55 = euptrip-clean -@MINGW32_TRUE@am__append_56 = \ +@PMP_TRUE@am__append_27 = pmpost +@PMP_TRUE@@WIN32_TRUE@am__append_28 = call_pmpost +@PMP_TRUE@@WIN32_TRUE@am__append_29 = install-pmpost-links +@PMP_TRUE@@WIN32_TRUE@am__append_30 = uninstall-pmpost-links +@PMP_TRUE@@WIN32_FALSE@am__append_31 = pmpost$(EXEEXT):pdvitomp +@UPMP_TRUE@am__append_32 = upmpost +@UPMP_TRUE@@WIN32_TRUE@am__append_33 = call_upmpost +@UPMP_TRUE@@WIN32_TRUE@am__append_34 = install-upmpost-links +@UPMP_TRUE@@WIN32_TRUE@am__append_35 = uninstall-upmpost-links +@UPMP_TRUE@@WIN32_FALSE@am__append_36 = upmpost$(EXEEXT):updvitomp +@PMP_TRUE@am__append_37 = pmpostdir/pmpost.test +@UPMP_TRUE@am__append_38 = pmpostdir/upmpost.test +@ETEX_TRUE@am__append_39 = etex +@ETEX_TRUE@am__append_40 = $(etex_tests) +@ETEX_TRUE@am__append_41 = dvitype pltotf tftopl +@ETEX_TRUE@am__append_42 = etrip.diffs +@ETEX_TRUE@am__append_43 = etrip-clean +@PTEX_TRUE@am__append_44 = ptex +@PWEB_TRUE@am__append_45 = $(pweb_programs) +@PTEX_TRUE@am__append_46 = $(ptex_tests) +@PTEX_TRUE@am__append_47 = dvitype pltotf tftopl +@PTEX_TRUE@am__append_48 = ptrip.diffs +@PTEX_TRUE@am__append_49 = ptrip-clean +@PWEB_TRUE@am__append_50 = $(pweb_tests) +@EPTEX_TRUE@am__append_51 = eptex +@EPTEX_TRUE@am__append_52 = $(eptex_tests) +@EPTEX_TRUE@am__append_53 = dvitype pltotf tftopl +@EPTEX_TRUE@am__append_54 = eptrip.diffs +@EPTEX_TRUE@am__append_55 = eptrip-clean +@UPTEX_TRUE@am__append_56 = uptex +@UPWEB_TRUE@am__append_57 = $(upweb_programs) +@UPTEX_TRUE@am__append_58 = $(uptex_tests) +@UPTEX_TRUE@am__append_59 = dvitype pltotf tftopl +@UPTEX_TRUE@am__append_60 = uptrip.diffs +@UPTEX_TRUE@am__append_61 = uptrip-clean +@UPWEB_TRUE@am__append_62 = $(upweb_tests) +@EUPTEX_TRUE@am__append_63 = euptex +@EUPTEX_TRUE@am__append_64 = $(euptex_tests) +@EUPTEX_TRUE@am__append_65 = dvitype pltotf tftopl +@EUPTEX_TRUE@am__append_66 = euptrip.diffs +@EUPTEX_TRUE@am__append_67 = euptrip-clean +@MINGW32_TRUE@am__append_68 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@PDFTEX_TRUE@am__append_57 = pdftex ttf2afm pdftosrc -@PDFTEX_TRUE@am__append_58 = $(pdftex_tests) $(ttf2afm_tests) \ +@PDFTEX_TRUE@am__append_69 = pdftex ttf2afm pdftosrc +@PDFTEX_TRUE@am__append_70 = $(pdftex_tests) $(ttf2afm_tests) \ @PDFTEX_TRUE@ $(pdftosrc_tests) -@LUATEX_TRUE@am__append_59 = luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_60 = call_luatex -@LUATEX_TRUE@@WIN32_TRUE@am__append_61 = install-luatex-links -@LUATEX_TRUE@@WIN32_TRUE@am__append_62 = uninstall-luatex-links -@LUATEX_TRUE@@WIN32_FALSE@am__append_63 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac -@LUAJITTEX_TRUE@am__append_64 = luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_65 = call_luajittex -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_66 = install-luajittex-links -@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_67 = uninstall-luajittex-links -@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_68 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc -@LUATEX_TRUE@am__append_69 = $(luatex_tests) -@LUAJITTEX_TRUE@am__append_70 = $(luajittex_tests) -@LUATEX_TRUE@@cross_FALSE@am__append_71 = txt2zlib -@XETEX_TRUE@am__append_72 = xetex -@XETEX_MACOSX_TRUE@am__append_73 = -DXETEX_MAC -@XETEX_MACOSX_FALSE@am__append_74 = $(FONTCONFIG_INCLUDES) -@XETEX_MACOSX_FALSE@am__append_75 = $(FONTCONFIG_LIBS) -@XETEX_MACOSX_TRUE@am__append_76 = \ +@LUATEX_TRUE@am__append_71 = luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_72 = call_luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_73 = install-luatex-links +@LUATEX_TRUE@@WIN32_TRUE@am__append_74 = uninstall-luatex-links +@LUATEX_TRUE@@WIN32_FALSE@am__append_75 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac +@LUAJITTEX_TRUE@am__append_76 = luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_77 = call_luajittex +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_78 = install-luajittex-links +@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_79 = uninstall-luajittex-links +@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_80 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc +@LUATEX_TRUE@am__append_81 = $(luatex_tests) +@LUAJITTEX_TRUE@am__append_82 = $(luajittex_tests) +@LUATEX_TRUE@@cross_FALSE@am__append_83 = txt2zlib +@XETEX_TRUE@am__append_84 = xetex +@XETEX_MACOSX_TRUE@am__append_85 = -DXETEX_MAC +@XETEX_MACOSX_FALSE@am__append_86 = $(FONTCONFIG_INCLUDES) +@XETEX_MACOSX_FALSE@am__append_87 = $(FONTCONFIG_LIBS) +@XETEX_MACOSX_TRUE@am__append_88 = \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \ @XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c -@XETEX_MACOSX_FALSE@am__append_77 = \ +@XETEX_MACOSX_FALSE@am__append_89 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h -@XETEX_TRUE@am__append_78 = $(xetex_tests) -@OTANGLE_TRUE@am__append_79 = $(omegaware_programs) -@OTANGLE_TRUE@am__append_80 = $(OTANGLE_tests) $(OMFONTS_tests) -@OTANGLE_TRUE@am__append_81 = pltotf tftopl -@ALEPH_TRUE@am__append_82 = aleph -@ALEPH_TRUE@am__append_83 = $(aleph_tests) -@SYNCTEX_TRUE@am__append_84 = synctex -@TEX_SYNCTEX_TRUE@am__append_85 = -I$(srcdir)/synctexdir \ +@XETEX_TRUE@am__append_90 = $(xetex_tests) +@OTANGLE_TRUE@am__append_91 = $(omegaware_programs) +@OTANGLE_TRUE@am__append_92 = $(OTANGLE_tests) $(OMFONTS_tests) +@OTANGLE_TRUE@am__append_93 = pltotf tftopl +@ALEPH_TRUE@am__append_94 = aleph +@ALEPH_TRUE@am__append_95 = $(aleph_tests) +@SYNCTEX_TRUE@am__append_96 = synctex +@TEX_SYNCTEX_TRUE@am__append_97 = -I$(srcdir)/synctexdir \ @TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\" -@TEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_DEPEND) -@TEX_SYNCTEX_TRUE@am__append_88 = \ +@TEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_DEPEND) +@TEX_SYNCTEX_TRUE@am__append_100 = \ @TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h -@ETEX_SYNCTEX_TRUE@am__append_89 = -I$(srcdir)/synctexdir \ +@ETEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \ @ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\" -@ETEX_SYNCTEX_TRUE@am__append_90 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_91 = $(ZLIB_DEPEND) -@ETEX_SYNCTEX_TRUE@am__append_92 = \ +@ETEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND) +@ETEX_SYNCTEX_TRUE@am__append_104 = \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h -@PTEX_SYNCTEX_TRUE@am__append_93 = -I$(srcdir)/synctexdir \ +@PTEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \ @PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\" -@PTEX_SYNCTEX_TRUE@am__append_94 = $(ZLIB_LIBS) -@PTEX_SYNCTEX_TRUE@am__append_95 = $(ZLIB_DEPEND) -@PTEX_SYNCTEX_TRUE@am__append_96 = \ +@PTEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS) +@PTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND) +@PTEX_SYNCTEX_TRUE@am__append_108 = \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h -@UPTEX_SYNCTEX_TRUE@am__append_97 = -I$(srcdir)/synctexdir \ +@UPTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \ @UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\" -@UPTEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_LIBS) -@UPTEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_DEPEND) -@UPTEX_SYNCTEX_TRUE@am__append_100 = \ +@UPTEX_SYNCTEX_TRUE@am__append_110 = $(ZLIB_LIBS) +@UPTEX_SYNCTEX_TRUE@am__append_111 = $(ZLIB_DEPEND) +@UPTEX_SYNCTEX_TRUE@am__append_112 = \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h -@EPTEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \ +@EPTEX_SYNCTEX_TRUE@am__append_113 = -I$(srcdir)/synctexdir \ @EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\" -@EPTEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS) -@EPTEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND) -@EPTEX_SYNCTEX_TRUE@am__append_104 = \ +@EPTEX_SYNCTEX_TRUE@am__append_114 = $(ZLIB_LIBS) +@EPTEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_DEPEND) +@EPTEX_SYNCTEX_TRUE@am__append_116 = \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h -@EUPTEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \ +@EUPTEX_SYNCTEX_TRUE@am__append_117 = -I$(srcdir)/synctexdir \ @EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\" -@EUPTEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS) -@EUPTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND) -@EUPTEX_SYNCTEX_TRUE@am__append_108 = \ +@EUPTEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_LIBS) +@EUPTEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_DEPEND) +@EUPTEX_SYNCTEX_TRUE@am__append_120 = \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h -@PDFTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \ +@PDFTEX_SYNCTEX_TRUE@am__append_121 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\" -@PDFTEX_SYNCTEX_TRUE@am__append_110 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_122 = \ @PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h -@XETEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_123 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\" -@XETEX_SYNCTEX_TRUE@am__append_112 = \ +@XETEX_SYNCTEX_TRUE@am__append_124 = \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h -@SYNCTEX_TRUE@am__append_113 = $(synctex_tests) +@SYNCTEX_TRUE@am__append_125 = $(synctex_tests) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ @@ -828,9 +843,6 @@ nodist_libmf_a_OBJECTS = $(am__objects_11) mf-pool.$(OBJEXT) libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS) libmplib_a_AR = $(AR) $(ARFLAGS) libmplib_a_LIBADD = -am_libmplib_a_OBJECTS = mplibdir/libmplib_a-avl.$(OBJEXT) \ - mplibdir/libmplib_a-decNumber.$(OBJEXT) \ - mplibdir/libmplib_a-decContext.$(OBJEXT) am__objects_12 = libmplib_a-mp.$(OBJEXT) am__objects_13 = libmplib_a-mpmath.$(OBJEXT) am__objects_14 = libmplib_a-mpmathbinary.$(OBJEXT) @@ -844,8 +856,13 @@ nodist_libmplib_a_OBJECTS = libmplib_a-tfmin.$(OBJEXT) \ $(am__objects_12) $(am__objects_13) $(am__objects_14) \ $(am__objects_15) $(am__objects_16) $(am__objects_17) \ $(am__objects_18) $(am__objects_19) $(am__objects_20) -libmplib_a_OBJECTS = $(am_libmplib_a_OBJECTS) \ - $(nodist_libmplib_a_OBJECTS) +libmplib_a_OBJECTS = $(nodist_libmplib_a_OBJECTS) +libmputil_a_AR = $(AR) $(ARFLAGS) +libmputil_a_LIBADD = +am_libmputil_a_OBJECTS = mplibdir/libmputil_a-avl.$(OBJEXT) \ + mplibdir/libmputil_a-decNumber.$(OBJEXT) \ + mplibdir/libmputil_a-decContext.$(OBJEXT) +libmputil_a_OBJECTS = $(am_libmputil_a_OBJECTS) libpdftex_a_AR = $(AR) $(ARFLAGS) libpdftex_a_LIBADD = am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \ @@ -980,40 +997,44 @@ am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \ @MFN_TRUE@@MF_TRUE@am__EXEEXT_9 = mf-nowin$(EXEEXT) @MF_TRUE@@WIN32_TRUE@am__EXEEXT_10 = inimf$(EXEEXT) @MP_TRUE@am__EXEEXT_11 = mpost$(EXEEXT) -@ETEX_TRUE@am__EXEEXT_12 = etex$(EXEEXT) -@PTEX_TRUE@am__EXEEXT_13 = ptex$(EXEEXT) -@PWEB_TRUE@am__EXEEXT_14 = $(am__EXEEXT_2) -@EPTEX_TRUE@am__EXEEXT_15 = eptex$(EXEEXT) -@UPTEX_TRUE@am__EXEEXT_16 = uptex$(EXEEXT) -@UPWEB_TRUE@am__EXEEXT_17 = $(am__EXEEXT_3) -@EUPTEX_TRUE@am__EXEEXT_18 = euptex$(EXEEXT) -@PDFTEX_TRUE@am__EXEEXT_19 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ +@PMP_TRUE@am__EXEEXT_12 = pmpost$(EXEEXT) +@UPMP_TRUE@am__EXEEXT_13 = upmpost$(EXEEXT) +@ETEX_TRUE@am__EXEEXT_14 = etex$(EXEEXT) +@PTEX_TRUE@am__EXEEXT_15 = ptex$(EXEEXT) +@PWEB_TRUE@am__EXEEXT_16 = $(am__EXEEXT_2) +@EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT) +@UPTEX_TRUE@am__EXEEXT_18 = uptex$(EXEEXT) +@UPWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_3) +@EUPTEX_TRUE@am__EXEEXT_20 = euptex$(EXEEXT) +@PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ @PDFTEX_TRUE@ pdftosrc$(EXEEXT) -@LUATEX_TRUE@am__EXEEXT_20 = luatex$(EXEEXT) -@LUAJITTEX_TRUE@am__EXEEXT_21 = luajittex$(EXEEXT) -@XETEX_TRUE@am__EXEEXT_22 = xetex$(EXEEXT) -@OTANGLE_TRUE@am__EXEEXT_23 = $(am__EXEEXT_4) -@ALEPH_TRUE@am__EXEEXT_24 = aleph$(EXEEXT) -@SYNCTEX_TRUE@am__EXEEXT_25 = synctex$(EXEEXT) -@TEX_TRUE@am__EXEEXT_26 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT) +@LUAJITTEX_TRUE@am__EXEEXT_23 = luajittex$(EXEEXT) +@XETEX_TRUE@am__EXEEXT_24 = xetex$(EXEEXT) +@OTANGLE_TRUE@am__EXEEXT_25 = $(am__EXEEXT_4) +@ALEPH_TRUE@am__EXEEXT_26 = aleph$(EXEEXT) +@SYNCTEX_TRUE@am__EXEEXT_27 = synctex$(EXEEXT) +@TEX_TRUE@am__EXEEXT_28 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @TEX_TRUE@ tftopl$(EXEEXT) -@MF_TRUE@am__EXEEXT_27 = gftype$(EXEEXT) tftopl$(EXEEXT) -@MP_TRUE@am__EXEEXT_28 = pltotf$(EXEEXT) tftopl$(EXEEXT) -@ETEX_TRUE@am__EXEEXT_29 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@MF_TRUE@am__EXEEXT_29 = gftype$(EXEEXT) tftopl$(EXEEXT) +@MP_TRUE@am__EXEEXT_30 = pltotf$(EXEEXT) tftopl$(EXEEXT) +@ETEX_TRUE@am__EXEEXT_31 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @ETEX_TRUE@ tftopl$(EXEEXT) -@PTEX_TRUE@am__EXEEXT_30 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@PTEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @PTEX_TRUE@ tftopl$(EXEEXT) -@EPTEX_TRUE@am__EXEEXT_31 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@EPTEX_TRUE@am__EXEEXT_33 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @EPTEX_TRUE@ tftopl$(EXEEXT) -@UPTEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@UPTEX_TRUE@am__EXEEXT_34 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @UPTEX_TRUE@ tftopl$(EXEEXT) -@EUPTEX_TRUE@am__EXEEXT_33 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@EUPTEX_TRUE@am__EXEEXT_35 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @EUPTEX_TRUE@ tftopl$(EXEEXT) -@OTANGLE_TRUE@am__EXEEXT_34 = pltotf$(EXEEXT) tftopl$(EXEEXT) -@MP_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_mpost$(EXEEXT) -@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_luatex$(EXEEXT) -@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_luajittex$(EXEEXT) -@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_38 = txt2zlib$(EXEEXT) +@OTANGLE_TRUE@am__EXEEXT_36 = pltotf$(EXEEXT) tftopl$(EXEEXT) +@MP_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_mpost$(EXEEXT) +@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_pmpost$(EXEEXT) +@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_upmpost$(EXEEXT) +@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luatex$(EXEEXT) +@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = call_luajittex$(EXEEXT) +@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_42 = txt2zlib$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \ alephdir/aleph-alephbis.$(OBJEXT) \ @@ -1036,6 +1057,12 @@ call_luatex_DEPENDENCIES = nodist_call_mpost_OBJECTS = call_mpost-callexe.$(OBJEXT) call_mpost_OBJECTS = $(nodist_call_mpost_OBJECTS) call_mpost_DEPENDENCIES = +nodist_call_pmpost_OBJECTS = call_pmpost-callexe.$(OBJEXT) +call_pmpost_OBJECTS = $(nodist_call_pmpost_OBJECTS) +call_pmpost_DEPENDENCIES = +nodist_call_upmpost_OBJECTS = call_upmpost-callexe.$(OBJEXT) +call_upmpost_OBJECTS = $(nodist_call_upmpost_OBJECTS) +call_upmpost_DEPENDENCIES = nodist_ctangle_OBJECTS = ctangle.$(OBJEXT) cweb.$(OBJEXT) ctangle_OBJECTS = $(nodist_ctangle_OBJECTS) ctangle_LDADD = $(LDADD) @@ -1118,13 +1145,12 @@ am__objects_32 = luatexdir/luajittex-luatex.$(OBJEXT) \ mplibdir/luajittex-lmplib.$(OBJEXT) nodist_luajittex_OBJECTS = $(am__objects_32) luajittex_OBJECTS = $(nodist_luajittex_OBJECTS) -am__DEPENDENCIES_6 = libluajittex.a libjitff.a libunilib.a \ - libluajitmisc.a libluajitsocket.a $(am__DEPENDENCIES_1) \ - libmd5.a libmplib.a $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_6 = libmplib.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libmputil.a \ + libunilib.a libmd5.a $(am__DEPENDENCIES_1) luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajittex_CXXFLAGS) \ $(CXXFLAGS) $(luajittex_LDFLAGS) $(LDFLAGS) -o $@ @@ -1133,12 +1159,6 @@ am__objects_33 = luatexdir/luatex-luatex.$(OBJEXT) \ nodist_luatex_OBJECTS = $(am__objects_33) luatex_OBJECTS = $(nodist_luatex_OBJECTS) am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) -am__DEPENDENCIES_8 = libluatex.a libff.a libunilib.a libluamisc.a \ - libluasocket.a $(am__DEPENDENCIES_7) libmd5.a libmplib.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luatex_CXXFLAGS) \ $(CXXFLAGS) $(luatex_LDFLAGS) $(LDFLAGS) -o $@ @@ -1147,12 +1167,12 @@ md5main_OBJECTS = $(am_md5main_OBJECTS) md5main_DEPENDENCIES = libmd5.a dist_mf_OBJECTS = mf-mfextra.$(OBJEXT) mf_OBJECTS = $(dist_mf_OBJECTS) -@WIN32_FALSE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) \ +@WIN32_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \ @WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @WIN32_FALSE@ $(am__DEPENDENCIES_1) mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \ - $(am__DEPENDENCIES_9) + $(am__DEPENDENCIES_8) dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT) mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS) mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) @@ -1163,6 +1183,10 @@ mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am__objects_34 = mpost-mpxout.$(OBJEXT) nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_34) mpost_OBJECTS = $(nodist_mpost_OBJECTS) +mpost_DEPENDENCIES = libmplib.a $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT) odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS) odvicopy_LDADD = $(LDADD) @@ -1182,7 +1206,7 @@ patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am_pbibtex_OBJECTS = nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT) pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS) -am__DEPENDENCIES_10 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_9 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \ pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h \ @@ -1196,7 +1220,7 @@ dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \ am__objects_36 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) nodist_pdftex_OBJECTS = $(am__objects_36) pdftex-pdftex-pool.$(OBJEXT) pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS) -am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libmd5.a pdftex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftex_CXXFLAGS) \ @@ -1221,6 +1245,26 @@ nodist_pltotf_OBJECTS = pltotf.$(OBJEXT) pltotf_OBJECTS = $(nodist_pltotf_OBJECTS) pltotf_LDADD = $(LDADD) pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) +am__objects_37 = pmpost-pmp.$(OBJEXT) +am__objects_38 = pmpost-pmpmath.$(OBJEXT) +am__objects_39 = pmpost-pmpmathbinary.$(OBJEXT) +am__objects_40 = pmpost-pmpmathdecimal.$(OBJEXT) +am__objects_41 = pmpost-pmpmathdouble.$(OBJEXT) +am__objects_42 = pmpost-pmpstrings.$(OBJEXT) +am__objects_43 = pmpost-pmpxout.$(OBJEXT) +am__objects_44 = pmpost-ppngout.$(OBJEXT) +am__objects_45 = pmpost-ppsout.$(OBJEXT) +am__objects_46 = pmpost-psvgout.$(OBJEXT) +nodist_pmpost_OBJECTS = $(am__objects_37) $(am__objects_38) \ + $(am__objects_39) $(am__objects_40) $(am__objects_41) \ + pmpost-pmpost.$(OBJEXT) $(am__objects_42) $(am__objects_43) \ + $(am__objects_44) $(am__objects_45) $(am__objects_46) \ + pmpost-ptfmin.$(OBJEXT) +pmpost_OBJECTS = $(nodist_pmpost_OBJECTS) +pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a nodist_pooltype_OBJECTS = pooltype.$(OBJEXT) pooltype_OBJECTS = $(nodist_pooltype_OBJECTS) pooltype_LDADD = $(LDADD) @@ -1232,12 +1276,12 @@ am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \ ptexdir/ptex_version.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-ptex.h -@PTEX_SYNCTEX_TRUE@am__objects_37 = synctexdir/ptex-synctex.$(OBJEXT) -dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_37) -am__objects_38 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT) -nodist_ptex_OBJECTS = $(am__objects_38) ptex-ptex-pool.$(OBJEXT) +@PTEX_SYNCTEX_TRUE@am__objects_47 = synctexdir/ptex-synctex.$(OBJEXT) +dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_47) +am__objects_48 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT) +nodist_ptex_OBJECTS = $(am__objects_48) ptex-ptex-pool.$(OBJEXT) ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS) -@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) +@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) am_ptftopl_OBJECTS = nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT) ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS) @@ -1254,14 +1298,14 @@ tangleboot_LDADD = $(LDADD) am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-tex.h -@TEX_SYNCTEX_TRUE@am__objects_39 = synctexdir/tex-synctex.$(OBJEXT) -dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_39) -am__objects_40 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) -nodist_tex_OBJECTS = $(am__objects_40) tex-tex-pool.$(OBJEXT) +@TEX_SYNCTEX_TRUE@am__objects_49 = synctexdir/tex-synctex.$(OBJEXT) +dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_49) +am__objects_50 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) +nodist_tex_OBJECTS = $(am__objects_50) tex-tex-pool.$(OBJEXT) tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS) -@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) +@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_12) nodist_tftopl_OBJECTS = tftopl.$(OBJEXT) tftopl_OBJECTS = $(nodist_tftopl_OBJECTS) tftopl_LDADD = $(LDADD) @@ -1278,12 +1322,33 @@ txt2zlib_OBJECTS = $(nodist_txt2zlib_OBJECTS) am_upbibtex_OBJECTS = nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT) upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS) -am__DEPENDENCIES_14 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_13 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) am_updvitype_OBJECTS = nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT) updvitype_OBJECTS = $(am_updvitype_OBJECTS) \ $(nodist_updvitype_OBJECTS) +am__objects_51 = upmpost-pmp.$(OBJEXT) +am__objects_52 = upmpost-pmpmath.$(OBJEXT) +am__objects_53 = upmpost-pmpmathbinary.$(OBJEXT) +am__objects_54 = upmpost-pmpmathdecimal.$(OBJEXT) +am__objects_55 = upmpost-pmpmathdouble.$(OBJEXT) +am__objects_56 = upmpost-pmpstrings.$(OBJEXT) +am__objects_57 = upmpost-pmpxout.$(OBJEXT) +am__objects_58 = upmpost-ppngout.$(OBJEXT) +am__objects_59 = upmpost-ppsout.$(OBJEXT) +am__objects_60 = upmpost-psvgout.$(OBJEXT) +am__objects_61 = $(am__objects_51) $(am__objects_52) $(am__objects_53) \ + $(am__objects_54) $(am__objects_55) upmpost-pmpost.$(OBJEXT) \ + $(am__objects_56) $(am__objects_57) $(am__objects_58) \ + $(am__objects_59) $(am__objects_60) upmpost-ptfmin.$(OBJEXT) +nodist_upmpost_OBJECTS = $(am__objects_61) +upmpost_OBJECTS = $(nodist_upmpost_OBJECTS) +am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a +upmpost_DEPENDENCIES = $(am__DEPENDENCIES_14) am_uppltotf_OBJECTS = nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT) uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS) @@ -1291,12 +1356,12 @@ am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \ uptexdir/uptexextra.h uptexdir/uptex_version.h \ synctexdir/synctex.c synctexdir/synctex.h \ synctexdir/synctex-common.h synctexdir/synctex-uptex.h -@UPTEX_SYNCTEX_TRUE@am__objects_41 = \ +@UPTEX_SYNCTEX_TRUE@am__objects_62 = \ @UPTEX_SYNCTEX_TRUE@ synctexdir/uptex-synctex.$(OBJEXT) dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \ - $(am__objects_41) -am__objects_42 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT) -nodist_uptex_OBJECTS = $(am__objects_42) uptex-uptex-pool.$(OBJEXT) + $(am__objects_62) +am__objects_63 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT) +nodist_uptex_OBJECTS = $(am__objects_63) uptex-uptex-pool.$(OBJEXT) uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS) @UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) am_uptftopl_OBJECTS = @@ -1335,12 +1400,12 @@ am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \ xetexdir/xetex_version.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ synctexdir/synctex-xetex.h -@XETEX_SYNCTEX_TRUE@am__objects_43 = \ +@XETEX_SYNCTEX_TRUE@am__objects_64 = \ @XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT) dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \ - $(am__objects_43) -am__objects_44 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) -nodist_xetex_OBJECTS = $(am__objects_44) xetex-xetex-pool.$(OBJEXT) + $(am__objects_64) +am__objects_65 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) +nodist_xetex_OBJECTS = $(am__objects_65) xetex-xetex-pool.$(OBJEXT) xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS) @XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \ @@ -1430,14 +1495,15 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \ $(nodist_libluamisc_a_SOURCES) \ $(nodist_libluasocket_a_SOURCES) $(dist_libluatex_a_SOURCES) \ $(nodist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \ - $(nodist_libmf_a_SOURCES) $(libmplib_a_SOURCES) \ - $(nodist_libmplib_a_SOURCES) $(libpdftex_a_SOURCES) \ + $(nodist_libmf_a_SOURCES) $(nodist_libmplib_a_SOURCES) \ + $(libmputil_a_SOURCES) $(libpdftex_a_SOURCES) \ $(EXTRA_libpdftex_a_SOURCES) $(nodist_libsynctex_a_SOURCES) \ $(libukanji_a_SOURCES) $(libunilib_a_SOURCES) \ $(libxetex_a_SOURCES) $(libsynctex_la_SOURCES) \ $(dist_aleph_SOURCES) $(nodist_aleph_SOURCES) \ $(nodist_bibtex_SOURCES) $(nodist_call_luajittex_SOURCES) \ $(nodist_call_luatex_SOURCES) $(nodist_call_mpost_SOURCES) \ + $(nodist_call_pmpost_SOURCES) $(nodist_call_upmpost_SOURCES) \ $(nodist_ctangle_SOURCES) $(nodist_ctangleboot_SOURCES) \ $(nodist_ctie_SOURCES) $(nodist_cweave_SOURCES) \ $(nodist_dvicopy_SOURCES) $(nodist_dvitype_SOURCES) \ @@ -1459,9 +1525,9 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \ $(nodist_EXTRA_pdftosrc_SOURCES) $(pdvitype_SOURCES) \ $(nodist_pdvitype_SOURCES) $(nodist_pktogf_SOURCES) \ $(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \ - $(nodist_pooltype_SOURCES) $(ppltotf_SOURCES) \ - $(nodist_ppltotf_SOURCES) $(dist_ptex_SOURCES) \ - $(nodist_ptex_SOURCES) $(ptftopl_SOURCES) \ + $(nodist_pmpost_SOURCES) $(nodist_pooltype_SOURCES) \ + $(ppltotf_SOURCES) $(nodist_ppltotf_SOURCES) \ + $(dist_ptex_SOURCES) $(nodist_ptex_SOURCES) $(ptftopl_SOURCES) \ $(nodist_ptftopl_SOURCES) $(synctex_SOURCES) \ $(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \ $(dist_tex_SOURCES) $(nodist_tex_SOURCES) \ @@ -1469,18 +1535,18 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \ $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \ $(nodist_txt2zlib_SOURCES) $(upbibtex_SOURCES) \ $(nodist_upbibtex_SOURCES) $(updvitype_SOURCES) \ - $(nodist_updvitype_SOURCES) $(uppltotf_SOURCES) \ - $(nodist_uppltotf_SOURCES) $(dist_uptex_SOURCES) \ - $(nodist_uptex_SOURCES) $(uptftopl_SOURCES) \ - $(nodist_uptftopl_SOURCES) $(nodist_vftovp_SOURCES) \ - $(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \ - $(nodist_wofm2opl_SOURCES) $(nodist_wopl2ofm_SOURCES) \ - $(nodist_wovf2ovp_SOURCES) $(nodist_wovp2ovf_SOURCES) \ - $(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \ - $(nodist_EXTRA_xetex_SOURCES) + $(nodist_updvitype_SOURCES) $(nodist_upmpost_SOURCES) \ + $(uppltotf_SOURCES) $(nodist_uppltotf_SOURCES) \ + $(dist_uptex_SOURCES) $(nodist_uptex_SOURCES) \ + $(uptftopl_SOURCES) $(nodist_uptftopl_SOURCES) \ + $(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \ + $(nodist_weave_SOURCES) $(nodist_wofm2opl_SOURCES) \ + $(nodist_wopl2ofm_SOURCES) $(nodist_wovf2ovp_SOURCES) \ + $(nodist_wovp2ovf_SOURCES) $(dist_xetex_SOURCES) \ + $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES) DIST_SOURCES = $(libkanji_a_SOURCES) $(dist_libluajittex_a_SOURCES) \ $(dist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \ - $(libmplib_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \ + $(libmputil_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \ $(EXTRA_libpdftex_a_SOURCES) $(libukanji_a_SOURCES) \ $(libunilib_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \ $(libsynctex_la_SOURCES) $(dist_aleph_SOURCES) \ @@ -1701,13 +1767,13 @@ am__set_TESTS_bases = \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) -am__EXEEXT_39 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ +am__EXEEXT_43 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ gftopk.test gftype.test mft.test patgen.test pktogf.test \ pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \ vptovf.test weave.test -am__EXEEXT_40 = $(am__EXEEXT_39) tests/bibtex-openout-test.pl \ +am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \ tests/bibtex-longline-test.pl tests/bibtex-mem.test -@WEB_TRUE@am__EXEEXT_41 = $(am__EXEEXT_40) +@WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44) TEST_SUITE_LOG = test-suite.log TEST_EXTENSIONS = @EXEEXT@ .test LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver @@ -1999,10 +2065,10 @@ SUBDIRS = doc lib man web2c . window omegafonts otps proglib = lib/lib.a dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 nodist_man_MANS = -EXTRA_LIBRARIES = libmf.a libmplib.a libkanji.a libukanji.a \ - libpdftex.a libluasocket.a libluajitsocket.a libluamisc.a \ - libluajitmisc.a libunilib.a libff.a libjitff.a libluatex.a \ - libluajittex.a libxetex.a libsynctex.a libmd5.a +EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \ + libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \ + libluamisc.a libluajitmisc.a libunilib.a libff.a libjitff.a \ + libluatex.a libluajittex.a libxetex.a libsynctex.a libmd5.a EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \ ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \ @@ -2046,21 +2112,23 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ triptrap/trip.tex triptrap/trip.typ triptrap/trip1.in \ triptrap/trip2.in triptrap/tripin.log triptrap/tripman.tex \ triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \ - mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \ - $(etex_web_srcs) $(etex_ch_srcs) etexdir/ChangeLog \ - etexdir/etex_gen.tex $(etex_tests) tests/wprob.tex \ - etexdir/etrip/etrip.diffs etexdir/etrip/etrip.fot \ - etexdir/etrip/etrip.log etexdir/etrip/etrip.out \ - etexdir/etrip/etrip.pl etexdir/etrip/etrip.tex \ - etexdir/etrip/etrip.typ etexdir/etrip/etrip1.in \ - etexdir/etrip/etrip2.in etexdir/etrip/etrip3.in \ - etexdir/etrip/etripin.log etexdir/etrip/etripman.tex \ - etexdir/etrip/texmf.cnf etexdir/etrip/trip2.in $(ptex_tests) \ - $(pweb_tests) $(ptex_web_srcs) $(ptex_ch_srcs) \ - ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \ - ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \ - ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \ - ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \ + mplibdir/ChangeLog $(mpost_web) $(mp_tests) \ + pmpostdir/ChangeLog $(pmpost_web) $(pmp_tests) \ + pmpostdir/upmp.ch $(libmplib_web) $(etex_web_srcs) \ + $(etex_ch_srcs) etexdir/ChangeLog etexdir/etex_gen.tex \ + $(etex_tests) tests/wprob.tex etexdir/etrip/etrip.diffs \ + etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \ + etexdir/etrip/etrip.out etexdir/etrip/etrip.pl \ + etexdir/etrip/etrip.tex etexdir/etrip/etrip.typ \ + etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \ + etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \ + etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \ + etexdir/etrip/trip2.in $(ptex_tests) $(pweb_tests) \ + $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines \ + ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \ + ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \ + ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \ + ptexdir/INSTALL.txt ptexdir/README.txt \ ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \ ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \ tests/memdata3.bst ptexdir/tests/goth10.tfm \ @@ -2276,12 +2344,15 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \ $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c mf.p mf.pool \ mf-tangle $(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs \ ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \ - $(nodist_libmplib_a_SOURCES) mp-tangle mpmath-tangle \ - mpmathbinary-tangle mpmathdecimal-tangle mpmathdouble-tangle \ - mpstrings-tangle psout-tangle svgout-tangle pngout-tangle \ - $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \ - etex.pool etex-tangle etrip.diffs ewprob.log ewprob.tex \ - $(pweb_programs:=.c) $(pweb_programs:=.h) $(pweb_programs:=.p) \ + $(nodist_pmpost_SOURCES) pmp.w pmpost.w pmpxout.w ppsout.w \ + psvgout.w ptfmin.w pmp-tangle pmpxout-tangle ppsout-tangle \ + psvgout-tangle $(nodist_libmplib_a_SOURCES) mp-tangle \ + mpmath-tangle mpmathbinary-tangle mpmathdecimal-tangle \ + mpmathdouble-tangle mpstrings-tangle psout-tangle \ + svgout-tangle pngout-tangle $(nodist_etex_SOURCES) etex.web \ + etex.ch etex-web2c etex.p etex.pool etex-tangle etrip.diffs \ + ewprob.log ewprob.tex $(pweb_programs:=.c) \ + $(pweb_programs:=.h) $(pweb_programs:=.p) \ $(pweb_programs:=-web2c) $(pweb_programs:=.web) \ $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \ ptex.pool ptex-tangle ptests/nissya_bib.* ptests/xexampl.aux \ @@ -2327,16 +2398,18 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \ aleph.pool aleph-tangle CLEANFILES = TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \ - $(am__append_31) $(am__append_37) $(am__append_43) \ - $(am__append_49) $(am__append_55) + $(am__append_43) $(am__append_49) $(am__append_55) \ + $(am__append_61) $(am__append_67) TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \ - $(am__append_30) $(am__append_36) $(am__append_42) \ - $(am__append_48) $(am__append_54) + $(am__append_42) $(am__append_48) $(am__append_54) \ + $(am__append_60) $(am__append_66) bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \ - $(am__append_63) $(am__append_68) -install_exe_links = $(am__append_20) $(am__append_61) $(am__append_66) -uninstall_exe_links = $(am__append_21) $(am__append_62) \ - $(am__append_67) + $(am__append_31) $(am__append_36) $(am__append_75) \ + $(am__append_80) +install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \ + $(am__append_73) $(am__append_78) +uninstall_exe_links = $(am__append_21) $(am__append_30) \ + $(am__append_35) $(am__append_74) $(am__append_79) NEVER_DIST = `find . -name .svn` cwebdir/cweave.log cwebdir/cweave.trs \ ctiedir/ctie.log ctiedir/ctie.trs tiedir/tie.log \ tiedir/tie.trs @@ -2439,18 +2512,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C initex_CPPFLAGS = -DEXEPROG=\"tex.exe\" nodist_initex_SOURCES = callexe.c initex_LDADD = -tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_85) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_97) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_86) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_98) # TeX C sources tex_c_h = texini.c tex0.c texcoerce.h texd.h nodist_tex_SOURCES = $(tex_c_h) tex-pool.c -dist_tex_SOURCES = texextra.c $(am__append_88) +dist_tex_SOURCES = texextra.c $(am__append_100) # We must create texd.h before building the tex_OBJECTS. -tex_prereq = texd.h $(am__append_87) +tex_prereq = texd.h $(am__append_99) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -2495,9 +2568,8 @@ mf_ch_src = \ # mf_tests = mftraptest mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir -mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ - $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) + $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" nodist_call_mpost_SOURCES = callexe.c @@ -2511,12 +2583,59 @@ nodist_mpost_SOURCES = mpost.c $(mpxout_c_h) mpxout_c_h = mpxout.c mpxout.h mpost_web = mplibdir/mpost.w mplibdir/mpxout.w mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest -libmplib_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir +call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" +nodist_call_pmpost_SOURCES = callexe.c +call_pmpost_LDADD = +call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" +nodist_call_upmpost_SOURCES = callexe.c +call_upmpost_LDADD = +pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ + $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir + +pmpost_LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ + $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a + +upmpost_CPPFLAGS = -DUPMP $(pmpost_CPPFLAGS) +upmpost_LDADD = $(pmpost_LDADD) -libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \ +# Creating one file: just one rule +pmp_ctangle = $(ctangle_silent)CWEBINPUTS=.:$(srcdir)/pmpostdir $(ctangle) +# Creating several files: need stamp file and two rules with identical recipes +pmp_ctangle_sh = CWEBINPUTS=.:$(srcdir)/pmpostdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE) +nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) $(pmpmathdecimal_c_h) \ + $(pmpmathdouble_c_h) pmpost.c $(pmpstrings_c_h) $(pmpxout_c_h) \ + $(ppngout_c_h) $(ppsout_c_h) $(psvgout_c_h) ptfmin.c + +pmp_c_h = pmp.c pmplib.h pmpmp.h +pmpmath_c_h = pmpmath.c pmpmath.h +pmpmathbinary_c_h = pmpmathbinary.c pmpmathbinary.h +pmpmathdecimal_c_h = pmpmathdecimal.c pmpmathdecimal.h +pmpmathdouble_c_h = pmpmathdouble.c pmpmathdouble.h +pmpstrings_c_h = pmpstrings.h pmpstrings.c +pmpxout_c_h = pmpxout.c pmpxout.h +ppngout_c_h = pmplibpng.h pmppngout.h ppngout.c +ppsout_c_h = pmppsout.h ppsout.c pmplibps.h +psvgout_c_h = pmplibsvg.h pmpsvgout.h psvgout.c +nodist_upmpost_SOURCES = $(nodist_pmpost_SOURCES) + +# sed script +pmp_sed_main = 's/mpxout\.h/pmpxout.h/;s/mpmp\.h/pmpmp.h/;s/mplib\.h/pmplib.h/;s/mpstrings\.h/pmpstrings.h/' +pmp_sed_math = 's/mpmath\([a-z]*\)\.h/pmpmath\1.h/' +pmp_sed_ps = 's/mplibps\.h/pmplibps.h/;s/mppsout\.h/pmppsout.h/' +pmp_sed_svg = 's/mplibsvg\.h/pmplibsvg.h/;s/mpsvgout\.h/pmpsvgout.h/' +pmp_sed_png = 's/mplibpng\.h/pmplibpng.h/;s/mppngout\.h/pmppngout.h/' +pmp_sed = sed -e $(pmp_sed_main) -e $(pmp_sed_math) -e $(pmp_sed_ps) -e $(pmp_sed_svg) -e $(pmp_sed_png) +pmpost_web = pmpostdir/pmp.ch pmpostdir/pmpost.ch pmpostdir/pmpxout.ch pmpostdir/ppsout.ch \ + pmpostdir/psvgout.ch pmpostdir/ptfmin.ch + +pmp_tests = pmpostdir/pmpost.test pmpostdir/upmpost.test +libmputil_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir +libmputil_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \ mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c +libmplib_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ + $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir + nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathbinary_c_h) $(mpmathdecimal_c_h) \ $(mpmathdouble_c_h) $(mpstrings_c_h) $(pngout_c_h) $(psout_c_h) $(svgout_c_h) @@ -2533,19 +2652,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \ mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \ mplibdir/mpstrings.w mplibdir/tfmin.w -etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_89) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_101) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_90) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_102) # e-TeX C sources etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \ - etexdir/etex_version.h $(am__append_92) + etexdir/etex_version.h $(am__append_104) # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS. -etex_prereq = etexd.h etexdir/etex_version.h $(am__append_91) +etex_prereq = etexd.h etexdir/etex_version.h $(am__append_103) etex_web_srcs = \ tex.web \ etexdir/etex.ch @@ -2580,20 +2699,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \ pproglib = lib/libp.a libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h libkanji_a_CPPFLAGS = $(ptex_cppflags) -ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_93) +ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_105) # With --enable-ipc, pTeX may need to link with -lsocket. -ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_94) +ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_106) ptex_DEPENDENCIES = $(ptex_dependencies) # pTeX C sources ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \ - ptexdir/ptex_version.h $(am__append_96) + ptexdir/ptex_version.h $(am__append_108) # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS. -ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_95) +ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_107) ptex_web_srcs = \ tex.web \ tex.ch @@ -2627,22 +2746,22 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies) # e-pTeX Tests # eptex_tests = eptexdir/eptriptest -eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_101) +eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_113) # With --enable-ipc, e-pTeX may need to link with -lsocket. eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_102) + $(ipc_socketlibs) $(am__append_114) eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) # e-pTeX C sources eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \ - eptexdir/eptex_version.h $(am__append_104) + eptexdir/eptex_version.h $(am__append_116) # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS. eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \ - eptexdir/eptex_version.h $(am__append_103) + eptexdir/eptex_version.h $(am__append_115) eptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2674,21 +2793,21 @@ upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \ uptexdir/yokotate.test libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c libukanji_a_CPPFLAGS = $(uptex_cppflags) -uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_97) +uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_109) # With --enable-ipc, upTeX may need to link with -lsocket. -uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_98) +uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_110) uptex_DEPENDENCIES = $(uptex_dependencies) # upTeX C sources uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \ - uptexdir/uptex_version.h $(am__append_100) + uptexdir/uptex_version.h $(am__append_112) # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS. uptex_prereq = uptexd.h ptexdir/ptex_version.h \ - uptexdir/uptex_version.h $(am__append_99) + uptexdir/uptex_version.h $(am__append_111) uptex_web_srcs = \ tex.web \ tex.ch @@ -2723,23 +2842,23 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies) # e-upTeX Tests # euptex_tests = euptexdir/euptriptest -euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_105) +euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_117) # With --enable-ipc, e-upTeX may need to link with -lsocket. euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_106) + $(ipc_socketlibs) $(am__append_118) euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) # e-upTeX C sources euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \ - $(am__append_108) + $(am__append_120) # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS. euptex_prereq = euptexd.h etexdir/etex_version.h \ ptexdir/ptex_version.h eptexdir/eptex_version.h \ - uptexdir/uptex_version.h $(am__append_107) + uptexdir/uptex_version.h $(am__append_119) euptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2775,7 +2894,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/writejbig2.c pdftexdir/writejpg.c \ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ - $(am__append_56) + $(am__append_68) @MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \ pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \ @@ -2791,7 +2910,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \ # Force Automake to use CXXLD for linking nodist_EXTRA_pdftex_SOURCES = dummy.cxx pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE) -pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_109) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_121) pdftex_CXXFLAGS = $(WARNING_CXXFLAGS) # With --enable-ipc, pdfTeX may need to link with -lsocket. @@ -2804,7 +2923,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \ pdftexdir/pdftex_version.h pdftexdir/etex_version.h \ - $(am__append_110) + $(am__append_122) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -3195,23 +3314,17 @@ luatex_CPPFLAGS = $(luatex_preflags) $(LUA_INCLUDES) $(luatex_postflags) luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) $(luatex_postflags) luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luajittex_CXXFLAGS = $(WARNING_CXXFLAGS) -luatex_ldadd = libluatex.a libff.a libunilib.a libluamisc.a \ - libluasocket.a $(LUA_LIBS) libmd5.a libmplib.a $(MPFR_LIBS) \ - $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) $(ZZIPLIB_LIBS) \ - $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) -luajittex_ldadd = libluajittex.a libjitff.a libunilib.a \ - libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) libmd5.a \ - libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) \ - $(PIXMAN_LIBS) $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \ - $(POPPLER_LIBS) luatex_LDFLAGS = -export-dynamic luajittex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA) -luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) -luajittex_LDADD = $(luajittex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) -luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \ - $(LIBPNG_DEPEND) libmd5.a libmplib.a -luajittex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluajittex.a \ - $(LIBPNG_DEPEND) libmd5.a libmplib.a +luatex_postldadd = libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) \ + $(PIXMAN_LIBS) $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \ + $(POPPLER_LIBS) $(LDADD) libmputil.a libunilib.a libmd5.a \ + $(lua_socketlibs) +luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a $(LUA_LIBS) $(luatex_postldadd) +luajittex_LDADD = libluajittex.a libjitff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd) +luatex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) +luatex_DEPENDENCIES = $(luatex_depend) libluatex.a +luajittex_DEPENDENCIES = $(luatex_depend) libluajittex.a nodist_luatex_SOURCES = $(luatex_sources) nodist_luajittex_SOURCES = $(luatex_sources) luatex_sources = \ @@ -3243,16 +3356,16 @@ libxetex = libxetex.a xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \ $(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \ - $(ZLIB_INCLUDES) $(am__append_73) $(am__append_74) + $(ZLIB_INCLUDES) $(am__append_85) $(am__append_86) xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \ $(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \ - $(FREETYPE2_LIBS) $(ZLIB_LIBS) $(am__append_75) + $(FREETYPE2_LIBS) $(ZLIB_LIBS) $(am__append_87) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ $(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \ $(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \ $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_111) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_123) xetex_CFLAGS = # $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) @@ -3263,7 +3376,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \ xetexdir/etex_version.h xetexdir/xetex_version.h \ - $(am__append_112) + $(am__append_124) xetex_ch_srcs = \ xetexdir/xetex.web \ xetexdir/tex.ch0 \ @@ -3290,7 +3403,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \ xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \ xetexdir/image/mfileio.h xetexdir/image/numbers.c \ xetexdir/image/numbers.h xetexdir/image/pngimage.c \ - xetexdir/image/pngimage.h $(am__append_76) $(am__append_77) + xetexdir/image/pngimage.h $(am__append_88) $(am__append_89) # We must create xetexd.h etc. before building the libxetex_a_OBJECTS. libxetex_prereq = xetexd.h $(xetex_dependencies) @@ -3514,7 +3627,7 @@ all: ff-config.h .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(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)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.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 $(srcdir)/../../am/bin_links.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)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.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 $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -3536,7 +3649,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(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)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.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 $(srcdir)/../../am/bin_links.am: +$(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.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 $(srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -4322,23 +4435,28 @@ libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES $(AM_V_at)-rm -f libmf.a $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) $(AM_V_at)$(RANLIB) libmf.a + +libmplib.a: $(libmplib_a_OBJECTS) $(libmplib_a_DEPENDENCIES) $(EXTRA_libmplib_a_DEPENDENCIES) + $(AM_V_at)-rm -f libmplib.a + $(AM_V_AR)$(libmplib_a_AR) libmplib.a $(libmplib_a_OBJECTS) $(libmplib_a_LIBADD) + $(AM_V_at)$(RANLIB) libmplib.a mplibdir/$(am__dirstamp): @$(MKDIR_P) mplibdir @: > mplibdir/$(am__dirstamp) mplibdir/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) mplibdir/$(DEPDIR) @: > mplibdir/$(DEPDIR)/$(am__dirstamp) -mplibdir/libmplib_a-avl.$(OBJEXT): mplibdir/$(am__dirstamp) \ +mplibdir/libmputil_a-avl.$(OBJEXT): mplibdir/$(am__dirstamp) \ mplibdir/$(DEPDIR)/$(am__dirstamp) -mplibdir/libmplib_a-decNumber.$(OBJEXT): mplibdir/$(am__dirstamp) \ +mplibdir/libmputil_a-decNumber.$(OBJEXT): mplibdir/$(am__dirstamp) \ mplibdir/$(DEPDIR)/$(am__dirstamp) -mplibdir/libmplib_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ +mplibdir/libmputil_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \ mplibdir/$(DEPDIR)/$(am__dirstamp) -libmplib.a: $(libmplib_a_OBJECTS) $(libmplib_a_DEPENDENCIES) $(EXTRA_libmplib_a_DEPENDENCIES) - $(AM_V_at)-rm -f libmplib.a - $(AM_V_AR)$(libmplib_a_AR) libmplib.a $(libmplib_a_OBJECTS) $(libmplib_a_LIBADD) - $(AM_V_at)$(RANLIB) libmplib.a +libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES) + $(AM_V_at)-rm -f libmputil.a + $(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD) + $(AM_V_at)$(RANLIB) libmputil.a pdftexdir/$(am__dirstamp): @$(MKDIR_P) pdftexdir @: > pdftexdir/$(am__dirstamp) @@ -4679,6 +4797,14 @@ call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_ca @rm -f call_mpost$(EXEEXT) $(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS) +call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES) + @rm -f call_pmpost$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS) + +call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES) + @rm -f call_upmpost$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS) + ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES) @rm -f ctangle$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) @@ -4859,6 +4985,10 @@ pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDE @rm -f pltotf$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS) +pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES) + @rm -f pmpost$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS) + pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) @rm -f pooltype$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) @@ -4927,6 +5057,10 @@ updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvi @rm -f updvitype$(EXEEXT) $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) +upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES) + @rm -f upmpost$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS) + uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES) @rm -f uppltotf$(EXEEXT) $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS) @@ -5021,6 +5155,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_luajittex-callexe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_luatex-callexe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_mpost-callexe.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_pmpost-callexe.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_upmpost-callexe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangleboot.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctie.Po@am__quote@ @@ -5275,6 +5411,18 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktogf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktype.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pltotf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmathbinary.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmathdecimal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmathdouble.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpost.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpstrings.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpxout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-ppngout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-ppsout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-psvgout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-ptfmin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pooltype.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppltotf-ppltotf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex-pool.Po@am__quote@ @@ -5292,6 +5440,18 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt2zlib-txt2zlib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upbibtex-upbibtex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updvitype-updvitype.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmathbinary.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmathdecimal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmathdouble.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpost.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpstrings.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpxout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-ppngout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-ppsout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-psvgout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-ptfmin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uppltotf-uppltotf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptex-pool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptex0.Po@am__quote@ @@ -5508,9 +5668,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmplib_a-avl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmplib_a-decContext.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmplib_a-decNumber.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmputil_a-avl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmputil_a-decContext.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/luajittex-lmplib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/luatex-lmplib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po@am__quote@ @@ -10870,48 +11030,6 @@ libmd5/libmd5_a-md5.obj: libmd5/md5.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmd5/libmd5_a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi` -mplibdir/libmplib_a-avl.o: mplibdir/avl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-avl.o -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-avl.Tpo -c -o mplibdir/libmplib_a-avl.o `test -f 'mplibdir/avl.c' || echo '$(srcdir)/'`mplibdir/avl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-avl.Tpo mplibdir/$(DEPDIR)/libmplib_a-avl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/avl.c' object='mplibdir/libmplib_a-avl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-avl.o `test -f 'mplibdir/avl.c' || echo '$(srcdir)/'`mplibdir/avl.c - -mplibdir/libmplib_a-avl.obj: mplibdir/avl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-avl.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-avl.Tpo -c -o mplibdir/libmplib_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-avl.Tpo mplibdir/$(DEPDIR)/libmplib_a-avl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/avl.c' object='mplibdir/libmplib_a-avl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi` - -mplibdir/libmplib_a-decNumber.o: mplibdir/decNumber.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decNumber.o -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo -c -o mplibdir/libmplib_a-decNumber.o `test -f 'mplibdir/decNumber.c' || echo '$(srcdir)/'`mplibdir/decNumber.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo mplibdir/$(DEPDIR)/libmplib_a-decNumber.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decNumber.c' object='mplibdir/libmplib_a-decNumber.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decNumber.o `test -f 'mplibdir/decNumber.c' || echo '$(srcdir)/'`mplibdir/decNumber.c - -mplibdir/libmplib_a-decNumber.obj: mplibdir/decNumber.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decNumber.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo -c -o mplibdir/libmplib_a-decNumber.obj `if test -f 'mplibdir/decNumber.c'; then $(CYGPATH_W) 'mplibdir/decNumber.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decNumber.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo mplibdir/$(DEPDIR)/libmplib_a-decNumber.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decNumber.c' object='mplibdir/libmplib_a-decNumber.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decNumber.obj `if test -f 'mplibdir/decNumber.c'; then $(CYGPATH_W) 'mplibdir/decNumber.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decNumber.c'; fi` - -mplibdir/libmplib_a-decContext.o: mplibdir/decContext.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decContext.o -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo -c -o mplibdir/libmplib_a-decContext.o `test -f 'mplibdir/decContext.c' || echo '$(srcdir)/'`mplibdir/decContext.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo mplibdir/$(DEPDIR)/libmplib_a-decContext.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decContext.c' object='mplibdir/libmplib_a-decContext.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decContext.o `test -f 'mplibdir/decContext.c' || echo '$(srcdir)/'`mplibdir/decContext.c - -mplibdir/libmplib_a-decContext.obj: mplibdir/decContext.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decContext.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo -c -o mplibdir/libmplib_a-decContext.obj `if test -f 'mplibdir/decContext.c'; then $(CYGPATH_W) 'mplibdir/decContext.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decContext.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo mplibdir/$(DEPDIR)/libmplib_a-decContext.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decContext.c' object='mplibdir/libmplib_a-decContext.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decContext.obj `if test -f 'mplibdir/decContext.c'; then $(CYGPATH_W) 'mplibdir/decContext.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decContext.c'; fi` - libmplib_a-tfmin.o: tfmin.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.o -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po @@ -11052,6 +11170,48 @@ libmplib_a-svgout.obj: svgout.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-svgout.obj `if test -f 'svgout.c'; then $(CYGPATH_W) 'svgout.c'; else $(CYGPATH_W) '$(srcdir)/svgout.c'; fi` +mplibdir/libmputil_a-avl.o: mplibdir/avl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmputil_a-avl.o -MD -MP -MF mplibdir/$(DEPDIR)/libmputil_a-avl.Tpo -c -o mplibdir/libmputil_a-avl.o `test -f 'mplibdir/avl.c' || echo '$(srcdir)/'`mplibdir/avl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmputil_a-avl.Tpo mplibdir/$(DEPDIR)/libmputil_a-avl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/avl.c' object='mplibdir/libmputil_a-avl.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmputil_a-avl.o `test -f 'mplibdir/avl.c' || echo '$(srcdir)/'`mplibdir/avl.c + +mplibdir/libmputil_a-avl.obj: mplibdir/avl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmputil_a-avl.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmputil_a-avl.Tpo -c -o mplibdir/libmputil_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmputil_a-avl.Tpo mplibdir/$(DEPDIR)/libmputil_a-avl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/avl.c' object='mplibdir/libmputil_a-avl.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmputil_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi` + +mplibdir/libmputil_a-decNumber.o: mplibdir/decNumber.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmputil_a-decNumber.o -MD -MP -MF mplibdir/$(DEPDIR)/libmputil_a-decNumber.Tpo -c -o mplibdir/libmputil_a-decNumber.o `test -f 'mplibdir/decNumber.c' || echo '$(srcdir)/'`mplibdir/decNumber.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmputil_a-decNumber.Tpo mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decNumber.c' object='mplibdir/libmputil_a-decNumber.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmputil_a-decNumber.o `test -f 'mplibdir/decNumber.c' || echo '$(srcdir)/'`mplibdir/decNumber.c + +mplibdir/libmputil_a-decNumber.obj: mplibdir/decNumber.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmputil_a-decNumber.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmputil_a-decNumber.Tpo -c -o mplibdir/libmputil_a-decNumber.obj `if test -f 'mplibdir/decNumber.c'; then $(CYGPATH_W) 'mplibdir/decNumber.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decNumber.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmputil_a-decNumber.Tpo mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decNumber.c' object='mplibdir/libmputil_a-decNumber.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmputil_a-decNumber.obj `if test -f 'mplibdir/decNumber.c'; then $(CYGPATH_W) 'mplibdir/decNumber.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decNumber.c'; fi` + +mplibdir/libmputil_a-decContext.o: mplibdir/decContext.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmputil_a-decContext.o -MD -MP -MF mplibdir/$(DEPDIR)/libmputil_a-decContext.Tpo -c -o mplibdir/libmputil_a-decContext.o `test -f 'mplibdir/decContext.c' || echo '$(srcdir)/'`mplibdir/decContext.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmputil_a-decContext.Tpo mplibdir/$(DEPDIR)/libmputil_a-decContext.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decContext.c' object='mplibdir/libmputil_a-decContext.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmputil_a-decContext.o `test -f 'mplibdir/decContext.c' || echo '$(srcdir)/'`mplibdir/decContext.c + +mplibdir/libmputil_a-decContext.obj: mplibdir/decContext.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmputil_a-decContext.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmputil_a-decContext.Tpo -c -o mplibdir/libmputil_a-decContext.obj `if test -f 'mplibdir/decContext.c'; then $(CYGPATH_W) 'mplibdir/decContext.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decContext.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmputil_a-decContext.Tpo mplibdir/$(DEPDIR)/libmputil_a-decContext.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mplibdir/decContext.c' object='mplibdir/libmputil_a-decContext.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmputil_a-decContext.obj `if test -f 'mplibdir/decContext.c'; then $(CYGPATH_W) 'mplibdir/decContext.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decContext.c'; fi` + pdftexdir/libpdftex_a-avl.o: pdftexdir/avl.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-avl.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo -c -o pdftexdir/libpdftex_a-avl.o `test -f 'pdftexdir/avl.c' || echo '$(srcdir)/'`pdftexdir/avl.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po @@ -11850,6 +12010,34 @@ call_mpost-callexe.obj: callexe.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_mpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi` +call_pmpost-callexe.o: callexe.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_pmpost-callexe.o -MD -MP -MF $(DEPDIR)/call_pmpost-callexe.Tpo -c -o call_pmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_pmpost-callexe.Tpo $(DEPDIR)/call_pmpost-callexe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_pmpost-callexe.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_pmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c + +call_pmpost-callexe.obj: callexe.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_pmpost-callexe.obj -MD -MP -MF $(DEPDIR)/call_pmpost-callexe.Tpo -c -o call_pmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_pmpost-callexe.Tpo $(DEPDIR)/call_pmpost-callexe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_pmpost-callexe.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_pmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi` + +call_upmpost-callexe.o: callexe.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_upmpost-callexe.o -MD -MP -MF $(DEPDIR)/call_upmpost-callexe.Tpo -c -o call_upmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_upmpost-callexe.Tpo $(DEPDIR)/call_upmpost-callexe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_upmpost-callexe.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_upmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c + +call_upmpost-callexe.obj: callexe.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_upmpost-callexe.obj -MD -MP -MF $(DEPDIR)/call_upmpost-callexe.Tpo -c -o call_upmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_upmpost-callexe.Tpo $(DEPDIR)/call_upmpost-callexe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_upmpost-callexe.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_upmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi` + eptexdir/eptex-eptexextra.o: eptexdir/eptexextra.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptexdir/eptex-eptexextra.o -MD -MP -MF eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo -c -o eptexdir/eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo eptexdir/$(DEPDIR)/eptex-eptexextra.Po @@ -12312,6 +12500,174 @@ pdvitype-pdvitype.obj: pdvitype.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi` +pmpost-pmp.o: pmp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmp.o -MD -MP -MF $(DEPDIR)/pmpost-pmp.Tpo -c -o pmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmp.Tpo $(DEPDIR)/pmpost-pmp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='pmpost-pmp.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c + +pmpost-pmp.obj: pmp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmp.obj -MD -MP -MF $(DEPDIR)/pmpost-pmp.Tpo -c -o pmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmp.Tpo $(DEPDIR)/pmpost-pmp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='pmpost-pmp.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi` + +pmpost-pmpmath.o: pmpmath.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmath.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmath.Tpo -c -o pmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmath.Tpo $(DEPDIR)/pmpost-pmpmath.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='pmpost-pmpmath.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c + +pmpost-pmpmath.obj: pmpmath.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmath.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmath.Tpo -c -o pmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmath.Tpo $(DEPDIR)/pmpost-pmpmath.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='pmpost-pmpmath.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi` + +pmpost-pmpmathbinary.o: pmpmathbinary.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathbinary.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmathbinary.Tpo -c -o pmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathbinary.Tpo $(DEPDIR)/pmpost-pmpmathbinary.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='pmpost-pmpmathbinary.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c + +pmpost-pmpmathbinary.obj: pmpmathbinary.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathbinary.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmathbinary.Tpo -c -o pmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathbinary.Tpo $(DEPDIR)/pmpost-pmpmathbinary.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='pmpost-pmpmathbinary.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi` + +pmpost-pmpmathdecimal.o: pmpmathdecimal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdecimal.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdecimal.Tpo -c -o pmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdecimal.Tpo $(DEPDIR)/pmpost-pmpmathdecimal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='pmpost-pmpmathdecimal.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c + +pmpost-pmpmathdecimal.obj: pmpmathdecimal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdecimal.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdecimal.Tpo -c -o pmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdecimal.Tpo $(DEPDIR)/pmpost-pmpmathdecimal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='pmpost-pmpmathdecimal.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi` + +pmpost-pmpmathdouble.o: pmpmathdouble.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdouble.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdouble.Tpo -c -o pmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdouble.Tpo $(DEPDIR)/pmpost-pmpmathdouble.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='pmpost-pmpmathdouble.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c + +pmpost-pmpmathdouble.obj: pmpmathdouble.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdouble.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdouble.Tpo -c -o pmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdouble.Tpo $(DEPDIR)/pmpost-pmpmathdouble.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='pmpost-pmpmathdouble.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi` + +pmpost-pmpost.o: pmpost.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpost.o -MD -MP -MF $(DEPDIR)/pmpost-pmpost.Tpo -c -o pmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpost.Tpo $(DEPDIR)/pmpost-pmpost.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='pmpost-pmpost.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c + +pmpost-pmpost.obj: pmpost.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpost.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpost.Tpo -c -o pmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpost.Tpo $(DEPDIR)/pmpost-pmpost.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='pmpost-pmpost.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi` + +pmpost-pmpstrings.o: pmpstrings.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpstrings.o -MD -MP -MF $(DEPDIR)/pmpost-pmpstrings.Tpo -c -o pmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpstrings.Tpo $(DEPDIR)/pmpost-pmpstrings.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='pmpost-pmpstrings.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c + +pmpost-pmpstrings.obj: pmpstrings.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpstrings.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpstrings.Tpo -c -o pmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpstrings.Tpo $(DEPDIR)/pmpost-pmpstrings.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='pmpost-pmpstrings.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi` + +pmpost-pmpxout.o: pmpxout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpxout.o -MD -MP -MF $(DEPDIR)/pmpost-pmpxout.Tpo -c -o pmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpxout.Tpo $(DEPDIR)/pmpost-pmpxout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='pmpost-pmpxout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c + +pmpost-pmpxout.obj: pmpxout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpxout.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpxout.Tpo -c -o pmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpxout.Tpo $(DEPDIR)/pmpost-pmpxout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='pmpost-pmpxout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi` + +pmpost-ppngout.o: ppngout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppngout.o -MD -MP -MF $(DEPDIR)/pmpost-ppngout.Tpo -c -o pmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppngout.Tpo $(DEPDIR)/pmpost-ppngout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='pmpost-ppngout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c + +pmpost-ppngout.obj: ppngout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppngout.obj -MD -MP -MF $(DEPDIR)/pmpost-ppngout.Tpo -c -o pmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppngout.Tpo $(DEPDIR)/pmpost-ppngout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='pmpost-ppngout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi` + +pmpost-ppsout.o: ppsout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppsout.o -MD -MP -MF $(DEPDIR)/pmpost-ppsout.Tpo -c -o pmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppsout.Tpo $(DEPDIR)/pmpost-ppsout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='pmpost-ppsout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c + +pmpost-ppsout.obj: ppsout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppsout.obj -MD -MP -MF $(DEPDIR)/pmpost-ppsout.Tpo -c -o pmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppsout.Tpo $(DEPDIR)/pmpost-ppsout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='pmpost-ppsout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi` + +pmpost-psvgout.o: psvgout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-psvgout.o -MD -MP -MF $(DEPDIR)/pmpost-psvgout.Tpo -c -o pmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-psvgout.Tpo $(DEPDIR)/pmpost-psvgout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='pmpost-psvgout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c + +pmpost-psvgout.obj: psvgout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-psvgout.obj -MD -MP -MF $(DEPDIR)/pmpost-psvgout.Tpo -c -o pmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-psvgout.Tpo $(DEPDIR)/pmpost-psvgout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='pmpost-psvgout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi` + +pmpost-ptfmin.o: ptfmin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ptfmin.o -MD -MP -MF $(DEPDIR)/pmpost-ptfmin.Tpo -c -o pmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ptfmin.Tpo $(DEPDIR)/pmpost-ptfmin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='pmpost-ptfmin.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c + +pmpost-ptfmin.obj: ptfmin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ptfmin.obj -MD -MP -MF $(DEPDIR)/pmpost-ptfmin.Tpo -c -o pmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ptfmin.Tpo $(DEPDIR)/pmpost-ptfmin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='pmpost-ptfmin.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi` + ppltotf-ppltotf.o: ppltotf.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.o -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po @@ -12578,6 +12934,174 @@ updvitype-updvitype.obj: updvitype.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o updvitype-updvitype.obj `if test -f 'updvitype.c'; then $(CYGPATH_W) 'updvitype.c'; else $(CYGPATH_W) '$(srcdir)/updvitype.c'; fi` +upmpost-pmp.o: pmp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmp.o -MD -MP -MF $(DEPDIR)/upmpost-pmp.Tpo -c -o upmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmp.Tpo $(DEPDIR)/upmpost-pmp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='upmpost-pmp.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c + +upmpost-pmp.obj: pmp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmp.obj -MD -MP -MF $(DEPDIR)/upmpost-pmp.Tpo -c -o upmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmp.Tpo $(DEPDIR)/upmpost-pmp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='upmpost-pmp.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi` + +upmpost-pmpmath.o: pmpmath.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmath.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmath.Tpo -c -o upmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmath.Tpo $(DEPDIR)/upmpost-pmpmath.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='upmpost-pmpmath.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c + +upmpost-pmpmath.obj: pmpmath.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmath.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmath.Tpo -c -o upmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmath.Tpo $(DEPDIR)/upmpost-pmpmath.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='upmpost-pmpmath.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi` + +upmpost-pmpmathbinary.o: pmpmathbinary.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathbinary.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmathbinary.Tpo -c -o upmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathbinary.Tpo $(DEPDIR)/upmpost-pmpmathbinary.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='upmpost-pmpmathbinary.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c + +upmpost-pmpmathbinary.obj: pmpmathbinary.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathbinary.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmathbinary.Tpo -c -o upmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathbinary.Tpo $(DEPDIR)/upmpost-pmpmathbinary.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='upmpost-pmpmathbinary.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi` + +upmpost-pmpmathdecimal.o: pmpmathdecimal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdecimal.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdecimal.Tpo -c -o upmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdecimal.Tpo $(DEPDIR)/upmpost-pmpmathdecimal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='upmpost-pmpmathdecimal.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c + +upmpost-pmpmathdecimal.obj: pmpmathdecimal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdecimal.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdecimal.Tpo -c -o upmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdecimal.Tpo $(DEPDIR)/upmpost-pmpmathdecimal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='upmpost-pmpmathdecimal.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi` + +upmpost-pmpmathdouble.o: pmpmathdouble.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdouble.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdouble.Tpo -c -o upmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdouble.Tpo $(DEPDIR)/upmpost-pmpmathdouble.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='upmpost-pmpmathdouble.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c + +upmpost-pmpmathdouble.obj: pmpmathdouble.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdouble.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdouble.Tpo -c -o upmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdouble.Tpo $(DEPDIR)/upmpost-pmpmathdouble.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='upmpost-pmpmathdouble.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi` + +upmpost-pmpost.o: pmpost.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpost.o -MD -MP -MF $(DEPDIR)/upmpost-pmpost.Tpo -c -o upmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpost.Tpo $(DEPDIR)/upmpost-pmpost.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='upmpost-pmpost.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c + +upmpost-pmpost.obj: pmpost.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpost.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpost.Tpo -c -o upmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpost.Tpo $(DEPDIR)/upmpost-pmpost.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='upmpost-pmpost.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi` + +upmpost-pmpstrings.o: pmpstrings.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpstrings.o -MD -MP -MF $(DEPDIR)/upmpost-pmpstrings.Tpo -c -o upmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpstrings.Tpo $(DEPDIR)/upmpost-pmpstrings.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='upmpost-pmpstrings.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c + +upmpost-pmpstrings.obj: pmpstrings.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpstrings.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpstrings.Tpo -c -o upmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpstrings.Tpo $(DEPDIR)/upmpost-pmpstrings.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='upmpost-pmpstrings.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi` + +upmpost-pmpxout.o: pmpxout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpxout.o -MD -MP -MF $(DEPDIR)/upmpost-pmpxout.Tpo -c -o upmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpxout.Tpo $(DEPDIR)/upmpost-pmpxout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='upmpost-pmpxout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c + +upmpost-pmpxout.obj: pmpxout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpxout.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpxout.Tpo -c -o upmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpxout.Tpo $(DEPDIR)/upmpost-pmpxout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='upmpost-pmpxout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi` + +upmpost-ppngout.o: ppngout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppngout.o -MD -MP -MF $(DEPDIR)/upmpost-ppngout.Tpo -c -o upmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppngout.Tpo $(DEPDIR)/upmpost-ppngout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='upmpost-ppngout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c + +upmpost-ppngout.obj: ppngout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppngout.obj -MD -MP -MF $(DEPDIR)/upmpost-ppngout.Tpo -c -o upmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppngout.Tpo $(DEPDIR)/upmpost-ppngout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='upmpost-ppngout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi` + +upmpost-ppsout.o: ppsout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppsout.o -MD -MP -MF $(DEPDIR)/upmpost-ppsout.Tpo -c -o upmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppsout.Tpo $(DEPDIR)/upmpost-ppsout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='upmpost-ppsout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c + +upmpost-ppsout.obj: ppsout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppsout.obj -MD -MP -MF $(DEPDIR)/upmpost-ppsout.Tpo -c -o upmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppsout.Tpo $(DEPDIR)/upmpost-ppsout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='upmpost-ppsout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi` + +upmpost-psvgout.o: psvgout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-psvgout.o -MD -MP -MF $(DEPDIR)/upmpost-psvgout.Tpo -c -o upmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-psvgout.Tpo $(DEPDIR)/upmpost-psvgout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='upmpost-psvgout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c + +upmpost-psvgout.obj: psvgout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-psvgout.obj -MD -MP -MF $(DEPDIR)/upmpost-psvgout.Tpo -c -o upmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-psvgout.Tpo $(DEPDIR)/upmpost-psvgout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='upmpost-psvgout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi` + +upmpost-ptfmin.o: ptfmin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ptfmin.o -MD -MP -MF $(DEPDIR)/upmpost-ptfmin.Tpo -c -o upmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ptfmin.Tpo $(DEPDIR)/upmpost-ptfmin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='upmpost-ptfmin.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c + +upmpost-ptfmin.obj: ptfmin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ptfmin.obj -MD -MP -MF $(DEPDIR)/upmpost-ptfmin.Tpo -c -o upmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ptfmin.Tpo $(DEPDIR)/upmpost-ptfmin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='upmpost-ptfmin.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi` + uppltotf-uppltotf.o: uppltotf.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uppltotf-uppltotf.o -MD -MP -MF $(DEPDIR)/uppltotf-uppltotf.Tpo -c -o uppltotf-uppltotf.o `test -f 'uppltotf.c' || echo '$(srcdir)/'`uppltotf.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uppltotf-uppltotf.Tpo $(DEPDIR)/uppltotf-uppltotf.Po @@ -14327,6 +14851,85 @@ mptrap.diffs: mpost$(EXEEXT) mptrap-clean: rm -rf mptrapdir +.PHONY: install-pmpost-links install-upmpost-links uninstall-pmpost-links uninstall-upmpost-links +@WIN32_TRUE@install-pmpost-links: call_pmpost$(EXEEXT) +@WIN32_TRUE@ $(INSTALL_PROGRAM) call_pmpost$(EXEEXT) $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT) +@WIN32_TRUE@install-upmpost-links: call_upmpost$(EXEEXT) +@WIN32_TRUE@ $(INSTALL_PROGRAM) call_upmpost$(EXEEXT) $(DESTDIR)$(bindir)/updvitomp$(EXEEXT) +@WIN32_TRUE@uninstall-pmpost-links: +@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT) +@WIN32_TRUE@uninstall-upmpost-links: +@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/updvitomp$(EXEEXT) + +pmp.w: mplibdir/mp.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mp.w >$@ +pmpmath.c: mpmath.c + $(AM_V_GEN)$(pmp_sed) mpmath.c >$@ +pmpmath.h: mpmath.h + $(AM_V_GEN)$(pmp_sed) mpmath.h >$@ +pmpmathbinary.c: mpmathbinary.c + $(AM_V_GEN)$(pmp_sed) mpmathbinary.c >$@ +pmpmathbinary.h: mpmathbinary.h + $(AM_V_GEN)$(pmp_sed) mpmathbinary.h >$@ +pmpmathdecimal.c: mpmathdecimal.c + $(AM_V_GEN)$(pmp_sed) mpmathdecimal.c >$@ +pmpmathdecimal.h: mpmathdecimal.h + $(AM_V_GEN)$(pmp_sed) mpmathdecimal.h >$@ +pmpmathdouble.c: mpmathdouble.c + $(AM_V_GEN)$(pmp_sed) mpmathdouble.c >$@ +pmpmathdouble.h: mpmathdouble.h + $(AM_V_GEN)$(pmp_sed) mpmathdouble.h >$@ +pmpost.w: mplibdir/mpost.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpost.w >$@ +pmpstrings.c: mpstrings.c + $(AM_V_GEN)$(pmp_sed) mpstrings.c >$@ +pmpstrings.h: mpstrings.h + $(AM_V_GEN)$(pmp_sed) mpstrings.h >$@ +pmpxout.w: mplibdir/mpxout.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpxout.w >$@ +pmplibpng.h: mplibpng.h + $(AM_V_GEN)$(pmp_sed) mplibpng.h >$@ +pmppngout.h: mppngout.h + $(AM_V_GEN)$(pmp_sed) mppngout.h >$@ +ppngout.c: pngout.c + $(AM_V_GEN)$(pmp_sed) pngout.c >$@ +ppsout.w: mplibdir/psout.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/psout.w >$@ +psvgout.w: mplibdir/svgout.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/svgout.w >$@ +ptfmin.w: mplibdir/tfmin.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/tfmin.w >$@ + +# Creating one file: just one rule +pmpost.c: ctangle$(EXEEXT) pmpost.w pmpostdir/pmpost.ch + $(pmp_ctangle) pmpost pmpost +ptfmin.c: ctangle$(EXEEXT) ptfmin.w pmpostdir/ptfmin.ch + $(pmp_ctangle) ptfmin ptfmin + +# Creating several files: need stamp file and two rules with identical recipes +$(pmp_c_h): pmp-tangle + @$(pmp_ctangle_sh) pmp pmp +pmp-tangle: ctangle$(EXEEXT) pmp.w pmpostdir/pmp.ch tangle-sh + @$(pmp_ctangle_sh) pmp pmp + +$(pmpxout_c_h): pmpxout-tangle + @$(pmp_ctangle_sh) pmpxout pmpxout +pmpxout-tangle: ctangle$(EXEEXT) pmpxout.w pmpostdir/pmpxout.ch tangle-sh + @$(pmp_ctangle_sh) pmpxout pmpxout + +$(ppsout_c_h): ppsout-tangle + @$(pmp_ctangle_sh) ppsout ppsout +ppsout-tangle: ctangle$(EXEEXT) ppsout.w pmpostdir/ppsout.ch tangle-sh + @$(pmp_ctangle_sh) ppsout ppsout + +$(psvgout_c_h): psvgout-tangle + @$(pmp_ctangle_sh) psvgout psvgout +psvgout-tangle: ctangle$(EXEEXT) psvgout.w pmpostdir/psvgout.ch tangle-sh + @$(pmp_ctangle_sh) psvgout psvgout + +$(pmpost_OBJECTS) $(upmpost_OBJECTS): $(nodist_pmpost_SOURCES) $(PTEXENC_DEPEND) \ + $(LIBPNG_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) + # Creating one file: just one rule tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w $(mp_ctangle) tfmin.w diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index cc4a2cc3af1..20b8085be97 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -27,18 +27,20 @@ AC_ARG_ENABLE([ipc], kpse_indent_26))[]dnl dnl [PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS] m4_define([kpse_tex_progs], [dnl -[[tex], [yes], [no], [TeX], []], -[[etex], [no], [yes], [e-TeX], []], -[[ptex], [yes], [yes], [pTeX], [ptexenc]], -[[eptex], [yes], [yes], [e-pTeX], [ptexenc]], -[[uptex], [yes], [yes], [upTeX], [ptexenc]], -[[euptex], [yes], [yes], [e-upTeX], [ptexenc]], -[[aleph], [yes], [], [Aleph], []], -[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng]], -[[luatex], [yes], [], [LuaTeX], [poppler mpfr cairo libpng zziplib lua52]], -[[luajittex], [yes], [], [LuaJITTeX], [poppler mpfr cairo libpng zziplib luajit]], -[[mp], [yes], [], [MetaPost], [mpfr cairo libpng]], -[[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 teckit harfbuzz]], +[[tex], [yes], [no], [TeX], []], +[[etex], [no], [yes], [e-TeX], []], +[[ptex], [yes], [yes], [pTeX], [ptexenc]], +[[eptex], [yes], [yes], [e-pTeX], [ptexenc]], +[[uptex], [yes], [yes], [upTeX], [ptexenc]], +[[euptex], [yes], [yes], [e-upTeX], [ptexenc]], +[[aleph], [yes], [], [Aleph], []], +[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng]], +[[luatex], [yes], [], [LuaTeX], [poppler mpfr cairo libpng zziplib lua52]], +[[luajittex], [yes], [], [LuaJITTeX], [poppler mpfr cairo libpng zziplib luajit]], +[[mp], [yes], [], [MetaPost], [mpfr cairo libpng]], +[[pmp], [yes], [], [pMetaPost], [mpfr cairo libpng ptexenc]], +[[upmp], [yes], [], [upMetaPost], [mpfr cairo libpng ptexenc]], +[[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 teckit harfbuzz]], ])[]dnl m4_foreach([Kpse_Prog], [kpse_tex_progs], [m4_ifset([Kpse_Prog], diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 64b7c465868..079e11d4f7a 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -757,6 +757,10 @@ XETEX_SYNCTEX_FALSE XETEX_SYNCTEX_TRUE XETEX_FALSE XETEX_TRUE +UPMP_FALSE +UPMP_TRUE +PMP_FALSE +PMP_TRUE MP_FALSE MP_TRUE LUAJITTEX_FALSE @@ -988,6 +992,8 @@ enable_pdftex_synctex enable_luatex enable_luajittex enable_mp +enable_pmp +enable_upmp enable_xetex enable_xetex_synctex enable_mf @@ -1717,6 +1723,8 @@ Optional Features: --disable-luatex do not compile and install LuaTeX --disable-luajittex do not compile and install LuaJITTeX --disable-mp do not compile and install MetaPost + --disable-pmp do not compile and install pMetaPost + --disable-upmp do not compile and install upMetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -18167,6 +18175,40 @@ test "x$enable_web2c:$enable_mp" = xyes:yes && { need_cairo=yes need_libpng=yes } +# Check whether --enable-pmp was given. +if test "${enable_pmp+set}" = set; then : + enableval=$enable_pmp; +fi +case $enable_pmp in #( + yes | no) : + ;; #( + *) : + enable_pmp=yes ;; +esac + +test "x$enable_web2c:$enable_pmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} +# Check whether --enable-upmp was given. +if test "${enable_upmp+set}" = set; then : + enableval=$enable_upmp; +fi +case $enable_upmp in #( + yes | no) : + ;; #( + *) : + enable_upmp=yes ;; +esac + +test "x$enable_web2c:$enable_upmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; @@ -19486,6 +19528,20 @@ else MP_TRUE='#' MP_FALSE= fi + if test "x$enable_pmp" = xyes; then + PMP_TRUE= + PMP_FALSE='#' +else + PMP_TRUE='#' + PMP_FALSE= +fi + if test "x$enable_upmp" = xyes; then + UPMP_TRUE= + UPMP_FALSE='#' +else + UPMP_TRUE='#' + UPMP_FALSE= +fi if test "x$enable_xetex" = xyes; then XETEX_TRUE= XETEX_FALSE='#' @@ -24435,6 +24491,14 @@ if test -z "${MP_TRUE}" && test -z "${MP_FALSE}"; then as_fn_error $? "conditional \"MP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${PMP_TRUE}" && test -z "${PMP_FALSE}"; then + as_fn_error $? "conditional \"PMP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${UPMP_TRUE}" && test -z "${UPMP_FALSE}"; then + as_fn_error $? "conditional \"UPMP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${XETEX_TRUE}" && test -z "${XETEX_FALSE}"; then as_fn_error $? "conditional \"XETEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 7dca1a603e8..8602a488d12 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-09-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/luatex.am: Factor out common *_LDADD and *_DEPENDENCIES. + 2014-08-19 Peter Breitenlohner <peb@mppmu.mpg.de> * image/writepng.w: Avoid PNG warnings. diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index aa0c9b68145..fc6399bd010 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -44,24 +44,19 @@ luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) $(l luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luajittex_CXXFLAGS = $(WARNING_CXXFLAGS) -luatex_ldadd = libluatex.a libff.a libunilib.a libluamisc.a libluasocket.a $(LUA_LIBS) -luatex_ldadd += libmd5.a libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) -luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) - -luajittex_ldadd = libluajittex.a libjitff.a libunilib.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) -luajittex_ldadd += libmd5.a libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) -luajittex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) - luatex_LDFLAGS = -export-dynamic luajittex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA) -luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) -luajittex_LDADD = $(luajittex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) +luatex_postldadd = libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) +luatex_postldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) +luatex_postldadd += $(LDADD) libmputil.a libunilib.a libmd5.a $(lua_socketlibs) + +luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a $(LUA_LIBS) $(luatex_postldadd) +luajittex_LDADD = libluajittex.a libjitff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd) -luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a -luatex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a -luajittex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluajittex.a -luajittex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a +luatex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) +luatex_DEPENDENCIES = $(luatex_depend) libluatex.a +luajittex_DEPENDENCIES = $(luatex_depend) libluajittex.a $(luatex_OBJECTS): libluatex.a libmplib.a $(luajittex_OBJECTS): libluajittex.a libmplib.a diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index e7297c08285..67951d562e5 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,10 @@ +2014-09-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libmplib.am: Build a separate library libmputil.a from + distributed *.[ch] files. Move respective rules from here ... + * am/libmputil.am (new): ... to here. + * am/mplib.am (mpost_LDADD): Add libmputil.a. + 2014-09-06 Peter Breitenlohner <peb@mppmu.mpg.de> * mpxout.w (bad_dvi_two): Correctly use mpx_abort(). diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am index e8c98dfe096..ca2d8e4c969 100644 --- a/Build/source/texk/web2c/mplibdir/am/libmplib.am +++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am @@ -11,8 +11,6 @@ libmplib_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMA $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir ## libmplib C sources -libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \ - mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathbinary_c_h) $(mpmathdecimal_c_h) \ $(mpmathdouble_c_h) $(mpstrings_c_h) $(pngout_c_h) $(psout_c_h) $(svgout_c_h) mp_c_h = mp.c mplib.h mpmp.h diff --git a/Build/source/texk/web2c/mplibdir/am/libmputil.am b/Build/source/texk/web2c/mplibdir/am/libmputil.am new file mode 100644 index 00000000000..09ace983a0b --- /dev/null +++ b/Build/source/texk/web2c/mplibdir/am/libmputil.am @@ -0,0 +1,15 @@ +## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. +## +## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. + +## libmplib.a, used by MetaPost and luaTeX +## +EXTRA_LIBRARIES += libmputil.a + +libmputil_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir + +## libmputil C sources +libmputil_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \ + mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c + diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 7b152f20b15..041bf67d012 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -18,9 +18,8 @@ endif MP EXTRA_PROGRAMS += mpost mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir -mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ - $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) + $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\" nodist_call_mpost_SOURCES = callexe.c diff --git a/Build/source/texk/web2c/pmpostdir/ChangeLog b/Build/source/texk/web2c/pmpostdir/ChangeLog new file mode 100644 index 00000000000..98677828d27 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/ChangeLog @@ -0,0 +1,6 @@ +2014-09-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import pMetaPost and upMetaPost from ???. + * Rename change files and adapt to TeX Live build system. + * Handle pMetaPost/upMetaPost differences via '#ifdef UPMP'. + * pmpost.test, upmpost.test: Shell scripts for simple test. diff --git a/Build/source/texk/web2c/pmpostdir/am/pmpost.am b/Build/source/texk/web2c/pmpostdir/am/pmpost.am new file mode 100644 index 00000000000..71c0de0bc16 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/am/pmpost.am @@ -0,0 +1,183 @@ +## texk/web2c/pmpostdir/am/pmpost.am: Makefile fragment for pMetaPost. +## +## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. + +## pMetaPost and upMetaPost +## +if PMP +bin_PROGRAMS += pmpost +if WIN32 +noinst_PROGRAMS += call_pmpost +install_exe_links += install-pmpost-links +uninstall_exe_links += uninstall-pmpost-links +else !WIN32 +bin_links += pmpost$(EXEEXT):pdvitomp +endif !WIN32 +endif PMP +if UPMP +bin_PROGRAMS += upmpost +if WIN32 +noinst_PROGRAMS += call_upmpost +install_exe_links += install-upmpost-links +uninstall_exe_links += uninstall-upmpost-links +else !WIN32 +bin_links += upmpost$(EXEEXT):updvitomp +endif !WIN32 +endif UPMP +EXTRA_PROGRAMS += pmpost upmpost + +call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\" +nodist_call_pmpost_SOURCES = callexe.c +call_pmpost_LDADD = + +call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\" +nodist_call_upmpost_SOURCES = callexe.c +call_upmpost_LDADD = + +pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \ + $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir +pmpost_LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \ + $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a + +upmpost_CPPFLAGS = -DUPMP $(pmpost_CPPFLAGS) +upmpost_LDADD = $(pmpost_LDADD) + +.PHONY: install-pmpost-links install-upmpost-links uninstall-pmpost-links uninstall-upmpost-links +if WIN32 +install-pmpost-links: call_pmpost$(EXEEXT) + $(INSTALL_PROGRAM) call_pmpost$(EXEEXT) $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT) +install-upmpost-links: call_upmpost$(EXEEXT) + $(INSTALL_PROGRAM) call_upmpost$(EXEEXT) $(DESTDIR)$(bindir)/updvitomp$(EXEEXT) +uninstall-pmpost-links: + rm -f $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT) +uninstall-upmpost-links: + rm -f $(DESTDIR)$(bindir)/updvitomp$(EXEEXT) +endif WIN32 + +# Creating one file: just one rule +pmp_ctangle = $(ctangle_silent)CWEBINPUTS=.:$(srcdir)/pmpostdir $(ctangle) +# Creating several files: need stamp file and two rules with identical recipes +pmp_ctangle_sh = CWEBINPUTS=.:$(srcdir)/pmpostdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE) + +## pMetaPost C sources +nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) $(pmpmathdecimal_c_h) \ + $(pmpmathdouble_c_h) pmpost.c $(pmpstrings_c_h) $(pmpxout_c_h) \ + $(ppngout_c_h) $(ppsout_c_h) $(psvgout_c_h) ptfmin.c +pmp_c_h = pmp.c pmplib.h pmpmp.h +pmpmath_c_h = pmpmath.c pmpmath.h +pmpmathbinary_c_h = pmpmathbinary.c pmpmathbinary.h +pmpmathdecimal_c_h = pmpmathdecimal.c pmpmathdecimal.h +pmpmathdouble_c_h = pmpmathdouble.c pmpmathdouble.h +pmpstrings_c_h = pmpstrings.h pmpstrings.c +pmpxout_c_h = pmpxout.c pmpxout.h +ppngout_c_h = pmplibpng.h pmppngout.h ppngout.c +ppsout_c_h = pmppsout.h ppsout.c pmplibps.h +psvgout_c_h = pmplibsvg.h pmpsvgout.h psvgout.c + +## upMetaPost C sources +nodist_upmpost_SOURCES = $(nodist_pmpost_SOURCES) + +# sed script +pmp_sed_main = 's/mpxout\.h/pmpxout.h/;s/mpmp\.h/pmpmp.h/;s/mplib\.h/pmplib.h/;s/mpstrings\.h/pmpstrings.h/' +pmp_sed_math = 's/mpmath\([a-z]*\)\.h/pmpmath\1.h/' +pmp_sed_ps = 's/mplibps\.h/pmplibps.h/;s/mppsout\.h/pmppsout.h/' +pmp_sed_svg = 's/mplibsvg\.h/pmplibsvg.h/;s/mpsvgout\.h/pmpsvgout.h/' +pmp_sed_png = 's/mplibpng\.h/pmplibpng.h/;s/mppngout\.h/pmppngout.h/' +pmp_sed = sed -e $(pmp_sed_main) -e $(pmp_sed_math) -e $(pmp_sed_ps) -e $(pmp_sed_svg) -e $(pmp_sed_png) + +pmp.w: mplibdir/mp.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mp.w >$@ +pmpmath.c: mpmath.c + $(AM_V_GEN)$(pmp_sed) mpmath.c >$@ +pmpmath.h: mpmath.h + $(AM_V_GEN)$(pmp_sed) mpmath.h >$@ +pmpmathbinary.c: mpmathbinary.c + $(AM_V_GEN)$(pmp_sed) mpmathbinary.c >$@ +pmpmathbinary.h: mpmathbinary.h + $(AM_V_GEN)$(pmp_sed) mpmathbinary.h >$@ +pmpmathdecimal.c: mpmathdecimal.c + $(AM_V_GEN)$(pmp_sed) mpmathdecimal.c >$@ +pmpmathdecimal.h: mpmathdecimal.h + $(AM_V_GEN)$(pmp_sed) mpmathdecimal.h >$@ +pmpmathdouble.c: mpmathdouble.c + $(AM_V_GEN)$(pmp_sed) mpmathdouble.c >$@ +pmpmathdouble.h: mpmathdouble.h + $(AM_V_GEN)$(pmp_sed) mpmathdouble.h >$@ +pmpost.w: mplibdir/mpost.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpost.w >$@ +pmpstrings.c: mpstrings.c + $(AM_V_GEN)$(pmp_sed) mpstrings.c >$@ +pmpstrings.h: mpstrings.h + $(AM_V_GEN)$(pmp_sed) mpstrings.h >$@ +pmpxout.w: mplibdir/mpxout.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpxout.w >$@ +pmplibpng.h: mplibpng.h + $(AM_V_GEN)$(pmp_sed) mplibpng.h >$@ +pmppngout.h: mppngout.h + $(AM_V_GEN)$(pmp_sed) mppngout.h >$@ +ppngout.c: pngout.c + $(AM_V_GEN)$(pmp_sed) pngout.c >$@ +ppsout.w: mplibdir/psout.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/psout.w >$@ +psvgout.w: mplibdir/svgout.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/svgout.w >$@ +ptfmin.w: mplibdir/tfmin.w + $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/tfmin.w >$@ + +# Creating one file: just one rule +pmpost.c: ctangle$(EXEEXT) pmpost.w pmpostdir/pmpost.ch + $(pmp_ctangle) pmpost pmpost +ptfmin.c: ctangle$(EXEEXT) ptfmin.w pmpostdir/ptfmin.ch + $(pmp_ctangle) ptfmin ptfmin + +# Creating several files: need stamp file and two rules with identical recipes +$(pmp_c_h): pmp-tangle + @$(pmp_ctangle_sh) pmp pmp +pmp-tangle: ctangle$(EXEEXT) pmp.w pmpostdir/pmp.ch tangle-sh + @$(pmp_ctangle_sh) pmp pmp + +$(pmpxout_c_h): pmpxout-tangle + @$(pmp_ctangle_sh) pmpxout pmpxout +pmpxout-tangle: ctangle$(EXEEXT) pmpxout.w pmpostdir/pmpxout.ch tangle-sh + @$(pmp_ctangle_sh) pmpxout pmpxout + +$(ppsout_c_h): ppsout-tangle + @$(pmp_ctangle_sh) ppsout ppsout +ppsout-tangle: ctangle$(EXEEXT) ppsout.w pmpostdir/ppsout.ch tangle-sh + @$(pmp_ctangle_sh) ppsout ppsout + +$(psvgout_c_h): psvgout-tangle + @$(pmp_ctangle_sh) psvgout psvgout +psvgout-tangle: ctangle$(EXEEXT) psvgout.w pmpostdir/psvgout.ch tangle-sh + @$(pmp_ctangle_sh) psvgout psvgout + +## pMetaPost CWeb sources +pmpost_web = pmpostdir/pmp.ch pmpostdir/pmpost.ch pmpostdir/pmpxout.ch pmpostdir/ppsout.ch \ + pmpostdir/psvgout.ch pmpostdir/ptfmin.ch + +$(pmpost_OBJECTS) $(upmpost_OBJECTS): $(nodist_pmpost_SOURCES) $(PTEXENC_DEPEND) \ + $(LIBPNG_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND) + +EXTRA_DIST += pmpostdir/ChangeLog $(pmpost_web) + +DISTCLEANFILES += $(nodist_pmpost_SOURCES) \ + pmp.w pmpost.w pmpxout.w ppsout.w psvgout.w ptfmin.w \ + pmp-tangle pmpxout-tangle ppsout-tangle psvgout-tangle + +## (u)pMetaPost Tests +## +pmp_tests = pmpostdir/pmpost.test pmpostdir/upmpost.test + +EXTRA_DIST += $(pmp_tests) + +if PMP +TESTS += pmpostdir/pmpost.test +endif PMP +if UPMP +TESTS += pmpostdir/upmpost.test +endif UPMP + +## Unresolved pMetaPost/upMetaPost diff +EXTRA_DIST += pmpostdir/upmp.ch + diff --git a/Build/source/texk/web2c/pmpostdir/pmp.ch b/Build/source/texk/web2c/pmpostdir/pmp.ch new file mode 100644 index 00000000000..aef89a90598 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/pmp.ch @@ -0,0 +1,361 @@ +% jMetaPost change file for MetaPost +% +% written by Michio Matsuyama <fwhw5892@mb.infoweb.ne.jp> +% Hideyuki Suzuki <hideyuki@sat.t.u-tokyo.ac.jp> +% +% $Id: jmp.ch,v 1.42 2000/03/20 02:55:50 hideyuki Exp $ + +% +% +% change file of mp.w for pMetaPost (CWEB version) +% Akira Kakuto (translated the WEB version) +% +% + +@x +@d default_banner "This is MetaPost, Version 1.999" /* printed when \MP\ starts */ +@y +@z + +@x +#define metapost_version "1.999" +@y +#ifdef UPMP +#define metapost_name "upMetaPost" +#define metapost_version "1.999-0.04-u1.11" +#else +#define metapost_name "pMetaPost" +#define metapost_version "1.999-0.04" +#endif +#define default_banner "This is " metapost_name ", Version " metapost_version /* printed when \MP\ starts */ +@z + +@x +# include <unistd.h> /* for access */ +#endif +@y +# include <unistd.h> /* for access */ +#endif +#include <kpathsea/config.h> +#include <kpathsea/kpathsea.h> +#include <ptexenc/ptexenc.h> +#include <errno.h> +@z + +@x +void mp_close_file (MP mp, void *f) { + (void) mp; + if (f != NULL) + fclose ((FILE *) f); +@y +void mp_close_file (MP mp, void *f) { + (void) mp; +#ifdef WIN32 + if (f != NULL) { + clear_infile_enc((FILE *)f); + fclose ((FILE *) f); + } +#else + if (f != NULL) + fclose ((FILE *) f); +#endif +@z + +@x +mp->buf_size = 200; +@y +{ + char *kpse_buf = kpse_var_value("buf_size"); + if(kpse_buf) { + mp->buf_size = atoi(kpse_buf); + free(kpse_buf); + } else { + mp->buf_size = 500000; + } +} +@z + +@x +static boolean mp_input_ln (MP mp, void *f) { + /* inputs the next line or returns |false| */ + char *s; + size_t size = 0; + mp->last = mp->first; /* cf.\ Matthew 19\thinspace:\thinspace30 */ + s = (mp->read_ascii_file) (mp, f, &size); + if (s == NULL) + return false; + if (size > 0) { + mp->last = mp->first + size; + if (mp->last >= mp->max_buf_stack) { + mp->max_buf_stack = mp->last + 1; + while (mp->max_buf_stack > mp->buf_size) { + mp_reallocate_buffer (mp, (mp->buf_size + (mp->buf_size >> 2))); + } + } + (void) memcpy ((mp->buffer + mp->first), s, size); + } + free (s); + return true; +} +@y +static boolean mp_input_ln (MP mp, void *f ) { + int i = EOF; + mp->last = input_line2((FILE *)f, mp->buffer, mp->first, mp->buf_size, &i); + if (i == EOF && errno != EINTR && mp->last == mp->first) + return false; + if (i != EOF && i != '\n' && i != '\r') { + fprintf (stderr, "! Unable to read an entire line---bufsize=%u.\n", + (unsigned) mp->buf_size); + fputs ("Please increase buf_size in texmf.cnf.\n", stderr); + exit (1); + } + if (i == '\r') { + while ((i = getc ((FILE *)f)) == EOF && errno == EINTR) + ; + if (i != '\n') + ungetc (i, f); + } + return true; +} +@z + +@x +wterm (mp->banner); +@y +wterm (mp->banner); +wterm(" ("); +wterm(getencstring()); +wterm(")"); +@z + +@x +} four_quarters; +typedef union { + integer sc; + four_quarters qqqq; +} font_data; +@y +} four_quarters; +typedef struct { + halfword RH, LH; +} two_halves; +typedef union { + two_halves hh; + integer sc; + four_quarters qqqq; +} font_data; +@z + +% +% tategaki support +% +% Suppose h==(0,height), d==(0,-depth) && w==(width,0) in horizontal string, +% && h==(height,0), d==(-depth,0) && w==(0,-width) in vertical string. +% Four vertices of the bounding box is h, d, h+w && d+w && those of the +% transformed boundig box is Th, Td, T(h+w) && T(d+w), so that the values +% of Th, Td && Tw are compared here. + +@x +@ The height width and depth information stored in a text node determines a +rectangle that needs to be transformed according to the transformation +parameters stored in the text node. + +@y +@ The height width and depth information stored in a text node determines a +rectangle that needs to be transformed according to the transformation +parameters stored in the text node. + +Boundig box depends on JFM font ID. + +@d yoko_jfm_id 11 /* `yoko-kumi' fonts */ +@d tate_jfm_id 9 /* `tate-kumi' fonts */ +@d font_jfm_p(A) (mp->font_id[(A)]!=0) + +@z + +@x + mp_number x0a, y0a, x1a, y1a, arg1; + mp_text_node p0 = (mp_text_node)p; + new_number (x0a); + new_number (x1a); + new_number (y0a); + new_number (y1a); + new_number (arg1); + number_clone (arg1, p0->depth); + number_negate (arg1); + take_scaled (x1a, p0->txx, p0->width); + take_scaled (y0a, p0->txy, arg1); + take_scaled (y1a, p0->txy, p0->height); +@y + mp_number x0a, y0a, x1a, y1a, arg1, arg2; + mp_text_node p0 = (mp_text_node)p; + new_number (x0a); + new_number (x1a); + new_number (y0a); + new_number (y1a); + new_number (arg1); + new_number (arg2); + number_clone (arg1, p0->depth); + number_negate (arg1); + number_clone (arg2, p0->width); + number_negate (arg2); + if ( mp->font_id[mp_font_n(p)]!=tate_jfm_id ) { + take_scaled (x1a, p0->txx, p0->width); + take_scaled (y0a, p0->txy, arg1); + take_scaled (y1a, p0->txy, p0->height); + } else { + take_scaled (x1a, p0->txy, arg2); + take_scaled (y0a, p0->txx, arg1); + take_scaled (y1a, p0->txx, p0->height); + } +@z + +@x + take_scaled (x1a, p0->tyx, p0->width); + number_clone (arg1, p0->depth); + number_negate (arg1); + take_scaled (y0a, p0->tyy, arg1); + take_scaled (y1a, p0->tyy, p0->height); +@y + if ( mp->font_id[mp_font_n(p)]!=tate_jfm_id ) { + take_scaled (x1a, p0->tyx, p0->width); + number_clone (arg1, p0->depth); + number_negate (arg1); + take_scaled (y0a, p0->tyy, arg1); + take_scaled (y1a, p0->tyy, p0->height); + } else { + number_clone (arg1, p0->depth); + number_negate (arg1); + number_clone (arg2, p0->width); + number_negate (arg2); + take_scaled (x1a, p0->tyy, arg2); + take_scaled (y0a, p0->tyx, arg1); + take_scaled (y1a, p0->tyx, p0->height); + } +@z + +@x + wlog (mp->banner); +@y + wlog (mp->banner); + wlog (" ("); + wlog (getencstring()); + wlog (")"); +@z + +% +% char type pointers +@x +eight_bits *font_bc; +eight_bits *font_ec; /* first and last character code */ +@y +eight_bits *font_bc; +eight_bits *font_ec; /* first and last character code */ +halfword *font_nt; +halfword *font_id; +@z + +@x +int *char_base; /* base address for |char_info| */ +@y +int *char_base; /* base address for |char_info| */ +int *ctype_base; +@z + +@x +xfree (mp->char_base); +@y +xfree (mp->font_id); +xfree (mp->font_nt); +xfree (mp->char_base); +xfree (mp->ctype_base); +@z + +@x + XREALLOC (mp->char_base, l, int); +@y + XREALLOC (mp->font_id, l, halfword); + XREALLOC (mp->font_nt, l, halfword); + XREALLOC (mp->char_base, l, int); + XREALLOC (mp->ctype_base, l, int); +@z + + +@x +mp->char_base[null_font] = 0; +@y +mp->font_id[null_font] = 0; +mp->font_nt[null_font] = 0; +mp->char_base[null_font] = 0; +mp->ctype_base[null_font] = 0; +@z + +@x +@d char_mp_info(A,B) mp->font_info[mp->char_base[(A)]+(B)].qqqq +@y +@d char_mp_info(A,B) mp->font_info[mp->char_base[(A)]+(B)].qqqq +@d ctype_char_end(A) (A)].hh.LH +@d ctype_char(A) mp->font_info[mp->ctype_base[(A)]+ctype_char_end +@d ctype_type_end(A) (A)].hh.RH +@d ctype_type(A) mp->font_info[mp->ctype_base[(A)]+ctype_type_end +@z + +% +% lookup character type table +@x +void mp_set_text_box (MP mp, mp_text_node p) { +@y +@<Declare JFM function for text measuring@>; +void mp_set_text_box (MP mp, mp_text_node p) { +#ifdef UPMP + integer cx; /* code for Japanese two byte character */ +#endif +@z + +@x + if ((*(mp_text_p (p)->str + k) < bc) || (*(mp_text_p (p)->str + k) > ec)) { + mp_lost_warning (mp, f, *(mp_text_p (p)->str + k)); + } else { + cc = char_mp_info (f, *(mp_text_p (p)->str + k)); +@y + if ( ((*(mp_text_p (p)->str + k) < bc) || (*(mp_text_p (p)->str + k) > ec)) && (mp->font_id[f]==0) ) { + mp_lost_warning (mp, f, *(mp_text_p (p)->str + k)); + } else { + if (mp->font_id[f]!=0) { +#ifdef UPMP + if (multistrlen(mp_text_p (p)->str, kk, k)>1) { + cx=fromBUFF(mp_text_p (p)->str, kk, k); + k=k+multistrlen(mp_text_p (p)->str, kk, k)-1; + } else { + cx=*(mp_text_p (p)->str + k); + } + cc=char_mp_info(f,mp_lookup_ctype(mp, f, cx)); +#else + cc=char_mp_info(f,mp_lookup_ctype(mp, f,fromBUFF(mp_text_p(p)->str,limit,k))); + k++; +#endif + } else { + cc = char_mp_info (f, *(mp_text_p (p)->str + k)); + } +@z + +@x +@* Debugging. +@y +@ @<Declare JFM function for text measuring@>= +static int mp_lookup_ctype (MP mp,font_number f, integer c) +{ + int l, u, r, ch; + l=0; u=mp->font_nt[f]-1; + while ( l<u ) { + r=(l+u)/2; + ch=ctype_char(f)(r); + if ( (ch==c) ) { + return ctype_type(f)(r);}; + if ( (ch<c) ) l=r+1; + else u=r-1; + }; + return 0; +} +@* Debugging. +@z diff --git a/Build/source/texk/web2c/pmpostdir/pmpost.ch b/Build/source/texk/web2c/pmpostdir/pmpost.ch new file mode 100644 index 00000000000..250ad137585 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/pmpost.ch @@ -0,0 +1,288 @@ +@x +#include <kpathsea/kpathsea.h> +@y +#include <kpathsea/kpathsea.h> +#include <ptexenc/ptexenc.h> +char kanjioption[16]; +@z + +@x +@d TEX "tex" +@y +@z + +@x +#ifndef MPXCOMMAND +#define MPXCOMMAND "makempx" +#endif +@y +#ifdef UPMP +#define TEX "eptex" +#ifndef MPXCOMMAND +#define MPXCOMMAND "upmakempx" +#endif +#define mpost_name "upmpost" +#define dvitomp_name "updvitomp" +#else +#define TEX "euptex" +#ifndef MPXCOMMAND +#define MPXCOMMAND "pmakempx" +#endif +#define mpost_name "pmpost" +#define dvitomp_name "pdvitomp" +#endif +@z + +@x + if (cnf_cmd!=NULL && (strcmp (cnf_cmd, "1")!=0)) { + if (mp_troff_mode(mp)!=0) + cmd = concatn (cnf_cmd, " -troff ", + qmpname, " ", qmpxname, NULL); + else if (mpost_tex_program!=NULL && *mpost_tex_program != '\0') + cmd = concatn (cnf_cmd, " -tex=", mpost_tex_program, " ", + qmpname, " ", qmpxname, NULL); +@y + if (cnf_cmd!=NULL && (strcmp (cnf_cmd, "1")!=0)) { + if (kanjioption[0]) + cnf_cmd = concatn (cnf_cmd, " --kanji=", kanjioption, NULL); + if (mp_troff_mode(mp)) + cmd = concatn (cnf_cmd, " -troff ", + qmpname, " ", qmpxname, NULL); + else if (mpost_tex_program!=NULL && *mpost_tex_program != '\0') + cmd = concatn (cnf_cmd, " -tex=", mpost_tex_program, " ", + qmpname, " ", qmpxname, NULL); +@z + +@x + if (mpost_tex_program != NULL && *mpost_tex_program != '\0') { + maincmd = mpost_xstrdup(mpost_tex_program); + } else { + if (mpxmode == mpx_tex_mode) { + s = kpse_var_value("TEX"); + if (s==NULL) s = kpse_var_value("MPXMAINCMD"); + if (s==NULL) s = mpost_xstrdup (TEX); + maincmd = (char *)mpost_xmalloc (strlen(s)+strlen(default_args)+1); + strcpy(maincmd,s); +@y + if (mpost_tex_program != NULL && *mpost_tex_program != '\0') { + if (kanjioption[0]) { + maincmd = (char *)mpost_xmalloc (strlen(mpost_tex_program) + + strlen(kanjioption) + 15); + strcpy(maincmd, mpost_tex_program); + strcat(maincmd, " --kanji="); + strcat(maincmd, kanjioption); + } else + maincmd = mpost_xstrdup(mpost_tex_program); + } else { + if (mpxmode == mpx_tex_mode) { + s = kpse_var_value("TEX"); + if (s==NULL) s = kpse_var_value("MPXMAINCMD"); + if (s==NULL) s = mpost_xstrdup (TEX); + if (kanjioption[0]) + maincmd = (char *)mpost_xmalloc (strlen(s)+strlen(default_args)+ + strlen(kanjioption)+13); + else + maincmd = (char *)mpost_xmalloc (strlen(s)+strlen(default_args)+1); + strcpy(maincmd,s); + if (kanjioption[0]) { + strcat(maincmd, " --kanji="); + strcat(maincmd, kanjioption); + } +@z + +@x + const char *banner = "% Written by metapost version "; +@y + const char *banner = "% Written by " mpost_name " version "; +@z + +@x + const char *banner = "% Written by dvitomp version "; +@y + const char *banner = "% Written by " dvitomp_name " version "; +@z + +@x + { "kpathsea-debug", 1, 0, 0 }, +@y + { "kpathsea-debug", 1, 0, 0 }, + { "kanji", 1, 0, 0 }, +@z + +@x + if (user_progname == NULL) + user_progname = optarg; + } +@y + if (user_progname == NULL) + user_progname = optarg; + } + } else if (ARGUMENT_IS ("kanji")) { + strcpy(kanjioption, optarg); + if(!set_enc_string(optarg, optarg)) { + fprintf(stderr,"Ignoring unknown argument `%s' to --kanji", optarg); + } +@z + +@x + { "no-kpathsea", 0, &nokpse, 1 }, +@y + { "no-kpathsea", 0, &nokpse, 1 }, + { "kanji", 1, 0, 0 }, +@z + +@x + } else if (option_is ("progname")) { + user_progname = optarg; +@y + } else if (option_is ("progname")) { + user_progname = optarg; + } else if (option_is ("kanji")) { + strcpy (kanjioption, optarg); + if(!set_enc_string(optarg, optarg)) { + fprintf(stderr,"Ignoring unknown argument `%s' to --kanji", optarg); + } +@z + +@x + fprintf(stdout, "This is dvitomp %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +else + fprintf(stdout, "This is MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +@y + fprintf(stdout, "This is " dvitomp_name " %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +else + fprintf(stdout, "This is " metapost_name " %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +@z + +@x +"Usage: mpost [OPTION] [&MEMNAME] [MPNAME[.mp]] [COMMANDS]\n" +" mpost --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n" +"\n" +" Run MetaPost on MPNAME, usually creating MPNAME.NNN (and perhaps\n" +" MPNAME.tfm), where NNN are the character numbers generated.\n" +" Any remaining COMMANDS are processed as MetaPost input,\n" +" after MPNAME is read.\n\n" +" With a --dvitomp argument, MetaPost acts as DVI-to-MPX converter only.\n" +" Call MetaPost with --dvitomp --help for option explanations.\n\n"); +fprintf(stdout, +" -ini be inimpost, for dumping mem files\n" +@y +"Usage: " mpost_name " [OPTION] [&MEMNAME] [MPNAME[.mp]] [COMMANDS]\n" +" " mpost_name " --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n" +"\n" +" Run " metapost_name " on MPNAME, usually creating MPNAME.NNN (and perhaps\n" +" MPNAME.tfm), where NNN are the character numbers generated.\n" +" Any remaining COMMANDS are processed as " metapost_name " input,\n" +" after MPNAME is read.\n\n" +" With a --dvitomp argument, " metapost_name " acts as DVI-to-MPX converter only.\n" +" Call " metapost_name " with --dvitomp --help for option explanations.\n\n"); +fprintf(stdout, +" -ini be ini" mpost_name ", for dumping mem files\n" +@z + +@x +" -jobname=STRING set the job name to STRING\n" +@y +" -jobname=STRING set the job name to STRING\n" +" -kanji=STRING set the Japanese encoding to STRING\n" +@z + +@x +" -version output version information and exit\n" +"\n" +"Email bug reports to mp-implementors@@tug.org.\n" +@y +" -version output version information and exit\n" +@z + +@x + fprintf(stdout, "This is dvitomp %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +else + fprintf(stdout, "This is MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +@y + fprintf(stdout, "This is " dvitomp_name " %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +else + fprintf(stdout, "This is " metapost_name " %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +@z + +@x +"Usage: dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n" +" mpost --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n" +@y +"Usage: " dvitomp_name " DVINAME[.dvi] [MPXNAME[.mpx]]\n" +" " mpost_name " --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n" +@z + +@x +" -progname=STRING set program name to STRING\n" +@y +" -progname=STRING set program name to STRING\n" +#ifdef UPMP +" -kanji=STRING set kanji encoding (STRING=euc|jis|sjis|utf8|uptex)\n" +#else +" -kanji=STRING set kanji encoding (sjis, jis, euc, utf8)\n" +#endif +@z + +@x + fprintf(stdout, "dvitomp (MetaPost) %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +else + fprintf(stdout, "MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +@y + fprintf(stdout, dvitomp_name " (" metapost_name ") %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +else + fprintf(stdout, metapost_name " %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string); +@z + +@x +"Current maintainer of MetaPost: Luigi Scarso.\n\n" +@y +"Current maintainer of MetaPost: Luigi Scarso.\n" +#ifdef UPMP +"Authors of upMetaPost: Michio Matsuyama, Hideyuki Suzuki, Takuji Tanaka.\n\n" +#else +"Authors of pMetaPost: Michio Matsuyama, Hideyuki Suzuki.\n\n" +#endif +@z + +@x + const char * banner = "This is MetaPost, version "; +@y + const char * banner = "This is " metapost_name ", version "; +@z + +@x + if (dvitomp_only) { + @<Read and set dvitomp command line options@>; + } else { +@y + kanjioption[0] = '\0'; +#ifdef UPMP + enable_UPTEX (true); + set_enc_string("uptex", "uptex"); +#else + enable_UPTEX (false); +#if defined(WIN32) + set_enc_string("sjis", "sjis"); +#else + set_enc_string("utf8", "euc"); +#endif +#endif + + if (dvitomp_only) { + @<Read and set dvitomp command line options@>; + } else { +#ifdef WIN32 + options->mem_name = + strlwr(kpse_program_basename(argv[0])); +#else + options->mem_name = + kpse_program_basename(argv[0]); +#endif +@z + +@x + if(putenv(xstrdup("engine=metapost"))) +@y + if(putenv(xstrdup("engine=" mpost_name))) +@z diff --git a/Build/source/texk/web2c/pmpostdir/pmpost.test b/Build/source/texk/web2c/pmpostdir/pmpost.test new file mode 100755 index 00000000000..fab9d16dc65 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/pmpost.test @@ -0,0 +1,13 @@ +#! /bin/sh + +# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +./pmpost -version || exit 1 + +./pmpost -help || exit 1 + +./pmpost -dvitomp -version || exit 1 + +./pmpost -dvitomp -help || exit 1 + diff --git a/Build/source/texk/web2c/pmpostdir/pmpxout.ch b/Build/source/texk/web2c/pmpostdir/pmpxout.ch new file mode 100644 index 00000000000..0f4acf0f524 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/pmpxout.ch @@ -0,0 +1,539 @@ +@x +#include "avl.h" +@y +#include "avl.h" +#include <ptexenc/ptexenc.h> +@z + +@x +@d virtual_space 1000000 /* maximum total bytes of typesetting commands for virtual fonts */ +@d max_fonts 1000 /* maximum number of distinct fonts per \.{DVI} file */ +@d max_fnums 3000 /* maximum number of fonts plus fonts local to virtual fonts */ +@d max_widths (256*max_fonts) /* maximum number of different characters among all fonts */ +@d line_length 79 /* maximum output line length (must be at least 60) */ +@d stack_size 100 /* \.{DVI} files shouldn't |push| beyond this depth */ +@d font_tolerance 0.00001 +@y +@ @<Glob...@>= +#ifdef UPMP +#define virtual_space 2000000 /* maximum total bytes of typesetting commands for virtual fonts */ +#else +#define virtual_space 1000000 /* maximum total bytes of typesetting commands for virtual fonts */ +#endif +#define max_fonts 1000 /* maximum number of distinct fonts per \.{DVI} file */ +#define max_fnums 3000 /* maximum number of fonts plus fonts local to virtual fonts */ +#ifdef UPMP +#define max_widths 2000000 /* maximum number of different characters among all fonts */ +#else +#define max_widths 512000 /* maximum number of different characters among all fonts */ +#endif +#define line_length 79 /* maximum output line length (must be at least 60) */ +#define stack_size 100 /* \.{DVI} files shouldn't |push| beyond this depth */ +#define font_tolerance 0.00001 +@z + +@x +@d undefined_commands 250: case 251: case 252: case 253: case 254: case 255 +@y +@d dir 255 /* p\TeX\ direction */ +@d undefined_commands 250: case 251: case 252: case 253: case 254 +@z + +@x +mpx_read_tfm_word(mpx); lh=mpx->b2*(int)(256)+mpx->b3; +@y +mpx_read_tfm_word(mpx); +@<Read the pTeX header data@>;@/ +lh=mpx->b2*(int)(256)+mpx->b3; +@z + +@x + if ( mpx->b0<128 ) + mpx->tfm_check_sum=((mpx->b0*(int)(256)+mpx->b1)*256+mpx->b2)*256+mpx->b3; + else + mpx->tfm_check_sum=(((mpx->b0-256)*(int)(256)+mpx->b1)*256+mpx->b2)*256+mpx->b3; + } + if ( k==5 ) { + if (mpx->mode == mpx_troff_mode) { + mpx->font_design_size[f]=(((mpx->b0*(int)(256)+mpx->b1)*256+mpx->b2)*256+mpx->b3)/(65536.0*16); + } + } +} +@y + if ( mpx->b0<128 ) + mpx->tfm_check_sum=((mpx->b0*(int)(256)+mpx->b1)*256+mpx->b2)*256+mpx->b3; + else + mpx->tfm_check_sum=(((mpx->b0-256)*(int)(256)+mpx->b1)*256+mpx->b2)*256+mpx->b3; + } + if ( k==5 ) { + if (mpx->mode == mpx_troff_mode) { + mpx->font_design_size[f]=(((mpx->b0*(int)(256)+mpx->b1)*256+mpx->b2)*256+mpx->b3)/(65536.0*16); + } + } +} +@<Read JFM character type table@>; +@z + +@x +@<Width of character |c| in font |f|@>= +floor(mpx->dvi_scale*mpx->font_scaled_size[f]*char_width(f,c)) + +@ @<Width of character |p| in font |cur_font|@>= +floor(mpx->dvi_scale*mpx->font_scaled_size[cur_font]*char_width(cur_font,p)) +@y +@ @c @<Declare JFM character type table lookup routine@>@; /* p\TeX */ +static integer mpx_scaled_char_width (MPX mpx,integer f,integer c) +{ + if (mpx->font_id[f]!=0) c=mpx_lookup_ctype(mpx, f,c); + return floor(mpx->dvi_scale*mpx->font_scaled_size[f]*char_width(f,c)); +} +@z + +@x +@ @c @<Declare a procedure called |finish_last_char|@>@; +static void mpx_do_set_char (MPX mpx,web_integer f, web_integer c) { + if ( (c<mpx->font_bc[f])||(c>mpx->font_ec[f]) ) + mpx_abort(mpx,"attempt to typeset invalid character %d",c); +@.attempt to typeset...@> +@y +@ (u)pDVItoMP: |do_set_char| is called with non-virtual font. +In the case of non-virtual Kanji font, the width is looked up +with the character type, and the character is printed by the +function |set_kanji_char|. + +When the width written in the virtual font is same as +the width of the substituted font, the next character can be +written in the same string in output mpx file. +In other words, the width of the character is calculated +in |do_dvi_commands|. So even if the width is wrong here, the output PostScript file is not affected. + +@ @c @<Declare a procedure called |finish_last_char|@>@; +static void mpx_do_set_char (MPX mpx,integer f,integer c) +{ +integer kkk; + +if (mpx->font_id[f]!=0) { + kkk=mpx_lookup_ctype(mpx, f,c); + if ( (kkk<mpx->font_bc[f]) || (kkk>mpx->font_ec[f]) ) + mpx_abort(mpx,"attempt to typeset invalid character (JFM) %d",c); +} else if ( (c<mpx->font_bc[f])||(c>mpx->font_ec[f]) ) { + mpx_abort(mpx,"attempt to typeset invalid character %d",c); +} +@.attempt to typeset...@> +@z + +@x + if ((mpx->h!=mpx->str_h2)||(mpx->v!=mpx->str_v)|| + (f!=mpx->str_f)||(mpx->dvi_scale!=mpx->str_scale) ) { +@y + if ((mpx->h!=mpx->str_h2)||(mpx->v!=mpx->str_v2)|| + (f!=mpx->str_f)||(mpx->dvi_scale!=mpx->str_scale) ) { +@z + +@x + fprintf(mpx->mpxfile,"_s("); mpx->print_col=3;@/ + mpx->str_scale=mpx->dvi_scale; mpx->str_f=f; + mpx->str_v=mpx->v; mpx->str_h1=mpx->h; +@y + if ((mpx->d==0) || (mpx->font_id[f]==9)) { + fprintf(mpx->mpxfile,"_s("); mpx->print_col=3;}@/ + else { + fprintf(mpx->mpxfile,"_sr("); mpx->print_col=4;}@/ + mpx->str_scale=mpx->dvi_scale; mpx->str_f=f; + mpx->str_v1=mpx->v; mpx->str_h1=mpx->h; +@z + +@x + mpx_print_char(mpx, (unsigned char)c); + mpx->str_h2=(web_integer)(mpx->h+@<Width of character |c| in font |f|@>); +@y + if (mpx->font_id[f]!=0) + mpx_print_kanji_char(mpx, c); + else + mpx_print_char(mpx, c); + if (mpx->d==0) { + mpx->str_h2=mpx->h+mpx_scaled_char_width(mpx, f, c); + mpx->str_v2=mpx->v; + } else { + mpx->str_h2=mpx->h; + mpx->str_v2=mpx->v+mpx_scaled_char_width(mpx, f, c); + } +@z + +@x +web_integer str_h1; +web_integer str_v; /* starting position for current output string */ +web_integer str_h2; /* where the current output string ends */ +@y +integer str_h1; +integer str_v1; /* starting position for current output string */ +integer str_h2; +integer str_v2; /* where the current output string ends */ +@z + +@x + fprintf(mpx->mpxfile,"vardef _s(expr _t,_f,_m,_x,_y)(text _c)=\n"); + fprintf(mpx->mpxfile, + " addto _p also _t infont _f scaled _m shifted (_x,_y) _c; enddef;\n"); +@y + fprintf(mpx->mpxfile,"vardef _s(expr _t,_f,_m,_x,_y)(text _c)=\n"); + fprintf(mpx->mpxfile, + " addto _p also _t infont _f scaled _m shifted (_x,_y) _c; enddef;\n"); + fprintf(mpx->mpxfile,"vardef _sr(expr _t,_f,_m,_x,_y)=\n"); + fprintf(mpx->mpxfile," addto _p also _t infont _f rotated -90"); + fprintf(mpx->mpxfile," scaled _m shifted (_x,_y); enddef;\n"); +@z + +@x + x=mpx->conv*mpx->str_h1; + y=mpx->conv*(-mpx->str_v); +@y + x=mpx->conv*mpx->str_h1; + y=mpx->conv*(-mpx->str_v1); +@z + +@x +@<Handle a special rule that determines the box size@>= +{ + mpx->pic_wd=mpx->h; mpx->pic_dp=mpx->v; mpx->pic_ht=ht-mpx->v; +} +@y +@<Handle a special rule that determines the box size@>= +{ if (mpx->d==0) { + mpx->pic_wd=mpx->h; mpx->pic_dp=mpx->v; mpx->pic_ht=ht-mpx->v; + } else { + mpx->pic_wd=mpx->v; mpx->pic_dp=-mpx->h; mpx->pic_ht=ht+mpx->h; + } +} +@z + +@x + mpx->str_v=0; + mpx->str_h2=0; + mpx->str_scale=1.0; /* values don't matter */ +@y + mpx->str_h2=0; + mpx->str_v2=0; + mpx->str_scale=1.0; /* values don't matter */ +@z + +@x +dd=-mpx->pic_dp*mpx->conv; +w=mpx->conv*mpx->pic_wd; +h=mpx->conv*mpx->pic_ht; +fprintf(mpx->mpxfile, + "setbounds _p to (0,%1.4f)--(%1.4f,%1.4f)--\n" + " (%1.4f,%1.4f)--(0,%1.4f)--cycle;\n",dd,w,dd,w,h,h) +@y +if (mpx->d==0) { + dd=-mpx->pic_dp*mpx->conv; + w=mpx->conv*mpx->pic_wd; + h=mpx->conv*mpx->pic_ht; + fprintf(mpx->mpxfile, + "setbounds _p to (0,%1.4f)--(%1.4f,%1.4f)--\n",dd,w,dd); + fprintf(mpx->mpxfile, + " (%1.4f,%1.4f)--(0,%1.4f)--cycle;\n",w,h,h); +} else { + dd=-mpx->pic_dp*mpx->conv; + w=-mpx->pic_wd*mpx->conv; + h=mpx->conv*mpx->pic_ht; + fprintf(mpx->mpxfile, + "setbounds _p to (%1.4f,0)--(%1.4f,%1.4f)--\n",h,h,w); + fprintf(mpx->mpxfile, + " (%1.4f,%1.4f)--(%1.4f,0)--cycle;\n", dd,w,dd); +} +@z + +@x +web_integer w;web_integer x;web_integer y;web_integer z; + /* current state values (|h| and |v| have already been declared) */ +web_integer hstack[(stack_size+1)]; +web_integer vstack[(stack_size+1)]; +web_integer wstack[(stack_size+1)]; +web_integer xstack[(stack_size+1)]; +web_integer ystack[(stack_size+1)]; +web_integer zstack[(stack_size+1)]; /* pushed down values in \.{DVI} units */ +@y +integer w;integer x;integer y;integer z;integer d; + /* current state values (|h| and |v| have already been declared) */ +integer hstack[(stack_size+1)]; +integer vstack[(stack_size+1)]; +integer wstack[(stack_size+1)]; +integer xstack[(stack_size+1)]; +integer ystack[(stack_size+1)]; +integer zstack[(stack_size+1)]; +integer dstack[(stack_size+1)]; /* pushed down values in \.{DVI} units */ +@z + +@x +mpx->h=0; mpx->v=0; +@y +mpx->h=0; mpx->v=0; mpx->d=0; +@z + +@x + mpx->hstack[mpx->stk_siz]=mpx->h; + mpx->vstack[mpx->stk_siz]=mpx->v; mpx->wstack[mpx->stk_siz]=mpx->w; + mpx->xstack[mpx->stk_siz]=mpx->x; + mpx->ystack[mpx->stk_siz]=mpx->y; mpx->zstack[mpx->stk_siz]=mpx->z; +@y + mpx->hstack[mpx->stk_siz]=mpx->h; + mpx->vstack[mpx->stk_siz]=mpx->v; mpx->wstack[mpx->stk_siz]=mpx->w; + mpx->xstack[mpx->stk_siz]=mpx->x; + mpx->ystack[mpx->stk_siz]=mpx->y; mpx->zstack[mpx->stk_siz]=mpx->z; + mpx->dstack[mpx->stk_siz]=mpx->d; +@z + +@x + mpx->h=mpx->hstack[mpx->stk_siz]; + mpx->v=mpx->vstack[mpx->stk_siz]; mpx->w=mpx->wstack[mpx->stk_siz]; + mpx->x=mpx->xstack[mpx->stk_siz]; + mpx->y=mpx->ystack[mpx->stk_siz]; mpx->z=mpx->zstack[mpx->stk_siz]; +@y + mpx->h=mpx->hstack[mpx->stk_siz]; + mpx->v=mpx->vstack[mpx->stk_siz]; mpx->w=mpx->wstack[mpx->stk_siz]; + mpx->x=mpx->xstack[mpx->stk_siz]; + mpx->y=mpx->ystack[mpx->stk_siz]; mpx->z=mpx->zstack[mpx->stk_siz]; + mpx->d=mpx->dstack[mpx->stk_siz]; +@z + +@x + case z0: return mpx->z; break; +@y + case z0: return mpx->z; break; + case dir: return mpx_get_byte(mpx); break; +@z + +@x + mpx->h += @<Width of character |p| in font |cur_font|@>; +@y + if (mpx->d==0) { + mpx->h+=mpx_scaled_char_width(mpx, cur_font, p); + } else { + mpx->v+=mpx_scaled_char_width(mpx, cur_font, p); + } +@z + +@x + mpx->h += q; +@y + if (mpx->d==0) { + mpx->h += q; + } else { + mpx->v += q; + } +@z + +@x +case pop: + mpx_do_pop(mpx); + break; +@y +case pop: + mpx_do_pop(mpx); + break; +case dir: + mpx->d=p; + break; +@z + +@x +case four_cases(right1): + mpx->h += trunc(p*mpx->dvi_scale); + break; +case w0: case four_cases(w1): + mpx->w = (web_integer)trunc(p*mpx->dvi_scale); mpx->h += mpx->w; + break; +case x0: case four_cases(x1): + mpx->x = (web_integer)trunc(p*mpx->dvi_scale); mpx->h += mpx->x; + break; +case four_cases(down1): + mpx->v += trunc(p*mpx->dvi_scale); + break; +case y0: case four_cases(y1): + mpx->y = (web_integer)trunc(p*mpx->dvi_scale); mpx->v += mpx->y; + break; +case z0: case four_cases(z1): + mpx->z = (web_integer)trunc(p*mpx->dvi_scale); mpx->v += mpx->z; + break; +@y +case four_cases(right1): + if (mpx->d==0) { + mpx->h+=trunc(p*mpx->dvi_scale); + } else { + mpx->v+=trunc(p*mpx->dvi_scale); + } + break; +case w0: case four_cases(w1): + if (mpx->d==0) { + mpx->h+=mpx->w; + } else { + mpx->v+=mpx->w; + } + break; +case x0: case four_cases(x1): + if (mpx->d==0) { + mpx->h+=mpx->x; + } else { + mpx->v+=mpx->x; + } + break; +case four_cases(down1): + if (mpx->d==0) { + mpx->v+=trunc(p*mpx->dvi_scale); + } else { + mpx->h-=trunc(p*mpx->dvi_scale); + } + break; +case y0: case four_cases(y1): + if (mpx->d==0) { + mpx->v+=mpx->y; + } else { + mpx->h-=mpx->y; + } + break; +case z0: case four_cases(z1): + if (mpx->d==0) { + mpx->v+=mpx->z; + } else { + mpx->h-=mpx->z; + } + break; +@z + +@x +@<Check if mp file is newer than mpxfile, exit if not@>= +if (mpx_newer(mpxopt->mpname, mpxopt->mpxname)) + return 0 +@y +@<Check if mp file is newer than mpxfile, exit if not@>= +if (mpx_newer(mpxopt->mpname, mpxopt->mpxname)) + return 0 + +@ ASCII p\TeX JFM ID +@d yoko_jfm_id 11 /* for `yoko-kumi' fonts */ +@d tate_jfm_id 9 /* for `tate-kumi' fonts */ +@d font_jfm_p(A) (mpx->font_id[(A)]!=0) + +@ @<Global...@>= +integer font_nt[max_fonts+1]; /* number of words in ctype table */ +integer font_id[max_fonts+1]; +integer jfm_char_code[max_widths+1]; +integer jfm_char_type[max_widths+1]; +integer jfm_char_index[max_fonts+1]; +integer next_jfm_char_index; + +@ @<Set init...@>= +mpx->font_nt[0]=0; +mpx->font_id[0]=0; +mpx->jfm_char_type[0]=0; +mpx->next_jfm_char_index=0; + +@ JFM character type table is stored in the array |jfm_char_code| and +|jfm_char_type|. The character code and the character type of $i$-th +record is stored in |jfm_char_code[i]| and |jfm_char_type[i]|, respectively. +The table is in the order of character code. + +@<Read the pTeX header data@>= +mpx->font_id[f]=mpx->b0*(int)(256)+mpx->b1; +if ((mpx->font_id[f]==yoko_jfm_id) || (mpx->font_id[f]==tate_jfm_id)) { + mpx->font_nt[f]=mpx->b2*(int)(256)+mpx->b3; + mpx_read_tfm_word(mpx); +} else { + mpx->font_id[f]=0; + mpx->font_nt[f]=0; +} + +@ @<Read JFM character type table@>= +mpx->jfm_char_index[f]=mpx->next_jfm_char_index; +k=mpx->jfm_char_index[f]; +mpx->next_jfm_char_index+=mpx->font_nt[f]; +while (k<mpx->next_jfm_char_index) { + mpx_read_tfm_word(mpx); + mpx->jfm_char_code[k]=mpx->b0*(int)(256)+mpx->b1; + mpx->jfm_char_type[k]=mpx->b2*(int)(256)+mpx->b3; + k++; +} + +@ JFM character type table is looked up by binary search. + +@<Declare JFM character type table lookup routine@>= +static integer mpx_lookup_ctype (MPX mpx,integer f, integer c) +{ + integer l, u, r, ch; + l=0; u=mpx->font_nt[f]-1; + while (l<u) { + r=(l+u)/2; + ch=mpx->jfm_char_code[mpx->jfm_char_index[f]+r]; + if (ch==c) { + return mpx->jfm_char_type[mpx->jfm_char_index[f]+r]; + } + if (ch<c) + l=r+1; + else + u=r-1; + } + return 0; +} + +@ All Kanji characters are supposed to be printable here, +so that the state always results in normal at the end of the procedure. +Kanji characters need to be converted into output Kanji encoding +from DVI(JIS). + +@<Declare subroutines for printing strings@>= +static void mpx_print_kanji_char (MPX mpx,integer c) +{ +#ifdef UPMP +#define BYTE1(x) (((x)>>24) & 0xff) +#define BYTE2(x) (((x)>>16) & 0xff) +#define BYTE3(x) (((x)>> 8) & 0xff) +#define BYTE4(x) ( (x) & 0xff) + int pflag = 0; +#else +#define Hi(x) (((x)>> 8) & 0xff) +#define Lo(x) ( (x) & 0xff) +#endif + if (mpx->print_col+2>line_length-2 ) { + if (mpx->state==normal) { + fprintf(mpx->mpxfile, "\""); + mpx->state=special; + } + fprintf(mpx->mpxfile, " \n"); + mpx->print_col=0; + } + if (mpx->state==special) { + fprintf(mpx->mpxfile,"&"); + mpx->print_col++; + } + if (mpx->state!=normal) { + fprintf(mpx->mpxfile, "\""); + mpx->print_col++; + mpx->state=normal; + } + c=toBUFF(fromDVI(c)); +#ifdef UPMP + if (BYTE1(c)!=0) pflag = 1; + if (pflag) { + putc2(BYTE1(c), mpx->mpxfile); + mpx->print_col++; + } + if (BYTE2(c)!=0) pflag = 1; + if (pflag) { + putc2(BYTE2(c), mpx->mpxfile); + mpx->print_col++; + } + if (BYTE3(c)!=0) pflag = 1; + if (pflag) { + putc2(BYTE3(c), mpx->mpxfile); + mpx->print_col++; + } + putc2(BYTE4(c), mpx->mpxfile); +#else + putc2(Hi(c), mpx->mpxfile); + mpx->print_col++; + putc2(Lo(c), mpx->mpxfile); +#endif + mpx->print_col++; +} +@z diff --git a/Build/source/texk/web2c/pmpostdir/ppsout.ch b/Build/source/texk/web2c/pmpostdir/ppsout.ch new file mode 100644 index 00000000000..f1ca7cfe6c4 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/ppsout.ch @@ -0,0 +1,95 @@ +% +% +% change file of psout.w for jMetaPost (CWEB version) +% Akira Kakuto (translated the WEB version) +% +% + +@x +#include <math.h> +@y +#include <math.h> +#include <ptexenc/ptexenc.h> +#ifdef UPMP +#include <ptexenc/unicode.h> +#endif +@z + +% Treat all Kanji fonts as used +@x + if ( mp->font_info[p].qqqq.b3==mp_used ) +@y + if ( mp->font_info[p].qqqq.b3==mp_used || mp->font_id[f]!=0) +@z + +% +% Kanji string output +@x +static void mp_print_initial_comment(MP mp,mp_edge_object *hh, int prologues); +@y +static void mp_print_initial_comment(MP mp,mp_edge_object *hh, int prologues); + +#define Hi(x) (((x) >> 8) & 0xff) +#define Lo(x) ((x) & 0xff) + +@ @c +static void mp_ps_kanji_string_out (MP mp, char *s) +{ + int i, c; +#ifdef UPMP + int cx; +#endif + size_t len; + + len = strlen(s); + i=0; + mp_ps_print(mp, "<"); + while (i<len) { + if ( mp->ps->ps_offset+5>mp->max_print_line ) + mp_ps_print_ln(mp); +#ifdef UPMP + c=toDVI(fromBUFF((unsigned char*)s, len, i)); + i=i+multistrlen((unsigned char*)s, len, i); + if (isinternalUPTEX() && c>65535) { + cx=UTF32toUTF16HS(c); /* High surrogate */ + mp_hex_digit_out(mp, Hi(cx) / 16); + mp_hex_digit_out(mp, Hi(cx) % 16); + mp_hex_digit_out(mp, Lo(cx) / 16); + mp_hex_digit_out(mp, Lo(cx) % 16); + c=UTF32toUTF16LS(c); /* Low surrogate */ + } +#else + c=toDVI(fromBUFF((unsigned char*)s, i+2, i)); + i=i+2; +#endif + mp_hex_digit_out(mp, Hi(c) / 16); + mp_hex_digit_out(mp, Hi(c) % 16); + mp_hex_digit_out(mp, Lo(c) / 16); + mp_hex_digit_out(mp, Lo(c) % 16); + }; + mp_ps_print(mp, ">"); +}; +@z + +@x + mp_ps_print_nl(mp, "%%Creator: MetaPost "); +@y +#ifdef UPMP + mp_ps_print_nl(mp, "%%Creator: MetaPost (upTeX version) "); +#else + mp_ps_print_nl(mp, "%%Creator: MetaPost (Japanese version) "); +#endif +@z + +% +% Call Kanji string output routine if the font is JFM. +@x + mp_ps_string_out(mp, gr_text_p(p),gr_text_l(p)); + mp_ps_name_out(mp, mp->font_name[gr_font_n(p)],false); +@y + if (mp->font_id[gr_font_n(p)]!=0) + mp_ps_kanji_string_out(mp, gr_text_p(p)); + else + mp_ps_string_out(mp, gr_text_p(p),gr_text_l(p)); + mp_ps_name_out(mp, mp->font_name[gr_font_n(p)],false); +@z diff --git a/Build/source/texk/web2c/pmpostdir/psvgout.ch b/Build/source/texk/web2c/pmpostdir/psvgout.ch new file mode 100644 index 00000000000..5e624585709 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/psvgout.ch @@ -0,0 +1,77 @@ +@x +#include <math.h> +@y +#include <math.h> +#include <ptexenc/ptexenc.h> +#ifdef UPMP +#include <ptexenc/unicode.h> +#endif +@z + +@x +@<Character |k| is not allowed in SVG output@>= + (k=='&')||(k=='>')||(k=='<') +@y +@<Character |k| is not allowed in SVG output@>= + (k=='&')||(k=='>')||(k=='<')||(k>=0x7F) +@z + +@x +@ Now for outputting the actual graphic objects. +@y +@ Now for outputting the actual graphic objects. + +@d yoko_jfm_id 11 /* `yoko-kumi' fonts */ +@d tate_jfm_id 9 /* `tate-kumi' fonts */ +@d font_jfm_p(A) (mp->font_id[(A)]!=0) +@z + +@x Even if prologues=3, Japanese texts are not converted into paths. + if (prologues == 3 ) { +@y + if (prologues == 3 && mp->font_id[gr_font_n(p)]==0) { +@z + +@x To realise vertical Japanese texts ... + mp_svg_attribute(mp, "font-size", mp->svg->buf); +@y + mp_svg_attribute(mp, "font-size", mp->svg->buf); + if ( mp->font_id[gr_font_n(p)]==tate_jfm_id ) { + mp_svg_reset_buf(mp); + append_string("tb-rl"); + mp_svg_attribute(mp, "writing-mode", mp->svg->buf); + } +@z + +@x + while (l-->0) { +@y + if ( mp->font_id[gr_font_n(p)]!=0 ) { +#ifdef UPMP + if (is_internalUPTEX() ) { + while (l>0) { + append_string("&#"); + mp_svg_store_int(mp,UTF8StoUCS(s)); + append_char(';'); + k = UTF8length((int)*s); s += k; l -= k; + } + } else /* 1 charatcer = 2 bytes */ +#endif + { + l >>= 1; + while (l-->0) { + k =((int)*s++)*0x100; k += (int)*s++; + append_string("&#"); + mp_svg_store_int(mp,toUCS(k)); + append_char(';'); + } + } + } else + while (l-->0) { +@z + +@x + mp_svg_print(mp, "<?xml version=\"1.0\"?>"); +@y + mp_svg_print(mp, "<?xml version=\"1.0\" encoding=\"utf-8\"?>"); +@z diff --git a/Build/source/texk/web2c/pmpostdir/ptfmin.ch b/Build/source/texk/web2c/pmpostdir/ptfmin.ch new file mode 100644 index 00000000000..0cfc5b12f72 --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/ptfmin.ch @@ -0,0 +1,104 @@ +@x +#include <w2c/config.h> +@y +#include <kpathsea/kpathsea.h> +#include <w2c/config.h> +@z + +% +% local variable "nt" && "ct" +@x + halfword lf,tfm_lh,bc,ec,nw,nh,nd; /* subfile size parameters */ +@y + halfword lf,tfm_lh,bc,ec,nw,nh,nd,nt; /* subfile size parameters */ +@z + +@x + int h_and_d; /* height and depth indices being unpacked */ +@y + int h_and_d; /* height and depth indices being unpacked */ + halfword ct; /* char and type */ + halfword id; /* JFM font id */ +@z + +@x +@<Read the character data and the width, height, and depth tables and + |goto done|@> +@y +@<Read the character type table@>; +@<Read the character data and the width, height, and depth tables and + |goto done|@> +@z + +% +% routine to process JFM file format +@x +@<Read the \.{TFM} size fields@>= +tfget; read_two(lf); +@y +@d yoko_jfm_id 11 /* `yoko-kumi' fonts */ +@d tate_jfm_id 9 /* `tate-kumi' fonts */ +@d font_jfm_p(A) (mp->font_id[(A)]!=0) +@d incr(A) (A)=(A)+1 /* increase a variable by unity */ +@<Read the \.{TFM} size fields@>= +tfget; read_two(lf); +if ( (lf==yoko_jfm_id) || (lf==tate_jfm_id) ) { + id=lf; + tfget; read_two(nt); + tfget; read_two(lf); +} else { + id=0; nt=0; +}; +@z + +@x +whd_size=(size_t)((ec+1-bc)+nw+nh+nd); +@y +whd_size=(size_t)((ec+1-bc)+nt+nw+nh+nd); +@z + +% +% reserve space for character type table +@x +mp->char_base[n]=(int)(mp->next_fmem-(size_t)bc); +mp->width_base[n]=(int)(mp->next_fmem+(size_t)(ec-bc)+1); +@y +mp->font_id[n]=id; +mp->font_nt[n]=nt; +mp->ctype_base[n]=mp->next_fmem; +mp->char_base[n]=(int)(mp->next_fmem+nt-(size_t)bc); +mp->width_base[n]=(int)(mp->next_fmem+nt+(size_t)(ec-bc)+1); +@z + +% +% read character type table +% +@x +tf_ignore(4*(tfm_lh-2)) +@y +tf_ignore(4*(tfm_lh-2)) + +@ @<Read the character type table@>= +ii=mp->ctype_base[n]+nt; +i=mp->ctype_base[n]; +while ( i<ii ) { + tfget; read_two(ct); + mp->font_info[i].hh.LH=ct; + tfget; read_two(ct); + mp->font_info[i].hh.RH=ct; + incr(i); +} +@z + +@x +mp_pack_file_name(mp, mp->cur_name,mp->cur_area,mp->cur_ext); +mp->tfm_infile = (mp->open_file)(mp, mp->name_of_file, "r",mp_filetype_metrics); +@y +mp_pack_file_name(mp, mp->cur_name,mp->cur_area,mp->cur_ext); +{ + char *fulln; + fulln = kpse_find_file(fname, kpse_tfm_format, 1); + mp->tfm_infile = (mp->open_file)(mp, fulln, "r",mp_filetype_metrics); + if(fulln) mp_xfree(fulln); +} +@z diff --git a/Build/source/texk/web2c/pmpostdir/upmp.ch b/Build/source/texk/web2c/pmpostdir/upmp.ch new file mode 100644 index 00000000000..a7e99a0cc4b --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/upmp.ch @@ -0,0 +1,12 @@ +% +% routine to process JFM file format +@x +@d read_two(A) { (A)=tfbyte; + if ( (A)>127 ) goto BAD_TFM; + tfget; (A)=(A)*0400+tfbyte; +} +@y +@d read_two(A) { (A)=tfbyte; + tfget; (A)=(A)*0400+tfbyte; +} +@z diff --git a/Build/source/texk/web2c/pmpostdir/upmpost.test b/Build/source/texk/web2c/pmpostdir/upmpost.test new file mode 100755 index 00000000000..289afd9c75c --- /dev/null +++ b/Build/source/texk/web2c/pmpostdir/upmpost.test @@ -0,0 +1,13 @@ +#! /bin/sh + +# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +./upmpost -version || exit 1 + +./upmpost -help || exit 1 + +./upmpost -dvitomp -version || exit 1 + +./upmpost -dvitomp -help || exit 1 + diff --git a/Build/source/utils/configure b/Build/source/utils/configure index b75ffc0c8cf..cabc21dc9ea 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -733,6 +733,8 @@ enable_pdftex_synctex enable_luatex enable_luajittex enable_mp +enable_pmp +enable_upmp enable_xetex enable_xetex_synctex enable_mf @@ -1529,6 +1531,8 @@ Optional Features: --disable-luatex do not compile and install LuaTeX --disable-luajittex do not compile and install LuaJITTeX --disable-mp do not compile and install MetaPost + --disable-pmp do not compile and install pMetaPost + --disable-upmp do not compile and install upMetaPost --disable-xetex do not compile and install XeTeX --disable-xetex-synctex build XeTeX without SyncTeX support --disable-mf do not build METAFONT @@ -3835,6 +3839,40 @@ test "x$enable_web2c:$enable_mp" = xyes:yes && { need_cairo=yes need_libpng=yes } +# Check whether --enable-pmp was given. +if test "${enable_pmp+set}" = set; then : + enableval=$enable_pmp; +fi +case $enable_pmp in #( + yes | no) : + ;; #( + *) : + enable_pmp=yes ;; +esac + +test "x$enable_web2c:$enable_pmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} +# Check whether --enable-upmp was given. +if test "${enable_upmp+set}" = set; then : + enableval=$enable_upmp; +fi +case $enable_upmp in #( + yes | no) : + ;; #( + *) : + enable_upmp=yes ;; +esac + +test "x$enable_web2c:$enable_upmp" = xyes:yes && { + need_mpfr=yes + need_cairo=yes + need_libpng=yes + need_ptexenc=yes +} # Check whether --enable-xetex was given. if test "${enable_xetex+set}" = set; then : enableval=$enable_xetex; |