summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog.TL4
-rw-r--r--Build/source/texk/web2c/eptexdir/eptex.ech4
-rw-r--r--Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffsbin25389 -> 25380 bytes
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.diffs36
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex-base.ch31
-rw-r--r--Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffsbin9549 -> 9508 bytes
-rw-r--r--Build/source/texk/web2c/triptrap/mftrap.diffs12
-rw-r--r--Build/source/texk/web2c/triptrap/trip.diffs12
9 files changed, 67 insertions, 37 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index 75ae3ddb88b..c6c972c5358 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-04-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * eptex.ech: Adapted to pTeX Version p3.2.
+
2011-04-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* eptrip/etrip.tex, eptrip/etrip.log, eptrip/eptrip.diffs:
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index 63e799bf088..e11b01f2e42 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.ech
+++ b/Build/source/texk/web2c/eptexdir/eptex.ech
@@ -9,9 +9,9 @@
@z
@x [1.2] l.200 - pTeX:
-@d pTeX_version_string=='-p3.1.11' {current p\TeX\ version}
+@d pTeX_version_string=='-p3.2' {current p\TeX\ version}
@y
-@d pTeX_version_string=='-p3.1.11-110315' {current \epTeX\ version}
+@d pTeX_version_string=='-p3.2-110415' {current \epTeX\ version}
@z
@x e-pTeX: banner
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
index 0a0099d2707..87e97a7b5ce 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
+++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
Binary files differ
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
index 8e1ae9e6f86..44b152a91e3 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
@@ -12,7 +12,7 @@
1c1
< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23
---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 13:29
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (INITEX) 15 APR 2011 13:04
3c3
< (trip.tex
---
@@ -23,8 +23,8 @@
< 471 memory locations dumped; current usage is 96&278
< 341 multiletter control sequences
---
-> (format=trip 2011.4.7)
-> 1489 strings of total length 26178
+> (format=trip 2011.4.15)
+> 1489 strings of total length 26179
> 479 memory locations dumped; current usage is 104&278
> 342 multiletter control sequences
461c461
@@ -39,7 +39,7 @@
< ** &trip trip
< (trip.tex ##
---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011)
> **(./trip.tex ##
17c16
< Memory usage before: 159&313; after: 102&278; still untouched: 1613
@@ -53,7 +53,7 @@
1c1
< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23
---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=trip 2011.4.7) 7 APR 2011 13:29
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (format=trip 2011.4.15) 15 APR 2011 13:04
3c3
< (trip.tex ##
---
@@ -174,7 +174,7 @@
< 372 multiletter control sequences out of 2100
---
> 44 strings out of 1811
-> 261 string characters out of 7822
+> 261 string characters out of 7821
> 3821 words of memory out of 3999
> 373 multiletter control sequences out of 15000+0
7301c7305
@@ -187,11 +187,11 @@
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (TeX Live 2011/dev)
+> This is DVItype, Version 3.6 (TeX Live 2011)
9c9
< ' TeX output 2008.03.15:0223'
---
-> ' TeX output 2011.04.07:1329'
+> ' TeX output 2011.04.15:1304'
419c419
< 1121: down4 639342208
---
@@ -340,28 +340,38 @@
1c1
< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 11:46
---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 13:29
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (INITEX) 15 APR 2011 13:04
+26,27c26,27
+< (format=etrip 2011.4.7)
+< 1490 strings of total length 26209
+---
+> (format=etrip 2011.4.15)
+> 1490 strings of total length 26210
+ ./etex --progname=etex
+ diff SRCDIR/etexdir/etrip/etrip.fot etrip.fot
1c1
< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011)
+ diff SRCDIR/etexdir/etrip/etrip.log etrip.log
1c1
< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46
---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 13:29
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (format=etrip 2011.4.15) 15 APR 2011 13:04
+4276c4276
+< 140 string characters out of 7791
+---
+> 140 string characters out of 7790
+ 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 etrip.typ
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (TeX Live 2011/dev)
+> This is DVItype, Version 3.6 (TeX Live 2011)
9c9
< ' TeX output 2011.04.07:1213'
---
-> ' TeX output 2011.04.07:1329'
+> ' TeX output 2011.04.15:1304'
+ :
PASS: etexdir/etrip.test
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index eea14d372b3..5dd7bb4cefb 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ptex-base.ch: Add \ifdbox and \ifddir,
+ (pTeX_version_string) Version p3.2.
+
2011-03-31 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* ptex-base.ch: TeX formatting.
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index 74ffabac810..ca0028a7cd8 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -1,4 +1,4 @@
-% This is a change file for pTeX 3.1.11
+% This is a change file for pTeX 3.2
% By Sadayuki Tanaka and ASCII MEDIA WORKS.
%
% Thanks for :
@@ -45,12 +45,13 @@
% (05/23/2010) AK Bug fix by Hironori Kitagawa.
% (31/12/2010) AK Bug fix and accent Kanji by Hironori Kitagawa.
% (19/01/2011) PB Let \lastkern etc act through disp node.
+% (15/04/2011) PB pTeX p3.2 Add \ifdbox and \ifddir
%
@x [1.2] l.200 - pTeX:
@d banner==TeX_banner
@d banner_k==TeX_banner_k
@y
-@d pTeX_version_string=='-p3.1.11' {current p\TeX\ version}
+@d pTeX_version_string=='-p3.2' {current p\TeX\ version}
@#
@d pTeX_banner=='This is pTeX, Version 3.1415926',pTeX_version_string
@d pTeX_banner_k==pTeX_banner
@@ -2262,19 +2263,21 @@ string_code:if cur_cs<>0 then sprint_cs(cur_cs)
else print_kanji(cx);
@z
-@x [28.487] l.9852 - pTeX: iftdir, ifydir, iftbox, ifybox
+@x [28.487] l.9852 - pTeX: iftdir, ifydir, ifddir, iftbox, ifybox, ifdbox
@d if_case_code=16 { `\.{\\ifcase}' }
@y
@d if_case_code=16 { `\.{\\ifcase}' }
@#
@d if_tdir_code=if_case_code+1 { `\.{\\iftdir}' }
@d if_ydir_code=if_tdir_code+1 { `\.{\\ifydir}' }
-@d if_mdir_code=if_ydir_code+1 { `\.{\\ifmdir}' }
+@d if_ddir_code=if_ydir_code+1 { `\.{\\ifddir}' }
+@d if_mdir_code=if_ddir_code+1 { `\.{\\ifmdir}' }
@d if_tbox_code=if_mdir_code+1 { `\.{\\iftbox}' }
@d if_ybox_code=if_tbox_code+1 { `\.{\\ifybox}' }
+@d if_dbox_code=if_ybox_code+1 { `\.{\\ifdbox}' }
@z
-@x [28.487] l.9887 - pTeX: iftdir, ifydir, iftbox, ifybox
+@x [28.487] l.9887 - pTeX: iftdir, ifydir, ifddir, iftbox, ifybox, ifdbox
primitive("ifcase",if_test,if_case_code);
@!@:if_case_}{\.{\\ifcase} primitive@>
@y
@@ -2284,36 +2287,43 @@ primitive("iftdir",if_test,if_tdir_code);
@!@:if_tdir_}{\.{\\iftdir} primitive@>
primitive("ifydir",if_test,if_ydir_code);
@!@:if_ydir_}{\.{\\ifydir} primitive@>
+primitive("ifddir",if_test,if_ddir_code);
+@!@:if_ddir_}{\.{\\ifddir} primitive@>
primitive("ifmdir",if_test,if_mdir_code);
@!@:if_mdir_}{\.{\\ifmdir} primitive@>
primitive("iftbox",if_test,if_tbox_code);
@!@:if_tbox_}{\.{\\iftbox} primitive@>
primitive("ifybox",if_test,if_ybox_code);
@!@:if_ybox_}{\.{\\ifybox} primitive@>
+primitive("ifdbox",if_test,if_dbox_code);
+@!@:if_dbox_}{\.{\\ifdbox} primitive@>
@z
-@x [28.488] l.9907 - pTeX: iftdir, ifydir, iftbox, ifybox
+@x [28.488] l.9907 - pTeX: iftdir, ifydir, ifddir, iftbox, ifybox, ifdbox
if_case_code:print_esc("ifcase");
@y
if_case_code:print_esc("ifcase");
if_tdir_code:print_esc("iftdir");
if_ydir_code:print_esc("ifydir");
+ if_ddir_code:print_esc("ifddir");
if_mdir_code:print_esc("ifmdir");
if_tbox_code:print_esc("iftbox");
if_ybox_code:print_esc("ifybox");
+ if_dbox_code:print_esc("ifdbox");
@z
-@x [28.501] l.10073 - pTeX: iftdir, ifydir, iftbox, ifybox
+@x [28.501] l.10073 - pTeX: iftdir, ifydir, ifddir, iftbox, ifybox, ifdbox
if_void_code, if_hbox_code, if_vbox_code: @<Test box register status@>;
@y
if_tdir_code: b:=(abs(direction)=dir_tate);
if_ydir_code: b:=(abs(direction)=dir_yoko);
+if_ddir_code: b:=(abs(direction)=dir_dtou);
if_mdir_code: b:=(direction<0);
-if_void_code, if_hbox_code, if_vbox_code, if_tbox_code, if_ybox_code:
+if_void_code, if_hbox_code, if_vbox_code, if_tbox_code, if_ybox_code, if_dbox_code:
@<Test box register status@>;
@z
-@x [28.505] l.10118 - pTeX: Test box register status : iftbox, ifybox
+@x [28.505] l.10118 - pTeX: Test box register status : iftbox, ifybox, ifdbox
if this_if=if_void_code then b:=(p=null)
else if p=null then b:=false
else if this_if=if_hbox_code then b:=(type(p)=hlist_node)
@@ -2326,7 +2336,8 @@ else begin
if this_if=if_hbox_code then b:=(type(p)=hlist_node)
else if this_if=if_vbox_code then b:=(type(p)=vlist_node)
else if this_if=if_tbox_code then b:=(box_dir(p)=dir_tate)
- else b:=(box_dir(p)=dir_yoko);
+ else if this_if=if_ybox_code then b:=(box_dir(p)=dir_yoko)
+ else b:=(box_dir(p)=dir_dtou);
end
@z
diff --git a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs
index ef9bcfc6d7c..24e5e68344b 100644
--- a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs
+++ b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs
Binary files differ
diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs
index eced3f7f277..eabce33a605 100644
--- a/Build/source/texk/web2c/triptrap/mftrap.diffs
+++ b/Build/source/texk/web2c/triptrap/mftrap.diffs
@@ -7,7 +7,7 @@
1c1
< This is METAFONT, Version 2.718281 (INIMF) 15 MAR 2008 02:23
---
-> This is METAFONT, Version 2.718281 (TeX Live 2010/pretest) (INIMF) 18 MAY 2010 13:31
+> This is METAFONT, Version 2.718281 (TeX Live 2011) (INIMF) 15 APR 2011 13:04
150c150
< String usage 26&83 (891&11438 still untouched)
---
@@ -16,7 +16,7 @@
< (preloaded base=trap 2008.3.15)
< 1117 strings of total length 20614
---
-> (base=trap 2010.5.18)
+> (base=trap 2011.4.15)
> 1122 strings of total length 20566
+ ./mf --progname=inimf
+ mv trap.log mftrap.log
@@ -27,7 +27,7 @@
< ** &trap trap
< (trap.mf
---
-> This is METAFONT, Version 2.718281 (TeX Live 2010/pretest) (INIMF)
+> This is METAFONT, Version 2.718281 (TeX Live 2011) (INIMF)
> **(trap.mf
39c38
< String usage 41&161 (815&7634 still untouched)
@@ -37,7 +37,7 @@
1c1
< This is METAFONT, Version 2.718281 (preloaded base=trap 2008.3.15) 15 MAR 2008 02:23
---
-> This is METAFONT, Version 2.718281 (TeX Live 2010/pretest) (base=trap 2010.5.18) 18 MAY 2010 13:31
+> This is METAFONT, Version 2.718281 (TeX Live 2011) (base=trap 2011.4.15) 15 APR 2011 13:04
1825c1825
< String usage 24&92 (858&11309 still untouched)
---
@@ -69,10 +69,10 @@
1c1
< This is GFtype, Version 3.1
---
-> This is GFtype, Version 3.1 (TeX Live 2010/pretest)
+> This is GFtype, Version 3.1 (TeX Live 2011)
3c3
< ' METAFONT output 2008.03.15:0223'
---
-> ' METAFONT output 2010.05.18:1331'
+> ' METAFONT output 2011.04.15:1304'
+ exit 0
PASS: trap.test
diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs
index f47446e97e8..52d10c9c2a0 100644
--- a/Build/source/texk/web2c/triptrap/trip.diffs
+++ b/Build/source/texk/web2c/triptrap/trip.diffs
@@ -10,7 +10,7 @@
1c1
< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23
---
-> This is TeX, Version 3.1415926 (TeX Live 2010/pretest) (INITEX) 18 MAY 2010 13:31
+> This is TeX, Version 3.1415926 (TeX Live 2011) (INITEX) 15 APR 2011 13:03
3c3
< (trip.tex
---
@@ -19,7 +19,7 @@
< (preloaded format=trip 2008.3.15)
< 1326 strings of total length 23646
---
-> (format=trip 2010.5.18)
+> (format=trip 2011.4.15)
> 1370 strings of total length 24558
461c461
< Hyphenation trie of length 273 has 9 ops out of 500
@@ -32,13 +32,13 @@
< ** &trip trip
< (trip.tex ##
---
-> This is TeX, Version 3.1415926 (TeX Live 2010/pretest)
+> This is TeX, Version 3.1415926 (TeX Live 2011)
> **(./trip.tex ##
+ diff SRCDIR/triptrap/trip.log trip.log
1c1
< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23
---
-> This is TeX, Version 3.1415926 (TeX Live 2010/pretest) (format=trip 2010.5.18) 18 MAY 2010 13:31
+> This is TeX, Version 3.1415926 (TeX Live 2011) (format=trip 2011.4.15) 15 APR 2011 13:03
3c3
< (trip.tex ##
---
@@ -108,11 +108,11 @@
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (TeX Live 2010/pretest)
+> This is DVItype, Version 3.6 (TeX Live 2011)
9c9
< ' TeX output 2008.03.15:0223'
---
-> ' TeX output 2010.05.18:1331'
+> ' TeX output 2011.04.15:1303'
419c419
< 1121: down4 639342208
---
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 00:21:18 +0000