From 06404536f9517619e263d461c86e7088a1b66a23 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Mon, 11 Sep 2017 07:17:29 +0900 Subject: [PATCH] simplified code --- source/texk/web2c/ptexdir/ptex-base.ch | 20 +++++++------------ .../web2c/ptexdir/tests/kinsoku_table.tex | 2 -- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/source/texk/web2c/ptexdir/ptex-base.ch b/source/texk/web2c/ptexdir/ptex-base.ch index d341cd040..57ef1bc3d 100644 --- a/source/texk/web2c/ptexdir/ptex-base.ch +++ b/source/texk/web2c/ptexdir/ptex-base.ch @@ -6295,13 +6295,10 @@ if is_char_kanji(n) then if (j<>no_entry)and(cur_val>inhibit_after)and(global or cur_level=level_one) then begin n:=0; cur_val:=0 end { remove the entry from inhibit table } - else if j=no_entry then begin - if (cur_val<=inhibit_after) and not(cur_level=level_one or not global) then - begin print_err("Inhibit table is full!!"); - help1("I'm skipping this control sequences.");@/ - error; end; - return; - end; + else if j=no_entry then + begin print_err("Inhibit table is full!!"); + help1("I'm skipping this control sequences.");@/ + error; return; end; define(inhibit_xsp_code_base+j,cur_val,n); end else @@ -6375,12 +6372,9 @@ if is_char_ascii(n) or is_char_kanji(n) then define(kinsoku_base+j,0,0) { remove the entry from KINSOKU table } else begin if j=no_entry then begin - if (cur_val<>0) and not(cur_level=level_one or not global) then - begin print_err("KINSOKU table is full!!"); - help1("I'm skipping this control sequences.");@/ - error; end; - return; - end; + print_err("KINSOKU table is full!!"); + help1("I'm skipping this control sequences.");@/ + error; return; end; if (p=pre_break_penalty_code)or(p=post_break_penalty_code) then begin define(kinsoku_base+j,p,tokanji(n)); word_define(kinsoku_penalty_base+j,cur_val); diff --git a/source/texk/web2c/ptexdir/tests/kinsoku_table.tex b/source/texk/web2c/ptexdir/tests/kinsoku_table.tex index d5f7c007e..bece61cd0 100644 --- a/source/texk/web2c/ptexdir/tests/kinsoku_table.tex +++ b/source/texk/web2c/ptexdir/tests/kinsoku_table.tex @@ -16,7 +16,6 @@ \message{<\the\prebreakpenalty"3001, \the\prebreakpenalty"4000>}% 2, D { \prebreakpenalty"3001=\dflt\relax - \prebreakpenalty"5000=\dflt\relax % no error \global\prebreakpenalty"4000=1\relax% error \message{<\the\prebreakpenalty"3001, \the\prebreakpenalty"4000>}% D, D } @@ -38,7 +37,6 @@ \prebreakpenalty"4000=\dflt\relax \prebreakpenalty"3549=1\relax% no error -\prebreakpenalty"3548=\dflt\relax% no error \message{<\the\prebreakpenalty"3001, \the\prebreakpenalty"4000, \the\prebreakpenalty"3549>}% D, D, 1