texlive[44638] Build/source/texk/dvidvi: texk/dvidvi: Support pTeX
commits+takuji at tug.org
commits+takuji at tug.org
Mon Jun 19 16:00:22 CEST 2017
Revision: 44638
http://tug.org/svn/texlive?view=revision&revision=44638
Author: takuji
Date: 2017-06-19 16:00:21 +0200 (Mon, 19 Jun 2017)
Log Message:
-----------
texk/dvidvi: Support pTeX dvi by H. Yamashita-san
Modified Paths:
--------------
trunk/Build/source/texk/dvidvi/ChangeLog
trunk/Build/source/texk/dvidvi/Makefile.am
trunk/Build/source/texk/dvidvi/Makefile.in
trunk/Build/source/texk/dvidvi/dvidvi.c
trunk/Build/source/texk/dvidvi/dvidvi.test
Added Paths:
-----------
trunk/Build/source/texk/dvidvi/tests/playout.3
trunk/Build/source/texk/dvidvi/tests/playtate.dvi
Modified: trunk/Build/source/texk/dvidvi/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvidvi/ChangeLog 2017-06-19 13:53:02 UTC (rev 44637)
+++ trunk/Build/source/texk/dvidvi/ChangeLog 2017-06-19 14:00:21 UTC (rev 44638)
@@ -1,3 +1,10 @@
+2017-06-18 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * dvidvi.c: Add support for pTeX tate-kumi DVI.
+ * dvidvi.test: Add tests for pTeX support.
+ * playout.3, playtate.dvi: Added.
+ * Makefile.am: Adjusted for pTeX support.
+
2015-07-07 Peter Breitenlohner <peb at mppmu.mpg.de>
* Makefile.am: Better dependencies for 'make check'.
Modified: trunk/Build/source/texk/dvidvi/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvidvi/Makefile.am 2017-06-19 13:53:02 UTC (rev 44637)
+++ trunk/Build/source/texk/dvidvi/Makefile.am 2017-06-19 14:00:21 UTC (rev 44638)
@@ -3,7 +3,7 @@
## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
##
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DUNIX
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DASCIIPTEX -DUNIX
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = dvidvi
@@ -36,6 +36,7 @@
EXTRA_DIST += $(TESTS)
## dvidvi.test
-EXTRA_DIST += tests/play.dvi tests/playout.2
-DISTCLEANFILES = play*.2 play*.dvi
+EXTRA_DIST += tests/play.dvi tests/playout.2 \
+ tests/playtate.dvi tests/playout.3
+DISTCLEANFILES = play*.2 play*.3 play*.dvi
Modified: trunk/Build/source/texk/dvidvi/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvidvi/Makefile.in 2017-06-19 13:53:02 UTC (rev 44637)
+++ trunk/Build/source/texk/dvidvi/Makefile.in 2017-06-19 14:00:21 UTC (rev 44638)
@@ -540,7 +540,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DUNIX
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DASCIIPTEX -DUNIX
AM_CFLAGS = $(WARNING_CFLAGS)
dvidvi_SOURCES = dvidvi.c
dist_man1_MANS = dvidvi.1
@@ -547,9 +547,9 @@
EXTRA_DIST = a5bookle.bat a5bookle.com a5bookle.hlp a5test.tex \
build.com doubside.bat doubside.com doubside.hlp \
dvidvi.kohm-patch dvisamp.tex $(TESTS) tests/play.dvi \
- tests/playout.2
+ tests/playout.2 tests/playtate.dvi tests/playout.3
TESTS = dvidvi.test
-DISTCLEANFILES = play*.2 play*.dvi
+DISTCLEANFILES = play*.2 play*.3 play*.dvi
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
Modified: trunk/Build/source/texk/dvidvi/dvidvi.c
===================================================================
--- trunk/Build/source/texk/dvidvi/dvidvi.c 2017-06-19 13:53:02 UTC (rev 44637)
+++ trunk/Build/source/texk/dvidvi/dvidvi.c 2017-06-19 14:00:21 UTC (rev 44638)
@@ -165,6 +165,10 @@
integer *pagenumbers ;
int prettycolumn ; /* the column we are at when running pretty */
+#ifdef ASCIIPTEX
+int ptexdvi ; /* true if dvi file is extended (TATEKUMI) */
+#endif
+
/*
* This array holds values that indicate the length of a command, if
* we aren't concerned with that command (which is most of them) or
@@ -873,6 +877,11 @@
if (c == 2 && d == 0xdf /* dave fuchs */ &&
e == 0xdf)
break ;
+#ifdef ASCIIPTEX
+ if (c == 3 && d == 0xdf /* dave fuchs */ &&
+ e == 0xdf)
+ break ;
+#endif
fseek(infile,-4L,SEEK_CUR);
}
if (p < 10)
@@ -1024,6 +1033,11 @@
putfontdef(i) ;
outdvibyte(249) ;
outdviquad(p) ;
+#ifdef ASCIIPTEX
+ if (ptexdvi)
+ outdvibyte(3) ;
+ else
+#endif
outdvibyte(2) ;
outdviquad(0xdfdfdfdfL) ;
while (dviloc & 3)
@@ -1129,6 +1143,12 @@
p += dvibyte() + 2 ;
fseek(infile,p,SEEK_SET);
break ;
+#ifdef ASCIIPTEX
+case 255:
+ ptexdvi = 1 ;
+ outdvibyte(len);
+ break ;
+#endif
default: fprintf(stderr, "Bad dvi command was %d at %ld\n", len, p) ;
error("! lost sync dvi in file lost dvi sync file in") ;
}
@@ -1160,6 +1180,10 @@
struct pagespec *ps ;
Boolean beginp ;
+#ifdef ASCIIPTEX
+ ptexdvi = 0 ;
+#endif
+
writepreamble() ;
if ( !pagemodulo )
pagefake = (pagecount + modulo - 1) / modulo * modulo ;
Modified: trunk/Build/source/texk/dvidvi/dvidvi.test
===================================================================
--- trunk/Build/source/texk/dvidvi/dvidvi.test 2017-06-19 13:53:02 UTC (rev 44637)
+++ trunk/Build/source/texk/dvidvi/dvidvi.test 2017-06-19 14:00:21 UTC (rev 44638)
@@ -10,3 +10,10 @@
&& diff playout.2 $srcdir/tests/playout.2 \
|| exit 1
+rm -rf play*
+cp $srcdir/tests/playtate.dvi .
+./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' playtate playout \
+ 2>playout.3 \
+ && diff playout.3 $srcdir/tests/playout.3 \
+ || exit 1
+
Added: trunk/Build/source/texk/dvidvi/tests/playout.3
===================================================================
--- trunk/Build/source/texk/dvidvi/tests/playout.3 (rev 0)
+++ trunk/Build/source/texk/dvidvi/tests/playout.3 2017-06-19 14:00:21 UTC (rev 44638)
@@ -0,0 +1,5 @@
+
+This is dvidvi 1.1, Copyright (C) 1988-91, Radical Eye Software
+Improved from 1.0 to 1.1, 1994, Markus Kohm
+playtate.dvi -> playout.dvi
+[5] [12] [9] [8] [13]
Property changes on: trunk/Build/source/texk/dvidvi/tests/playout.3
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/texk/dvidvi/tests/playtate.dvi
===================================================================
(Binary files differ)
Index: trunk/Build/source/texk/dvidvi/tests/playtate.dvi
===================================================================
--- trunk/Build/source/texk/dvidvi/tests/playtate.dvi 2017-06-19 13:53:02 UTC (rev 44637)
+++ trunk/Build/source/texk/dvidvi/tests/playtate.dvi 2017-06-19 14:00:21 UTC (rev 44638)
Property changes on: trunk/Build/source/texk/dvidvi/tests/playtate.dvi
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
More information about the tex-live-commits
mailing list