summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/euptexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-22 13:00:40 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-22 13:00:40 +0000
commitb3e544255a809f9dd960a88e868e317f3f6f6cff (patch)
tree7a189031bfbd000573a7bef7c8ff2b9695337a49 /Build/source/texk/web2c/euptexdir
parent51775d7d8c281c16ed2ed7f52b557905774d1d13 (diff)
(e-)((u)p)TeX: Update (e)((u)p)trip tests
git-svn-id: svn://tug.org/texlive/trunk@32757 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/euptexdir')
-rw-r--r--Build/source/texk/web2c/euptexdir/ChangeLog12
-rw-r--r--Build/source/texk/web2c/euptexdir/am/euptex.am4
-rw-r--r--Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs100
-rwxr-xr-xBuild/source/texk/web2c/euptexdir/euptriptest4
4 files changed, 62 insertions, 58 deletions
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 61916a5523b..cb7d54ebce1 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,15 @@
+2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * eptrip/etrip.{log,tex} (removed): Renamed ...
+ * eptrip/eptrip.{log,tex} (new): ... into these.
+ * euptriptest, am/euptex.am: Adapted to renaming etrip.{log,tex}
+ => eptrip.{log,tex} in ../eptexdir/eptrip/.
+ * eptrip/eptrip.{diffs,log}: Updated for e-upTeX 3.14159265.
+
+2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * triptrap/trip.diffs: Updated for TeX 3.14159265.
+
2014-01-20 Peter Breitenlohner <peb@mppmu.mpg.de>
TeX tuneup of 2014.
diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am
index 303ab25d000..6cb847d055e 100644
--- a/Build/source/texk/web2c/euptexdir/am/euptex.am
+++ b/Build/source/texk/web2c/euptexdir/am/euptex.am
@@ -97,8 +97,8 @@ endif EUPTEX
##
## eptexdir/eptriptest
EXTRA_DIST += \
- eptexdir/eptrip/etrip.log \
- eptexdir/eptrip/etrip.tex \
+ eptexdir/eptrip/eptrip.log \
+ eptexdir/eptrip/eptrip.tex \
euptexdir/euptrip/euptrip.diffs \
euptexdir/euptrip/texmf.cnf
euptrip.diffs: euptex$(EXEEXT)
diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs
index 73adbefc533..570e57a0d90 100644
--- a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs
+++ b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs
@@ -11,9 +11,9 @@
+ sed 's/, yoko direction//;s/yoko direction, //' trip.log
+ diff SRCDIR/triptrap/tripin.log cuptripin.log
1c1
-< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23
+< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37
3,11c3
< (trip.tex
< ! Bad character code (256).
@@ -32,13 +32,13 @@
> ### horizontal mode entered at line 77 (language255:hyph
> enmin1,63)
450,453c443,446
-< (preloaded format=trip 2008.3.15)
+< (preloaded format=trip 2014.1.7)
< 1326 strings of total length 23646
< 471 memory locations dumped; current usage is 96&278
< 341 multiletter control sequences
---
-> (format=trip 2013.11.21)
-> 1617 strings of total length 27814
+> (preloaded format=trip 2014.1.22)
+> 1617 strings of total length 27833
> 489 memory locations dumped; current usage is 110&278
> 393 multiletter control sequences
461c454
@@ -50,11 +50,11 @@
+ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log
+ diff SRCDIR/triptrap/trip.fot cuptrip.fot
1,3c1,2
-< This is TeX, Version 3.1415926 (INITEX)
+< This is TeX, Version 3.14159265 (INITEX)
< ** &trip trip
< (trip.tex ##
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014)
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex)
> **(./trip.tex ##
17c16
< Memory usage before: 159&313; after: 102&278; still untouched: 1613
@@ -66,9 +66,9 @@
> Memory usage before: 456&431; after: 394&418; still untouched: 483
+ diff SRCDIR/triptrap/trip.log cuptrip.log
1c1
-< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23
+< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37
3c3
< (trip.tex ##
---
@@ -333,7 +333,7 @@
< 372 multiletter control sequences out of 2100
---
> 44 strings out of 1683
-> 261 string characters out of 8186
+> 261 string characters out of 8167
> 4017 words of memory out of 4500
> 424 multiletter control sequences out of 15000+0
7301c7310
@@ -348,9 +348,9 @@
---
> This is DVItype, Version 3.6 (TeX Live 2014)
9c9
-< ' TeX output 2008.03.15:0223'
+< ' TeX output 2014.01.07:0959'
---
-> ' TeX output 2013.11.21:1053'
+> ' TeX output 2014.01.22:1137'
419c419
< 1121: down4 639342208
---
@@ -368,7 +368,7 @@
+ sed 's/, yoko direction//;s/yoko direction, //' trip.log
+ diff SRCDIR/triptrap/tripin.log xuptripin.log
1,11c1,4
-< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23
+< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09
< **\input trip
< (trip.tex
< ! Bad character code (256).
@@ -380,7 +380,7 @@
< I changed this one to zero.
<
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37
> entering extended mode
> ***\input trip
> (./trip.tex
@@ -397,13 +397,13 @@
> ### horizontal mode entered at line 77 (language255:hyph
> enmin1,63)
450,453c438,441
-< (preloaded format=trip 2008.3.15)
+< (preloaded format=trip 2014.1.7)
< 1326 strings of total length 23646
< 471 memory locations dumped; current usage is 96&278
< 341 multiletter control sequences
---
-> (format=trip 2013.11.21)
-> 1617 strings of total length 27814
+> (preloaded format=trip 2014.1.22)
+> 1617 strings of total length 27833
> 536 memory locations dumped; current usage is 157&278
> 468 multiletter control sequences
461c449
@@ -415,11 +415,11 @@
+ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log
+ diff SRCDIR/triptrap/trip.fot xuptrip.fot
1,3c1,3
-< This is TeX, Version 3.1415926 (INITEX)
+< This is TeX, Version 3.14159265 (INITEX)
< ** &trip trip
< (trip.tex ##
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014)
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex)
> **entering extended mode
> ## (./trip.tex
17c17
@@ -436,11 +436,11 @@
> ### bottom level
+ diff SRCDIR/triptrap/trip.log xuptrip.log
1,3c1,4
-< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23
+< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59
< ** &trip trip
< (trip.tex ##
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37
> entering extended mode
> **&trip \toksdef\tokens=0 \input trip
> (./trip.tex
@@ -769,7 +769,7 @@
< 372 multiletter control sequences out of 2100
---
> 44 strings out of 1683
-> 261 string characters out of 8186
+> 261 string characters out of 8167
> 4017 words of memory out of 4500
> 499 multiletter control sequences out of 15000+0
7301,7302c7307,7308
@@ -786,9 +786,9 @@
---
> This is DVItype, Version 3.6 (TeX Live 2014)
9c9
-< ' TeX output 2008.03.15:0223'
+< ' TeX output 2014.01.07:0959'
---
-> ' TeX output 2013.11.21:1053'
+> ' TeX output 2014.01.22:1137'
419c419
< 1121: down4 639342208
---
@@ -804,42 +804,34 @@
+ ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm
+ ./tftopl ./etrip.tfm etrip.pl
+ diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl
-+ ln -s SRCDIR/eptexdir/eptrip/etrip.tex .
++ ln -s SRCDIR/eptexdir/eptrip/eptrip.tex etrip.tex
+ ./euptex --progname=eupinitex --ini
+ sed 's/, yoko direction//;s/yoko direction, //' etrip.log
+ diff SRCDIR/etexdir/etrip/etripin.log euptripin.log
1c1
-< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43
+< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53
-5c5
-< This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6.
----
-> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6.
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37
27,29c27,29
-< 1491 strings of total length 26239
-< 280 memory locations dumped; current usage is 36&166
+< 1491 strings of total length 26258
+< 281 memory locations dumped; current usage is 36&167
< 408 multiletter control sequences
---
-> 1618 strings of total length 27845
-> 283 memory locations dumped; current usage is 40&166
+> 1618 strings of total length 27864
+> 284 memory locations dumped; current usage is 40&167
> 468 multiletter control sequences
+ ./euptex --progname=euptex
+ sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' etrip.log
+ diff SRCDIR/etexdir/etrip/etrip.fot euptrip.fot
1c1
-< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014)
----
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014)
-4c4
-< This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6.
+< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex)
---
-> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6.
-+ diff SRCDIR/eptexdir/eptrip/etrip.log euptrip.log
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex)
++ diff SRCDIR/eptexdir/eptrip/eptrip.log euptrip.log
1c1
-< This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43
+< This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25
---
-> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:53
+> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:37
2210,2215d2209
< ! Bad character code (256).
< l.676 \iffontchar\font 256
@@ -847,22 +839,22 @@
< A character number must be between 0 and 255, or KANJI code.
< I changed this one to zero.
<
-4296,4297c4290,4291
-< 18 strings out of 1695
-< 140 string characters out of 8218
+4421,4422c4415,4416
+< 19 strings out of 1692
+< 145 string characters out of 8157
---
-> 18 strings out of 1682
-> 140 string characters out of 8155
-4299c4293
-< 460 multiletter control sequences out of 15000+0
+> 19 strings out of 1682
+> 145 string characters out of 8136
+4424c4418
+< 463 multiletter control sequences out of 15000+0
---
> 469 multiletter control sequences out of 15000+0
+ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi
++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi
+ diff SRCDIR/etexdir/etrip/etrip.typ euptrip.typ
9c9
-< ' TeX output 2013.11.21:1043'
+< ' TeX output 2014.01.22:1125'
---
-> ' TeX output 2013.11.21:1053'
+> ' TeX output 2014.01.22:1137'
+ :
-PASS: euptexdir/euptrip.test
+PASS: euptexdir/euptriptest
diff --git a/Build/source/texk/web2c/euptexdir/euptriptest b/Build/source/texk/web2c/euptexdir/euptriptest
index b755443084b..fbff0ce62a0 100755
--- a/Build/source/texk/web2c/euptexdir/euptriptest
+++ b/Build/source/texk/web2c/euptexdir/euptriptest
@@ -90,7 +90,7 @@ echo "*** e-TeX specific part of e-TRIP test for e-upTeX ***."
diff $etestdir/etrip.pl etrip.pl || is_OK=false
# get same filename in log
-$LN_S $eptestdir/etrip.tex .
+$LN_S $eptestdir/eptrip.tex etrip.tex
../euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot
sed "$P_SED1" etrip.log > euptripin.log || exit 1
@@ -103,7 +103,7 @@ diff $etestdir/etrip.fot euptrip.fot
# We use $DIFF instead of `diff' only for those files where there
# might actually be legitimate numerical differences.
-$DIFF $DIFFFLAGS $eptestdir/etrip.log euptrip.log
+$DIFF $DIFFFLAGS $eptestdir/eptrip.log euptrip.log
eval ../dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1
$DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ