e-(u)pTeX bug fix from Hironori Kitagawa

git-svn-id: svn://tug.org/texlive/trunk@23688 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 24 insertions, 14 deletions

diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index 1df293c25e5..3e85b5e7768 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-25  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
+
+	* eptex.ech (just_copy): Copy the additional pTeX fields.
+
 2011-08-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Renamed ChangeLog => Changes.txt, ChangeLog.TL => ChangeLog.
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index 30d687672be..3255a77e2b3 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.ech
+++ b/Build/source/texk/web2c/eptexdir/eptex.ech
@@ -13,7 +13,7 @@
 @y
 @d eTeX_version_string=='-2.3' {current \eTeX\ version}
 @#
-@d epTeX_version_string=='-110415'
+@d epTeX_version_string=='-110825'
 @z
 
 @x e-pTeX: banner
@@ -293,6 +293,19 @@ disp_node: begin
 othercases goto next_p
 @z
 
+@x e-pTeX: just_copy
+  hlist_node,vlist_node: begin r:=get_node(box_node_size);
+@y
+  dir_node,
+  hlist_node,vlist_node: begin r:=get_node(box_node_size);
+@z
+@x e-pTeX: just_copy
+    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+@y
+    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+    add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+@z
+
 @x e-pTeX: ifcsname l.28620
   buffer[m]:=info(p) mod @'400; incr(m); p:=link(p);
 @y
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index 4e9d98b8497..83dc1a8e1a8 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* synctex-e-rec.ch0: Shorten a change set to simplify e-pTeX.
+
 2011-08-22  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* synctex-luatex.h, synctex-xetex.h: Define SYNCTEX_CURH and
@@ -15,7 +19,6 @@
 	* synctex-ep-rec.ch1 (removed): ... this file.
 	Mail from Akira, Sat, 23 Jul 2011 23:02:45.
 
-
 2011-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	SyncTeX infrastructure for pTeX and e-pTeX.
diff --git a/Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0 b/Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0
index 9229ac910ab..d0553ccbbaf 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0
+++ b/Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0
@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
 
@@ -82,21 +82,11 @@ MISSING IMPLEMENTATION: 0 synctag for medium sized node at mem[p]
 link(prev_p):=p;
 @z
 
-@x etex.ch l.4126
-  if is_char_node(p) then r:=get_avail
-  else case type(p) of
+@x etex.ch l.4186
   hlist_node,vlist_node: begin r:=get_node(box_node_size);
-    mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
-    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-    end;
 @y
-  if is_char_node(p) then r:=get_avail
-  else case type(p) of
   hlist_node,vlist_node: begin r:=get_node(box_node_size);
     @<Copy the box {\sl Sync\TeX} information@>;
-    mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
-    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-    end;
 @z
 
 @x synctex-e-mem.ch0 l.100