From e197848863027c2230d6210dc74dede87da4e9df Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 31 Mar 2011 13:00:41 +0000 Subject: Bug fix and TeX formatting from Hironori Kitagawa git-svn-id: svn://tug.org/texlive/trunk@21902 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/ptexdir/ptex-base.ch | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'Build/source/texk/web2c/ptexdir') diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 117b026eb5a..eea14d372b3 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-03-31 Hironori Kitagawa + + * ptex-base.ch: TeX formatting. + 2011-03-30 Peter Breitenlohner * ptex-base.ch: Handle disp_node from discretionary. diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index 8e1a633185d..74ffabac810 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -1184,7 +1184,7 @@ for k:="A" to "Z" do @+@t\1@>for k:=3 to 6 do kcat_code(@"20+k):=kana; {3 ku ... 6 ku} @+@t\1@>for k:=7 to 8 do kcat_code(@"20+k):=other_kchar; {7 ku ... 8 ku} @+@t\1@>for k:=16 to 84 do kcat_code(@"20+k):=kanji; {16 ku ... 84 ku} -{ @"20+k = kcatcodekey(fromKUTEN(HILO(k,1)) } +{ $\.{@@"20}+|k| = |kcatcodekey|(|fromKUTEN|(|HILO|(k,1))$ } @z @x [17.236] l.5092 - pTeX: cur_jfam_code, jchr_widow_penalty @@ -1390,9 +1390,9 @@ if (pmem_end) then begin print_esc("CLOBBERED."); return; @.CLOBBERED@> end; -if info(p)>=cs_token_flag then print_cs(info(p)-cs_token_flag) {wchar_token} +if info(p)>=cs_token_flag then print_cs(info(p)-cs_token_flag) {|wchar_token|} else begin - if check_kanji(info(p)) then {wchar_token} + if check_kanji(info(p)) then {|wchar_token|} begin m:=kcat_code(kcatcodekey(info(p))); c:=info(p); end else begin m:=Hi(info(p)); c:=Lo(info(p)); @@ -1511,7 +1511,7 @@ else show_token_list(link(start),loc,100000) {avoid reference count} begin_pseudoprint; if token_typenull) then - begin if (link(start)=null)and(check_kanji(info(start))) then {wchar_token} + begin if (link(start)=null)and(check_kanji(info(start))) then {|wchar_token|} begin cur_input:=input_stack[base_ptr-1]; s:=get_avail; info(s):=Lo(buffer[loc]); cur_input:=input_stack[base_ptr]; @@ -1795,7 +1795,7 @@ if loc<>null then {list not exhausted} @ else check_outer_validity; end - else if check_kanji(t) then {wchar_token} + else if check_kanji(t) then {|wchar_token|} begin cur_chr:=t; cur_cmd:=kcat_code(kcatcodekey(t)); end else @@ -1825,7 +1825,7 @@ end; begin no_new_control_sequence:=false; get_next; no_new_control_sequence:=true; @^inner loop@> if cur_cs=0 then - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {wchar_token} + if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {|wchar_token|} cur_tok:=cur_chr else cur_tok:=(cur_cmd*@'400)+cur_chr else cur_tok:=cs_token_flag+cur_cs; @@ -1854,7 +1854,7 @@ while p<>null do overflow("buffer size",buf_size); @:TeX capacity exceeded buffer size}{\quad buffer size@> end; - if check_kanji(info(p)) then {wchar_token} + if check_kanji(info(p)) then {|wchar_token|} begin buffer[j]:=Hi(info(p)); incr(j); end; buffer[j]:=Lo(info(p)); incr(j); p:=link(p); @@ -2062,7 +2062,7 @@ end; @y procedure scan_char_num; begin scan_int; -if not is_char_ascii(cur_val)and not check_kanji(cur_val) then {wchar_token} +if not is_char_ascii(cur_val)and not check_kanji(cur_val) then {|wchar_token|} begin print_err("Bad character code"); @.Bad character code@> help2("A character number must be between 0 and 255, or KANJI code.")@/ @@ -2096,7 +2096,7 @@ end @= begin get_token; {suppress macro expansion} if cur_tok Kanji } goto main_loop_j+1; end else if ins_kp=true then begin { Kanji -> Ascii } - {@;} + {@@;} ins_kp:=false; goto main_loop; end else begin { Kanji -> cs } - {@;} + {@@;} goto reswitch; end; -- cgit v1.2.3