summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/lua-widow-control/lua-widow-control.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/generic/lua-widow-control/lua-widow-control.sty')
-rw-r--r--macros/luatex/generic/lua-widow-control/lua-widow-control.sty32
1 files changed, 13 insertions, 19 deletions
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.sty b/macros/luatex/generic/lua-widow-control/lua-widow-control.sty
index a44b5af1da..e7179e6a9e 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.sty
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.sty
@@ -13,7 +13,7 @@
\DeclareRelease{}{0000-00-00}{lua-widow-control-2022-02-22.sty}
\DeclareRelease{v1.1.6}{2022-02-22}{lua-widow-control-2022-02-22.sty}
-\DeclareCurrentRelease{v2.0.6}{2022-04-23} %%version %%dashdate
+\DeclareCurrentRelease{v2.1.0}{2022-05-14} %%version %%dashdate
% If this version of LaTeX doesn't support command hooks, then we load
% the last v1.1.X version of the package.
@@ -23,8 +23,8 @@
\ProvidesExplPackage
{lua-widow-control}
- {2022/04/23} %%slashdate
- {v2.0.6} %%version
+ {2022/05/14} %%dashdate
+ {v2.1.0} %%version
{Use Lua to remove widows and orphans}
% Unconditional Package Loads
@@ -105,6 +105,7 @@
disablecmds .clist_gset:N = \g__lwc_disablecmds_cl,
disablecmds .value_required:n = false,
disablecmds .initial:n = { \@sect, % LaTeX default
+ \@ssect, % LaTeX starred
\M@sect, % Memoir
\@mem@old@ssect, % Memoir Starred
\ttl@straight@ii, % titlesec normal
@@ -112,11 +113,6 @@
\ttl@part@ii, % titlesec part
},
disablecmds .usage:n = preamble,
-
- nobreak .choice:,
- nobreak / keep .code:n = \lua_now:n { lwc.nobreak_behaviour = "keep" },
- nobreak / split .code:n = \lua_now:n { lwc.nobreak_behaviour = "split" },
- nobreak / warn .code:n = \lua_now:n { lwc.nobreak_behaviour = "warn" },
}
% Load the Lua code
@@ -138,16 +134,10 @@
}
% Core Function Definitions
-\cs_new:Npn \__lwc_enable: {
- \lua_now:n { lwc.enable_callbacks() }
-}
+\cs_new_eq:NN \iflwc \__lwc_iflwc:
-\cs_new:Npn \__lwc_disable: {
- \lua_now:n { lwc.disable_callbacks() }
-}
-
-\prg_set_conditional:Nnn \__lwc_if_enabled: { T, F, TF } {
- \lua_now:n { lwc.if_lwc_enabled() }
+\prg_new_conditional:Nnn \__lwc_if_enabled: { T, F, TF } {
+ \__lwc_if_enabled:
\prg_return_true:
\else
\prg_return_false:
@@ -230,8 +220,12 @@
disable .value_forbidden:n = true,
debug .choice:,
- debug / true .code:n = \lua_now:n { lwc.debug = true },
- debug / false .code:n = \lua_now:n { lwc.debug = false },
+ debug / true .code:n = \__lwc_debug:n { true },
+ debug / false .code:n = \__lwc_debug:n { false },
+
+ nobreak .code:n = \__lwc_nobreak:n { #1 },
+ nobreak .value_required:n = true,
+ nobreak .initial:n = keep,
strict .meta:n = { emergencystretch = 0pt,
max-cost = 5000,