diff options
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/eptex.ech | 23 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/eptex_version.h | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/euptexdir/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/euptexdir/euptex.ch1 | 9 |
5 files changed, 29 insertions, 14 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 4cb68dd7407..154737e3a34 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-11-19 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> + + * eptex.ech: Fix a bug introduced in the primitive \lastnodechar. + * eptex_version.h: Change version to 141119. + 2014-11-09 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * eptex.ech: Improve the new primitive \lastnodechar. diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech index fc71a4a42a1..3cf81163cb0 100644 --- a/Build/source/texk/web2c/eptexdir/eptex.ech +++ b/Build/source/texk/web2c/eptexdir/eptex.ech @@ -19,7 +19,7 @@ @y @d eTeX_version_string=='-2.6' {current \eTeX\ version} @# -@d epTeX_version_string=='-141109' +@d epTeX_version_string=='-141119' @z @x e-pTeX: banner @@ -125,13 +125,18 @@ else if (type(tx)=kern_node) and (subtype(tx)=normal) then if ((type(r)=penalty_node) and (subtype(r)=kinsoku_pena)) then tx:=last_jchr else tx:=r; end; if not is_char_node(tx) then - if type(tx)=ligature_node then cur_val:=character(lig_char(tx)) else cur_val:=-1 -else if font_dir[font(tx)]<>dir_default then cur_val:=info(link(tx)) -else cur_val:=character(tx); + begin if type(tx)=ligature_node then + begin r:=lig_ptr(tx); + while link(r)<>null do r:=link(r); + cur_val:=qo(character(r)); + end + end +else if font_dir[font(tx)]<>dir_default then cur_val:=KANJI(info(link(tx))) +else cur_val:=qo(character(tx)); end @z -@x +@x [26.424] e-pTeX: node char if cur_chr=last_node_type_code then begin cur_val_level:=int_val; if (tx=head)or(mode=0) then cur_val:=-1; @@ -143,12 +148,12 @@ end if (tx=head)or(mode=0) then cur_val:=-1; end else if cur_chr=last_node_char_code then - begin cur_val_level:=int_val; - if (tx=head)or(mode=0) then cur_val:=-1 - else if font_dir[font(tx)]<>dir_default then cur_val:=info(link(tx)) - else cur_val:=character(tx) + begin cur_val_level:=int_val; cur_val:=-1; end else cur_val_level:=cur_chr; + if (cur_chr=last_node_char_code)and(is_char_node(tx))and(tx<>head) then + begin if font_dir[font(tx)]<>dir_default then cur_val:=KANJI(info(link(tx))) + else cur_val:=qo(character(tx)); end; @z @x [26.424] e-pTeX: node types diff --git a/Build/source/texk/web2c/eptexdir/eptex_version.h b/Build/source/texk/web2c/eptexdir/eptex_version.h index d476b1afa7e..481adfd64c6 100644 --- a/Build/source/texk/web2c/eptexdir/eptex_version.h +++ b/Build/source/texk/web2c/eptexdir/eptex_version.h @@ -1 +1 @@ -#define EPTEX_VERSION "141109" +#define EPTEX_VERSION "141119" diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 9ffbaca5d3a..f3321ea24d5 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-11-19 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> + + * euptex.ch1: Fix a bug introduced in the primitive \lastnodechar. + 2014-11-09 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * euptex.ch1: Improve the new primitive \lastnodechar. diff --git a/Build/source/texk/web2c/euptexdir/euptex.ch1 b/Build/source/texk/web2c/euptexdir/euptex.ch1 index 9330be8ff54..14550ad64c5 100644 --- a/Build/source/texk/web2c/euptexdir/euptex.ch1 +++ b/Build/source/texk/web2c/euptexdir/euptex.ch1 @@ -7,15 +7,16 @@ @z @x -else if font_dir[font(tx)]<>dir_default then cur_val:=info(link(tx)) +else if font_dir[font(tx)]<>dir_default then cur_val:=KANJI(info(link(tx))) @y -else if font_dir[font(tx)]<>dir_default then cur_val:=info(link(tx)) mod max_cjk_val +else if font_dir[font(tx)]<>dir_default then cur_val:=KANJI(info(link(tx))) mod max_cjk_val @z @x - else if font_dir[font(tx)]<>dir_default then cur_val:=info(link(tx)) + begin if font_dir[font(tx)]<>dir_default then cur_val:=KANJI(info(link(tx))) @y - else if font_dir[font(tx)]<>dir_default then cur_val:=info(link(tx)) mod max_cjk_val + begin if font_dir[font(tx)]<>dir_default then cur_val:=KANJI(info(link(tx))) mod max_cjk_val + {it seems that |mod max_cjk_val| is not necessary in the above line, but why?} @z @x e-pTeX: ifcsname l.28620 |