summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-04-09 06:30:28 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-04-09 06:30:28 +0000
commit9e9d3aab7049dce8d82a1a13ab7dd695d235cfd6 (patch)
treea6b466407444be041a98245350a338c2e0a597da /Build/source
parent631f97d50b10e08d2a64934d40da0c8859053437 (diff)
dvi2tty: accept FNTDEF between PRE--BOP and between EOP--BOP
git-svn-id: svn://tug.org/texlive/trunk@62985 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvi2tty/ChangeLog11
-rw-r--r--Build/source/texk/dvi2tty/Makefile.am1
-rw-r--r--Build/source/texk/dvi2tty/Makefile.in2
-rwxr-xr-xBuild/source/texk/dvi2tty/configure22
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c13
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.dvibin0 -> 1084 bytes
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.tex12
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef1.dvibin0 -> 1084 bytes
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef2.dvibin0 -> 1084 bytes
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef3.dvibin0 -> 1096 bytes
-rwxr-xr-xBuild/source/texk/dvi2tty/dvi2tty.test10
-rw-r--r--Build/source/texk/dvi2tty/fntdef0.tty36
-rw-r--r--Build/source/texk/dvi2tty/version.ac2
13 files changed, 93 insertions, 16 deletions
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 0708ef70ba7..7b6081d3879 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,14 @@
+2022-04-09 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ dvi2tty-6.0.1.
+ * dvistuff.c:
+ Accept FNTDEF between PRE--BOP and between EOP--BOP.
+ * test/fntdef0.tex, test/fntdef[0123].dvi,
+ dvi2tty.test, fntdef0.tty, Makefile.am:
+ Add new tests.
+ * version.ac: Update version number.
+ https://github.com/texjporg/tex-jp-build/issues/138
+
2022-03-11 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* dvi2tty.[ch], dvistuff.c: Error exit if fail to get font,
diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am
index 8ba5a1656e2..b0d39f2c62f 100644
--- a/Build/source/texk/dvi2tty/Makefile.am
+++ b/Build/source/texk/dvi2tty/Makefile.am
@@ -61,6 +61,7 @@ EXTRA_DIST += ligtest.dis
DISTCLEANFILES = ligtest.dout
## dvi2tty.test
EXTRA_DIST += ligtest.tty test.tty testc.tty tests.tty testu.tty
+EXTRA_DIST += fntdef0.tty
DISTCLEANFILES += ligtest.out test.out testc.out tests.out testu.out
DISTCLEANFILES += table.out tablec.out tables.out tableu.out tableuC.out
DISTCLEANFILES += tableEu.out tableEu1.out tableEuC.out tableEua.out
diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in
index 3410fb678fd..a7aba2ccae8 100644
--- a/Build/source/texk/dvi2tty/Makefile.in
+++ b/Build/source/texk/dvi2tty/Makefile.in
@@ -560,7 +560,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(DVI2TTY_TREE) TLpatches $(TESTS) ligtest.dis \
- ligtest.tty test.tty testc.tty tests.tty testu.tty
+ ligtest.tty test.tty testc.tty tests.tty testu.tty fntdef0.tty
NEVER_DIST = `find . $(NEVER_NAMES)`
# Files not to be distributed
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure
index e331fea7d11..7e169929f62 100755
--- a/Build/source/texk/dvi2tty/configure
+++ b/Build/source/texk/dvi2tty/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for dvi2tty (TeX Live) 6.0.0.
+# Generated by GNU Autoconf 2.71 for dvi2tty (TeX Live) 6.0.1.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -629,8 +629,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvi2tty (TeX Live)'
PACKAGE_TARNAME='dvi2tty--tex-live-'
-PACKAGE_VERSION='6.0.0'
-PACKAGE_STRING='dvi2tty (TeX Live) 6.0.0'
+PACKAGE_VERSION='6.0.1'
+PACKAGE_STRING='dvi2tty (TeX Live) 6.0.1'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1378,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dvi2tty (TeX Live) 6.0.0 to adapt to many kinds of systems.
+\`configure' configures dvi2tty (TeX Live) 6.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1450,7 +1450,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvi2tty (TeX Live) 6.0.0:";;
+ short | recursive ) echo "Configuration of dvi2tty (TeX Live) 6.0.1:";;
esac
cat <<\_ACEOF
@@ -1571,7 +1571,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvi2tty (TeX Live) configure 6.0.0
+dvi2tty (TeX Live) configure 6.0.1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2095,7 +2095,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvi2tty (TeX Live) $as_me 6.0.0, which was
+It was created by dvi2tty (TeX Live) $as_me 6.0.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -8417,7 +8417,7 @@ fi
# Define the identity of the package.
PACKAGE='dvi2tty--tex-live-'
- VERSION='6.0.0'
+ VERSION='6.0.1'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -14530,7 +14530,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvi2tty (TeX Live) config.lt 6.0.0
+dvi2tty (TeX Live) config.lt 6.0.1
configured by $0, generated by GNU Autoconf 2.71.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16151,7 +16151,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvi2tty (TeX Live) $as_me 6.0.0, which was
+This file was extended by dvi2tty (TeX Live) $as_me 6.0.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16219,7 +16219,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-dvi2tty (TeX Live) config.status 6.0.0
+dvi2tty (TeX Live) config.status 6.0.1
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c b/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c
index dcb17129c1d..a0f1c6d744c 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c
@@ -361,7 +361,7 @@ void preamble(void)
{
mseek(DVIfile, 0L, absolute); /* read the dvifile from the start */
- if ((opcode = skipnops()) != PRE)
+ if ((opcode = (int) num(1)) != PRE)
errorexit(nopre);
opcode = (int) get1(); /* check id in preamble, ignore rest of it */
if (opcode != VERSIONID)
@@ -881,8 +881,15 @@ int skipnops(void)
{
register int opcode;
- while ((opcode = (int) num(1)) == NOP);
-
+ while (opcode = (int) num(1)) {
+ if (opcode >= FNT_DEF1 && opcode <= FNT_DEF4) {
+ fontdef(opcode - FNT_DEF1 + 1);
+ continue;
+ }
+ else if (opcode == NOP)
+ continue;
+ break;
+ }
return opcode;
} /* skipnops */
diff --git a/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.dvi b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.dvi
new file mode 100644
index 00000000000..e0772d27ea3
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.dvi
Binary files differ
diff --git a/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.tex b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.tex
new file mode 100644
index 00000000000..c9773f1f1e7
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef0.tex
@@ -0,0 +1,12 @@
+% font definition
+\documentclass{article}
+\usepackage[dvips]{color}
+\begin{document}
+first page.
+\newpage
+\textbf{second page.}
+\newpage
+\textit{third page.}
+\newpage
+\textsl{fourth page.}
+\end{document}
diff --git a/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef1.dvi b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef1.dvi
new file mode 100644
index 00000000000..f7eff548174
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef1.dvi
Binary files differ
diff --git a/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef2.dvi b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef2.dvi
new file mode 100644
index 00000000000..d88fa721321
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef2.dvi
Binary files differ
diff --git a/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef3.dvi b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef3.dvi
new file mode 100644
index 00000000000..c3dec018e15
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-src/test/fntdef3.dvi
Binary files differ
diff --git a/Build/source/texk/dvi2tty/dvi2tty.test b/Build/source/texk/dvi2tty/dvi2tty.test
index 5a5a09873e4..e33f49e81d7 100755
--- a/Build/source/texk/dvi2tty/dvi2tty.test
+++ b/Build/source/texk/dvi2tty/dvi2tty.test
@@ -46,5 +46,15 @@ rc=0
./dvi2tty -Eu -a $test_src/table.dvi >tableEua.out && diff $srcdir/tableEua.tty tableEua.out || rc=9
+## different position of FNTDEF and NOP
+./dvi2tty $test_src/fntdef0.dvi >fntdef0.out && diff $srcdir/fntdef0.tty fntdef0.out || rc=1
+
+./dvi2tty $test_src/fntdef1.dvi >fntdef1.out && diff $srcdir/fntdef0.tty fntdef1.out || rc=2
+
+./dvi2tty $test_src/fntdef2.dvi >fntdef2.out && diff $srcdir/fntdef0.tty fntdef2.out || rc=3
+
+./dvi2tty $test_src/fntdef3.dvi >fntdef3.out && diff $srcdir/fntdef0.tty fntdef3.out || rc=4
+
+
exit $rc
diff --git a/Build/source/texk/dvi2tty/fntdef0.tty b/Build/source/texk/dvi2tty/fntdef0.tty
new file mode 100644
index 00000000000..f3ace132f71
--- /dev/null
+++ b/Build/source/texk/dvi2tty/fntdef0.tty
@@ -0,0 +1,36 @@
+
+
+
+
+first page.
+
+
+
+ 1
+
+
+
+
+second page.
+
+
+
+ 2
+
+
+
+
+third page.
+
+
+
+ 3
+
+
+
+
+fourth page.
+
+
+
+ 4
diff --git a/Build/source/texk/dvi2tty/version.ac b/Build/source/texk/dvi2tty/version.ac
index bf57bb02318..174a4d42c87 100644
--- a/Build/source/texk/dvi2tty/version.ac
+++ b/Build/source/texk/dvi2tty/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current dvi2tty version
-m4_define([dvi2tty_version], [6.0.0])
+m4_define([dvi2tty_version], [6.0.1])