diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-07 11:21:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-07 11:21:45 +0000 |
commit | 3bbd721df0882f2147bb324f257b66754476fcbf (patch) | |
tree | 10f24bd83f4bf8c4cba5c438044366f427ea6865 /Build/source/texk/web2c/omegafonts | |
parent | 12fc55ea548adddbfde8062da475dff9322f52af (diff) |
Correctly handle 'vptovf foo.vpl bar vf' and 'ovp2ovf foo.ovp bar.ovf' (from TANAKA Takuji)
pltotf, tftopl, vftovp, vptovf: Verify test output files
git-svn-id: svn://tug.org/texlive/trunk@32351 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/omegafonts')
-rw-r--r-- | Build/source/texk/web2c/omegafonts/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/omfonts.c | 2 | ||||
-rwxr-xr-x | Build/source/texk/web2c/omegafonts/selectfont.test | 8 |
5 files changed, 18 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog index 6809118e740..8c2af72d2df 100644 --- a/Build/source/texk/web2c/omegafonts/ChangeLog +++ b/Build/source/texk/web2c/omegafonts/ChangeLog @@ -1,3 +1,10 @@ +2013-12-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * omfonts.c (main): Use make_suffix() for implied ofm_name. + * selectfont.test: Add test for 'ovp2ovf foo.ovp bar.ovf'. + * Makefile.am (DISTCLEANFILES): Additional files. + Mail from TANAKA Takuji <KXD02663@nifty.ne.jp>, 27 Nov 2013. + 2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> * omfonts.c (main): Use kpse_program_basename(). diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am index 7e7fb7b6000..bc3fda25aaa 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.am +++ b/Build/source/texk/web2c/omegafonts/Makefile.am @@ -129,7 +129,7 @@ EXTRA_DIST += tests/repeat.opl tests/repeated.opl DISTCLEANFILES += tests/xrepeated.* ## selectfont.test EXTRA_DIST += tests/sample.out tests/sample.ovp tests/sample0-h.opl -DISTCLEANFILES += tests/sample*.ofm tests/sample.ovf tests/sample1-h.opl tests/xsample.out +DISTCLEANFILES += tests/sample*.ofm tests/sample*.ovf tests/sample1-h.opl tests/xsample*.out ## specialhex.test EXTRA_DIST += tests/specialhex.ovp DISTCLEANFILES += tests/specialhex.ofm tests/specialhex.opl \ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 5fa5a92b7b3..0ace84f551e 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -689,8 +689,8 @@ DISTCLEANFILES = pl-parser.output tests/charwdr.* tests/charwdv.* \ tests/xlevel1.ofm tests/xlevel1.opl tests/Cherokee.tfm \ tests/OCherokee.ofm tests/OCherokee.opl tests/OCherokee.ovf \ tests/xCherokee.* tests/xOCherokee.* tests/realnum.* \ - tests/xrepeated.* tests/sample*.ofm tests/sample.ovf \ - tests/sample1-h.opl tests/xsample.out tests/specialhex.ofm \ + tests/xrepeated.* tests/sample*.ofm tests/sample*.ovf \ + tests/sample1-h.opl tests/xsample*.out tests/specialhex.ofm \ tests/specialhex.opl tests/specialhex.ovf tests/xspecialhex.* linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf bin_links = \ diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c index afd94cff68f..09db093fd93 100644 --- a/Build/source/texk/web2c/omegafonts/omfonts.c +++ b/Build/source/texk/web2c/omegafonts/omfonts.c @@ -245,7 +245,7 @@ main (int argc, string *argv) if (optind+3 <= argc) { *(files[2]) = extend_filename(cmdline(optind+2) , suffixes[2]); } else if (program == PROG_OVP2OVF) { - *(files[2]) = extend_filename(cmdline(optind+1), suffixes[2]); + *(files[2]) = make_suffix(cmdline(optind+1), suffixes[2]); } } } else if (program != PROG_OFM2OPL) { diff --git a/Build/source/texk/web2c/omegafonts/selectfont.test b/Build/source/texk/web2c/omegafonts/selectfont.test index ddabe3de870..d6024571107 100755 --- a/Build/source/texk/web2c/omegafonts/selectfont.test +++ b/Build/source/texk/web2c/omegafonts/selectfont.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests @@ -23,3 +23,9 @@ diff $srcdir/tests/sample0-h.opl tests/sample1-h.opl || exit 1 diff $srcdir/tests/sample.out tests/xsample.out || exit 1 +./omfonts -ovp2ovf -verbose $srcdir/tests/sample.ovp tests/sample2.ovf || exit 1 + +./omfonts -ovf2ovp -verbose tests/sample2 sample2 tests/xsample2.out || exit 1 + +diff $srcdir/tests/sample.out tests/xsample2.out || exit 1 + |