summaryrefslogtreecommitdiff
path: root/fonts/utilities
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-08-28 03:03:09 +0000
committerNorbert Preining <norbert@preining.info>2023-08-28 03:03:09 +0000
commit7ea6dacf544f9f0ec4f9566681de2434ca5e0e38 (patch)
tree2e2a1e8fe535c89eaed717f92cd8264e0107d1ca /fonts/utilities
parent7c84f6395cab83b2390f4dc08fdfe235413de4d9 (diff)
CTAN sync 202308280303
Diffstat (limited to 'fonts/utilities')
-rw-r--r--fonts/utilities/ps2pk/ChangeLog5
-rwxr-xr-xfonts/utilities/ps2pk/tests/lmmath.test8
-rwxr-xr-xfonts/utilities/ps2pk/tests/ps2pk.test51
3 files changed, 42 insertions, 22 deletions
diff --git a/fonts/utilities/ps2pk/ChangeLog b/fonts/utilities/ps2pk/ChangeLog
index 7d476d56ec..11b54cead5 100644
--- a/fonts/utilities/ps2pk/ChangeLog
+++ b/fonts/utilities/ps2pk/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-27 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * tests/ps2pk.test, tests/lmmath.test:
+ Make easier to test on Windows.
+
2022-11-06 Sam James <sam@gentoo.org>
* basename.c: placate clang16.
diff --git a/fonts/utilities/ps2pk/tests/lmmath.test b/fonts/utilities/ps2pk/tests/lmmath.test
index bc3123eb3b..776719db33 100755
--- a/fonts/utilities/ps2pk/tests/lmmath.test
+++ b/fonts/utilities/ps2pk/tests/lmmath.test
@@ -1,9 +1,13 @@
#! /bin/sh -vx
-# $Id: lmmath.test 45809 2017-11-15 00:36:56Z karl $
+# $Id: lmmath.test 68084 2023-08-27 14:18:22Z takuji $
# Copyright 2017 Karl Berry <tex-live@tug.org>
# Copyright 2014 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_ps2pk=$BinDir/ps2pk$ExeExt
+
test -d tests || mkdir -p tests
TEXMFCNF=$srcdir/../kpathsea
@@ -19,6 +23,6 @@ AFMFONTS="`dirname $afmpath`"
export TEXMFCNF ENCFONTS T1FONTS AFMFONTS
-./ps2pk -elm-mathit.enc -X600 -Y600 -R600 -S0 -E1 -P12.0 lmmi12.pfb lmmi12.600pk || exit 1
+$_ps2pk -elm-mathit.enc -X600 -Y600 -R600 -S0 -E1 -P12.0 lmmi12.pfb lmmi12.600pk || exit 1
diff $srcdir/tests/lmmi12.600pk lmmi12.600pk || exit 1
diff --git a/fonts/utilities/ps2pk/tests/ps2pk.test b/fonts/utilities/ps2pk/tests/ps2pk.test
index 5f32933f1e..eda5704198 100755
--- a/fonts/utilities/ps2pk/tests/ps2pk.test
+++ b/fonts/utilities/ps2pk/tests/ps2pk.test
@@ -1,9 +1,17 @@
#! /bin/sh -vx
-# $Id: ps2pk.test 48633 2018-09-09 17:56:55Z karl $
+# $Id: ps2pk.test 68084 2023-08-27 14:18:22Z takuji $
# Copyright 2017-2018 Karl Berry <tex-live@tug.org>
# Copyright 2012-2014 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_pfb2pfa=$BinDir/pfb2pfa$ExeExt
+_ps2pk=$BinDir/ps2pk$ExeExt
+_pk2bm=$BinDir/pk2bm$ExeExt
+_pktest=$BinDir/pktest$ExeExt
+_mag=$BinDir/mag$ExeExt
+
LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
@@ -11,33 +19,36 @@ TEXFONTS=.; export TEXFONTS
rm -f Symbol*
+rc=0
+
cp $srcdir/tests/Symbol.afm $srcdir/tests/Symbol.pfb .
-./pfb2pfa -v Symbol.pfb || exit 1
-diff $srcdir/tests/Symbol.pfa Symbol.pfa || exit 1
+$_pfb2pfa -v Symbol.pfb || rc=1
+diff $srcdir/tests/Symbol.pfa Symbol.pfa || rc=2
-./ps2pk -v Symbol.pfa || exit 1
-diff $srcdir/tests/Symbol10.300pk Symbol10.300pk || exit 1
+$_ps2pk -v Symbol.pfa || rc=3
+diff $srcdir/tests/Symbol10.300pk Symbol10.300pk || rc=4
rm -f Symbol10.300pk
-./ps2pk -v Symbol.pfb || exit 1
-diff $srcdir/tests/Symbol10.300pk Symbol10.300pk || exit 1
+$_ps2pk -v Symbol.pfb || rc=5
+diff $srcdir/tests/Symbol10.300pk Symbol10.300pk || rc=6
-./pk2bm -h -ca Symbol10.300pk >Symbol.alpha.hex || exit 1
-diff $srcdir/tests/Symbol.alpha.hex Symbol.alpha.hex || exit 1
+$_pk2bm -h -ca Symbol10.300pk >Symbol.alpha.hex || rc=7
+diff $srcdir/tests/Symbol.alpha.hex Symbol.alpha.hex || rc=8
-./pk2bm -b -o141 Symbol10.300pk >Symbol.alpha.pix || exit 1
-diff $srcdir/tests/Symbol.alpha.pix Symbol.alpha.pix || exit 1
-./pktest -ca -W24 -H22 Symbol.alpha.pk <Symbol.alpha.pix || exit 1
-./pk2bm -b -ca Symbol.alpha.pk | \
- sed 's/yoff : 28/yoff : 21/' >Symbol.alpha.out || exit 1
-diff Symbol.alpha.pix Symbol.alpha.out || exit 1
+$_pk2bm -b -o141 Symbol10.300pk >Symbol.alpha.pix || rc=9
+diff $srcdir/tests/Symbol.alpha.pix Symbol.alpha.pix || rc=10
+$_pktest -ca -W24 -H22 Symbol.alpha.pk <Symbol.alpha.pix || rc=11
+$_pk2bm -b -ca Symbol.alpha.pk | \
+ sed 's/yoff : 28/yoff : 21/' >Symbol.alpha.out || rc=12
+diff Symbol.alpha.pix Symbol.alpha.out || rc=13
val1='167 240 263 288'
-val2=`./mag -r -R240 $val1` || exit 1
-val3=`./mag -R240 $val2` || exit 1
+val2=`$_mag -r -R240 $val1` || rc=14
+val3=`$_mag -R240 $val2` || rc=15
-echo "./mag -r -R240 $val1 => $val2"
-echo "./mag -R240 $val2 => $val3"
-test "x$val1" = "x$val3" || exit 1
+echo "$_mag -r -R240 $val1 => $val2"
+echo "$_mag -R240 $val2 => $val3"
+test "x$val1" = "x$val3" || rc=16
+exit $rc