summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-12-10 08:12:28 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-12-10 08:12:28 +0000
commitdb2683e88ae12a32ad6620b4e40218761ea14f41 (patch)
tree30e7a9ac9e9606a8bd035659cff24af887044191
parent16c62d985823b7f0a91fb01dfaae6f112aa986c6 (diff)
web2c/eptexdir: Fix bugs in \fontcharwd etc. (H. Kitagawa)
git-svn-id: svn://tug.org/texlive/trunk@35778 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/eptexdir/eptex.ech35
-rw-r--r--Build/source/texk/web2c/eptexdir/eptex_version.h2
3 files changed, 40 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index 154737e3a34..9ac1f64f20a 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-10 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * eptex.ech: Fix bugs in \fontcharwd etc.
+ * eptex_version.h: Change version to 141210.
+
2014-11-19 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* eptex.ech: Fix a bug introduced in the primitive \lastnodechar.
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index 07d81b821e2..96d12f9154d 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=='-141119'
+@d epTeX_version_string=='-141210'
@z
@x e-pTeX: banner
@@ -322,9 +322,42 @@ last_node_type_code: print_esc("lastnodetype");
last_node_char_code: print_esc("lastnodechar");
@z
@x e-pTeX: font_char_{wd,ht,dp,ic}_code l.27306
+ if (font_bc[q]<=cur_val)and(font_ec[q]>=cur_val) then
begin i:=char_info(q)(qi(cur_val));
+ case m of
+ font_char_wd_code: cur_val:=char_width(q)(i);
+ font_char_ht_code: cur_val:=char_height(q)(height_depth(i));
+ font_char_dp_code: cur_val:=char_depth(q)(height_depth(i));
+ font_char_ic_code: cur_val:=char_italic(q)(i);
+ end; {there are no other cases}
+ end
+ else cur_val:=0;
+ end;
@y
+ if font_dir[q]<>dir_default then {Japanese font}
+ begin if cur_val>=256 then {Japanese Character}
+ begin cur_val:=get_jfm_pos(KANJI(cur_val),q);
+ i:=orig_char_info(q)(qi(cur_val));
+ case m of
+ font_char_wd_code: cur_val:=char_width(q)(i);
+ font_char_ht_code: cur_val:=char_height(q)(height_depth(i));
+ font_char_dp_code: cur_val:=char_depth(q)(height_depth(i));
+ font_char_ic_code: cur_val:=char_italic(q)(i);
+ end; {there are no other cases}
+ end
+ else cur_val:=0;
+ end
+ else if (font_bc[q]<=cur_val)and(font_ec[q]>=cur_val) then
begin i:=orig_char_info(q)(qi(cur_val));
+ case m of
+ font_char_wd_code: cur_val:=char_width(q)(i);
+ font_char_ht_code: cur_val:=char_height(q)(height_depth(i));
+ font_char_dp_code: cur_val:=char_depth(q)(height_depth(i));
+ font_char_ic_code: cur_val:=char_italic(q)(i);
+ end; {there are no other cases}
+ end
+ else cur_val:=0;
+ end;
@z
@x e-pTeX: displacement value when typesetting right-to-left l.27798
diff --git a/Build/source/texk/web2c/eptexdir/eptex_version.h b/Build/source/texk/web2c/eptexdir/eptex_version.h
index 481adfd64c6..abf14fd3be5 100644
--- a/Build/source/texk/web2c/eptexdir/eptex_version.h
+++ b/Build/source/texk/web2c/eptexdir/eptex_version.h
@@ -1 +1 @@
-#define EPTEX_VERSION "141119"
+#define EPTEX_VERSION "141210"