summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/eptexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-15 15:38:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-15 15:38:27 +0000
commit342660cefdbcaf02dd26950cd356583679e9e95b (patch)
treeaae338457da065c51a68b2092b994c07a1e29a6b /Build/source/texk/web2c/eptexdir
parentec0b24f8e27ead959283a11b62eb9337c23327b0 (diff)
e-TeX, pTeX, e-pTeX, and trip/trap tests
git-svn-id: svn://tug.org/texlive/trunk@21078 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/eptexdir')
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog.TL4
-rw-r--r--Build/source/texk/web2c/eptexdir/am/eptex.am6
-rw-r--r--Build/source/texk/web2c/eptexdir/eptex.ech6
-rw-r--r--Build/source/texk/web2c/eptexdir/eptrip.diffsbin28591 -> 28654 bytes
-rw-r--r--Build/source/texk/web2c/eptexdir/etex.ch14
5 files changed, 15 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index fc251bc2b73..13df2a3f1dd 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: TeX Live (TL) changes for e-pTeX
==============================================
+2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/eptex.am (eptrip-clean): Use TRIPTRAP_CLEAN.
+
2011-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* eptrip.test (new): Shell script for e-pTRIP test,
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index ac658c51c25..0c69b955518 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -52,9 +52,9 @@ eptexdir/etex_version.h: etexdir/etex.ch
| sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
# Extract ptex version
-eptexdir/ptex_version.h: ptexdir/ptex-base.ch
+eptexdir/ptex_version.h: eptexdir/eptex.ech
$(MKDIR_P) eptexdir
- grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+ grep '^@d pTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
| sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate eptex.web
@@ -95,6 +95,7 @@ if EPTEX
TESTS += $(eptex_tests)
check_PROGRAMS += dvitype pltotf tftopl
TRIPTRAP += eptrip.diffs
+TRIPTRAP_CLEAN += eptrip-clean
endif EPTEX
## Test data and results
@@ -102,7 +103,6 @@ endif EPTEX
## eptexdir/eptrip.test
EXTRA_DIST += eptexdir/eptrip.diffs
.PHONY: eptrip-clean
-clean-local:: eptrip-clean
eptrip-clean:
rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi
rm -f cptripin.fot cptripin.log cptrip.fot cptrip.log cptrip.typ
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index ada966d46f8..424dfe732be 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.ech
+++ b/Build/source/texk/web2c/eptexdir/eptex.ech
@@ -8,6 +8,12 @@
\def\epTeX{$\varepsilon$-p\TeX}
@z
+@x [1.2] l.200 - pTeX:
+@d pTeX_version_string=='-p3.1.11' {current p\TeX\ version}
+@y
+@d pTeX_version_string=='-p3.1.11-110102' {current \epTeX\ version}
+@z
+
@x e-pTeX: banner
{printed when p\TeX\ starts}
@y
diff --git a/Build/source/texk/web2c/eptexdir/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip.diffs
index 63b01ff8062..0ac4fb35ff3 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip.diffs
+++ b/Build/source/texk/web2c/eptexdir/eptrip.diffs
Binary files differ
diff --git a/Build/source/texk/web2c/eptexdir/etex.ch1 b/Build/source/texk/web2c/eptexdir/etex.ch1
index 0145dd260da..a722016c77e 100644
--- a/Build/source/texk/web2c/eptexdir/etex.ch1
+++ b/Build/source/texk/web2c/eptexdir/etex.ch1
@@ -33,14 +33,14 @@
@x [26.420]
if box(cur_val)=null then cur_val:=0
else
- begin q:=box(cur_val);
+ begin q:=box(cur_val);
while (q<>null)and(box_dir(q)<>abs(direction)) do q:=link(q);
if q=null then
begin q:=new_dir_node(box(cur_val),abs(direction));
@y
if q=null then cur_val:=0
else
- begin qx:=q;
+ begin qx:=q;
while (q<>null)and(box_dir(q)<>abs(direction)) do q:=link(q);
if q=null then
begin q:=new_dir_node(qx,abs(direction));