summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/texk/web2c/Makefile.in24
-rw-r--r--Build/source/texk/web2c/pmpostdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/pmpostdir/am/pmpost.am15
-rwxr-xr-xBuild/source/texk/web2c/pmpostdir/pmpsamp.test35
-rw-r--r--Build/source/texk/web2c/pmpostdir/tests/psample.mp16
-rwxr-xr-xBuild/source/texk/web2c/pmpostdir/upmpsamp.test35
6 files changed, 116 insertions, 16 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index d4c0a00a1f4..c225fc76a9b 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -196,8 +196,8 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
@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
+@PMP_TRUE@am__append_37 = $(pmpost_tests)
+@UPMP_TRUE@am__append_38 = $(upmpost_tests)
@ETEX_TRUE@am__append_39 = etex
@ETEX_TRUE@am__append_40 = $(etex_tests)
@ETEX_TRUE@am__append_41 = dvitype pltotf tftopl
@@ -2113,7 +2113,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
triptrap/trip2.in triptrap/tripin.log triptrap/tripman.tex \
triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \
mplibdir/ChangeLog $(mpost_web) $(mp_tests) \
- pmpostdir/ChangeLog $(pmpost_web) $(pmp_tests) $(libmplib_web) \
+ pmpostdir/ChangeLog $(pmpost_web) $(pmpost_tests) \
+ $(upmpost_tests) pmpostdir/tests/psample.mp $(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 \
@@ -2345,13 +2346,13 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \
$(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) \
+ psvgout-tangle pmpsamp.* upmpsamp.* \
+ $(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 \
@@ -2627,7 +2628,8 @@ pmp_sed = sed -e $(pmp_sed_main) -e $(pmp_sed_math) -e $(pmp_sed_ps) -e $(pmp_se
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
+pmpost_tests = pmpostdir/pmpost.test pmpostdir/pmpsamp.test
+upmpost_tests = pmpostdir/upmpost.test pmpostdir/upmpsamp.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
diff --git a/Build/source/texk/web2c/pmpostdir/ChangeLog b/Build/source/texk/web2c/pmpostdir/ChangeLog
index 0e3eeadb4d5..aa615995ad6 100644
--- a/Build/source/texk/web2c/pmpostdir/ChangeLog
+++ b/Build/source/texk/web2c/pmpostdir/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pmpsamp.test, upmpsamp.test, tests/psample.mp: Shell scripts
+ and data for new tests.
+
2014-09-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* ptfmin.ch: Allow character codes up to 0xffff.
@@ -9,4 +14,4 @@
* 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.
+ * pmpost.test, upmpost.test: Shell scripts for simple tests.
diff --git a/Build/source/texk/web2c/pmpostdir/am/pmpost.am b/Build/source/texk/web2c/pmpostdir/am/pmpost.am
index b0d5a86b06b..e6e1d9f1654 100644
--- a/Build/source/texk/web2c/pmpostdir/am/pmpost.am
+++ b/Build/source/texk/web2c/pmpostdir/am/pmpost.am
@@ -167,14 +167,21 @@ DISTCLEANFILES += $(nodist_pmpost_SOURCES) \
## (u)pMetaPost Tests
##
-pmp_tests = pmpostdir/pmpost.test pmpostdir/upmpost.test
+pmpost_tests = pmpostdir/pmpost.test pmpostdir/pmpsamp.test
+upmpost_tests = pmpostdir/upmpost.test pmpostdir/upmpsamp.test
-EXTRA_DIST += $(pmp_tests)
+EXTRA_DIST += $(pmpost_tests) $(upmpost_tests)
if PMP
-TESTS += pmpostdir/pmpost.test
+TESTS += $(pmpost_tests)
endif PMP
if UPMP
-TESTS += pmpostdir/upmpost.test
+TESTS += $(upmpost_tests)
endif UPMP
+EXTRA_DIST += pmpostdir/tests/psample.mp
+## pmpostdir/pmpsamp.test
+DISTCLEANFILES += pmpsamp.*
+## pmpostdir/upmpsamp.test
+DISTCLEANFILES += upmpsamp.*
+
diff --git a/Build/source/texk/web2c/pmpostdir/pmpsamp.test b/Build/source/texk/web2c/pmpostdir/pmpsamp.test
new file mode 100755
index 00000000000..aba36e6dcba
--- /dev/null
+++ b/Build/source/texk/web2c/pmpostdir/pmpsamp.test
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+tests=pmpostdir/tests
+
+test -d $tests || mkdir -p $tests
+
+TEXMFCNF=$srcdir/../kpathsea
+
+tfmpath=`$KPSEWHICH cmr10.tfm` || exit 77
+TFMFONTS="$srcdir/$tests;`echo $tfmpath | sed 's,/fonts/tfm/.*$,/fonts/tfm//,'`"
+
+mppath=`$KPSEWHICH plain.mp` || exit 77
+MPINPUTS=".;`dirname $mppath`"
+
+mappath=`$KPSEWHICH psfonts.map` || exit 77
+TEXFONTMAPS=`echo $mappath | sed 's,/fonts/map/.*$,/fonts/map//,'`
+
+t1path=`$KPSEWHICH cmmi10.pfb` || exit 77
+T1FONTS="$srcdir/$tests;`echo $t1path | sed 's,/fonts/type1/.*$,/fonts/type1//,'`"
+
+vfpath=`$KPSEWHICH min10.vf` || exit 77
+VFFONTS="$srcdir/$tests;`dirname $vfpath`"
+
+export TEXMFCNF TFMFONTS MPINPUTS TEXFONTMAPS T1FONTS VFFONTS
+
+eptex -version >/dev/null 2>&1 || exit 77
+
+echo 'input plain;' >pmpsamp.mp
+cat "$srcdir/$tests/psample.mp" >>pmpsamp.mp
+
+./pmpost -ini -kanji=utf8 -tex=eptex pmpsamp || exit 1
+
diff --git a/Build/source/texk/web2c/pmpostdir/tests/psample.mp b/Build/source/texk/web2c/pmpostdir/tests/psample.mp
new file mode 100644
index 00000000000..db5867ba8df
--- /dev/null
+++ b/Build/source/texk/web2c/pmpostdir/tests/psample.mp
@@ -0,0 +1,16 @@
+prologues:=3;
+outputformat:="eps";
+outputtemplate:="%j.%o";
+beginfig(1);
+ u=1cm;
+ drawarrow (-.5u,0)--(4u,0);
+ drawarrow (0,-.5u)--(0,2u);
+ pickup pencircle scaled 1pt;
+ draw (0,0){up}
+ for i=1 upto 8: ..(i/2,sqrt(i/2))*u endfor;
+ label.lrt(btex 関数$y=\sqrt{x}$ etex, (3,sqrt(3))*u);
+ label.rt(btex $x$軸 etex, (4,0)*u);
+ label.top(btex $y$軸 etex, (0,2)*u);
+ label.llft(btex 原点$O$ etex, (0,0));
+endfig;
+end.
diff --git a/Build/source/texk/web2c/pmpostdir/upmpsamp.test b/Build/source/texk/web2c/pmpostdir/upmpsamp.test
new file mode 100755
index 00000000000..f4dfe95e3ae
--- /dev/null
+++ b/Build/source/texk/web2c/pmpostdir/upmpsamp.test
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+tests=pmpostdir/tests
+
+test -d $tests || mkdir -p $tests
+
+TEXMFCNF=$srcdir/../kpathsea
+
+tfmpath=`$KPSEWHICH cmr10.tfm` || exit 77
+TFMFONTS="$srcdir/$tests;`echo $tfmpath | sed 's,/fonts/tfm/.*$,/fonts/tfm//,'`"
+
+mppath=`$KPSEWHICH plain.mp` || exit 77
+MPINPUTS=".;`dirname $mppath`"
+
+mappath=`$KPSEWHICH psfonts.map` || exit 77
+TEXFONTMAPS=`echo $mappath | sed 's,/fonts/map/.*$,/fonts/map//,'`
+
+t1path=`$KPSEWHICH cmmi10.pfb` || exit 77
+T1FONTS="$srcdir/$tests;`echo $t1path | sed 's,/fonts/type1/.*$,/fonts/type1//,'`"
+
+vfpath=`$KPSEWHICH upjisr-h.vf` || exit 77
+VFFONTS="$srcdir/$tests;`dirname $vfpath`"
+
+export TEXMFCNF TFMFONTS MPINPUTS TEXFONTMAPS T1FONTS VFFONTS
+
+euptex -version >/dev/null 2>&1 || exit 77
+
+echo 'input plain;' >upmpsamp.mp
+cat "$srcdir/$tests/psample.mp" >>upmpsamp.mp
+
+./upmpost -ini -tex=euptex upmpsamp || exit 1
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 02:53:56 +0000