From ce3a350555a7f3069c2715b37672f0c0d7f709fe Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 11 Mar 2012 14:02:19 +0000 Subject: remove unnecessary and seemingly wrong changes git-svn-id: svn://tug.org/texlive/trunk@25602 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/ptexdir/ptex-base.ch | 25 ++----------------------- Build/source/texk/web2c/uptexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/uptexdir/uptex-m.ch | 10 ---------- 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index d6b086c7b7a..b1aa74771b8 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-03-11 Akira Kakuto + + * ptex-base.ch: remove unnecessary and seemingly wrong changes + 2012-03-08 Akira Kakuto * ptex-base.ch: fix a long-remained bug in show_context. diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index 215fc411648..e86cba18dfd 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -1483,17 +1483,6 @@ kanji,kana,other_kchar: begin print("kanji character "); {|state| code at start of line} @z -@x [22.311] l.6986 - pTeX: label -@p procedure show_context; {prints where the scanner is} -label done; -var old_setting:0..max_selector; {saved |selector| setting} -@y -@p procedure show_context; {prints where the scanner is} -label done, done1; -var old_setting:0..max_selector; {saved |selector| setting} -@!s: pointer; {temporary pointer} -@z - @x [22.316] l.7110 - pTeX: init kcode_pos @d begin_pseudoprint== begin l:=tally; tally:=0; selector:=pseudo; @@ -1505,6 +1494,7 @@ var old_setting:0..max_selector; {saved |selector| setting} trick_count:=1000000; end @z + @x [22.316] l.7114 - pTeX: kcode_pos @d set_trick_count== begin first_count:=tally; @@ -1546,21 +1536,10 @@ 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 cur_input:=input_stack[base_ptr-1]; - s:=get_avail; info(s):=Lo(info(loc)); - cur_input:=input_stack[base_ptr]; - link(start):=s; - show_token_list(start,loc,100000); - free_avail(s);link(start):=null; - goto done1; - end; - end; + begin if (token_type=backed_up)and(loc<>null) then show_token_list(start,loc,100000); end else show_token_list(link(start),loc,100000); {avoid reference count} -done1: @z @x [24.341] l.7479 - pTeX: set last_chr diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index bb21264fef2..61522465a88 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-03-11 Akira Kakuto + + * uptex-m.ch: remove unnecessary and seemingly wrong changes + 2012-03-08 Akira Kakuto * uptex-m.ch: fix a long-remained bug in show_context. diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch index 4c68f806fcf..15a6430680f 100644 --- a/Build/source/texk/web2c/uptexdir/uptex-m.ch +++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch @@ -349,16 +349,6 @@ kcp:=trick_buf2[(p-1) mod error_line]; if ((kcp mod @'10)>0)and(nrestmultichr(kcp)>0) then p:=p-(kcp mod @'10); @z -@x - 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(info(loc)); -@y - 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):=(info(loc) mod max_char_val); -@z - @x begin cur_chr:=buffer[loc]; incr(loc); if multistrlen(ustringcast(buffer), limit+1, loc-1)=2 then -- cgit v1.2.3