summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl4
-rw-r--r--Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control-2022-02-22.sty4
-rw-r--r--Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty6
-rw-r--r--Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua29
-rw-r--r--Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex2
-rw-r--r--Master/texmf-dist/tex/optex/lua-widow-control/lua-widow-control.opm2
6 files changed, 17 insertions, 30 deletions
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 59825332020..cc1932d8e1d 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.2.0, %%version
+%D version=2.2.1, %%version
%D title=lua-widow-control,
%D subtitle=\ConTeXt module for lua-widow-control,
%D author=Max Chernoff,
-%D date=2022-06-17, %%dashdate
+%D date=2022-07-28, %%dashdate
%D copyright=Max Chernoff,
%D license=MPL-2.0+,
%D url=https://github.com/gucci-on-fleek/lua-widow-control]
diff --git a/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control-2022-02-22.sty b/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control-2022-02-22.sty
index 74645635600..fc410085e34 100644
--- a/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control-2022-02-22.sty
+++ b/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control-2022-02-22.sty
@@ -12,8 +12,8 @@
% report a real version number here for debugging.
\PackageInfo{lua-widow-control}{%
Real version:
- 2022/06/17 %%slashdate
- v2.2.0 %%version
+ 2022/07/28 %%slashdate
+ v2.2.1 %%version
}
\PackageWarning{lua-widow-control}{%
diff --git a/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty b/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty
index 7d1be850b91..8b768637670 100644
--- a/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty
+++ b/Master/texmf-dist/tex/lualatex/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.2.0}{2022-06-17} %%version %%dashdate
+\DeclareCurrentRelease{v2.2.1}{2022-07-28} %%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/06/17} %%slashdate
- {v2.2.0} %%version
+ {2022/07/28} %%slashdate
+ {v2.2.1} %%version
{Use Lua to remove widows and orphans}
% Unconditional Package Loads
diff --git a/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua b/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua
index 800faf56242..0f23f42592a 100644
--- a/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua
+++ b/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua
@@ -194,8 +194,8 @@ elseif plain or latex or optex then
debug("Plain/LaTeX")
luatexbase.provides_module {
name = lwc.name,
- date = "2022/06/17", --%%slashdate
- version = "2.2.0", --%%version
+ date = "2022/07/28", --%%slashdate
+ version = "2.2.1", --%%version
description = [[
This module provides a LuaTeX-based solution to prevent
@@ -344,25 +344,19 @@ local function long_paragraph(head)
-- We can't modify the original paragraph
head = copy_list(head)
+ if lmtx then
+ tex.preparelinebreak(head)
+ end
+
-- Prevent ultra-short last lines (\TeX{}Book p. 104), except with narrow columns
-- Equivalent to \\parfillskip=0pt plus 0.8\\hsize
- local parfillskip
- if lmtx or last(head).id ~= glue_id then
- -- LMTX does not automatically add the \\parfillskip glue
- parfillskip = new_node("glue", "parfillskip")
- else
- parfillskip = last(head)
- end
+ local parfillskip = last(head)
if tex.hsize > min_col_width then
parfillskip[stretch_order] = 0
parfillskip.stretch = 0.8 * tex.hsize -- Last line must be at least 20% long
end
- if lmtx or last(head).id ~= glue_id then
- last(head).next = parfillskip
- end
-
-- Break the paragraph 1 line longer than natural
return linebreak(head, {
looseness = 1,
@@ -379,15 +373,8 @@ local function natural_paragraph(head)
-- We can't modify the original paragraph
head = copy_list(head)
- --[[ Contrary to the documentation, LMTX does not automatically add
- the \\parfillskip glue before `pre_linebreak_filter`, so we need
- to add it here so that our \\prevgraf comparisons are correct.
- ]]
if lmtx then
- parfillskip = new_node("glue", "parfillskip")
- parfillskip[stretch_order] = 1
- parfillskip.stretch = 1 -- 0pt plus 1fil
- last(head).next = parfillskip
+ tex.preparelinebreak(head)
end
-- Break the paragraph naturally to get \\prevgraf
diff --git a/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex b/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex
index 2e1dcef902e..45c9e288e45 100644
--- a/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex
+++ b/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex
@@ -3,7 +3,7 @@
% SPDX-License-Identifier: MPL-2.0+
% SPDX-FileCopyrightText: 2022 Max Chernoff
-\wlog{lua-widow-control v2.2.0} %%version
+\wlog{lua-widow-control v2.2.1} %%version
\ifx\directlua\undefined
\errmessage{%
diff --git a/Master/texmf-dist/tex/optex/lua-widow-control/lua-widow-control.opm b/Master/texmf-dist/tex/optex/lua-widow-control/lua-widow-control.opm
index ff26f856c5f..d628a401e46 100644
--- a/Master/texmf-dist/tex/optex/lua-widow-control/lua-widow-control.opm
+++ b/Master/texmf-dist/tex/optex/lua-widow-control/lua-widow-control.opm
@@ -3,7 +3,7 @@
% SPDX-License-Identifier: MPL-2.0+
% SPDX-FileCopyrightText: 2022 Max Chernoff
-\_codedecl\lwcenable{lua-widow-control <v2.2.0>} %%version
+\_codedecl\lwcenable{lua-widow-control <v2.2.1>} %%version
\_namespace{lwc}
\_clubpenalty=1