From 9ac1e4f21452c36163d25579ad52cbf56eefb517 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 27 Jan 2011 12:30:16 +0000 Subject: Fix dvi2tty test (uninitialized variable) git-svn-id: svn://tug.org/texlive/trunk@21189 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvi2tty/ChangeLog | 2 + Build/source/texk/dvi2tty/Makefile.am | 7 +- Build/source/texk/dvi2tty/Makefile.in | 4 +- .../texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog | 4 ++ .../dvi2tty-5.3.4-PATCHES/patch-02-initialize | 12 ++++ Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c | 2 + Build/source/texk/dvi2tty/dvi2tty.test | 14 ++-- Build/source/texk/dvi2tty/test.tty | 20 +++--- Build/source/texk/dvi2tty/testc.tty | 75 ++++++++++++++++++++++ Build/source/texk/dvi2tty/tests.tty | 20 +++--- Build/source/texk/dvi2tty/testu.tty | 20 +++--- 11 files changed, 140 insertions(+), 40 deletions(-) create mode 100644 Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-02-initialize create mode 100644 Build/source/texk/dvi2tty/testc.tty diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog index e8adf2ecb0e..24e3660cd92 100644 --- a/Build/source/texk/dvi2tty/ChangeLog +++ b/Build/source/texk/dvi2tty/ChangeLog @@ -1,6 +1,8 @@ 2011-01-26 Peter Breitenlohner * dvi2tty.test: Unset DVI2TTY to nullify dvi2tty options. + Additional testcase with '-c'. + * testc.tty: Expected output. 2010-11-13 Peter Breitenlohner diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am index aa99d31e86b..67257f9bb85 100644 --- a/Build/source/texk/dvi2tty/Makefile.am +++ b/Build/source/texk/dvi2tty/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvi2tty/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009 - 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -48,10 +48,9 @@ man1_MANS = \ TESTS = dvi2tty.test TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE) -DISTCLEANFILES = EXTRA_DIST += $(TESTS) ## dvi2tty.test -EXTRA_DIST += ligtest.tty test.tty tests.tty testu.tty -DISTCLEANFILES += ligtest.out test.out tests.out testu.out +EXTRA_DIST += ligtest.tty test.tty testc.tty tests.tty testu.tty +DISTCLEANFILES = ligtest.out test.out testc.out tests.out testu.out diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in index efa1d7263e6..71db038c303 100644 --- a/Build/source/texk/dvi2tty/Makefile.in +++ b/Build/source/texk/dvi2tty/Makefile.in @@ -254,7 +254,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(DVI2TTY_TREE) $(DVI2TTY_TREE)-PATCHES $(TESTS) \ - ligtest.tty test.tty tests.tty testu.tty + ligtest.tty test.tty testc.tty tests.tty testu.tty INCLUDES = $(KPATHSEA_INCLUDES) AM_CPPFLAGS = -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) @@ -275,7 +275,7 @@ man1_MANS = \ TESTS = dvi2tty.test TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE) -DISTCLEANFILES = ligtest.out test.out tests.out testu.out +DISTCLEANFILES = ligtest.out test.out testc.out tests.out testu.out all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog index e9491b07b1b..2678b33e926 100644 --- a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog +++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2011-01-27 Peter Breitenlohner + + * dvistuff.c (fontdef): Initialize the fontnum member. + 2011-01-26 Peter Breitenlohner * dvistuff.c (dopage): Typecast dochar() argument to the diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-02-initialize b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-02-initialize new file mode 100644 index 00000000000..35c3abb2237 --- /dev/null +++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-02-initialize @@ -0,0 +1,12 @@ +diff -ur dvi2tty-5.3.4.orig/dvistuff.c dvi2tty-5.3.4/dvistuff.c +--- dvi2tty-5.3.4.orig/dvistuff.c 2011-01-26 11:35:56.000000000 +0100 ++++ dvi2tty-5.3.4/dvistuff.c 2011-01-27 13:20:02.928406313 +0100 +@@ -1419,6 +1419,8 @@ + } + if (japan) + fonts->fontnum = getjsubfont(name); ++ else ++ fonts->fontnum = 0; + + if ((strstr(name, "sy")) != NULL) + fonts->flags |= SYMFONT; diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c index 901877d158a..a53dfb48380 100644 --- a/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c +++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c @@ -1419,6 +1419,8 @@ void fontdef(int x) } if (japan) fonts->fontnum = getjsubfont(name); + else + fonts->fontnum = 0; if ((strstr(name, "sy")) != NULL) fonts->flags |= SYMFONT; diff --git a/Build/source/texk/dvi2tty/dvi2tty.test b/Build/source/texk/dvi2tty/dvi2tty.test index 64522fdb5b3..096e3aa0256 100755 --- a/Build/source/texk/dvi2tty/dvi2tty.test +++ b/Build/source/texk/dvi2tty/dvi2tty.test @@ -4,11 +4,17 @@ test_src=$srcdir/$DVI2TTY_TREE/test unset DVI2TTY # nullify dvi2tty options (if any) -./dvi2tty $test_src/test.dvi >test.out && diff $srcdir/test.tty test.out || exit 1 +rc=0 -./dvi2tty -s $test_src/test.dvi >tests.out && diff $srcdir/tests.tty tests.out || exit 1 +./dvi2tty $test_src/test.dvi >test.out && diff $srcdir/test.tty test.out || rc=1 -./dvi2tty -u $test_src/test.dvi >testu.out && diff $srcdir/testu.tty testu.out || exit 1 +./dvi2tty -c $test_src/test.dvi >testc.out && diff $srcdir/testc.tty testc.out || rc=1 -./dvi2tty $test_src/ligtest >ligtest.out && diff $srcdir/ligtest.tty ligtest.out || exit 1 +./dvi2tty -s $test_src/test.dvi >tests.out && diff $srcdir/tests.tty tests.out || rc=1 + +./dvi2tty -u $test_src/test.dvi >testu.out && diff $srcdir/testu.tty testu.out || rc=1 + +./dvi2tty $test_src/ligtest >ligtest.out && diff $srcdir/ligtest.tty ligtest.out || rc=1 + +exit $rc diff --git a/Build/source/texk/dvi2tty/test.tty b/Build/source/texk/dvi2tty/test.tty index b86e2d3c06f..5bab4786c48 100644 --- a/Build/source/texk/dvi2tty/test.tty +++ b/Build/source/texk/dvi2tty/test.tty @@ -54,21 +54,21 @@ so far not in verbatim (tt font) now in verbatim (tt font) -accents: "'-e" -"LaTeX -now inline: bla"'-e" test -now inline: bla "'-e"test -now inline: bla "'-e" test -real spaces"""xxx -tildes accent ""o +accents: \'{e} +\LaTeX +now inline: bla\'{e} test +now inline: bla \'{e}test +now inline: bla \'{e} test +real spaces~~~xxx +tildes accent \~o horizontal 2 - is -- horizontal 3 - is --- ligatures: ffl fi fl Yp -what about vertical bars _ +what about vertical bars | horizontal bar - -and tildes " +and tildes ~ < funny carrots > -or other symbols: "" - " [ ] ` ^ ? = ; / . , + * ( ) ' & % $ # " ! +or other symbols: \\ { } [ ] _ ^ ? = ; / . , + * ( ) ' & % $ # " ! diff --git a/Build/source/texk/dvi2tty/testc.tty b/Build/source/texk/dvi2tty/testc.tty new file mode 100644 index 00000000000..14ecafb9e62 --- /dev/null +++ b/Build/source/texk/dvi2tty/testc.tty @@ -0,0 +1,75 @@ + + + + +accents: e +LATEX +now inline: blae test +now inline: bla etest +now inline: bla e test +real spaces xxx +tildes accent ~o +horizontal 2 - is { +horizontal 3 - is | +ligatures:  Yp +what about vertical bars | +horizontal bar - +and tildes +< funny carrots > +copyright cO +pounds $ +euro diamond3 scandinavian ae AE  o  O  AA A aa a Z z +alpha eta  +nu  +tau  +beta +theta  +xi  +upsilon  +gamma +iota  +phi  +delta  +kappa  +pi  +chi  +epsilon  +lambda  +rho  +psi +zeta  +mu  +sigma  +omega_!____ + 1 | 2 |3|| + 4 | 5 |6|| +_7_|_8_|9||_ +so far not in verbatim (tt font) + + + + 1 + + + + +now in verbatim (tt font) +accents: \'{e} +\LaTeX +now inline: bla\'{e} test +now inline: bla \'{e}test +now inline: bla \'{e} test +real spaces~~~xxx +tildes accent \~o +horizontal 2 - is -- +horizontal 3 - is --- +ligatures: ffl fi fl Yp +what about vertical bars | +horizontal bar - +and tildes ~ +< funny carrots > +or other symbols: \\ { } [ ] _ ^ ? = ; / . , + * ( ) ' & % $ # " ! + + + + 2 diff --git a/Build/source/texk/dvi2tty/tests.tty b/Build/source/texk/dvi2tty/tests.tty index 7c6e186f3e2..9790d7aa00a 100644 --- a/Build/source/texk/dvi2tty/tests.tty +++ b/Build/source/texk/dvi2tty/tests.tty @@ -54,21 +54,21 @@ so far not in verbatim (tt font) now in verbatim (tt font) -accents: "'-e" -{L TeX -now inline: bla"'-e" test -now inline: bla "'-e"test -now inline: bla "'-e" test -real spaces"""xxx -tildes accent "| +accents: \'{e} +\LaTeX +now inline: bla\'{e} test +now inline: bla \'{e}test +now inline: bla \'{e} test +real spaces~~~xxx +tildes accent \~o horizontal 2 - is -- horizontal 3 - is --- ligatures: ffl fi fl Yp -what about vertical bars _ +what about vertical bars | horizontal bar - -and tildes " +and tildes ~ < funny carrots > -or other symbols: "" - " [ ] ` ^ ? = ; / . , + * ( ) ' & % $ # " ! +or other symbols: \\ { } [ ] _ ^ ? = ; / . , + * ( ) ' & % $ # " ! diff --git a/Build/source/texk/dvi2tty/testu.tty b/Build/source/texk/dvi2tty/testu.tty index ce9f9c4d5dc..e8cd5e09603 100644 --- a/Build/source/texk/dvi2tty/testu.tty +++ b/Build/source/texk/dvi2tty/testu.tty @@ -54,21 +54,21 @@ so far not in verbatim (tt font) now in verbatim (tt font) -accents: "'-e" -äL TeX -now inline: bla"'-e" test -now inline: bla "'-e"test -now inline: bla "'-e" test -real spaces"""xxx -tildes accent "ö +accents: \'{e} +\LaTeX +now inline: bla\'{e} test +now inline: bla \'{e}test +now inline: bla \'{e} test +real spaces~~~xxx +tildes accent \~o horizontal 2 - is -- horizontal 3 - is --- ligatures: ffl fi fl Yp -what about vertical bars _ +what about vertical bars | horizontal bar - -and tildes " +and tildes ~ < funny carrots > -or other symbols: "" - " [ ] ` ^ ? = ; / . , + * ( ) ' & % $ # " ! +or other symbols: \\ { } [ ] _ ^ ? = ; / . , + * ( ) ' & % $ # " ! -- cgit v1.2.3