From 4619c6e66ef47e8e4953142a5c65467a6b0a2c01 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 30 Jul 2020 17:51:33 +0200 Subject: 2020-07-30 16:52:00 --- tex/context/base/mkiv/spac-ver.mkxl | 57 +++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 31 deletions(-) (limited to 'tex/context/base/mkiv/spac-ver.mkxl') diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl index c889aa05b..9c3f361c0 100644 --- a/tex/context/base/mkiv/spac-ver.mkxl +++ b/tex/context/base/mkiv/spac-ver.mkxl @@ -1355,19 +1355,14 @@ \let\oninterlineskip\relax -\unexpanded\def\leaveoutervmode - {\ifvmode\ifinner\else - \leavevmode - \fi\fi} - \unexpanded\def\resetpenalties#1% {\ifdefined#1% - #1\minusone + \frozen#1\minusone \fi} \unexpanded\def\setpenalties#1#2#3% {\ifdefined#1% space before #3 prevents lookahead problems, needed when #3=text - #1\numexpr#2+\plusone\relax\space\doexpandedrecurse{\the\numexpr#2\relax}{ #3}\zerocount\relax + \frozen#1\numexpr#2+\plusone\relax\space\doexpandedrecurse{\the\numexpr#2\relax}{ #3}\zerocount\relax \fi} %D \macros @@ -1410,12 +1405,12 @@ \def\defaultgridadjdemerits {10000} % always was so \unexpanded\def\nopenalties - {\widowpenalty \zerocount - \clubpenalty \zerocount - \brokenpenalty \zerocount - \doublehyphendemerits\zerocount - \finalhyphendemerits \zerocount - \adjdemerits \zerocount} + {\frozen\widowpenalty \zerocount + \frozen\clubpenalty \zerocount + \frozen\brokenpenalty \zerocount + \frozen\doublehyphendemerits\zerocount + \frozen\finalhyphendemerits \zerocount + \frozen\adjdemerits \zerocount} \unexpanded\def\setdefaultpenalties {\directsetup{\systemsetupsprefix\s!default}} @@ -1432,13 +1427,13 @@ \directsetup{\systemsetupsprefix\s!reset} - \widowpenalty \defaultwidowpenalty - \clubpenalty \defaultclubpenalty - \displaywidowpenalty \defaultdisplaywidowpenalty - \brokenpenalty \defaultbrokenpenalty - \doublehyphendemerits\defaultdoublehyphendemerits - \finalhyphendemerits \defaultfinalhyphendemerits - \adjdemerits \defaultadjdemerits + \frozen\widowpenalty \defaultwidowpenalty + \frozen\clubpenalty \defaultclubpenalty + \frozen\displaywidowpenalty \defaultdisplaywidowpenalty + \frozen\brokenpenalty \defaultbrokenpenalty + \frozen\doublehyphendemerits\defaultdoublehyphendemerits + \frozen\finalhyphendemerits \defaultfinalhyphendemerits + \frozen\adjdemerits \defaultadjdemerits \stopsetups @@ -1446,13 +1441,13 @@ \directsetup{\systemsetupsprefix\s!reset} - \widowpenalty \defaultgridwidowpenalty - \clubpenalty \defaultgridclubpenalty - \displaywidowpenalty \defaultgriddisplaywidowpenalty - \brokenpenalty \defaultgridbrokenpenalty - \doublehyphendemerits\defaultgriddoublehyphendemerits - \finalhyphendemerits \defaultgridfinalhyphendemerits - \adjdemerits \defaultgridadjdemerits + \frozen\widowpenalty \defaultgridwidowpenalty + \frozen\clubpenalty \defaultgridclubpenalty + \frozen\displaywidowpenalty \defaultgriddisplaywidowpenalty + \frozen\brokenpenalty \defaultgridbrokenpenalty + \frozen\doublehyphendemerits\defaultgriddoublehyphendemerits + \frozen\finalhyphendemerits \defaultgridfinalhyphendemerits + \frozen\adjdemerits \defaultgridadjdemerits \stopsetups @@ -1464,10 +1459,10 @@ \setpenalties \widowpenalties \plustwo \maxdimen \setpenalties \clubpenalties \plustwo \maxdimen - \brokenpenalty \maxdimen - \doublehyphendemerits \defaultdoublehyphendemerits - \finalhyphendemerits \defaultfinalhyphendemerits - \adjdemerits \defaultadjdemerits + \frozen \brokenpenalty \maxdimen + \frozen \doublehyphendemerits \defaultdoublehyphendemerits + \frozen \finalhyphendemerits \defaultfinalhyphendemerits + \frozen \adjdemerits \defaultadjdemerits \stopsetups -- cgit v1.2.3