summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-04-08 03:01:49 +0000
committerNorbert Preining <norbert@preining.info>2022-04-08 03:01:49 +0000
commitd1d30aef56e5df7bbe7ee55e9fecf7d72514b6bf (patch)
tree4451fea46d2b0b3ed47697c11110a0fe6df8e890 /macros
parent4ab0687cfdd546779ccb6d8589a671441bf5865f (diff)
CTAN sync 202204080301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/zref/README.md2
-rw-r--r--macros/latex/contrib/zref/zref.dtx77
-rw-r--r--macros/latex/contrib/zref/zref.pdfbin698729 -> 699064 bytes
-rw-r--r--macros/luatex/generic/lua-widow-control/README.md2
-rw-r--r--macros/luatex/generic/lua-widow-control/lua-widow-control.lua23
-rw-r--r--macros/luatex/generic/lua-widow-control/lua-widow-control.opm2
-rw-r--r--macros/luatex/generic/lua-widow-control/lua-widow-control.pdfbin379185 -> 380127 bytes
-rw-r--r--macros/luatex/generic/lua-widow-control/lua-widow-control.sty6
-rw-r--r--macros/luatex/generic/lua-widow-control/lua-widow-control.tex2
-rw-r--r--macros/luatex/generic/lua-widow-control/lwc-documentation.tex4
-rw-r--r--macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv4
-rw-r--r--macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl4
12 files changed, 68 insertions, 58 deletions
diff --git a/macros/latex/contrib/zref/README.md b/macros/latex/contrib/zref/README.md
index bb47ffdbfa..2406610dfd 100644
--- a/macros/latex/contrib/zref/README.md
+++ b/macros/latex/contrib/zref/README.md
@@ -1,6 +1,6 @@
# zref packages for LaTeX
-Version: 2022-03-08 v2.33
+Version: 2022-04-07 v2.34
Package zref tries to get rid of the restriction
diff --git a/macros/latex/contrib/zref/zref.dtx b/macros/latex/contrib/zref/zref.dtx
index 731338b70a..af22a5802e 100644
--- a/macros/latex/contrib/zref/zref.dtx
+++ b/macros/latex/contrib/zref/zref.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% File: zref.dtx
-% Version: 2022-03-08 v2.33
+% Version: 2022-04-07 v2.34
% Info: A new reference scheme for LaTeX
%
% Copyright (C)
@@ -112,7 +112,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: zref 2022-03-08 v2.33 A new reference scheme for LaTeX (HO)}
+\Msg{* Package: zref 2022-04-07 v2.34 A new reference scheme for LaTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -124,7 +124,7 @@
This is a generated file.
Project: zref
-Version: 2022-03-08 v2.33
+Version: 2022-04-07 v2.34
Copyright (C)
2006-2012 Heiko Oberdiek
@@ -230,7 +230,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{zref.drv}%
- [2022-03-08 v2.33 A new reference scheme for LaTeX (HO)]%
+ [2022-04-07 v2.34 A new reference scheme for LaTeX (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\setlength{\emergencystretch}{1em}
@@ -245,7 +245,7 @@ and the derived files
% \GetFileInfo{zref.drv}
%
% \title{The \xpackage{zref} package}
-% \date{2022-03-08 v2.33}
+% \date{2022-04-07 v2.34}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/zref/issues}}}
%
@@ -1663,7 +1663,7 @@ the height difference of the two baselines is
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref}
- [2022-03-08 v2.33 A new reference scheme for LaTeX (HO)]%
+ [2022-04-07 v2.34 A new reference scheme for LaTeX (HO)]%
% \end{macrocode}
%
% \subsubsection{Load basic module}
@@ -1750,7 +1750,7 @@ the height difference of the two baselines is
%<*base>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-base}%
- [2022-03-08 v2.33 Module base for zref (HO)]%
+ [2022-04-07 v2.34 Module base for zref (HO)]%
% \end{macrocode}
%
% \subsubsection{Utilities}
@@ -2924,22 +2924,22 @@ the height difference of the two baselines is
\renewcommand*{\thezref@unique}{%
zref@\number\c@zref@unique
}%
- }{}%
-}
% \end{macrocode}
-% \end{macro}
% To improve the behaviour if include/includeonly is used, we round the
% counter up at every include, see https://github.com/ho-tex/zref/issues/10
-%
% \begin{macrocode}
-\IfFormatAtLeastTF{2020/10/01}
- {
- \AddToHook
- {include/after}
- {\setcounter{zref@unique}
- {\csname fp_to_int:n\endcsname{ceil(\c@zref@unique +100,-2)}}}
- }{}
+ \IfFormatAtLeastTF{2020/10/01}
+ {%
+ \AddToHook
+ {include/after}
+ {\setcounter{zref@unique}
+ {\csname fp_to_int:n\endcsname{ceil(\c@zref@unique +100,-2)}}}
+ }{}%
+ }{}%
+}
% \end{macrocode}
+% \end{macro}
+%
%
% \subsubsection{Utilities}
%
@@ -3070,7 +3070,7 @@ the height difference of the two baselines is
%<*user>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-user}%
- [2022-03-08 v2.33 Module user for zref (HO)]%
+ [2022-04-07 v2.34 Module user for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -3161,7 +3161,7 @@ the height difference of the two baselines is
%<*abspage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspage}%
- [2022-03-08 v2.33 Module abspage for zref (HO)]%
+ [2022-04-07 v2.34 Module abspage for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -3209,7 +3209,7 @@ the height difference of the two baselines is
%<*counter>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-counter}%
- [2022-03-08 v2.33 Module counter for zref (HO)]%
+ [2022-04-07 v2.34 Module counter for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -3254,7 +3254,7 @@ the height difference of the two baselines is
%<*lastpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-lastpage}%
- [2022-03-08 v2.33 Module lastpage for zref (HO)]%
+ [2022-04-07 v2.34 Module lastpage for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\RequirePackage{zref-abspage}[2019/11/29]
\RequirePackage{atveryend}[2009/12/07]
@@ -3326,7 +3326,7 @@ the height difference of the two baselines is
%<*thepage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-thepage}%
- [2022-03-08 v2.33 Module thepage for zref (HO)]%
+ [2022-04-07 v2.34 Module thepage for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -3401,7 +3401,7 @@ the height difference of the two baselines is
%<*nextpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-nextpage}%
- [2022-03-08 v2.33 Module nextpage for zref (HO)]%
+ [2022-04-07 v2.34 Module nextpage for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -3505,7 +3505,7 @@ the height difference of the two baselines is
%<*totpages>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-totpages}%
- [2022-03-08 v2.33 Module totpages for zref (HO)]%
+ [2022-04-07 v2.34 Module totpages for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -3547,7 +3547,7 @@ the height difference of the two baselines is
%<*pagelayout>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-pagelayout}%
- [2022-03-08 v2.33 Module pagelayout for zref (HO)]%
+ [2022-04-07 v2.34 Module pagelayout for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -3779,7 +3779,7 @@ the height difference of the two baselines is
%<*pageattr>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-pageattr}%
- [2022-03-08 v2.33 Module pageattr for zref (HO)]%
+ [2022-04-07 v2.34 Module pageattr for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -4011,7 +4011,7 @@ the height difference of the two baselines is
%<*marks>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-marks}%
- [2022-03-08 v2.33 Module marks for zref (HO)]%
+ [2022-04-07 v2.34 Module marks for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -4117,7 +4117,7 @@ the height difference of the two baselines is
%<*runs>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-runs}%
- [2022-03-08 v2.33 Module runs for zref (HO)]%
+ [2022-04-07 v2.34 Module runs for zref (HO)]%
% \end{macrocode}
%
% \begin{macro}{\zruns}
@@ -4149,7 +4149,7 @@ the height difference of the two baselines is
%<*perpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-perpage}%
- [2022-03-08 v2.33 Module perpage for zref (HO)]%
+ [2022-04-07 v2.34 Module perpage for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -4352,7 +4352,7 @@ the height difference of the two baselines is
%<*titleref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-titleref}%
- [2022-03-08 v2.33 Module titleref for zref (HO)]%
+ [2022-04-07 v2.34 Module titleref for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -4765,7 +4765,7 @@ the height difference of the two baselines is
%<*xr>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-xr}%
- [2022-03-08 v2.33 Module xr for zref (HO)]%
+ [2022-04-07 v2.34 Module xr for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -5301,7 +5301,7 @@ the height difference of the two baselines is
%<*hyperref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-hyperref}%
- [2022-03-08 v2.33 Module hyperref for zref (HO)]%
+ [2022-04-07 v2.34 Module hyperref for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -5331,7 +5331,7 @@ the height difference of the two baselines is
%<*savepos>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-savepos}%
- [2022-03-08 v2.33 Module savepos for zref (HO)]%
+ [2022-04-07 v2.34 Module savepos for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -5504,7 +5504,7 @@ the height difference of the two baselines is
%<*abspos>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspos}%
- [2022-03-08 v2.33 Module abspos for zref (HO)]%
+ [2022-04-07 v2.34 Module abspos for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -6158,7 +6158,7 @@ the height difference of the two baselines is
%<*dotfill>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-dotfill}%
- [2022-03-08 v2.33 Module dotfill for zref (HO)]%
+ [2022-04-07 v2.34 Module dotfill for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -6258,7 +6258,7 @@ the height difference of the two baselines is
%<*env>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-env}%
- [2022-03-08 v2.33 Module env for zref (HO)]%
+ [2022-04-07 v2.34 Module env for zref (HO)]%
\RequirePackage{zref-base}[2019/11/29]
\ifx\ZREF@base@ok Y%
\else
@@ -6797,6 +6797,9 @@ the height difference of the two baselines is
% \item Make the unique counter more robust when includeonly is used,
% https://github.com/ho-tex/zref/issues/10
% \end{Version}
+% \begin{Version}{2022-04-07 v2.34}
+% \item Updated
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/macros/latex/contrib/zref/zref.pdf b/macros/latex/contrib/zref/zref.pdf
index 3d4505c17b..463bcaf221 100644
--- a/macros/latex/contrib/zref/zref.pdf
+++ b/macros/latex/contrib/zref/zref.pdf
Binary files differ
diff --git a/macros/luatex/generic/lua-widow-control/README.md b/macros/luatex/generic/lua-widow-control/README.md
index 219a1f5eb1..850f034f8e 100644
--- a/macros/luatex/generic/lua-widow-control/README.md
+++ b/macros/luatex/generic/lua-widow-control/README.md
@@ -48,4 +48,4 @@ Lua-widow-control is licensed under the [_Mozilla Public License_, version 2.0](
Please note that a compiled document is absolutely **not** considered to be an "Executable Form" as defined by the MPL. The use of lua-widow-control in a document does not place **any** obligations on the document's author or distributors. The MPL and CC-BY-SA licenses **only** apply to you if you distribute the lua-widow-control source code or documentation.
---
-_v2.0.3 (2022-03-28)_ <!--%%version %%dashdate-->
+_v2.0.4 (2022-04-07)_ <!--%%version %%dashdate-->
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.lua b/macros/luatex/generic/lua-widow-control/lua-widow-control.lua
index cd1c6adb93..2e374ac6e1 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.lua
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.lua
@@ -107,8 +107,8 @@ elseif plain or latex or optex then
debug_print("Plain/LaTeX")
luatexbase.provides_module {
name = lwc.name,
- date = "2022/03/28", --%%slashdate
- version = "2.0.3", --%%version
+ date = "2022/04/07", --%%slashdate
+ version = "2.0.4", --%%version
description = [[
This module provides a LuaTeX-based solution to prevent
@@ -231,6 +231,13 @@ end
--- Saves each paragraph, but lengthened by 1 line
function lwc.save_paragraphs(head)
+ -- Ensure that we were actually given a par (only under \ConTeXt{} for some reason)
+ if (head.id ~= par_id and context) or
+ status.output_active -- Don't run during the output routine
+ then
+ return head
+ end
+
-- Prevent the "underfull hbox" warnings when we store a potential paragraph
local renable_box_warnings
if (context or optex) or
@@ -240,10 +247,6 @@ function lwc.save_paragraphs(head)
lwc.callbacks.disable_box_warnings.enable()
end
- -- Ensure that we were actually given a par (only under \ConTeXt{} for some reason)
- if head.id ~= par_id and context then
- return head
- end
-- We need to return the unmodified head at the end, so we make a copy here
local new_head = copy(head)
@@ -307,9 +310,11 @@ local last_paragraph = 0
--- some arbitrary number for \lwc/, and the value corresponds to the
--- paragraphs index, which is negated for the end of the paragraph.
function lwc.mark_paragraphs(head)
- set_attribute(head, attribute, #paragraphs + (100 * pagenum()))
- set_attribute(last(head), attribute, -1 * (#paragraphs + (100 * pagenum())))
- last_paragraph = #paragraphs
+ if not status.output_active then
+ set_attribute(head, attribute, #paragraphs + (100 * pagenum()))
+ set_attribute(last(head), attribute, -1 * (#paragraphs + (100 * pagenum())))
+ last_paragraph = #paragraphs
+ end
return head
end
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.opm b/macros/luatex/generic/lua-widow-control/lua-widow-control.opm
index cfe2ddf248..6ff6281583 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.opm
+++ b/macros/luatex/generic/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.0.3>} %%version
+\_codedecl\lwcenable{lua-widow-control <v2.0.4>} %%version
\_clubpenalty=1
\_widowpenalty=1
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf b/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
index fff2fc72bf..007b3136f0 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
Binary files differ
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 367c73adfe..0690a23208 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.3}{2022-03-28} %%version %%dashdate
+\DeclareCurrentRelease{v2.0.4}{2022-04-07} %%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/03/28} %%slashdate
- {v2.0.3} %%version
+ {2022/04/07} %%slashdate
+ {v2.0.4} %%version
{Use Lua to remove widows and orphans}
% Unconditional Package Loads
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.tex b/macros/luatex/generic/lua-widow-control/lua-widow-control.tex
index 29bfdc15f1..4ff5bd993b 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.tex
+++ b/macros/luatex/generic/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.0.3} %%version
+\wlog{lua-widow-control v2.0.4} %%version
\ifx\directlua\undefined
\errmessage{%
diff --git a/macros/luatex/generic/lua-widow-control/lwc-documentation.tex b/macros/luatex/generic/lua-widow-control/lwc-documentation.tex
index 7bec7a0a33..8d59b2a735 100644
--- a/macros/luatex/generic/lua-widow-control/lwc-documentation.tex
+++ b/macros/luatex/generic/lua-widow-control/lwc-documentation.tex
@@ -37,7 +37,7 @@
\startdocument[
title=lua-widow-control,
author=Max Chernoff,
- version=2.0.3, %%version
+ version=2.0.4, %%version
github=https://github.com/gucci-on-fleek/lua-widow-control,
ctan=https://www.ctan.org/pkg/lua-widow-control,
]
@@ -312,6 +312,8 @@ You could just disable then reenable \lwc/ every time that you use the command;
\Lwc/ automatically patches the default \LaTeX{}, \ConTeXt{}, and Plain~\TeX{} section commands, so you shouldn't need to patch these yourself. \Lwc/ also patches the commands provided by \sans{memoir}, \sans{\acronym{KOMA}-script}, and \sans{titlesec}. You'll need to patch any other section commands yourself.
+Note that the \LaTeX{} option does not \emph{append} commands to the disable list; rather, it \emph{sets} the list from scratch. This means that you can set an empty list to disable any command patching; however, this also means that if you want to disable one command on top of the defaults, you'll also need to manually include the default list.
+
\startTABLE
\NC Plain \TeX{}
\NC \inlineTEX{\lwcdisablecmd{$\meta{\backslash macro}$}}
diff --git a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
index 74f61d941e..83f72b3905 100644
--- a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
+++ b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
@@ -1,10 +1,10 @@
%D \module
%D [ file=t-lua-widow-control,
-%D version=2.0.3, %%version
+%D version=2.0.4, %%version
%D title=lua-widow-control,
%D subtitle=\ConTeXt module for lua-widow-control,
%D author=Max Chernoff,
-%D date=2022-03-28, %%dashdate
+%D date=2022-04-07, %%dashdate
%D copyright=Max Chernoff,
%D license=MPL-2.0+,
%D url=https://github.com/gucci-on-fleek/lua-widow-control]
diff --git a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
index 74f61d941e..83f72b3905 100644
--- a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
+++ b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
@@ -1,10 +1,10 @@
%D \module
%D [ file=t-lua-widow-control,
-%D version=2.0.3, %%version
+%D version=2.0.4, %%version
%D title=lua-widow-control,
%D subtitle=\ConTeXt module for lua-widow-control,
%D author=Max Chernoff,
-%D date=2022-03-28, %%dashdate
+%D date=2022-04-07, %%dashdate
%D copyright=Max Chernoff,
%D license=MPL-2.0+,
%D url=https://github.com/gucci-on-fleek/lua-widow-control]