summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-26 13:37:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-26 13:37:49 +0000
commitdba36815c3521f281d4962346b0b9dbdb7e787e7 (patch)
tree519d4b65c05c687929af17ad581997eb170d1230 /Build/source
parentecf810bdf23cee1b69f6bac4936e33555721bc60 (diff)
Fix dvi2tty 'make check' problem
git-svn-id: svn://tug.org/texlive/trunk@21175 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvi2tty/ChangeLog4
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog5
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-01-typecast12
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c2
-rwxr-xr-xBuild/source/texk/dvi2tty/dvi2tty.test2
5 files changed, 24 insertions, 1 deletions
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 78c6bd2069b..e8adf2ecb0e 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dvi2tty.test: Unset DVI2TTY to nullify dvi2tty options.
+
2010-11-13 Peter Breitenlohner <peb@mppmu.mpg.de>
Import dvi2tty-5.3.4.
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 c2d90b0c0e4..e9491b07b1b 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,8 @@
+2011-01-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dvistuff.c (dopage): Typecast dochar() argument to the
+ parameter type 'unsigned char', not to 'char'.
+
2010-11-13 Peter Breitenlohner <peb@mppmu.mpg.de>
Import dvi2tty-5.3.4.
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-01-typecast b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-01-typecast
new file mode 100644
index 00000000000..eaa46090ded
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-01-typecast
@@ -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 2010-11-13 16:35:19.000000000 +0100
++++ dvi2tty-5.3.4/dvistuff.c 2011-01-26 11:35:56.526064435 +0100
+@@ -441,7 +441,7 @@
+
+ while ((opcode = (int) get1()) != EOP) { /* process page until eop */
+ if (opcode <= LASTCHAR)
+- dochar((char) opcode);
++ dochar((unsigned char) opcode);
+ else if ((opcode >= FONT_00) && (opcode <= FONT_63))
+ setfont((long) opcode - FONT_00);
+ else if (opcode > POST_POST)
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 4e37a1f30f7..901877d158a 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c
@@ -441,7 +441,7 @@ void dopage(void)
while ((opcode = (int) get1()) != EOP) { /* process page until eop */
if (opcode <= LASTCHAR)
- dochar((char) opcode);
+ dochar((unsigned char) opcode);
else if ((opcode >= FONT_00) && (opcode <= FONT_63))
setfont((long) opcode - FONT_00);
else if (opcode > POST_POST)
diff --git a/Build/source/texk/dvi2tty/dvi2tty.test b/Build/source/texk/dvi2tty/dvi2tty.test
index 6d0a77d4019..64522fdb5b3 100755
--- a/Build/source/texk/dvi2tty/dvi2tty.test
+++ b/Build/source/texk/dvi2tty/dvi2tty.test
@@ -2,6 +2,8 @@
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
./dvi2tty -s $test_src/test.dvi >tests.out && diff $srcdir/tests.tty tests.out || exit 1