diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-18 13:52:11 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-18 13:52:11 +0000 |
commit | 8ec7e9e16594cda561fc22fc6607f7cbb95d4aed (patch) | |
tree | cdfe448fee20c35d425ae90826f35ff55810f1e8 /Build/source/texk/web2c/ptexdir/ptex-base.ch | |
parent | d078252edb11572f39d434c7c97b107fdd5b8e49 (diff) |
more upTeX and e-upTeX
git-svn-id: svn://tug.org/texlive/trunk@23592 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/ptexdir/ptex-base.ch')
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ptex-base.ch | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index 010ca831e5a..74325111e22 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -46,6 +46,7 @@ % (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 +% (2011-08-18) PB Bug fix by Hironori Kitagawa. % @x [1.2] l.200 - pTeX: @d banner==TeX_banner @@ -5848,6 +5849,9 @@ function get_jfm_pos(@!kcode:KANJI_code;@!f:internal_font_number):eight_bits; var @!jc:KANJI_code; {temporary register for KANJI} @!sp,@!mp,@!ep:pointer; begin@/ +if f=null_font then + begin get_jfm_pos:=kchar_type(null_font)(0); return; + end; jc:=toDVI(kcode); sp:=1; { start position } ep:=font_num_ext[f]-1; { end position } @@ -6677,11 +6681,13 @@ main_i:=orig_char_info(main_f)(qi(0)); goto main_loop_j+3; @# main_loop_j+1: space_factor:=1000; - fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l; - link(tail):=main_p; tail:=main_p; last_jchr:=tail; - fast_get_avail(main_p); info(main_p):=KANJI(cur_chr); - link(tail):=main_p; tail:=main_p; - cx:=cur_chr; @<Insert kinsoku penalty@>; + if main_f<>null_font then + begin fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l; + link(tail):=main_p; tail:=main_p; last_jchr:=tail; + fast_get_avail(main_p); info(main_p):=KANJI(cur_chr); + link(tail):=main_p; tail:=main_p; + cx:=cur_chr; @<Insert kinsoku penalty@>; + end; ins_kp:=false; again_2: get_next; @@ -6717,7 +6723,10 @@ again_2: @# main_loop_j+3: if ins_kp=true then @<Insert |pre_break_penalty| of |cur_chr|@>; - @<Look ahead for glue or kerning@>; + if main_f<>null_font then + begin @<Look ahead for glue or kerning@>; + end + else inhibit_glue_flag:=false; if ins_kp=false then begin { Kanji -> Kanji } goto main_loop_j+1; end else if ins_kp=true then begin { Kanji -> Ascii } |