From 1b913ce64901669921736117b2ed8aa36c55110e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 May 2022 20:33:11 +0000 Subject: lua-widow-control (14may22) git-svn-id: svn://tug.org/texlive/trunk@63302 c570f23f-e606-0410-a88d-b1316a301751 --- .../lua-widow-control/t-lua-widow-control.mkiv | 48 +++++++++++----------- .../lua-widow-control/t-lua-widow-control.mkxl | 48 +++++++++++----------- 2 files changed, 46 insertions(+), 50 deletions(-) (limited to 'Master/texmf-dist/tex/context') diff --git a/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkiv b/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkiv index 1e52f8d9012..090ff5aa809 100644 --- a/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkiv +++ b/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkiv @@ -1,10 +1,10 @@ %D \module %D [ file=t-lua-widow-control, -%D version=2.0.6, %%version +%D version=2.1.0, %%version %D title=lua-widow-control, %D subtitle=\ConTeXt module for lua-widow-control, %D author=Max Chernoff, -%D date=2022-04-23, %%dashdate +%D date=2022-05-14, %%dashdate %D copyright=Max Chernoff, %D license=MPL-2.0+, %D url=https://github.com/gucci-on-fleek/lua-widow-control] @@ -16,39 +16,36 @@ \installcommandhandler \????lwc {lwc} \????lwc \newdimen\lwc_emergency_stretch +\newcount\lwc_max_cost \appendtoks \lwc_emergency_stretch=\lwcparameter{emergencystretch} -\to\everysetuplwc -\appendtoks \doifelse{\lwcparameter{\c!state}}\v!start{ - \ctxlua{lwc.enable_callbacks()} + \lwc_enable }{ - \ctxlua{lwc.disable_callbacks()} + \lwc_disable } -\to\everysetuplwc -\appendtoks - \doifelse{\lwcparameter{debug}}\v!start{ - \ctxlua{lwc.debug = true} - }{ - \ctxlua{lwc.debug = false} - } -\to\everysetuplwc + \lwc_debug{\lwcparameter{debug}} -\appendtoks - \ctxlua{lwc.nobreak_behaviour = "\lwcparameter{nobreak}"} -\to\everysetuplwc + \lwc_nobreak{\lwcparameter{nobreak}} -\newcount\lwc_max_cost -\appendtoks \lwc_max_cost=\lwcparameter{maxcost} -\to\everysetuplwc -\appendtoks % We can't just set the penalties because they will be reset automatically % at \\starttext. \startsetups[*default] + \directsetup{*reset} + + \clubpenalty=\lwcparameter{orphanpenalty} + \widowpenalty=\lwcparameter{widowpenalty} + \displaywidowpenalty=\lwcparameter{widowpenalty} + \brokenpenalty=\lwcparameter{brokenpenalty} + \stopsetups + + \startsetups[grid][*default] + \directsetup{*reset} + \clubpenalty=\lwcparameter{orphanpenalty} \widowpenalty=\lwcparameter{widowpenalty} \displaywidowpenalty=\lwcparameter{widowpenalty} @@ -58,8 +55,6 @@ \setups[*default] \to\everysetuplwc -\define\iflwc{\ctxlua{lwc.if_lwc_enabled()}} - \ctxloadluafile{lua-widow-control} \setuplwc[ @@ -86,14 +81,14 @@ \newcount\lwc_disable_count \define\lwc_patch_pre{% - \iflwc% + \lwc_if_enabled% \advance\lwc_disable_count by 1% \setuplwc[\c!state=\v!stop]% \fi% } \define\lwc_patch_post{ - \ifnum\lwc_disable_count>0% + \ifnum\lwc_disable_count>0\relax% \setuplwc[\c!state=\v!start]% \advance\lwc_disable_count by -1% \fi% @@ -102,5 +97,8 @@ \prependtoks\lwc_patch_pre\to\everybeforesectionheadhandle % Sectioning \prependtoks\lwc_patch_post\to\everyaftersectionheadhandle +% Make the commands public +\let\iflwc=\lwc_if_enabled + \protect \stopmodule diff --git a/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl b/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl index 1e52f8d9012..090ff5aa809 100644 --- a/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl +++ b/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl @@ -1,10 +1,10 @@ %D \module %D [ file=t-lua-widow-control, -%D version=2.0.6, %%version +%D version=2.1.0, %%version %D title=lua-widow-control, %D subtitle=\ConTeXt module for lua-widow-control, %D author=Max Chernoff, -%D date=2022-04-23, %%dashdate +%D date=2022-05-14, %%dashdate %D copyright=Max Chernoff, %D license=MPL-2.0+, %D url=https://github.com/gucci-on-fleek/lua-widow-control] @@ -16,39 +16,36 @@ \installcommandhandler \????lwc {lwc} \????lwc \newdimen\lwc_emergency_stretch +\newcount\lwc_max_cost \appendtoks \lwc_emergency_stretch=\lwcparameter{emergencystretch} -\to\everysetuplwc -\appendtoks \doifelse{\lwcparameter{\c!state}}\v!start{ - \ctxlua{lwc.enable_callbacks()} + \lwc_enable }{ - \ctxlua{lwc.disable_callbacks()} + \lwc_disable } -\to\everysetuplwc -\appendtoks - \doifelse{\lwcparameter{debug}}\v!start{ - \ctxlua{lwc.debug = true} - }{ - \ctxlua{lwc.debug = false} - } -\to\everysetuplwc + \lwc_debug{\lwcparameter{debug}} -\appendtoks - \ctxlua{lwc.nobreak_behaviour = "\lwcparameter{nobreak}"} -\to\everysetuplwc + \lwc_nobreak{\lwcparameter{nobreak}} -\newcount\lwc_max_cost -\appendtoks \lwc_max_cost=\lwcparameter{maxcost} -\to\everysetuplwc -\appendtoks % We can't just set the penalties because they will be reset automatically % at \\starttext. \startsetups[*default] + \directsetup{*reset} + + \clubpenalty=\lwcparameter{orphanpenalty} + \widowpenalty=\lwcparameter{widowpenalty} + \displaywidowpenalty=\lwcparameter{widowpenalty} + \brokenpenalty=\lwcparameter{brokenpenalty} + \stopsetups + + \startsetups[grid][*default] + \directsetup{*reset} + \clubpenalty=\lwcparameter{orphanpenalty} \widowpenalty=\lwcparameter{widowpenalty} \displaywidowpenalty=\lwcparameter{widowpenalty} @@ -58,8 +55,6 @@ \setups[*default] \to\everysetuplwc -\define\iflwc{\ctxlua{lwc.if_lwc_enabled()}} - \ctxloadluafile{lua-widow-control} \setuplwc[ @@ -86,14 +81,14 @@ \newcount\lwc_disable_count \define\lwc_patch_pre{% - \iflwc% + \lwc_if_enabled% \advance\lwc_disable_count by 1% \setuplwc[\c!state=\v!stop]% \fi% } \define\lwc_patch_post{ - \ifnum\lwc_disable_count>0% + \ifnum\lwc_disable_count>0\relax% \setuplwc[\c!state=\v!start]% \advance\lwc_disable_count by -1% \fi% @@ -102,5 +97,8 @@ \prependtoks\lwc_patch_pre\to\everybeforesectionheadhandle % Sectioning \prependtoks\lwc_patch_post\to\everyaftersectionheadhandle +% Make the commands public +\let\iflwc=\lwc_if_enabled + \protect \stopmodule -- cgit v1.2.3