From 62000bbaa70a2638588a1c15fc6511609f47b579 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 7 Nov 2014 09:42:37 +0000 Subject: texk/web2c: Correct help messages for Web2C and C versions of ofm2opl & Co git-svn-id: svn://tug.org/texlive/trunk@35536 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 7 +++++++ Build/source/texk/web2c/Makefile.in | 13 ++++++------ Build/source/texk/web2c/help.h | 24 +++++++++++++++++++++-- Build/source/texk/web2c/omegafonts/ChangeLog | 5 +++++ Build/source/texk/web2c/omegafonts/Makefile.am | 6 +++--- Build/source/texk/web2c/omegafonts/Makefile.in | 6 +++--- Build/source/texk/web2c/omegafonts/help.test | 20 +++++++++++++++++++ Build/source/texk/web2c/omegafonts/omfonts.c | 1 + Build/source/texk/web2c/omegaware/ChangeLog | 5 +++++ Build/source/texk/web2c/omegaware/am/omegaware.am | 13 ++++++------ Build/source/texk/web2c/omegaware/help.test | 17 ++++++++++++++++ Build/source/texk/web2c/omegaware/ofm2opl.ch | 2 +- Build/source/texk/web2c/omegaware/ovf2ovp.ch | 2 +- Build/source/texk/web2c/tftopl.ch | 2 +- Build/source/texk/web2c/tftopl.test | 4 +++- Build/source/texk/web2c/vftovp.ch | 2 +- Build/source/texk/web2c/vftovp.test | 4 +++- 17 files changed, 107 insertions(+), 26 deletions(-) create mode 100755 Build/source/texk/web2c/omegafonts/help.test create mode 100755 Build/source/texk/web2c/omegaware/help.test (limited to 'Build/source/texk/web2c') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index ed9091b5af0..14f43192d2c 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2014-11-07 Peter Breitenlohner + + * tftopl.ch, vftovp.ch: Add missing space to message. + * tftopl.test, vftovp.test: Display help and warning message. + + * help.h: Correct help messages for ofm2opl & Co. + 2014-11-06 Peter Breitenlohner * mf.ch, tftopl.ch, vftovp.ch: Add stringcast to avoid printing diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 8271f9be572..5ec31b79291 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -3433,12 +3433,13 @@ OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \ omegaware/otangle.test OMFONTS_tests = omegaware/charwd.test omegaware/check.test \ - omegaware/level1.test omegaware/ligkern.test \ - omegaware/ofonts.test omegaware/omfonts.test \ - omegaware/overbmp.test omegaware/realnum.test \ - omegaware/repeat.test omegaware/selectfont.test \ - omegaware/shorten.test omegaware/specialhex.test \ - omegaware/vrepeat.test omegaware/yannis.test + omegaware/help.test omegaware/level1.test \ + omegaware/ligkern.test omegaware/ofonts.test \ + omegaware/omfonts.test omegaware/overbmp.test \ + omegaware/realnum.test omegaware/repeat.test \ + omegaware/selectfont.test omegaware/shorten.test \ + omegaware/specialhex.test omegaware/vrepeat.test \ + omegaware/yannis.test al_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(OTANGLE) diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h index bee0a4f777a..1d1285645d6 100644 --- a/Build/source/texk/web2c/help.h +++ b/Build/source/texk/web2c/help.h @@ -216,9 +216,19 @@ const_string OFM2OPLHELP[] = { " Translate the font metrics OFMNAME to human-readable property list file", " OPLFILE or standard output.", "", +#ifdef OMFONTS + "-char-format=TYPE output character codes according to TYPE,", + " either `num' or `ascii'; default is num,", + " ascii = ascii letters and digits, num for all else", + "-num-format=TYPE output numbers according to TYPE,", + " either `hex' or `octal'; default is hex", + "-text-format=TYPE output coding scheme and family according to TYPE,", + " either `mixed' or `upper' case; default is mixed", +#else "-charcode-format=TYPE output character codes according to TYPE,", " either `hex' or `ascii'; default is hex,", " ascii = ascii letters and digits, hex for all else", +#endif "-help display this help and exit", "-verbose display progress reports", "-version output version information and exit", @@ -260,9 +270,19 @@ const_string OVF2OVPHELP[] = { " virtual property list file OVPFILE or standard output.", " If OFMNAME is not specified, OVFNAME (with `.ovf' removed) is used.", "", +#ifdef OMFONTS + "-char-format=TYPE output character codes according to TYPE,", + " either `num' or `ascii'; default is num,", + " ascii = ascii letters and digits, num for all else", + "-num-format=TYPE output numbers according to TYPE,", + " either `hex' or `octal'; default is hex", + "-text-format=TYPE output coding scheme and family according to TYPE,", + " either `mixed' or `upper' case; default is mixed", +#else "-charcode-format=TYPE output character codes according to TYPE,", " either `hex' or `ascii'; default is hex,", " ascii = ascii letters and digits, hex for all else", +#endif "-help display this help and exit", "-verbose display progress reports", "-version output version information and exit", @@ -556,9 +576,9 @@ const_string VFTOVPHELP[] = { " If TFMNAME is not specified, VFNAME (with `.vf' removed) is used.", "", "-charcode-format=TYPE output character codes according to TYPE,", - " either `octal' or `ascii'; default is ascii for", + " either `octal' or `ascii'; default is ascii for", " letters and digits, octal for all else", - "-help display this help and exit", + "-help display this help and exit", "-verbose display progress reports", "-version output version information and exit", NULL diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog index 826f6886191..247d9d3d23e 100644 --- a/Build/source/texk/web2c/omegafonts/ChangeLog +++ b/Build/source/texk/web2c/omegafonts/ChangeLog @@ -1,3 +1,8 @@ +2014-11-08 Peter Breitenlohner + + * omfonts.c: Help texts for C and Web2C versions differ. + * help.test: New shell script to test help messages and options. + 2014-09-22 Peter Breitenlohner * font_routines.c: Fixed packet_table realloc bug. diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am index 91eaaea3df1..4ac33f4eced 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.am +++ b/Build/source/texk/web2c/omegafonts/Makefile.am @@ -96,9 +96,9 @@ endif OTANGLE ## Tests ## -OMFONTS_tests = charwd.test check.test level1.test ligkern.test ofonts.test \ - omfonts.test overbmp.test realnum.test repeat.test selectfont.test \ - shorten.test specialhex.test yannis.test +OMFONTS_tests = charwd.test check.test help.test level1.test ligkern.test \ + ofonts.test omfonts.test overbmp.test realnum.test repeat.test \ + selectfont.test shorten.test specialhex.test yannis.test if OTANGLE TESTS = $(OMFONTS_tests) endif OTANGLE diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index d839d1a27ce..0a214f48c68 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -720,9 +720,9 @@ bin_links = \ omfonts$(EXEEXT):ovf2ovp \ omfonts$(EXEEXT):ovp2ovf -OMFONTS_tests = charwd.test check.test level1.test ligkern.test ofonts.test \ - omfonts.test overbmp.test realnum.test repeat.test selectfont.test \ - shorten.test specialhex.test yannis.test +OMFONTS_tests = charwd.test check.test help.test level1.test ligkern.test \ + ofonts.test omfonts.test overbmp.test realnum.test repeat.test \ + selectfont.test shorten.test specialhex.test yannis.test @OTANGLE_TRUE@TESTS = $(OMFONTS_tests) EXTRA_DIST = $(OMFONTS_tests) tests/charwd-r.pl tests/charwd-v.vpl \ diff --git a/Build/source/texk/web2c/omegafonts/help.test b/Build/source/texk/web2c/omegafonts/help.test new file mode 100755 index 00000000000..7850fe9b0ff --- /dev/null +++ b/Build/source/texk/web2c/omegafonts/help.test @@ -0,0 +1,20 @@ +#! /bin/sh + +# Copyright (C) 2014 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +echo && echo "*** omfonts -help" +./omfonts -help || exit 1 + +echo && echo "*** ofm2opl -help" +./omfonts -ofm2opl -char=foo -num=bar -text=baz -help || exit 1 + +echo && echo "*** opl2ofm -help" +./omfonts -opl2ofm -char=num -num=hex -text=mixed -help || exit 1 + +echo && echo "*** ovf2ovp -help" +./omfonts -ovf2ovp -char=foo -num=bar -text=baz -help || exit 1 + +echo && echo "*** ovp2ovf -help" +./omfonts -ovp2ovf -char=ascii -num=octal -text=upper -help || exit 1 + diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c index 3b836716fd4..0b9f9c3e5c4 100644 --- a/Build/source/texk/web2c/omegafonts/omfonts.c +++ b/Build/source/texk/web2c/omegafonts/omfonts.c @@ -21,6 +21,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc., */ +#define OMFONTS #define OFM2OPL #define OPL2OFM #define OVP2OVF diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog index 4ba7193ffe8..f51f54e1f12 100644 --- a/Build/source/texk/web2c/omegaware/ChangeLog +++ b/Build/source/texk/web2c/omegaware/ChangeLog @@ -1,3 +1,8 @@ +2014-11-07 Peter Breitenlohner + + * ofm2opl.ch, ovf2ovp.ch: Add missing space to message. + * help.test: New shell script to test help messages and options. + 2014-11-06 Peter Breitenlohner * ofm2opl.ch, ovf2ovp.ch: Add stringcast to avoid printing diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am index 6080c46c9ba..342f973fb86 100644 --- a/Build/source/texk/web2c/omegaware/am/omegaware.am +++ b/Build/source/texk/web2c/omegaware/am/omegaware.am @@ -100,12 +100,13 @@ DISTCLEANFILES += ovp2ovf.web OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \ omegaware/otangle.test OMFONTS_tests = omegaware/charwd.test omegaware/check.test \ - omegaware/level1.test omegaware/ligkern.test \ - omegaware/ofonts.test omegaware/omfonts.test \ - omegaware/overbmp.test omegaware/realnum.test \ - omegaware/repeat.test omegaware/selectfont.test \ - omegaware/shorten.test omegaware/specialhex.test \ - omegaware/vrepeat.test omegaware/yannis.test + omegaware/help.test omegaware/level1.test \ + omegaware/ligkern.test omegaware/ofonts.test \ + omegaware/omfonts.test omegaware/overbmp.test \ + omegaware/realnum.test omegaware/repeat.test \ + omegaware/selectfont.test omegaware/shorten.test \ + omegaware/specialhex.test omegaware/vrepeat.test \ + omegaware/yannis.test EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests) if OTANGLE diff --git a/Build/source/texk/web2c/omegaware/help.test b/Build/source/texk/web2c/omegaware/help.test new file mode 100755 index 00000000000..c6e69bb13d2 --- /dev/null +++ b/Build/source/texk/web2c/omegaware/help.test @@ -0,0 +1,17 @@ +#! /bin/sh + +# Copyright (C) 2014 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +echo && echo "*** ofm2opl -help" +./wofm2opl -char=foo -help || exit 1 + +echo && echo "*** opl2ofm -help" +./wopl2ofm -help || exit 1 + +echo && echo "*** ovf2ovp -help" +./wovf2ovp -char=bar -help || exit 1 + +echo && echo "*** ovp2ovf -help" +./wovp2ovf -help || exit 1 + diff --git a/Build/source/texk/web2c/omegaware/ofm2opl.ch b/Build/source/texk/web2c/omegaware/ofm2opl.ch index d6006b1f4dd..bbbbce8898e 100644 --- a/Build/source/texk/web2c/omegaware/ofm2opl.ch +++ b/Build/source/texk/web2c/omegaware/ofm2opl.ch @@ -355,7 +355,7 @@ begin else if strcmp (optarg, 'hex') = 0 then charcode_format := charcode_hex else - write_ln (stderr, 'Bad character code format', stringcast(optarg), '.'); + write_ln (stderr, 'Bad character code format ', stringcast(optarg), '.'); end; {Else it was a flag; |getopt| has already done the assignment.} until getopt_return_val = -1; diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.ch b/Build/source/texk/web2c/omegaware/ovf2ovp.ch index 620c9309779..575f6a43a86 100644 --- a/Build/source/texk/web2c/omegaware/ovf2ovp.ch +++ b/Build/source/texk/web2c/omegaware/ovf2ovp.ch @@ -547,7 +547,7 @@ begin else if strcmp (optarg, 'hex') = 0 then charcode_format := charcode_hex else - write_ln (stderr, 'Bad character code format', stringcast(optarg), '.'); + write_ln (stderr, 'Bad character code format ', stringcast(optarg), '.'); end; {Else it was a flag; |getopt| has already done the assignment.} until getopt_return_val = -1; diff --git a/Build/source/texk/web2c/tftopl.ch b/Build/source/texk/web2c/tftopl.ch index fad8087f4b0..2a8f44a93b0 100644 --- a/Build/source/texk/web2c/tftopl.ch +++ b/Build/source/texk/web2c/tftopl.ch @@ -337,7 +337,7 @@ begin else if strcmp (optarg, 'octal') = 0 then charcode_format := charcode_octal else - print_ln ('Bad character code format', stringcast(optarg), '.'); + print_ln ('Bad character code format ', stringcast(optarg), '.'); end; {Else it was a flag; |getopt| has already done the assignment.} until getopt_return_val = -1; diff --git a/Build/source/texk/web2c/tftopl.test b/Build/source/texk/web2c/tftopl.test index 19c4e9f1203..0241b542cbd 100755 --- a/Build/source/texk/web2c/tftopl.test +++ b/Build/source/texk/web2c/tftopl.test @@ -1,10 +1,12 @@ #! /bin/sh -# Copyright (C) 2009-2013 Peter Breitenlohner +# Copyright (C) 2009-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests +./tftopl -char=foo -help || exit 1 + TEXMFCNF=$srcdir/../kpathsea \ ./tftopl -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1 diff --git a/Build/source/texk/web2c/vftovp.ch b/Build/source/texk/web2c/vftovp.ch index aeb507bab08..ad8325205ab 100644 --- a/Build/source/texk/web2c/vftovp.ch +++ b/Build/source/texk/web2c/vftovp.ch @@ -577,7 +577,7 @@ begin else if strcmp (optarg, 'octal') = 0 then charcode_format := charcode_octal else - print_ln ('Bad character code format', stringcast(optarg), '.'); + print_ln ('Bad character code format ', stringcast(optarg), '.'); end; {Else it was a flag; |getopt| has already done the assignment.} until getopt_return_val = -1; diff --git a/Build/source/texk/web2c/vftovp.test b/Build/source/texk/web2c/vftovp.test index 614361300a4..c4a84b8bd20 100755 --- a/Build/source/texk/web2c/vftovp.test +++ b/Build/source/texk/web2c/vftovp.test @@ -1,10 +1,12 @@ #! /bin/sh -# Copyright (C) 2009-2013 Peter Breitenlohner +# Copyright (C) 2009-2014 Peter Breitenlohner # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests +./vftovp -char=bar -help || exit 1 + TEXMFCNF=$srcdir/../kpathsea \ TFMFONTS=$srcdir/tests \ ./vftovp -verbose $srcdir/tests/ptmr ptmr tests/xptmr || exit 1 -- cgit v1.2.3