diff options
Diffstat (limited to 'Build/source/texk/web2c/eptexdir')
-rw-r--r-- | Build/source/texk/web2c/eptexdir/ChangeLog.TL | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/eptexdir/eptex.ech | 25 | ||||
-rw-r--r-- | Build/source/texk/web2c/eptexdir/eptrip.diffs | bin | 28652 -> 28324 bytes | |||
-rw-r--r-- | Build/source/texk/web2c/eptexdir/etex.ch0 | 8 |
4 files changed, 29 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL index c7a12fa4f77..b5815a4d959 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL +++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL @@ -1,6 +1,13 @@ ChangeLog.TL: TeX Live (TL) changes for e-pTeX ============================================== +2011-01-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * eptex.ech, etex.ch0: Adapt to modified ../ptexdir/ptex-base.ch. + + * eptex.ech: Make \lastnodetype consistent with e-TeX, based on + code from Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>. + 2011-01-17 Peter Breitenlohner <peb@mppmu.mpg.de> * eptex.ech: banner_k==banner for e-pTeX. diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech index 2ce1d836469..868e1b2641e 100644 --- a/Build/source/texk/web2c/eptexdir/eptex.ech +++ b/Build/source/texk/web2c/eptexdir/eptex.ech @@ -31,22 +31,25 @@ @d max_quarterword=@"FFFF {largest allowable value in a |quarterword|} @z -@x e-pTeX: node types +@x [26.424] e-pTeX: node types last_node_type_code: if (type(tail)<>math_node)or(subtype(tail)<>end_M_code) then if type(tail)<=unset_node then cur_val:=type(tail)+1 else cur_val:=unset_node+2; + end; {there are no other cases} + end @y - last_node_type_code: - if (type(tail)<>math_node)or(subtype(tail)<>end_M_code) then - if type(tail)<=unset_node then begin - if type(tail)<dir_node then cur_val:=type(tail)+1 - else if type(tail)=dir_node then cur_val:=unset_node+1 - else if type(tail)<disp_node then cur_val:=type(tail) - else if type(tail)=disp_node then cur_val:=unset_node+2 - else cur_val:=type(tail)-1; - end - else cur_val:=unset_node; + last_node_type_code: + if ((type(q)<>math_node)or(subtype(q)<>end_M_code))and(head<>tail) then + if type(q)<=unset_node then begin + if type(q)=dir_node then q:=list_ptr(q); + cur_val:=type(q); + if cur_val<dir_node then cur_val:=cur_val+1 + else if cur_val>disp_node then cur_val:=cur_val-1; + end + else cur_val:=unset_node; {\epTeX's |unset_node| is \eTeX's |unset_node+2|} + end; {there are no other cases} + end; @z @x e-pTeX: if primitives - leave room for three e-TeX codes diff --git a/Build/source/texk/web2c/eptexdir/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip.diffs Binary files differindex 51ec1726728..b2f1fec66b2 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip.diffs +++ b/Build/source/texk/web2c/eptexdir/eptrip.diffs diff --git a/Build/source/texk/web2c/eptexdir/etex.ch0 b/Build/source/texk/web2c/eptexdir/etex.ch0 index 45ccb8246c0..4b5b8365104 100644 --- a/Build/source/texk/web2c/eptexdir/etex.ch0 +++ b/Build/source/texk/web2c/eptexdir/etex.ch0 @@ -16,6 +16,14 @@ if q=null then cur_val:=0 @+else cur_val:=mem[q+m].sc; if box(cur_val)=null then cur_val:=0 @+else cur_val:=mem[box(cur_val)+m].sc; @z +@x [26.424] + else cur_val:=unset_node+2; + end; {there are no other cases} +@y + else cur_val:=unset_node+2; + end {there are no other cases} +@z + @x [27.468] @d etex_convert_base=5 {base for \eTeX's command codes} @d eTeX_revision_code=etex_convert_base {command code for \.{\\eTeXrevision}} |