From 03ab4b0913a6d5174c7272b606c1cc9c26410f22 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Thu, 6 Apr 2017 12:28:01 +0000 Subject: ptexdir: sync with the repository by Japanese TeX Development Community git-svn-id: svn://tug.org/texlive/trunk@43707 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ptexdir/ChangeLog | 6 ++++++ Build/source/texk/web2c/ptexdir/ptex-base.ch | 4 +++- Build/source/texk/web2c/ptexdir/tests/postpena.tex | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 Build/source/texk/web2c/ptexdir/tests/postpena.tex (limited to 'Build') diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 1bcf418fb56..beb5f54cb52 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,9 @@ +2017-04-06 Hironori Kitagawa + + * ptex-base.ch: Fix a bug that the postbreakpenalty sometimes reappears + even when it was removed by \unpenalty. + * tests/postpena.tex: Added. + 2017-03-12 Akira Kakuto * ptex-base.ch: Fix a typo pointed out at diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index 7bf3a25f1c6..ea83b1719c2 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -6925,7 +6925,9 @@ end; @= if is_char_node(tail) then - begin cx:=qo(character(tail)); @; + begin if not( (last_jchr<>null) and (link(last_jchr)=tail) ) then + begin cx:=qo(character(tail)); @; + end; end else if type(tail)=ligature_node then begin cx:=qo(character(lig_char(tail))); @; diff --git a/Build/source/texk/web2c/ptexdir/tests/postpena.tex b/Build/source/texk/web2c/ptexdir/tests/postpena.tex new file mode 100644 index 00000000000..74f93a1f071 --- /dev/null +++ b/Build/source/texk/web2c/ptexdir/tests/postpena.tex @@ -0,0 +1,15 @@ +%% plain pTeX +\postbreakpenalty`#=200 +\postbreakpenalty`a=200 +\showboxdepth10000 +\showboxbreadth10000 +\tracingonline1 +\setbox0=\hbox{#」「\penalty-1000\showlists} +% # と 」 の間:\penalty10200 (合算) + +\setbox0=\hbox{#\unpenalty 」a\relax あ\showlists} +% # と 」 の間:\penalty10000 (prebreakpenalty of '」') +% a と あ の間:\penalty200 (postbreakpenalty of 'a') + + +\bye -- cgit v1.2.3