diff options
author | Karl Berry <karl@freefriends.org> | 2024-06-03 22:45:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-06-03 22:45:54 +0000 |
commit | 20764b4f139f332a640d0d75fc4597cbd18c9603 (patch) | |
tree | 7a9b3e50131066640c101e8921fd59b4a0e4dcdb | |
parent | 5192e50f4d1b99e5eb23807287b7229082668231 (diff) |
do not check for \outer validity unless OK_to_interrupt
git-svn-id: svn://tug.org/texlive/trunk@71418 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/euptexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/euptexdir/suppresserrors.ch | 23 | ||||
-rw-r--r-- | Build/source/texk/web2c/tex.ch | 8 |
4 files changed, 35 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 924d6e8df89..8607058f7f9 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,12 @@ +2024-06-03 David Fuchs <drfuchs@yahoo.com> + + * tex.ch (check_outer_validity): don't check unless OK_to_interrupt, + to avoid getting into an erroneous state if an \outer token + is deleted interactively. + Report from Tyge Thiessen: + https://tug.org/pipermail/tex-k/2024-March/004021.html + DEK bug entry: https://tug.org/texmfbug/newbug.html#B142outer + 2024-06-03 Karl Berry <karl@freefriends.org> * tests/fix-changefile-lines.py: new script from Tyge Thiessen diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 34397d189d0..364b5fb5956 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,9 @@ +2024-06-03 Karl Berry <karl@freefriends.org> + + * suppresserrors.ch (check_outer_validity): comment out hunk + for this procedure adding a check for "suppress_outer_error=0", to + avoid conflict with new change in tex.ch at the same place. + 2024-05-18 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * euptex-ctrlsym.test, tests/ctrlsym.{tex,log}, diff --git a/Build/source/texk/web2c/euptexdir/suppresserrors.ch b/Build/source/texk/web2c/euptexdir/suppresserrors.ch index 07049dd3533..eda54b0b93b 100644 --- a/Build/source/texk/web2c/euptexdir/suppresserrors.ch +++ b/Build/source/texk/web2c/euptexdir/suppresserrors.ch @@ -26,17 +26,18 @@ @d suppress_mathpar_error==int_par(suppress_mathpar_error_code) @z -@x {Perhaps this change hunk is not needed} -@p procedure check_outer_validity; -var p:pointer; {points to inserted token list} -@!q:pointer; {auxiliary pointer} -begin if scanner_status<>normal then -@y -@p procedure check_outer_validity; -var p:pointer; {points to inserted token list} -@!q:pointer; {auxiliary pointer} -begin if suppress_outer_error=0 then if scanner_status<>normal then -@z +% As of June 2024, this hunk conflicts with a new change in tex.ch. +%@x {Perhaps this change hunk is not needed} +%@p procedure check_outer_validity; +%var p:pointer; {points to inserted token list} +%@!q:pointer; {auxiliary pointer} +%begin if scanner_status<>normal then +%@y +%@p procedure check_outer_validity; +%var p:pointer; {points to inserted token list} +%@!q:pointer; {auxiliary pointer} +%begin if suppress_outer_error=0 then if scanner_status<>normal then +%@z @x @<Finish line, emit a \.{\\par}@> if cur_cmd>=outer_call then check_outer_validity; diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch index 3c2642e6726..9f5fe14d668 100644 --- a/Build/source/texk/web2c/tex.ch +++ b/Build/source/texk/web2c/tex.ch @@ -1501,6 +1501,14 @@ begin input_ptr:=0; max_in_stack:=0; source_filename_stack[0]:=0;full_source_filename_stack[0]:=0; @z +% Original report: https://tug.org/pipermail/tex-k/2024-March/004021.html +% TeX bug entry: https://tug.org/texmfbug/newbug.html#B142outer +@x [24.336] l.7152 - allow interactive deletion of \outer token +begin if scanner_status<>normal then +@y +begin if OK_to_interrupt and(scanner_status<>normal) then +@z + @x [24.338] l.7191 - i18n fix print(" while scanning "); @y |