From a0cde829cfe8d2d0c639976f6216bd8fd55c24ce Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 2 Nov 2011 14:39:39 +0000 Subject: ttf2pk, ttf2pk2: Add subfont tests git-svn-id: svn://tug.org/texlive/trunk@24456 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ttf2pk/ChangeLog | 4 +++ Build/source/texk/ttf2pk/Makefile.am | 5 +-- Build/source/texk/ttf2pk/Makefile.in | 8 ++--- Build/source/texk/ttf2pk/tests/GenR102-ec.map | 1 + Build/source/texk/ttf2pk/tests/GenR102-h.map | 1 + Build/source/texk/ttf2pk/tests/GenR102-v.map | 1 + Build/source/texk/ttf2pk/tests/ttf2pk.cfg | 4 ++- Build/source/texk/ttf2pk/tests/ttf2pk.test | 50 +++++++++++++++++++++----- Build/source/texk/ttf2pk/tests/ttfonts.map | 1 - Build/source/texk/ttf2pk2/tests/GenR102-ec.map | 1 + Build/source/texk/ttf2pk2/tests/GenR102-h.map | 1 + Build/source/texk/ttf2pk2/tests/GenR102-v.map | 1 + Build/source/texk/ttf2pk2/tests/ttf2pk.cfg | 4 ++- Build/source/texk/ttf2pk2/tests/ttf2pk.test | 50 +++++++++++++++++++++----- Build/source/texk/ttf2pk2/tests/ttfonts.map | 1 - 15 files changed, 105 insertions(+), 28 deletions(-) create mode 100644 Build/source/texk/ttf2pk/tests/GenR102-ec.map create mode 100644 Build/source/texk/ttf2pk/tests/GenR102-h.map create mode 100644 Build/source/texk/ttf2pk/tests/GenR102-v.map delete mode 100644 Build/source/texk/ttf2pk/tests/ttfonts.map create mode 100644 Build/source/texk/ttf2pk2/tests/GenR102-ec.map create mode 100644 Build/source/texk/ttf2pk2/tests/GenR102-h.map create mode 100644 Build/source/texk/ttf2pk2/tests/GenR102-v.map delete mode 100644 Build/source/texk/ttf2pk2/tests/ttfonts.map (limited to 'Build/source') diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog index 1f5370b535b..c93ce5a46d0 100644 --- a/Build/source/texk/ttf2pk/ChangeLog +++ b/Build/source/texk/ttf2pk/ChangeLog @@ -3,6 +3,10 @@ * ttf2pk.c (main): Bug fix: mapfiles is malloc()ed, so do not realloc() mapfiles+offset. + * tests/ttf2pk.test, tests/ttf2pk.cfg: Add subfont tests. + * tests/GenR102-{ec,h,v}.map: Additional test data. + * tests/ttfonts.map: Removed. + 2011-10-27 Peter Breitenlohner * data/HKSCS.sfd: New file copied from Master (r3283). diff --git a/Build/source/texk/ttf2pk/Makefile.am b/Build/source/texk/ttf2pk/Makefile.am index 230147ee3bf..7d9db839d2f 100644 --- a/Build/source/texk/ttf2pk/Makefile.am +++ b/Build/source/texk/ttf2pk/Makefile.am @@ -99,8 +99,9 @@ dist_sfddata_DATA = \ TESTS = tests/ttf2pk.test EXTRA_DIST = $(TESTS) ## tests/ttf2pk.test -EXTRA_DIST += tests/GenR102.ttf tests/gentium-ec.enc tests/ttf2pk.cfg tests/ttfonts.map -DISTCLEANFILES += GenR-ec.vpl GenR102-ec.* +EXTRA_DIST += tests/GenR102.ttf tests/gentium-ec.enc tests/ttf2pk.cfg \ + tests/GenR102-ec.map tests/GenR102-h.map tests/GenR102-v.map +DISTCLEANFILES += GenR-ec.vpl GenR102-* ## Not used ## diff --git a/Build/source/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in index 3a4600e82d7..d8fd9c33290 100644 --- a/Build/source/texk/ttf2pk/Makefile.in +++ b/Build/source/texk/ttf2pk/Makefile.in @@ -309,7 +309,7 @@ ttf2tfm_SOURCES = \ vplaux.c \ vplaux.h -DISTCLEANFILES = config.force GenR-ec.vpl GenR102-ec.* +DISTCLEANFILES = config.force GenR-ec.vpl GenR102-* LDADD = $(KPATHSEA_LIBS) $(FREETYPE_LIBS) dist_man1_MANS = ttf2pk.1 ttf2tfm.1 cfgdatadir = ${prefix}/texmf/ttf2pk @@ -336,9 +336,9 @@ dist_sfddata_DATA = \ TESTS = tests/ttf2pk.test EXTRA_DIST = $(TESTS) tests/GenR102.ttf tests/gentium-ec.enc \ - tests/ttf2pk.cfg tests/ttfonts.map BUGS MakeSub.in Makefile.dm \ - dvidrv.btm dvidrv.doc emdir.c emdir.h emtexdir.c emtexdir.h \ - ttf2pk.doc + tests/ttf2pk.cfg tests/GenR102-ec.map tests/GenR102-h.map \ + tests/GenR102-v.map BUGS MakeSub.in Makefile.dm dvidrv.btm \ + dvidrv.doc emdir.c emdir.h emtexdir.c emtexdir.h ttf2pk.doc all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/ttf2pk/tests/GenR102-ec.map b/Build/source/texk/ttf2pk/tests/GenR102-ec.map new file mode 100644 index 00000000000..84d7aed7631 --- /dev/null +++ b/Build/source/texk/ttf2pk/tests/GenR102-ec.map @@ -0,0 +1 @@ +GenR102-ec GenR102 Encoding=gentium-ec.enc PS=Only diff --git a/Build/source/texk/ttf2pk/tests/GenR102-h.map b/Build/source/texk/ttf2pk/tests/GenR102-h.map new file mode 100644 index 00000000000..8237b712267 --- /dev/null +++ b/Build/source/texk/ttf2pk/tests/GenR102-h.map @@ -0,0 +1 @@ +GenR102-h@UBig5@ GenR102 diff --git a/Build/source/texk/ttf2pk/tests/GenR102-v.map b/Build/source/texk/ttf2pk/tests/GenR102-v.map new file mode 100644 index 00000000000..146d48e7378 --- /dev/null +++ b/Build/source/texk/ttf2pk/tests/GenR102-v.map @@ -0,0 +1 @@ +GenR102-v@UBig5@ GenR102 Rotate=Yes diff --git a/Build/source/texk/ttf2pk/tests/ttf2pk.cfg b/Build/source/texk/ttf2pk/tests/ttf2pk.cfg index 6df52febed4..4a61f25f3cc 100644 --- a/Build/source/texk/ttf2pk/tests/ttf2pk.cfg +++ b/Build/source/texk/ttf2pk/tests/ttf2pk.cfg @@ -1 +1,3 @@ -map ttfonts +map GenR102-ec +map +GenR102-h +map +GenR102-v diff --git a/Build/source/texk/ttf2pk/tests/ttf2pk.test b/Build/source/texk/ttf2pk/tests/ttf2pk.test index 46eb7139e3f..3dcfc9227dc 100755 --- a/Build/source/texk/ttf2pk/tests/ttf2pk.test +++ b/Build/source/texk/ttf2pk/tests/ttf2pk.test @@ -3,18 +3,50 @@ # Copyright (C) 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. -rm -f GenR-ec.vpl GenR102-ec.* +rm -f GenR-ec.vpl GenR102-* -TEXMFCNF=$srcdir/../kpathsea \ - TEXFONTS=$srcdir/tests \ - ./ttf2tfm GenR102 -u -q -N -T gentium-ec -v GenR-ec GenR102-ec >GenR102-ec.map || exit 1 -diff $srcdir/tests/ttfonts.map GenR102-ec.map || exit 1 +TEXMFCNF=$srcdir/../kpathsea +TEXFONTS=.:$srcdir/tests +TTF2PKINPUTS=$srcdir/tests +SFDFONTS=$srcdir/data -TEXMFCNF=$srcdir/../kpathsea \ - TEXFONTS=.:$srcdir/tests \ - TTF2PKINPUTS=$srcdir/tests \ - ./ttf2pk -q GenR102-ec 100 || exit 1 +export TEXMFCNF TEXFONTS TTF2PKINPUTS SFDFONTS + +./ttf2tfm GenR102 -u -q -N -T gentium-ec -v GenR-ec GenR102-ec >GenR102-ec.map || exit 1 +diff $srcdir/tests/GenR102-ec.map GenR102-ec.map || exit 1 + +./ttf2pk -q GenR102-ec 100 || exit 1 tftopl GenR102-ec GenR102-ec || exit 77 pktype GenR102-ec.100pk >GenR102-ec.typ || exit 77 +echo passed GenR102-ec test + +./ttf2tfm GenR102 -q GenR102-h@UBig5@ >GenR102-h.map || exit 1 +diff $srcdir/tests/GenR102-h.map GenR102-h.map || exit 1 + +for sf in 00 01 02 24; do + + ./ttf2pk -q GenR102-h$sf 100 || exit 1 + + tftopl GenR102-h$sf GenR102-h$sf || exit 77 + pktype GenR102-h$sf.100pk >GenR102-h$sf.typ || exit 77 + +done + +echo passed GenR102-h test + +./ttf2tfm GenR102 -q -x GenR102-v@UBig5@ >GenR102-v.map || exit 1 +diff $srcdir/tests/GenR102-v.map GenR102-v.map || exit 1 + +for sf in 00 01 02 24; do + + ./ttf2pk -q GenR102-v$sf 100 || exit 1 + + tftopl GenR102-v$sf GenR102-v$sf || exit 77 + pktype GenR102-v$sf.100pk >GenR102-v$sf.typ || exit 77 + +done + +echo passed GenR102-v test + diff --git a/Build/source/texk/ttf2pk/tests/ttfonts.map b/Build/source/texk/ttf2pk/tests/ttfonts.map deleted file mode 100644 index 84d7aed7631..00000000000 --- a/Build/source/texk/ttf2pk/tests/ttfonts.map +++ /dev/null @@ -1 +0,0 @@ -GenR102-ec GenR102 Encoding=gentium-ec.enc PS=Only diff --git a/Build/source/texk/ttf2pk2/tests/GenR102-ec.map b/Build/source/texk/ttf2pk2/tests/GenR102-ec.map new file mode 100644 index 00000000000..84d7aed7631 --- /dev/null +++ b/Build/source/texk/ttf2pk2/tests/GenR102-ec.map @@ -0,0 +1 @@ +GenR102-ec GenR102 Encoding=gentium-ec.enc PS=Only diff --git a/Build/source/texk/ttf2pk2/tests/GenR102-h.map b/Build/source/texk/ttf2pk2/tests/GenR102-h.map new file mode 100644 index 00000000000..8237b712267 --- /dev/null +++ b/Build/source/texk/ttf2pk2/tests/GenR102-h.map @@ -0,0 +1 @@ +GenR102-h@UBig5@ GenR102 diff --git a/Build/source/texk/ttf2pk2/tests/GenR102-v.map b/Build/source/texk/ttf2pk2/tests/GenR102-v.map new file mode 100644 index 00000000000..146d48e7378 --- /dev/null +++ b/Build/source/texk/ttf2pk2/tests/GenR102-v.map @@ -0,0 +1 @@ +GenR102-v@UBig5@ GenR102 Rotate=Yes diff --git a/Build/source/texk/ttf2pk2/tests/ttf2pk.cfg b/Build/source/texk/ttf2pk2/tests/ttf2pk.cfg index 6df52febed4..4a61f25f3cc 100644 --- a/Build/source/texk/ttf2pk2/tests/ttf2pk.cfg +++ b/Build/source/texk/ttf2pk2/tests/ttf2pk.cfg @@ -1 +1,3 @@ -map ttfonts +map GenR102-ec +map +GenR102-h +map +GenR102-v diff --git a/Build/source/texk/ttf2pk2/tests/ttf2pk.test b/Build/source/texk/ttf2pk2/tests/ttf2pk.test index 46eb7139e3f..3dcfc9227dc 100755 --- a/Build/source/texk/ttf2pk2/tests/ttf2pk.test +++ b/Build/source/texk/ttf2pk2/tests/ttf2pk.test @@ -3,18 +3,50 @@ # Copyright (C) 2011 Peter Breitenlohner # You may freely use, modify and/or distribute this file. -rm -f GenR-ec.vpl GenR102-ec.* +rm -f GenR-ec.vpl GenR102-* -TEXMFCNF=$srcdir/../kpathsea \ - TEXFONTS=$srcdir/tests \ - ./ttf2tfm GenR102 -u -q -N -T gentium-ec -v GenR-ec GenR102-ec >GenR102-ec.map || exit 1 -diff $srcdir/tests/ttfonts.map GenR102-ec.map || exit 1 +TEXMFCNF=$srcdir/../kpathsea +TEXFONTS=.:$srcdir/tests +TTF2PKINPUTS=$srcdir/tests +SFDFONTS=$srcdir/data -TEXMFCNF=$srcdir/../kpathsea \ - TEXFONTS=.:$srcdir/tests \ - TTF2PKINPUTS=$srcdir/tests \ - ./ttf2pk -q GenR102-ec 100 || exit 1 +export TEXMFCNF TEXFONTS TTF2PKINPUTS SFDFONTS + +./ttf2tfm GenR102 -u -q -N -T gentium-ec -v GenR-ec GenR102-ec >GenR102-ec.map || exit 1 +diff $srcdir/tests/GenR102-ec.map GenR102-ec.map || exit 1 + +./ttf2pk -q GenR102-ec 100 || exit 1 tftopl GenR102-ec GenR102-ec || exit 77 pktype GenR102-ec.100pk >GenR102-ec.typ || exit 77 +echo passed GenR102-ec test + +./ttf2tfm GenR102 -q GenR102-h@UBig5@ >GenR102-h.map || exit 1 +diff $srcdir/tests/GenR102-h.map GenR102-h.map || exit 1 + +for sf in 00 01 02 24; do + + ./ttf2pk -q GenR102-h$sf 100 || exit 1 + + tftopl GenR102-h$sf GenR102-h$sf || exit 77 + pktype GenR102-h$sf.100pk >GenR102-h$sf.typ || exit 77 + +done + +echo passed GenR102-h test + +./ttf2tfm GenR102 -q -x GenR102-v@UBig5@ >GenR102-v.map || exit 1 +diff $srcdir/tests/GenR102-v.map GenR102-v.map || exit 1 + +for sf in 00 01 02 24; do + + ./ttf2pk -q GenR102-v$sf 100 || exit 1 + + tftopl GenR102-v$sf GenR102-v$sf || exit 77 + pktype GenR102-v$sf.100pk >GenR102-v$sf.typ || exit 77 + +done + +echo passed GenR102-v test + diff --git a/Build/source/texk/ttf2pk2/tests/ttfonts.map b/Build/source/texk/ttf2pk2/tests/ttfonts.map deleted file mode 100644 index 84d7aed7631..00000000000 --- a/Build/source/texk/ttf2pk2/tests/ttfonts.map +++ /dev/null @@ -1 +0,0 @@ -GenR102-ec GenR102 Encoding=gentium-ec.enc PS=Only -- cgit v1.2.3