summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-02-22 03:01:37 +0000
committerNorbert Preining <norbert@preining.info>2023-02-22 03:01:37 +0000
commit470678475288a244fd8a9af69f9abc9b46b2860f (patch)
treeb39e9f327aaf2a4b10bada3897e374878369fccc /macros/latex/contrib
parentb05164a5b679570a7040f2b28bbf156a0479c429 (diff)
CTAN sync 202302220301
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/fixdif/fixdif-zh-cn.pdfbin155063 -> 155063 bytes
-rw-r--r--macros/latex/contrib/fixdif/fixdif-zh-cn.tex2
-rw-r--r--macros/latex/contrib/fixdif/fixdif.dtx99
-rw-r--r--macros/latex/contrib/fixdif/fixdif.pdfbin92149 -> 94064 bytes
-rw-r--r--macros/latex/contrib/langsci-avm/README23
-rw-r--r--macros/latex/contrib/langsci-avm/langsci-avm.dtx894
-rw-r--r--macros/latex/contrib/langsci-avm/langsci-avm.ins23
-rw-r--r--macros/latex/contrib/langsci-avm/langsci-avm.pdfbin114198 -> 160240 bytes
-rw-r--r--macros/latex/contrib/naive-ebnf/DEPENDS.txt1
-rw-r--r--macros/latex/contrib/naive-ebnf/naive-ebnf.dtx105
-rw-r--r--macros/latex/contrib/naive-ebnf/naive-ebnf.pdfbin542835 -> 588553 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md5
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/README.md2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdfbin961936 -> 962540 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx14
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdfbin686657 -> 686472 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdfbin586863 -> 587431 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdfbin514646 -> 515050 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdfbin557793 -> 558354 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdfbin540820 -> 541395 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdfbin543108 -> 543671 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdfbin536219 -> 536785 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdfbin591646 -> 592206 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdfbin515474 -> 516032 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdfbin749558 -> 750122 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdfbin565712 -> 566285 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdfbin681579 -> 681952 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx18
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdfbin810260 -> 811796 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdfbin526338 -> 526936 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdfbin426365 -> 426770 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdfbin588430 -> 588866 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdfbin386819 -> 386480 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdfbin443946 -> 444499 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdfbin455951 -> 456334 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/postnotes/CHANGELOG.md8
-rw-r--r--macros/latex/contrib/postnotes/postnotes-code.pdfbin839836 -> 840032 bytes
-rw-r--r--macros/latex/contrib/postnotes/postnotes.dtx23
-rw-r--r--macros/latex/contrib/postnotes/postnotes.pdfbin177383 -> 177453 bytes
-rw-r--r--macros/latex/contrib/postnotes/postnotes.tex4
-rw-r--r--macros/latex/contrib/recorder-fingering/README.md6
-rw-r--r--macros/latex/contrib/recorder-fingering/recorder-fingering-RecorderInCchart.pngbin0 -> 73061 bytes
-rw-r--r--macros/latex/contrib/recorder-fingering/recorder-fingering.pdfbin89439 -> 89434 bytes
-rw-r--r--macros/latex/contrib/recorder-fingering/recorder-fingering.sty5
-rw-r--r--macros/latex/contrib/recorder-fingering/recorder-fingering.tex2
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md12
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin620740 -> 620743 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx34
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx12
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin667977 -> 667978 bytes
-rw-r--r--macros/latex/contrib/zref-clever/CHANGELOG.md8
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever-code.pdfbin1281092 -> 1283670 bytes
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever.dtx20
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever.pdfbin345913 -> 345913 bytes
76 files changed, 879 insertions, 509 deletions
diff --git a/macros/latex/contrib/fixdif/fixdif-zh-cn.pdf b/macros/latex/contrib/fixdif/fixdif-zh-cn.pdf
index da89964e6e..f2edfcd797 100644
--- a/macros/latex/contrib/fixdif/fixdif-zh-cn.pdf
+++ b/macros/latex/contrib/fixdif/fixdif-zh-cn.pdf
Binary files differ
diff --git a/macros/latex/contrib/fixdif/fixdif-zh-cn.tex b/macros/latex/contrib/fixdif/fixdif-zh-cn.tex
index d47b803baf..9b9ba2a6fa 100644
--- a/macros/latex/contrib/fixdif/fixdif-zh-cn.tex
+++ b/macros/latex/contrib/fixdif/fixdif-zh-cn.tex
@@ -1,6 +1,6 @@
\documentclass[letterpaper,11pt]{article}
\usepackage{fixdif}
-\date{2023/02/01\quad Version 2.0a%
+\date{2023/02/21\quad Version 2.0b%
\thanks{源代码见~\hyperref{https://github.com/AlphaZTX/fixdif}{}{}{GitHub}
或~\hyperref{https://www.ctan.org/pkg/fixdif}{}{}{CTAN}。}
}
diff --git a/macros/latex/contrib/fixdif/fixdif.dtx b/macros/latex/contrib/fixdif/fixdif.dtx
index e27b276fe8..46a15a5d63 100644
--- a/macros/latex/contrib/fixdif/fixdif.dtx
+++ b/macros/latex/contrib/fixdif/fixdif.dtx
@@ -131,7 +131,7 @@ Copyright (C) 2022-2023 by Zhang Tingxuan <alphaztx@163.com>.
%</internal>
%
%<*driver>
-\ProvidesFile{fixdif.dtx}[2023/02/01 (c) Copyright 2022-2023 by Zhang Tingxuan]
+\ProvidesFile{fixdif.dtx}[2023/02/21 (c) Copyright 2022-2023 by Zhang Tingxuan]
\documentclass{ltxdoc}
\usepackage{xcolor}
@@ -150,7 +150,7 @@ Copyright (C) 2022-2023 by Zhang Tingxuan <alphaztx@163.com>.
\title{The \pkg{fixdif} Package}
\author{Zhang Tingxuan}
-\date{2023/02/01\quad Version 2.0a\thanks{\url{https://github.com/AlphaZTX/fixdif}}}
+\date{2023/02/21\quad Version 2.0b\thanks{\url{https://github.com/AlphaZTX/fixdif}}}
\usepackage{hyperref}
\hypersetup{
@@ -206,49 +206,45 @@ Copyright (C) 2022-2023 by Zhang Tingxuan <alphaztx@163.com>.
% \maketitle
%
% \begin{abstract}
-% The \pkg{fixdif} package redefines the \cs{d} command in \LaTeX{}
-% and provides an interface to define commands for differential operators.
+% The \pkg{fixdif} package redefines the \cs{d} command in \LaTeX\ and
+% provides an interface to define commands for differential operators.
%
-% The package is compatible with pdf\TeX, \XeTeX{} and \LuaTeX.
-% Furthermore, the package is compatible with \pkg{unicode-math} package
-% in \XeTeX{} and \LuaTeX.
+% The package does well with pdf\TeX, \XeTeX\ and \LuaTeX, only works
+% with \LaTeX\ format. Furthermore, this package is compatible with
+% \pkg{unicode-math} package in \XeTeX\ and \LuaTeX.
% \end{abstract}
%
% {\parskip1pt plus 1pt\tableofcontents}
%
% \section{The background}
-% It's usually recommended that one should reserve a small skip between
+% It's usually recommended that a small skip should be reserved between
% the differential operator and the expression before it\footnote{See
% \url{https://tex.stackexchange.com/questions/14821/whats-the-proper-way-to-typeset-a-differential-operator}.}.
-% Take the following cases as an example:
-% \[f(x)\mathrm{d}x\qquad\mbox{and}\qquad f(x)\d x.\]
+% Take the following line as an example:
+% \[f(x)\mathrm{d}x\qquad\hbox{and}\qquad f(x)\d x.\]
% We usually consider that the example on the right side is better than the
-% one on the left side. The little skip between $f(x)$ and $\d x$ can be
-% regarded as a symbol of the product of $f(x)$ and $\d x$.
+% one on left side. The small skip between $f(x)$ and $\d x$ can be
+% regarded as a binary operator.
%
-% So some users prefer to define a macro like this:
+% Some users prefer to define a macro like this:
% \begin{Verbatim}
% \renewcommand\d{\mathop{\mathrm{d}}\!}
% \end{Verbatim}
-% This macro works well in ``display math'' and ``text math'', but we still
-% face the following three problems:
+% This macro works well in display math and text math, but still appears with
+% the following three problems:
% \begin{enumerate}
-% \item The skip before ``d'' would still be reserved in ``text fraction'',
-% which is regarded bad. For example, |$\d y/\d x$| produces
-% $\mathrm{d}y/\,\mathrm{d}x$;
-%
-% \item This |\d| command cannot be used out of math mode. In other words,
-% |\d{o}| would not produce ``\d{o}'' in text;
-%
-% \item The skip between ``d'' and the expression before it can be regarded
-% as a product operator. A product operator is definitely a binary operator.
-%
-% Take |\cdot| ($\cdot$) as an example.
-% A binary operator reserves small skips before and after itself when in
-% ``display math'' or ``text math'' such as $x\cdot y$, but the skips will
-% disappear in ``script math'' or ``script script math'' such as $a^{x\cdot y}$.
-% Thus the small skip should also disappear in script, but |$a^{f(x)\d x}$|
-% still produces $a^{f(x)\,\mathrm{d}x}$ but not $a^{f(x)\d x}$.
+% \item The skip before ``$\d$'' still exists before the denominator in
+% ``text fraction''. This is what we do not hope to see. For example,
+% |$\d y/\d x$| produces $\mathrm{d}y/\,\mathrm{d}x$.
+%
+% \item |\d| is defined as a text accent command in \LaTeXe\ kernel. If we
+% defined like this, |\d{o}| could not produce ``\d{o}'' in text.
+%
+% \item The skip before ``d'' should behave like skips around a binary operator.
+% It should disappear in script math and script script math. For example,
+% |$a+b$| yields $a+b$ while |$^{a+b}$| yields $^{a+b}$, the skips around ``$+$''
+% disappear in superscript. But in the definition above, |$^{f(x)\d x}$|
+% yields $^{f(x)\,\mathrm{d}x}$ but not $^{f(x)\d x}$.
% \end{enumerate}
% To solve these problems, you can try this package.
%
@@ -257,8 +253,8 @@ Copyright (C) 2022-2023 by Zhang Tingxuan <alphaztx@163.com>.
% \begin{Verbatim}
% \usepackage{fixdif}
% \end{Verbatim}
-% in the preamble (\pkg{fixdif} allows you to write this line anywhere in the
-% preamble since version 2.0). In your document,
+% in the preamble. \pkg{fixdif} allows you to write this line anywhere in the
+% preamble since version 2.0. In your document,
% \begin{Verbatim}
% \[ f(x)\d x,\quad\frac{\d y}{\d x},\quad\d y/\d x,\quad a^{y\d x}. \]
% \end{Verbatim}
@@ -269,41 +265,42 @@ Copyright (C) 2022-2023 by Zhang Tingxuan <alphaztx@163.com>.
% \DescribeMacro{\d}
% The \pkg{fixdif} package provides a \cs{d} command for the differential
% operator ``d'' in math mode. When in text, \cs{d} behaves just like
-% the old \cs{d} command in \LaTeX{} or plain \TeX{} as an
-% accent command. For example,
+% the old \cs{d} command in \LaTeX\ or plain \TeX\ as an accent command.
+% For example,
% \begin{Verbatim}
% $\d x$ and \d x
% \end{Verbatim}
-% will produce ``$\d x$ and \d x''.
+% tields ``$\d x$ and \d x''.
%
% \paragraph{Set the font of \cs{d}}
-% There are two basic package options to control the \cs{d}'s style in math
-% mode~--- \opt{rm} and \opt{normal}. The default option is \opt{rm}, in which
-% case |$f(x)\d x$| produces $f(x)\d x$. If you chose the \opt{normal} option,
-% for example
+% There are two package options to control the style of \cs{d} in math mode~---
+% \opt{rm} and \opt{normal}. The default option is \opt{rm}, in which case
+% |$f(x)\d x$| produces $f(x)\d x$. If you chose the \opt{normal} option,
+% that is
% \begin{Verbatim}
% \usepackage[normal]{fixdif}
% \end{Verbatim}
-% |$f(x)\d x$| would produces $f(x)\,dx$.
+% |$f(x)\d x$| yields $f(x)\,dx$.
%
% \DescribeMacro{\resetdfont}
-% Besides the previous two optional fonts, you can reset the font of
-% differential operator ``d'' through \cs{resetdfont} command in preamble:
+% Regardless of the two options above, you can reset the font of \cs{d}
+% through \cs{resetdfont} command in preamble:
% \begin{Verbatim}
% \resetdfont{\mathsf}
% \end{Verbatim}
-% then |\d x| will produce $\mathsf{d}x$.
+% then |$\d x$| yields $\mathsf{d}x$. Notice that the argument of
+% \cs{resetdfont} should be a command with \emph{one} argument.
%
% \paragraph{Control the behavior of \cs{partial}}
% \DescribeMacro{\partial}
-% In default, \cs{partial} will also be regarded as a differential operator
-% in this package. If you don't like this default setting, you can use the
-% \opt{nopartial} option:
+% In default, \cs{partial} will be regarded as a differential operator
+% after you load \pkg{fixdif}. If you don't like this default setting,
+% you can use the \opt{nopartial} option:
% \begin{Verbatim}
% \usepackage[nopartial]{fixdif}
% \end{Verbatim}
-% If you use the default setting, \cs{partialnondif} yields the ordinary
-% symbol $\partialnondif$.
+% If you choose to use the default settings, \cs{partialnondif} yields
+% the ordinary symbol ``$\partialnondif$''.
%
% \section{Define commands for differential operators}
% \noindent\emph{Attention! The commands in this section
@@ -313,7 +310,7 @@ Copyright (C) 2022-2023 by Zhang Tingxuan <alphaztx@163.com>.
% \noindent\textcolor{titlecolor}{\cs{letdif}\marg{cmd}\marg{csname}}\DescribeMacro{\letdif}
% \hfill(preamble only)
%
-% The \cs{letdif} command has two arguments~--- the first is the newly-defined
+% The \cs{letdif} command takes two arguments~--- the first is the newly-defined
% command and the second is the control sequence \emph{name} of a math character,
% that is, a command without its backslash. For example,
% \begin{Verbatim}
@@ -447,7 +444,7 @@ Copyright (C) 2022-2023 by Zhang Tingxuan <alphaztx@163.com>.
% Check the \TeX{} format and provides the package name.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixdif}[2023/02/01 Interface for defining differential operators.]
+\ProvidesPackage{fixdif}[2023/02/21 Interface for defining differential operators.]
% \end{macrocode}
%
% \subsection{Control the skip between slashes and differential operator}
diff --git a/macros/latex/contrib/fixdif/fixdif.pdf b/macros/latex/contrib/fixdif/fixdif.pdf
index 835ed6520e..381447c5e0 100644
--- a/macros/latex/contrib/fixdif/fixdif.pdf
+++ b/macros/latex/contrib/fixdif/fixdif.pdf
Binary files differ
diff --git a/macros/latex/contrib/langsci-avm/README b/macros/latex/contrib/langsci-avm/README
index 80c60efd2c..e884844e03 100644
--- a/macros/latex/contrib/langsci-avm/README
+++ b/macros/latex/contrib/langsci-avm/README
@@ -1,20 +1,15 @@
-langsci-avm is aimed at typesetting beautiful feature structures,
-also known as attribute-value matrices (AVMs), for use in linguistics.
+A package for typesetting feature structures, also known as attribute-value
+matrices (AVMs), for use in linguistics.
-The package provides a minimal and easy to read syntax.
-It depends only on the array package and can be placed almost everywhere,
-in particular in footnotes or graphs and tree structures. The package is meant
-as an update to, and serves the same purpose as, Christopher Manning’s
-avm package, but shares no code base with that package.
+The package provides a minimal and easy to read syntax. It depends only on the
+array package and can be placed almost everywhere, in particular in footnotes or
+graphs and tree structures. The package serves the same purpose as, Christopher
+Manning’s avm package, but shares no code base with that package.
-langsci-avm was developed at Language Science Press to help in the
-production of scientific texts in linguistics.
+Copyright (C) 2023 by Felix Kopecky, Language Science Press
-Copyright (C) 2020 by Felix Kopecky, Language Science Press
-
-This work consists of the file langsci-avm.dtx
- and the derived files langsci-avm.ins,
- langsci-avm.pdf.
+This work consists of the file langsci-avm.dtx
+ and the derived file langsci-avm.pdf.
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/macros/latex/contrib/langsci-avm/langsci-avm.dtx b/macros/latex/contrib/langsci-avm/langsci-avm.dtx
index 72346d4f51..06ca884a80 100644
--- a/macros/latex/contrib/langsci-avm/langsci-avm.dtx
+++ b/macros/latex/contrib/langsci-avm/langsci-avm.dtx
@@ -11,23 +11,18 @@
\preamble
------------------------------------------------------------------------------
-langsci-avm is aimed at typesetting beautiful feature structures,
-also known as attribute-value matrices (AVMs), for use in linguistics.
+A package for typesetting feature structures, also known as attribute-value
+matrices (AVMs), for use in linguistics.
-The package provides a minimal and easy to read syntax.
-It depends only on the array package and can be placed almost everywhere,
-in particular in footnotes or graphs and tree structures. The package is meant
-as an update to, and serves the same purpose as, Christopher Manning’s
-avm package, but shares no code base with that package.
+The package provides a minimal and easy to read syntax. It depends only on the
+array package and can be placed almost everywhere, in particular in footnotes or
+graphs and tree structures. The package serves the same purpose as, Christopher
+Manning’s avm package, but shares no code base with that package.
-langsci-avm was developed at Language Science Press to help in the
-production of scientific texts in linguistics.
+Copyright (C) 2023 by Felix Kopecky, Language Science Press
-Copyright (C) 2020 by Felix Kopecky, Language Science Press
-
-This work consists of the file langsci-avm.dtx
- and the derived files langsci-avm.ins,
- langsci-avm.pdf.
+This work consists of the file langsci-avm.dtx
+ and the derived file langsci-avm.pdf.
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -71,7 +66,9 @@ Please report any bugs or feature requests to
%<*driver>
\documentclass{l3doc}
\usepackage[linguistics]{forest}
-\usepackage{langsci-avm,enumitem,url,gb4e}
+\usepackage[lfg,tikz]{langsci-avm}
+\usetikzlibrary{arrows, arrows.meta}
+\usepackage{enumitem,url,gb4e,xltxtra}
\setlist[description]{font=\normalfont}
\begin{document}
\DocInput{\jobname.dtx}
@@ -83,15 +80,15 @@ Please report any bugs or feature requests to
% Please submit bug reports and feature requests to
% \protect\url{https://github.com/langsci/langsci-avm/issues}.
% }}
-% \date{Version 0.2.1 -- 15th July 2020}
+% \date{Version 0.3.0 -- \today}
% \maketitle
% \frenchspacing
% \begin{documentation}
% \section{Introduction}
-% \pkg{langsci-avm} is a \LaTeX3 package aimed at typesetting beautiful feature structures, also known as \emph{attribute-value matrices}, for use in linguistics. The package provides a minimal and easy to read syntax. It depends only on the \pkg{array} package and can be placed almost everywhere, in particular in footnotes or graphs and tree structures. The package is meant as an update to, and serves the same purpose as, Christopher Manning's \pkg{avm} package, but shares no code base with that package. When you come from \pkg{avm}, please see Section~\ref{sec:switching} for a quick conversion guide.
+% \pkg{langsci-avm} allows typesetting of feature structures, or \emph{attribute-value matrices} (AVM), for use in linguistics. The package provides a minimal and easy to read syntax. The package serves the same purpose as Christopher Manning's \pkg{avm} package, but shares no code base with that package. There is a conversion guide in Section~\ref{sec:switching}.
%
% To start using \pkg{langsci-avm}, place |\usepackage{langsci-avm}| in your preamble.\\\\
-% \emph{This document is structured as follows:} Section~\ref{sec:basiccommands} describes the input syntax for AVMs and their parts. Ways to customise your AVM's layout follow in Section~\ref{sec:options}, and selected usage cases are presented in Section~\ref{sec:applications}. There's also an administrative and \TeX nical appendix at the end of this document, in case you are interested.
+% \emph{This documentation is structured as follows:} Section~\ref{sec:basiccommands} describes the input syntax for AVMs and their parts. Ways to customise your AVM's layout follow in Section~\ref{sec:options}, and selected usage cases are presented in Section~\ref{sec:applications}. There's also an administrative and \TeX nical appendix at the end of this document, in case you are interested.
%
% \subsection{Example}
% \begin{verbatim}
@@ -119,7 +116,7 @@ Please report any bugs or feature requests to
% \begin{syntax}
% \cs{avm} \oarg{options} \marg{structure}
% \end{syntax}
-% The heart of this package and its root document comand is |\avm|. In the scope of the command, delimiter characters are processed to open and close (sub-)structures, as described in Section~\ref{sec:commands}. Special elements are described in Section~\ref{sec:specialcommands}. For a description of the layout \meta{options}, see Section~\ref{sec:options}.
+% This root command of the package type sets AVMs in the documen. In the \marg{structure}, delimiter characters are processed to open and close (sub-)structures, as described in Section~\ref{sec:commands}. Special elements (e.g. tags, operators, type descriptors) are described in Section~\ref{sec:specialcommands}. For a description of the layout \meta{options}, see Section~\ref{sec:options}.
%
% A \meta{structure} is basically the content of a stylised \cmd{tabular}: The columns are separated by \cmd{&} and a new line is entered with \cmd{\\}.
% \end{function}
@@ -127,42 +124,74 @@ Please report any bugs or feature requests to
% \subsection{Entering (sub-)structures within \texttt{\textbackslash avm}}
% \label{sec:commands}
%
-% \begin{function}{[...],<...>,(...),\{...\}}
+% \begin{function}[updated=2020-10-02]{[...],<...>,(...),\{...\},\[...\]}
% \begin{syntax}
% \cmd{[} \meta{structure} \cmd{]}
% \cmd{<} \meta{structure} \cmd{>}
% \cmd{(} \meta{structure} \cmd{)}
% \cmd{\{} \meta{structure} \cmd{\}}
+% \cmd{\[} \meta{structure} \cmd{\]}
% \end{syntax}
% Within the scope of \cs{avm}, these delimiters create (sub-)structures that are enclosed by the respective delimiter. Due to the special meaning that curly braces have in \LaTeX, these are the only ones that need to be run with an escape token (|\|). It is currently possible to mix delimiters, e.g. with |<|\meta{structure}|)|, but this may change in future versions.
%
-% \pkg{langsci-avm} expects your (sub-)structures to have \emph{at most two columns}, so that for every line in each (sub-)structure, there should be no more than one \cmd{&}. It is recommended to have at least some lines with a \cmd{&} in your \meta{structure}. Currently, display issues may appear in some structures if none are given.\bigskip\\
+% \pkg{langsci-avm} expects your (sub-)structures to have \emph{at most two columns}, so that for every line in each (sub-)structure, there should be no more than one \cmd{&}. It is recommended to have at least some lines with a \cmd{&} in your \meta{structure}. Currently, display issues may appear in some structures if none are given -- see the |align=false| option to remedy this effect.\bigskip\\
% \noindent\begin{minipage}[c]{.5\linewidth}
% \begin{verbatim}
% \avm{
-% [ < ( \{ ... \} ) > ]
+% [ < ( \{ ... \} ) > ]
% }
% \end{verbatim}
% \end{minipage}\begin{minipage}[c]{.5\linewidth}
% \avm{
-% [ < ( \{ ... \} ) > ]
+% [ < ( \{ ... \} ) > ]
% }
% \end{minipage}\bigskip\\
% \noindent\begin{minipage}[c]{.5\linewidth}
% \begin{verbatim}
% \avm{
-% [ \{ ... \} \\
-% < ( ... ), ( ... ) > ]
+% [ \{ ... \} \\
+% < ( ... ), ( ... ) > ]
% }
% \end{verbatim}
% \end{minipage}\begin{minipage}[c]{.5\linewidth}
% \avm{
-% [ \{ ... \} \\
-% < ( ... ), ( ... ) > ]
+% [ \{ ... \} \\
+% < ( ... ), ( ... ) > ]
% }
% \end{minipage}
% \end{function}
%
+% \begin{function}[added=2020-10-02]{\[ ... \]}
+% \begin{syntax} \cmd{\[} \meta{structure} \cmd{\]} \end{syntax}
+% Add a semantic bracket \avm[attributes=\normalfont]{\[ \meta{structure} \]}.\smallskip\\
+% \emph{Warning:} Semantic brackets are only available when the package option |[lfg]| is loaded (|\usepackage[lfg]{langsci-avm}|). Documents with this option can only be compiled with \XeLaTeX{}. If the |[lfg]| option is not present, \cmd{\[} \marg{structure} \cmd{\]} will result in none delimiter output, but the \marg{structure} will be printed nonetheless. (The semantic delimiters are not available in every font, and are currently not provided in standard \LaTeX\ documents. If you load the |[lfg]| option but do not provide the symbol (e.g. by using a font such as \pkg{libertinus}), the package \pkg{unicode-math} will automatically be loaded to provide the symbol.)
+% \end{function}
+%
+% \begin{function}[added=2021-03-03]{\lframe ... \rframe}
+% \begin{syntax}
+% \cmd{\lframe} \meta{structure} \cmd{\rframe}
+% \end{syntax}
+% Delimit a \meta{structure} placed in a rectangular box, which is used in Fillmore \& Kay's notation. It can be used like the other delimiters.\bigskip\\
+% \noindent\begin{minipage}[c]{.5\linewidth}
+% \begin{verbatim}
+% \avm{
+% \lframe ... \rframe
+% }
+% \end{verbatim}
+% \end{minipage}\begin{minipage}[c]{.5\linewidth}
+% \avm{
+% \lframe ... \rframe
+% }
+% \end{minipage}
+%
+% The parameters of the frame can be adjusted with these options:
+% \begin{description}[style=nextline]
+% \item[|framewidth =| \meta{length} \hfill (initially |1pt|)] Width of the frame.
+% \item[|framesep =| \meta{length} \hfill (initially |3pt|)] Separation of the frame and its contents.
+% \end{description}
+%
+% \end{function}
+%
% \begin{function}{!...!}
% \begin{syntax}
% \cmd{!} \meta{text} \cmd{!}
@@ -196,7 +225,7 @@ Please report any bugs or feature requests to
% \begin{syntax}
% \cs{type}\meta{*} \marg{type}
% \end{syntax}
-% Will output the \meta{type} in the |types| font (roman italics by default). The starred variant \cs{type*} will span the complete (sub-)structure and \emph{can only be placed in the first column} of this structure. After the starred \cs{type*}, a |\\| is recommended, but can usually be omitted.\bigskip\\
+% Will output the \meta{type} in the |types| font (serif italics by default). The starred variant \cs{type*} will span the complete (sub-)structure and \emph{can only be placed in the first column} of this structure. After the starred \cs{type*}, a |\\| is recommended, but can usually be omitted.\bigskip\\
% \noindent\begin{minipage}{.6\linewidth}
% \begin{verbatim}
% \avm{[ \type*{A type spanning a line}
@@ -210,20 +239,41 @@ Please report any bugs or feature requests to
% \end{minipage}
% \end{function}
%
-% \begin{function}{\punk}
+% \begin{function}[added=2020-10-02,updated=2021-12-14]{\id}
+% \begin{syntax}
+% \cs{id} \marg{id} \marg{structure}
+% \end{syntax}
+% A variant of \cs{substack} from \pkg{amsmath}, this command adds an identifier to the \marg{structure}. The contents of \marg{id} will be set in math mode by default, which is convenient given that they often contain variables with subscript indices. Multiple IDs should be separated by a new line, |\\|.\\
+% \noindent\begin{minipage}{.75\linewidth}
+% \begin{verbatim}
+% \avm{\id{n_1\\n_2}{[subj\\pred&swim]}}
+% \end{verbatim}
+% \end{minipage}\begin{minipage}{.25\linewidth}
+% \avm{\id{n_1\\n_2}{[subj\\pred&swim]}}
+% \end{minipage}\smallskip\\
+%
+% The position of the \marg{id} column relative to the \marg{structure} and the alignment within the \marg{id} column can be changed:
+%
+% \begin{description}[style=nextline]
+% \item[|id align =| \meta{token} \hfill (initially |l|)] Change the alignment of the column inserted by \cs{id}. Has to be a column specification. The most probable choices are \cmd{l} and \cmd{r}.
+% \item[|id position =| \meta{option} \hfill (initially |south-west|)] Change the position of \cs{id}. In the standard setting |south-west|, the \cs{id} is placed in the lower left corner of the enclosed structure. When set to |south-east|, the contents are set to the lower right corner. Currently, only |south-west| and |south-east| are recognised inputs, and an error is raised when an unknown option is input.
+% \end{description}
+% \end{function}
+%
+% \begin{function}[updated=2021-06-08]{\punk}
% \begin{syntax}
% \cs{punk} \marg{attribute}\marg{type}
% \end{syntax}
% Some \meta{attributes} think that the layout of the other attributes in their community leaves no space for them to express their individuality. They desire a life outside the confines of the alignment defined by the others, while still remaining a member of the matrix.
%
-% Technically, this is a line with no snapping to the column layout, but with spacing between the \meta{attribute} and \meta{type}. After \cs{punk}, a |\\| is recommended, but can be omitted in ``normal'' cases.\bigskip\\
+% Technically, this is a line with no snapping to the column layout, but with spacing between the \meta{attribute} and \meta{type}. After \cs{punk}, a |\\| is obligatory if not in the last line.\bigskip\\
% \noindent\begin{minipage}{.6\linewidth}
% \begin{verbatim}
% \avm{[ attr1 & val1\\
-% \punk{a quite long attr2}{val2} ]}
+% \punk{a quite long attr2}{val2}
% attr3 & val3\\
% attr4 & val4
-% ]}
+% ]}
% \end{verbatim}
% \end{minipage}\begin{minipage}{.4\linewidth}
% \avm{[
@@ -232,7 +282,8 @@ Please report any bugs or feature requests to
% attr3 & val3\\
% attr4 & val4
% ]}
-% \end{minipage}
+% \end{minipage}\bigskip\\
+% \emph{Hint:} Also have a look at the option |align=false|.
% \end{function}
%
% \begin{function}[updated=2020-03-16]{\+}
@@ -240,7 +291,7 @@ Please report any bugs or feature requests to
% \end{function}
%
% \begin{function}[added=2020-03-17]{\-}
-% In the scope of \cs{avm}, \cs{-} comes out as ``$\ominus$''. To use the ``optional hyphenation'' meaning of \cs{-}, please write |!\-!|.
+% In the scope of \cs{avm}, \cs{-} comes out as ``$\ominus$''. To use the ``optional hyphenation'' meaning of \cs{-}, please write |!\-!|, where |!| is your current |switch| token.
% \end{function}
%
% \begin{function}[added=2020-03-17]{\shuffle}
@@ -251,13 +302,13 @@ Please report any bugs or feature requests to
%
% \subsection{Defining styles}
%
-% You can customise many aspects of how an AVM is printed, including the fonts or spacing between delimiters and content. You can apply them locally via the \oarg{options} of \cs{avm} or by using \cs{avmsetup}. And you can also define your own styles and use them via the \oarg{style = } option in \cs{avm}.
+% You can customise many aspects of how an AVM is printed, including the fonts or spacing between delimiters and content. You can apply them locally via the \oarg{options} of \cs{avm} or globally by using \cs{avmsetup}. And you can also define your own styles and use them via the \oarg{style = } option in \cs{avm}.
%
% \begin{function}{\avmsetup}
% \begin{syntax}
% \cs{avmsetup} \marg{options}
% \end{syntax}
-% \marg{options} is a comma-separated list of |key = value| settings. See the list below for all user-configurable options. The \marg{options} are the same as in \cs{avm}\oarg{options}. When inserted in \cs{avm}\oarg{options}, they apply locally, and globally if given to \cs{avmsetup}. Local settings always override global ones, and you can have any feasible number of \cs{avmsetup}s in your document.
+% \marg{options} is a comma-separated list of |key=value| settings. See the list below for all user-configurable options. The \marg{options} are the same as in \cs{avm}\oarg{options}. When inserted in \cs{avm}\oarg{options}, they apply locally, and globally if given to \cs{avmsetup}. Local settings always override global ones, and you can have any feasible number of \cs{avmsetup}s in your document. The scope of \cs{avmsetup} can be restricted through grouping.
%
% \end{function}
%
@@ -265,7 +316,7 @@ Please report any bugs or feature requests to
% \begin{syntax}
% \cs{avmdefinestyle} \marg{name} \marg{settings}
% \end{syntax}
-% Instead of applying settings globally or per AVM, you can also define styles and assign them to AVMs, as in |\avm[style=|\meta{name}|]{...}|. The \meta{settings} are a comma-separated list of |key = value| settings, and should be a subset of the settings from \cs{avmsetup}. For example, the following |plain| style highlights neither attributes, values, nor types:
+% Instead of applying settings globally or per AVM, you can also define styles and assign them to AVMs, as in |\avm[style=|\meta{name}|]{...}|. The \meta{settings} are a comma-separated list of |key=value| settings, and should be a subset of the settings from \cs{avmsetup}. For example, the following |plain| style highlights neither attributes, values, nor types:
%
% \begin{verbatim}
% \avmdefinestyle{plain}{attributes=\normalfont,
@@ -277,14 +328,18 @@ Please report any bugs or feature requests to
%
% \bigskip
%
-% \noindent Now to the list of settings you can actually apply:
+% \noindent Now to the list of settings:
%
% \begin{description}[style=nextline]
% \item[|style =| \meta{name} \hfill (initially empty)] In addition to any style that you possibly define yourself, a style |narrow| is pre-defined in the package (see Section~\ref{sec:spacing}).
%
+% \item[|align =| \meta{choice} \hfill (initially |true|)] Controls whether the columns in the AVM and its substructures should be aligned (snapping to the grid) or not. Aligned AVMs are separated by |columnsep|, non-aligned are separated by |vectorsep|.
+%
% \item[|stretch =| \meta{factor} \hfill (initially |0.9|)] Define \cs{arraystretch}, i.e. a factor in the determination of line height.
%
% \item[|columnsep =| \meta{length} \hfill (initially |0.5ex|)] Define the \cs{tabcolsep}, i.e. horizontal space between columns. The first and second column will have |0\columnsep| to the left and right, respectively. Between the two the distance is |2\columnsep|. Using relative units (like |ex| or |em|) may be a good idea so that |columnsep| scales well with changes in font size.
+%
+% \item[|vectorsep =| \meta{length} \hfill (initially |1em|)] Define the horizontal separation between columns in non-aligned matrices (see option |align|).
%
% \item[|delimfactor =| \meta{factor} \hfill (initially |1000|)] Sets \cs{delimiterfactor}. The calculation for the minimum height of a delimiter is $y \cdot f /1000$, where $y$ is the height of the content and $f$ the value of \cmd{delimfactor}. The default |1000| ensure that the delimiters' height is at least that of the structure.
%
@@ -295,8 +350,6 @@ Please report any bugs or feature requests to
% \item[|attributes =| \meta{font settings} \hfill (initially |\textbackslash scshape|)] The font for attributes, i.e. the first column of each structure.
%
% \item[|values =| \meta{font settings} \hfill (initially |\textbackslash itshape|)] The font for values, i.e. the second column of each structure.
-%
-% \item[|apptovalues=| \meta{code} \hfill (initially \cs{/})] The \meta{code} is applied after the second column (``append to''). This is useful if |values| is set to |\itshape|, since \cs{itshape} does not automatically insert italic correction.
%
% \item[|types =| \meta{font settings} \hfill (initially |\textbackslash itshape|)] The font used in \cs{type} and \cs{type*}.
% \item[|tags =| \meta{format settings} \hfill (initially |\textbackslash footnotesize|)] The font (size) used in \cs{tag} and the shortcuts \cs{1}...\cs{9}.
@@ -304,13 +357,70 @@ Please report any bugs or feature requests to
% \item[|customise = | \meta{settings} \hfill (initially empty)] An interface to input custom commands to be run at the beginning of every \cs{avm}.
% \end{description}
%
+% \subsection{Drawing edges between AVM contents}
+% It is possible to make AVM contents available to \pkg{tikz}, so that they can be referenced in a \cmd{tikzpicture}. To enable this feature, \pkg{langsci-avm} has to be loaded with the option |[tikz]|:
+%
+% \begin{verbatim}
+% \usepackage[tikz]{langsci-avm}
+% \end{verbatim}
+% Additionaly, \cmd{avm} environments on which \pkg{tikz} is to be used need to have the |[pic]| option present:
+%
+% \begin{verbatim}
+% \avm[pic] {...}
+% \end{verbatim}
+%
+% Only the parts of an AVM that are specifically marked will be known to \pkg{tikz}. To mark a part of an AVM to be used by Ti\emph{k}Z, use \cs{node}:
+%
+% \begin{function}[added=2020-09-23]{\node}
+% \begin{syntax}
+% \cs{node} \marg{id} \marg{contents}
+% \end{syntax}
+% \marg{id} serves as part of the node's identifier in a \cmd{tikzpicture}. It will be prefixed, and it's complete name will be |avm-n-|\meta{id}, where |n| is the counter of \cs{avm} in your document that have the |[pic]| option enabled and that don't have a |picname| (see below). |n| starts at 1. For example, a \cs{node} named ``pretty-node'' in the fourth |[pic]|-enabled \cmd{avm} in your document will be |avm-4-pretty-node|. Note that \cs{node} will register the complete name globally in your document, and so can't be declared by other \pkg{tikz} nodes.
+%
+% This behaviour can be adjusted by passing a |[picname = |\meta{avm's name}|]| to \cs{avm}. E.g., \cs{node}s within |\avm[pic, picname=example1]| will have a full name pattern of |example1-|\meta{id}. Named \cs{avm}s do \emph{not} raise the |n| mentioned in the last paragraph.
+%
+% Any (sub-)structure can be placed into \marg{contents}. It could be just a value, an attribute's name, or parts thereof, but whole (sub-)structures can be part of \marg{contents} as well.
+% \end{function}
+%
+% A \cmd{tikzpicture} with options |[remember picture, overlay]| enabled can reference \pkg{langsci-avm}'s \cs{node}s. This way, Ti\emph{k}Z' extensive drawing abilities are available for the decoration of AVMs. Here's a very simple example document:
+%
+% \begin{center}
+% \avm[pic, picname=example1]{[ subj & \1\\
+% comps & <\node{gap}{gap-ss}> \bigskip\\
+% \node{phon}{phon} & <\1 \+ \2>
+% ]}
+%
+% \begin{tikzpicture}[remember picture,overlay]
+% \path[{Stealth[]}-{Stealth[]},gray,dashed,in=90,out=270]
+% (example1-gap.south) edge (example1-phon.north);
+% \end{tikzpicture}
+% \end{center}
+%
+% \begin{verbatim}
+% \documentclass{article}
+% \usepackage[tikz]{langsci-avm}
+% \usepackage{tikz} % optional, since langsci-avm will load tikz if option
+% % tikz is present
+% \usetikzlibrary{arrows,arrows.meta}
+%
+% \avm[pic]{[ subj & \1\\
+% comps & <\node{gap}{gap-ss}> \bigskip\\
+% \node{phon}{phon} & <\1 \+ \2>
+% ]}
+%
+% \begin{tikzpicture}[remember picture,overlay]
+% \path[{Stealth[]}-{Stealth[]},gray,dashed,in=90,out=270]
+% (avm-1-gap.south) edge (avm-1-phon.north);
+% \end{tikzpicture}
+% \end{verbatim}
+%
% \subsection{Defining input patterns}
%
% \begin{function}[added=2020-06-29]{\avmdefinecommand}
% \begin{syntax}
% \cs{avmdefinecommand} \marg{name} \oarg{label} \marg{settings}
% \end{syntax}
-% Sub-structures often come in patterns. For example, AVMs often have a \textsc{phon} attribute, which is mapped to a list, the entries of which are in italics. \cs{avmdefinecommand} can account for this and other input patterns. For example,
+% Structures often follow specific patterns. For example, AVMs often have a \textsc{phon} attribute, which is mapped to a list, the entries of which are in italics. \cs{avmdefinecommand} can account for this and other input patterns. For example,
%
% \begin{verbatim}
% \avmdefinecommand{custom}{...}
@@ -332,7 +442,7 @@ Please report any bugs or feature requests to
%
% This creates a command \cs{phon} (and the variant \cs{phon*}) within the scope of any \cs{avm}. It will print the label \texttt{phon} in the current font and then apply three settings locally: italics for the attribute (first) column, and two settings for very narrow delimiter fitting.
%
-% This results in: (The font of this documentation has little support for IPA.)\avmdefinecommand{phon}[phon] {attributes = \itshape,delimfactor = 900, delimfall = 10pt}\\\\
+% This results in: \avmdefinecommand{phon}[phon] {attributes = \itshape,delimfactor = 900, delimfall = 10pt}\bigskip\\
% \noindent\begin{minipage}[c]{.5\linewidth}
% \begin{verbatim}
% \avm{
@@ -349,12 +459,12 @@ Please report any bugs or feature requests to
% synsem & [ ... ]
% ]
% }
-% \end{minipage}
+% \end{minipage}\bigskip
%
% Note that any other structure type would have worked instead of \avm{<>}. But \avm{<>} and any other markers for sub-structures are left unchanged by \cs{phon} and other custom commands. This is why the \emph{attribute} font is changed by \cs{phon}, although \emph{lin'gwistiks} is technically a value. Remember that \cmd{<} creates a new list sub-substructure, and the first content is printed in its attribute font.
% \end{function}
%
-% \section{Applications}\label{sec:applications}
+% \newpage\section{Applications}\label{sec:applications}
%
% \subsection{Spacing and size of delimiters}\label{sec:spacing}
% \pkg{langsci-avm} automatically detects if the end of a sub-structure is followed by a line break. This is useful to find cases in which two sub-structures are printed immediately below each other, and to add extra spacing (the |extraskip| from the options). This automatic detection can be suppressed with \cs{relax}. See below for the effect of that detection:\bigskip\\
@@ -386,7 +496,7 @@ Please report any bugs or feature requests to
% [attr1 & val1 \\
% attr2 & val2 ]
% ]}
-% \end{minipage}\\\\
+% \end{minipage}\medskip
%
% If many delimiters are nested, this occasionally results in larger delimiter sizes. There is a pre-defined |narrow| style that resets |delimfall| (to |5pt|) and |delimfactor| (to |997|), which are the values recommended in the \textit{\TeX book}. This results in a more compact appearance:\bigskip\\
% \noindent\begin{minipage}[t]{.5\textwidth}\centering
@@ -407,33 +517,33 @@ Please report any bugs or feature requests to
% Sometimes AMVs are placed beside other content to express disjunctions or other relations. In \pkg{langsci-avm} this is done naturally:\bigskip\\
% \noindent\begin{minipage}[c]{.5\textwidth}
% \begin{verbatim}
-% \avm{ [attr1 & val1\\
+% \avm{[attr1 & val1\\
% attr2 & val2\\
-% attr3 & val3] } $\lor$
-% \avm{ [attr1' & val1'\\
+% attr3 & val3]} $\lor$
+% \avm{[attr1' & val1'\\
% attr2' & val2'\\
-% attr3' & val3'\\] }
+% attr3' & val3'\\]}
% \end{verbatim}
% \end{minipage}\begin{minipage}[c]{.5\textwidth}
-% \avm{ [attr1 & val1\\
-% attr2 & val2\\
-% attr3 & val3] } $\lor$
-% \avm{ [attr1' & val1'\\
-% attr2' & val2'\\
-% attr3' & val3'\\] }
+% \avm{[attr1 & val1\\
+% attr2 & val2\\
+% attr3 & val3]} $\lor$
+% \avm{[attr1' & val1'\\
+% attr2' & val2'\\
+% attr3' & val3'\\]}
% \end{minipage}\bigskip\\
% \noindent\begin{minipage}[c]{.5\textwidth}
% \begin{verbatim}
% \textit{sign} $\to$
-% \avm{ [ attribute1 & value1\\
-% attribute2 & value2\\
-% attribute3 & value3 ] }
+% \avm{[attribute1 & value1\\
+% attribute2 & value2\\
+% attribute3 & value3]}
% \end{verbatim}
% \end{minipage}\begin{minipage}[c]{.5\textwidth}
% \textit{sign} $\to$
-% \avm{ [ attribute1 & value1\\
+% \avm{[ attribute1 & value1\\
% attribute2 & value2\\
-% attribute3 & value3 ] }
+% attribute3 & value3 ]}
% \end{minipage}
%
% \pagebreak\subsection{Use as a vector}
@@ -505,7 +615,7 @@ Please report any bugs or feature requests to
% attr2 & val2\\
% attr3 & val3]}} ] ]
% \end{forest}
-% \end{minipage}
+% \end{minipage}\newpage
%
% It may happen that extensive AVMs protrude into the space reserved for other \pkg{forest} nodes or edges. In this case, the \pkg{forest} setting \cmd{for children = \{anchor=north\}} may be useful: (If you like, try this tree without that setting.)\bigskip\\
% \noindent\begin{minipage}[c]{.6\textwidth}
@@ -535,29 +645,14 @@ Please report any bugs or feature requests to
%
% Paths can be printed with a normal \cmd{|}, and $\oplus$ and other relation symbols can be input more easily (see Section~\ref{sec:commands}), though the package will also work with \verb+$|$+ and \verb+$\oplus$+.
%
-% \pkg{langsci-avm} is not yet able to draw lines in elements of AVMs. This feature is planned for Version 0.3.
-%
-%
-% \subsection{Spanning both columns}
-% You can use the \pkg{multicol} package to span both columns in a (sub-)structure. Please remember that every structure has two columns, so the only sensible usage is
-%
-% \begin{verbatim}
-% \multicolumn{2}{l}{...}
-% \end{verbatim}
-%
-% \noindent but only in the first column of a (sub-)structure. For a special usage case, see \cs{type} and \cs{type*} (which do not depend on \pkg{multicol}).
-%
% \section{Caveats and planned features}\label{sec:caveats}
% \begin{enumerate}
% \item There are currently no error messages. If you do not receive the intended output, please make sure that your code fits the syntax described in this documentation. If your code is fine but the output is not, please submit a bug report or feature request at \url{https://github.com/langsci/langsci-avm/issues}.
% \item[] These features are planned for the future:
% \item A check whether the delimiters are balanced, i.e. whether all (sub-)structures are closed by a \verb+]+, \verb+}+, etc.
-% \item Introduce the ability to draw (curved) lines between structures and elements.
% \item Improve the appearance of (very) large angle brackets so that they vertically span the complete structure they enclose, maybe using \pkg{scalerel}.
% \end{enumerate}
%
-% \section{Feedback and bug reports}
-% Comments, usage reports, and feature requests are welcome! Please open an issue for any of these at \url{https://github.com/langsci/langsci-avm/issues}, or write to me at \url{mailto:felix.kopecky@langsci-press.org} if you feel the need for a feature not listed here, big or small.
% \end{documentation}
%
% \begin{implementation}
@@ -570,34 +665,89 @@ Please report any bugs or feature requests to
%<@@=avm>
% \end{macrocode}
% \begin{macrocode}
-\RequirePackage{xparse,array}
+\RequirePackage{xparse}[2022/03/26]
+\RequirePackage{array}
% \end{macrocode}
%
% \begin{macrocode}
\ProvidesExplPackage {langsci-avm}
- {2020-07-15} {0.2.1}
- {AVMs and feature structures in LaTeX3}
+ {2023-02-20} {0.3.0}
+ {AVMs and feature structures}
+
+\msg_new:nnnn {avm} {lfgoptionmissing}
+ { Missing~package~option~lfg~at~line~\msg_line_number: }
+ {
+ You~issued~a~command~in~line~\msg_line_number:~that~is~only~available~when~
+ the~lfg~package~option~is~enabled.
+ }
+
+\msg_new:nnnn {avm} {idpositionunknown}
+ { Unkown~value~for~option~`id~position`~near~line~\msg_line_number:. }
+ { You~specified~an~unknown~value~for~option~`id~position`.~The~content~of~
+ the~id~could~not~be~output.~Please~see~the~manual~for~a~list~of~valid~
+ settings.
+ }
+% \end{macrocode}
+% Let's first check for package options.
+% \begin{macrocode}
+\bool_new:N \l__avm_lfg_bool
+\bool_new:N \l__avm_tikz_bool
+\DeclareOption{tikz}{ \bool_set_true:N \l__avm_tikz_bool }
+\DeclareOption{lfg}{ \bool_set_true:N \l__avm_lfg_bool }
+\ProcessOptions\relax
+% \end{macrocode}
+% Handling for the Ti\emph{k}Z package option.
+% \begin{macrocode}
+\bool_if:NT \l__avm_tikz_bool
+ {
+ \RequirePackage{tikz}
+ \newcounter{l__avm_picture_counter}
+ \tl_new:N \l__avm_picture_name_prefix_tl
+ }
+% \end{macrocode}
+% Handling for the LFG package option: If the semantic bracket is not available at the end of the preamble (i.e.) it was not loaded by another package, load \pkg{unicode-math} to provide the symbol.
+% \begin{macrocode}
+\bool_if:NT \l__avm_lfg_bool
+ {
+ \cs_if_exist:NF \lBrack
+ {
+ \RequirePackage{etoolbox}
+ \AtEndPreamble { \RequirePackage{unicode-math} }
+ }
+ }
% \end{macrocode}
% \begin{macro}{\avm}
% This document command initialises an AVM. The first, optional argumet is a key-value list of settings (see \cs{keys_define:nn} below) and the second is the AVM itself, given in the syntax described in this documentation.
%
-% \cs{avm} enters a group so that keys- and macro-assignemts remain local. It then initialises the commands and shortcuts and any user customisation, sets its mode to |true| and assigns the keys as given in the optional argument (if any). After the wrapper \cs{avm_wrap:n} is called, the group is closed.
+% \cs{avm} enters a group so that keys- and macro-assignemts remain local. It then initialises the commands and shortcuts and any user customisation, sets its mode to |true| and assigns the keys as given in the optional argument (if any). After the parser \cs{__avm_parse:n} is called, the group is closed.
%
% \begin{macrocode}
\NewDocumentCommand{\avm}{ O{} +m }
{
\c_group_begin_token
+ \keys_set:nn { avm } { #1 }
\__avm_initialise_document_commands:
\__avm_initialise_custom_commands:
\tl_use:N \l__avm_defined_commands_tl
- \bool_set_true:N \l__avm_mode_bool
- \keys_set:nn { avm } { #1 }
- \__avm_wrap:n { #2 }
+ \__avm_mode_switch:
+ \__avm_parse:n { #2 }
\c_group_end_token
}
% \end{macrocode}
% \end{macro}
%
+% \begin{variable}{\l__avm_mode_bool, \l__avm_parens_tracker, \l__avm_defined_commands_tl, \l__avm_fillmore_kay_box}
+% We need an auxiliary variable to store the current mode. \cs{l__avm_parens_tracker} is a stack for a future check whether the delimiters given to \cs{avm} are balanced. \cs{l__avm_defined_commands_tl} is a token list that stores any commands provided by the user via \cs{avmdefinecommand}. The box \cs{l__avm_fillmore_kay_box} is used as a temporary storage to realise Fillmore \& Kay's notation.
+% \begin{macrocode}
+\bool_new:N \l__avm_mode_bool
+\seq_new:N \l__avm_parens_tracker
+\tl_new:N \l__avm_defined_commands_tl
+\box_new:N \l__avm_fillmore_kay_box
+\tl_new:N \l__avm_parsed_tl
+\int_new:N \l__avm_mode_switch_character_int
+% \end{macrocode}
+% \end{variable}
+%
% \begin{macro}{\avmsetup}
% Forward the key-value settings given as the optional argument to \cs{avm} to the keys defined in |\keys_define:nn { avm }|. For the meaning of these keys and initial values, see Section~\ref{sec:basiccommands}.
%
@@ -607,14 +757,22 @@ Please report any bugs or feature requests to
\keys_define:nn { avm }
{
+ align .bool_set:N = \l__avm_align_bool,
+ align .initial:n = {true},
stretch .tl_set:N = \l__avm_arraystretch_tl,
stretch .initial:n = {0.9},
columnsep .dim_set:N = \l__avm_tabcolsep_dim,
columnsep .initial:n = {.5ex},
+ vectorsep .dim_set:N = \l__avm_singlesep_dim,
+ vectorsep .initial:n = {1em},
delimfactor .int_set:N = \l__avm_delimfactor_int,
delimfactor .initial:n = {1000},
delimfall .dim_set:N = \l__avm_delimshortfall_dim,
delimfall .initial:n = {0pt},
+ framewidth .dim_set:N = \l__avm_fillmore_kay_boxrule_dim,
+ framewidth .initial:n = {1pt},
+ framesep .dim_set:N = \l__avm_fillmore_kay_boxsep_dim,
+ framesep .initial:n = {3pt},
attributes .code:n = {\cs_set:Nn \__avm_font_attribute: {#1}},
attributes .initial:n = {\scshape},
types .code:n = {\cs_set:Nn \__avm_font_type: {#1}},
@@ -623,18 +781,32 @@ Please report any bugs or feature requests to
values .initial:n = {\itshape},
tags .code:n = {\cs_set:Nn \__avm_font_tag: {#1}},
tags .initial:n = {\footnotesize},
- apptovalues .code:n = {\cs_set:Nn \__avm_deinit_second_column: {#1}},
- apptovalues .initial:n = {\/},
singleton .code:n = {\cs_set:Nn \__avm_font_singleton: {#1}},
singleton .initial:n = {\normalfont},
- switch .code:n = {\tl_set:Nn \__avm_mode_switch_character {#1}},
+ switch .code:n =
+ {
+ \tl_set:Nn \l__avm_mode_switch_character {#1}
+ \exp_args:NNx \int_set:Nn \l__avm_mode_switch_character_int
+ {`\tl_use:N \l__avm_mode_switch_character}
+ },
switch .initial:n = { ! },
extraskip .dim_set:N = \l__avm_extra_skip_dim,
extraskip .initial:n = {\smallskipamount},
- customise .code:n = {\cs_set:Nn \__avm_initialise_custom_commands: {#1}},
+ extraskip~in~every~row .bool_set:N = \l__avm_extraskip_bool,
+ customise .code:n = {\cs_set:Nn \__avm_initialise_custom_commands:
+ {#1}},
customise .initial:n = { },
+ pic .bool_set:N = \l__avm_picture_bool,
+ pic .default:n = { true },
+ picname .tl_set:N = \l__avm_picture_name_tl,
+ picname .initial:n = {automatic},
+ id~align .code:n = { \newcolumntype{i}{#1} },
+ id~align .initial:n = {l},
+ id~position .tl_set:N = \l__avm_id_position_tl,
+ id~position .initial:n = {south-west},
style .choice:,
- style / narrow .code:n = {\delimiterfactor=997\delimitershortfall5pt},
+ style / narrow .code:n = {\int_set:Nn \l__avm_delimfactor_int {997}
+ \dim_set:Nn \l__avm_delimshortfall_dim {5pt}},
}
% \end{macrocode}
% \end{macro}
@@ -667,20 +839,11 @@ Please report any bugs or feature requests to
}
% \end{macrocode}
% \end{macro}
-
-% \begin{variable}{\l__avm_mode_bool, \l__avm_parens_tracker, \l__avm_defined_commands_tl}
-% We need an auxiliary variable to store the current mode. \cs{l__avm_parens_tracker} is a stack for a future check whether the delimiters given to \cs{avm} are balanced. \cs{l__avm_defined_commands_tl} is a token list that stores any commands provided by the user via \cs{avmdefinecommand}
-% \begin{macrocode}
-\bool_new:N \l__avm_mode_bool
-\seq_new:N \l__avm_parens_tracker
-\tl_new:N \l__avm_defined_commands_tl
-% \end{macrocode}
-% \end{variable}
-% \begin{macro}[int]{\seq_set_split:NVn}
-% In preparation for \cs{avm_wrap:n}, we need to split the user input at each occurrence of the escape character. Since the character is given in a variable, we need a variant of the sequence splitter that takes the \emph{evaluation} of the variable, rather than the variable itself, as its second argument.
+% \begin{macro}[int]{\tl_if_eq:VnTF}
+% A useful variant for comparing the values of token list variables with token lists.
% \begin{macrocode}
-\cs_generate_variant:Nn \seq_set_split:Nnn { NVn }
+\cs_generate_variant:Nn \tl_if_eq:nnTF {VnTF}
% \end{macrocode}
% \end{macro}
@@ -691,8 +854,8 @@ Please report any bugs or feature requests to
% \end{macrocode}
% \end{variable}
-% \begin{macro}[int]{\__avm_init_first_column:, \__avm_init_second_column:}
-% These macros apply the settings for the columns in a (sub-)structure. They take care of font selection and report the currently active column back to the system. Knowing which column is active is important when closing the (sub-)structure. If the structure is closed without a second column present, we need to skip back |2\tabcolsep|.
+% \begin{macro}[int]{\__avm_init_first_column:, \__avm_init_second_column:, \__avm_init_single_column:}
+% These macros apply the settings for the columns in a (sub-)structure. They take care of font selection and report the currently active column back to the system. Knowing which column is active is important when closing the (sub-)structure. If the structure is closed without a second column present, we need to skip back |2\tabcolsep|. (This does not apply to the case of vector structures, which are handled without this check.)
% \begin{macrocode}
\cs_new:Nn \__avm_init_first_column:
{
@@ -705,6 +868,35 @@ Please report any bugs or feature requests to
\bool_set_false:N \l__avm_in_first_column
\normalfont\__avm_font_value:
}
+
+\cs_new:Nn \__avm_init_single_column:
+ {
+ \normalfont\__avm_font_attribute:
+ }
+
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}[int,added=2020-09-21]{\__avm_deinit_first_column:, \__avm_deinit_second_column:}
+% These commands control settings that are applied after each column is exited. The single check here is whether italics is currently in use. If it is, the the italic correction is automatically applied. This replaces the user-configurable setting |apptovalues| from previous versions.
+% \begin{macrocode}
+
+\tl_const:Nn \l__avm_italics_tl {it}
+
+\cs_new:Nn \__avm_deinit_first_column:
+ {
+ \tl_if_eq:NNT \f@shape \l__avm_italics_tl {\/}
+ }
+
+\cs_new:Nn \__avm_deinit_second_column:
+ {
+ \tl_if_eq:NNT \f@shape \l__avm_italics_tl {\/}
+ }
+
+\cs_new:Nn \__avm_deinit_single_column:
+ {
+ \tl_if_eq:NNT \f@shape \l__avm_italics_tl {\/}
+ }
% \end{macrocode}
% \end{macro}
@@ -731,87 +923,216 @@ Please report any bugs or feature requests to
% \end{macro}
% \begin{macro}[int]{\__avm_module_begin:,\__avm_module_end:,etc.}
-% The replacement instructions for \cs{__avm_parse:n}
+% The replacement instructions for \cs{__avm_parse:n}. When option \meta{align = true} (default), the structure has two columns. Vector structures are inserted if \meta{align = false}.
% \begin{macrocode}
\cs_new:Nn \__avm_module_begin:
- {
- \begin{tabular}{@{}
- >{\__avm_init_first_column:}l
- >{\__avm_init_second_column:}l
- <{\__avm_deinit_second_column:}
- @{}}
+ {
+ \bool_if:NTF \l__avm_align_bool
+ {
+ \begin{tabular}{@{}
+ >{\__avm_init_first_column:}l
+ <{\__avm_deinit_first_column:}
+ >{\__avm_init_second_column:}l
+ <{\__avm_deinit_second_column:}
+ @{}}
+ }
+ {
+ \begin{tabular}{@{}
+ >{\__avm_init_single_column:}l
+ <{\__avm_deinit_single_column:}
+ @{}}
+ }
}
\cs_new:Nn \__avm_module_end:
{
\__avm_kern_unused_columns:
\end{tabular}
}
-\cs_new:Nn \__avm_replace_lbrace:
- {
- \__avm_parse_output:nw
- { \c_math_toggle_token\left\lbrace\__avm_module_begin: }
+
+\cs_new:Nn \__avm_replace_ampersand:
+ {
+ \bool_if:NTF \l__avm_align_bool
+ { \tl_build_put_right:Nn \l__avm_parsed_tl { & } }
+ { \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \__avm_deinit_first_column:\skip_horizontal:N
+ \dim_use:N \l__avm_singlesep_dim \__avm_init_second_column:
+ }
+ }
+ }
}
-\cs_new:Nn \__avm_replace_rbrace:
- {
- \__avm_parse_output:nw
- { \__avm_module_end:\right\rbrace\c_math_toggle_token\__avm_extra_skip: }
+\cs_new:Nn \__avm_replace_lbrace:
+ {
+ \c_math_toggle_token\left\lbrace\__avm_module_begin:
}
-\cs_new:Nn \__avm_replace_lbrack:
- {
- \__avm_parse_output:nw
- { \c_math_toggle_token\left\lbrack\__avm_module_begin: }
- }
-\cs_new:Nn \__avm_replace_rbrack:
- {
- \__avm_parse_output:nw
- { \__avm_module_end:\right\rbrack\c_math_toggle_token\__avm_extra_skip: }
+\cs_new:Nn \__avm_replace_rbrace:
+ {
+ \__avm_module_end:\right\rbrace\c_math_toggle_token\__avm_extra_skip:
+ }
+\cs_new:Nn \__avm_replace_lbrack:
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \bool_if:NTF \l__avm_mode_bool
+ {
+ \c_math_toggle_token\left\lbrack\__avm_module_begin:
+ }
+ { [ }
+ }
+ }
+ }
+\cs_new:Nn \__avm_replace_rbrack:
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \bool_if:NTF \l__avm_mode_bool
+ {
+ \__avm_module_end:\right\rbrack\c_math_toggle_token%
+ \__avm_extra_skip:
+ }
+ { ] }
+ }
+ }
+ }
+\bool_if:NTF \l__avm_lfg_bool
+ {
+ \cs_new:Nn \__avm_replace_llbrack:
+ {
+ \c_math_toggle_token\left\lBrack\__avm_module_begin:
+ }
+ \cs_new:Nn \__avm_replace_rrbrack:
+ {
+ \__avm_module_end:\right\rBrack\c_math_toggle_token\__avm_extra_skip:
+ }
+ }
+ {
+ \cs_new:Nn \__avm_replace_llbrack:
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \msg_warning:nn {avm}{lfgoptionmissing}
+ \c_math_toggle_token\left.\__avm_module_begin:
+ }
+ }
+ }
+ \cs_new:Nn \__avm_replace_rrbrack:
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \msg_warning:nn {avm}{lfgoptionmissing}
+ \__avm_module_end:\right.\c_math_toggle_token\__avm_extra_skip:
+ }
+ }
+ }
}
\cs_new:Nn \__avm_replace_lparen:
- {
- \__avm_parse_output:nw
- { \c_math_toggle_token\left(\__avm_module_begin: }
- }
-\cs_new:Nn \__avm_replace_rparen:
- {
- \__avm_parse_output:nw
- { \__avm_module_end:\right)\c_math_toggle_token\__avm_extra_skip: }
- }
-\cs_new:Nn \__avm_replace_langle:
- {
- \__avm_parse_output:nw
- { \c_math_toggle_token\left<\__avm_module_begin: }
- }
-\cs_new:Nn \__avm_replace_rangle:
- {
- \__avm_parse_output:nw
- { \__avm_module_end:\right>\c_math_toggle_token\__avm_extra_skip: }
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \bool_if:NTF \l__avm_mode_bool
+ {
+ \c_math_toggle_token\left(\__avm_module_begin:
+ }
+ { ( }
+ }
+ }
+ }
+\cs_new:Nn \__avm_replace_rparen:
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \bool_if:NTF \l__avm_mode_bool
+ {
+ \__avm_module_end:\right)\c_math_toggle_token\__avm_extra_skip:
+ }
+ { ) }
+ }
+ }
}
-\cs_new:Nn \__avm_replace_plus:
+\cs_new:Nn \__avm_replace_langle:
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \bool_if:NTF \l__avm_mode_bool
+ {
+ \c_math_toggle_token\left<\__avm_module_begin:
+ }
+ { < }
+ }
+ }
+ }
+\cs_new:Nn \__avm_replace_rangle:
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ {
+ \exp_not:n
+ {
+ \bool_if:NTF \l__avm_mode_bool
+ {
+ \__avm_module_end:\right>\c_math_toggle_token\__avm_extra_skip:
+ }
+ { > }
+ }
+ }
+ }
+\cs_new:Nn \__avm_replace_lframe:
+ {
+ \hbox_set:Nw \l__avm_fillmore_kay_box \group_begin:
+ \c_math_toggle_token\__avm_module_begin:
+ }
+\cs_new:Nn \__avm_replace_rframe:
+ {
+ \__avm_module_end:\c_math_toggle_token\group_end:\hbox_set_end:
+ \group_begin:
+ \dim_set_eq:NN \fboxrule \l__avm_fillmore_kay_boxrule_dim
+ \dim_set_eq:NN \fboxsep \l__avm_fillmore_kay_boxsep_dim
+ \fbox{\box_use:N \l__avm_fillmore_kay_box}
+ \group_end: \__avm_extra_skip:
+ }
+\cs_new:Nn \__avm_replace_plus:
{
- \__avm_parse_output:nw { \ensuremath { \oplus \! } }
+ \leavevmode\unskip\hbox{${}\oplus{}$}\ignorespaces
}
-\cs_new:Nn \__avm_replace_minus:
+\cs_new:Nn \__avm_replace_minus:
{
- \__avm_parse_output:nw { \ensuremath { \ominus \! } }
+ \leavevmode\unskip\hbox{${}\ominus{}$}\ignorespaces
}
-\cs_new:Nn \__avm_replace_circle:
+\cs_new:Nn \__avm_replace_circle:
{
- \__avm_parse_output:nw { \ensuremath { \bigcirc \, } }
+ \leavevmode\unskip\hbox{${}\bigcirc{}$}\ignorespaces
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}[updated=2020-03-30]{\tag,\type,\punk}
+% \begin{macro}[updated=2020-09-21]{\tag,\type,\punk,\node,\id}
% \begin{macrocode}
\cs_new:Npn \__avm_controls_tag:n #1
- { \fboxsep.25ex\fbox{\normalfont\__avm_font_tag: #1} }
+ { \fboxsep.25ex\fboxrule.4pt\fbox{\normalfont\__avm_font_tag: #1} }
\cs_new:Npn \__avm_controls_type:n #1
{ \c_group_begin_token\normalfont\__avm_font_type: #1\c_group_end_token }
\cs_new_protected:Npn \__avm_controls_type_starred:n #1
{
\bool_set_false:N \l__avm_in_first_column
- \normalfont\__avm_font_type: #1
- \__avm_deinit_second_column:\span\hspace*{-2\tabcolsep}
+ \normalfont\__avm_font_type: #1
+ \bool_if:NTF \l__avm_align_bool
+ { \__avm_deinit_second_column:\span\hspace*{-2\tabcolsep} }
+ { \__avm_deinit_single_column:}
\peek_meaning_ignore_spaces:NTF \\ {} {\\}
}
\cs_new_protected:Npn \__avm_controls_punk:nn #1 #2
@@ -819,165 +1140,156 @@ Please report any bugs or feature requests to
\bool_set_false:N \l__avm_in_first_column
\normalfont\c_group_begin_token\__avm_font_attribute:#1%
\c_group_end_token\hspace{2\tabcolsep}%
- \c_group_begin_token\__avm_font_type: #2\c_group_end_token%
+ \c_group_begin_token\__avm_font_value: #2\c_group_end_token%
\__avm_deinit_second_column:\span\hspace*{-2\tabcolsep}
- \peek_meaning_ignore_spaces:NTF \\ {} {\\}
+ \peek_charcode_ignore_spaces:NTF \\ {} {\\}
}
+\cs_new:Nn \__avm_mode_switch:
+ {
+ \bool_set_inverse:N \l__avm_mode_bool
+ \bool_if:NTF \l__avm_mode_bool
+ {
+ \DeclareDocumentCommand{\{}{}{ \__avm_replace_lbrace: }
+ \DeclareDocumentCommand{\}}{}{ \__avm_replace_rbrace: }
+ \DeclareDocumentCommand{\[}{}{ \__avm_replace_llbrack: }
+ \DeclareDocumentCommand{\]}{}{ \__avm_replace_rrbrack: }
+ \DeclareDocumentCommand{\+}{}{ \__avm_replace_plus: }
+ \DeclareDocumentCommand{\-}{}{ \__avm_replace_minus: }
+ }
+ {
+ \DeclareCommandCopy{\{}{\__avm_old_lbrace_store:}
+ \DeclareCommandCopy{\}}{\__avm_old_rbrace_store:}
+ \DeclareCommandCopy{\[}{\__avm_old_llbrack_store:}
+ \DeclareCommandCopy{\]}{\__avm_old_rrbrack_store:}
+ \DeclareCommandCopy{\+}{\__avm_old_plus_store:}
+ \DeclareCommandCopy{\-}{\__avm_old_minus_store:}
+ }
+ }
+
\cs_new:Nn \__avm_initialise_document_commands:
{
+ \DeclareCommandCopy{\__avm_old_lbrace_store:}{\{}
+ \DeclareCommandCopy{\__avm_old_rbrace_store:}{\}}
+ \DeclareCommandCopy{\__avm_old_llbrack_store:}{\[}
+ \DeclareCommandCopy{\__avm_old_rrbrack_store:}{\]}
+ \DeclareCommandCopy{\__avm_old_plus_store:}{\+}
+ \DeclareCommandCopy{\__avm_old_minus_store:}{\-}
\def\arraystretch{\tl_use:N \l__avm_arraystretch_tl}
- \tabcolsep=\l__avm_tabcolsep_dim
- \delimiterfactor=\l__avm_delimfactor_int
- \delimitershortfall=\l__avm_delimshortfall_dim
- \cs_if_exist:NTF \tag
- { \RenewDocumentCommand{\tag}{m}{ \__avm_controls_tag:n {##1} } }
- { \NewDocumentCommand{\tag}{m}{ \__avm_controls_tag:n {##1} } }
- \cs_if_exist:NTF \0
- { \RenewDocumentCommand{\0}{}{ \__avm_controls_tag:n {0} } }
- { \NewDocumentCommand{\0}{}{ \__avm_controls_tag:n {0} } }
- \cs_if_exist:NTF \1
- { \RenewDocumentCommand{\1}{}{ \__avm_controls_tag:n {1} } }
- { \NewDocumentCommand{\1}{}{ \__avm_controls_tag:n {1} } }
- \cs_if_exist:NTF \2
- { \RenewDocumentCommand{\2}{}{ \__avm_controls_tag:n {2} } }
- { \NewDocumentCommand{\2}{}{ \__avm_controls_tag:n {2} } }
- \cs_if_exist:NTF \3
- { \RenewDocumentCommand{\3}{}{ \__avm_controls_tag:n {3} } }
- { \NewDocumentCommand{\3}{}{ \__avm_controls_tag:n {3} } }
- \cs_if_exist:NTF \4
- { \RenewDocumentCommand{\4}{}{ \__avm_controls_tag:n {4} } }
- { \NewDocumentCommand{\4}{}{ \__avm_controls_tag:n {4} } }
- \cs_if_exist:NTF \5
- { \RenewDocumentCommand{\5}{}{ \__avm_controls_tag:n {5} } }
- { \NewDocumentCommand{\5}{}{ \__avm_controls_tag:n {5} } }
- \cs_if_exist:NTF \6
- { \RenewDocumentCommand{\6}{}{ \__avm_controls_tag:n {6} } }
- { \NewDocumentCommand{\6}{}{ \__avm_controls_tag:n {6} } }
- \cs_if_exist:NTF \7
- { \RenewDocumentCommand{\7}{}{ \__avm_controls_tag:n {7} } }
- { \NewDocumentCommand{\7}{}{ \__avm_controls_tag:n {7} } }
- \cs_if_exist:NTF \8
- { \RenewDocumentCommand{\8}{}{ \__avm_controls_tag:n {8} } }
- { \NewDocumentCommand{\8}{}{ \__avm_controls_tag:n {8} } }
- \cs_if_exist:NTF \9
- { \RenewDocumentCommand{\9}{}{ \__avm_controls_tag:n {9} } }
- { \NewDocumentCommand{\9}{}{ \__avm_controls_tag:n {9} } }
- \cs_if_exist:NTF \type
- { \RenewDocumentCommand{\type}{s m}
- {
- \IfBooleanTF { ##1 }
- { \__avm_controls_type_starred:n {##2} }
- { \__avm_controls_type:n {##2} }
- }
+ \dim_set_eq:NN \tabcolsep \l__avm_tabcolsep_dim
+ \int_set_eq:NN \delimiterfactor \l__avm_delimfactor_int
+ \dim_set_eq:NN \delimitershortfall \l__avm_delimshortfall_dim
+ \DeclareDocumentCommand{\shuffle}{}{ \__avm_replace_shuffle: }
+ \DeclareDocumentCommand{\lframe}{}{ \__avm_replace_lframe: }
+ \DeclareDocumentCommand{\rframe}{}{ \__avm_replace_rframe: }
+ \DeclareDocumentCommand{\tag}{m}{ \__avm_controls_tag:n {##1} }
+ \DeclareDocumentCommand{\0}{}{ \__avm_controls_tag:n {0} }
+ \DeclareDocumentCommand{\1}{}{ \__avm_controls_tag:n {1} }
+ \DeclareDocumentCommand{\2}{}{ \__avm_controls_tag:n {2} }
+ \DeclareDocumentCommand{\3}{}{ \__avm_controls_tag:n {3} }
+ \DeclareDocumentCommand{\4}{}{ \__avm_controls_tag:n {4} }
+ \DeclareDocumentCommand{\5}{}{ \__avm_controls_tag:n {5} }
+ \DeclareDocumentCommand{\6}{}{ \__avm_controls_tag:n {6} }
+ \DeclareDocumentCommand{\7}{}{ \__avm_controls_tag:n {7} }
+ \DeclareDocumentCommand{\8}{}{ \__avm_controls_tag:n {8} }
+ \DeclareDocumentCommand{\9}{}{ \__avm_controls_tag:n {9} }
+ \DeclareDocumentCommand{\type}{s m}
+ {
+ \IfBooleanTF { ##1 }
+ { \__avm_controls_type_starred:n {##2} }
+ { \__avm_controls_type:n {##2} }
}
- { \NewDocumentCommand{\type}{s m}
- {
- \IfBooleanTF { ##1 }
- { \__avm_controls_type_starred:n {##2} }
- { \__avm_controls_type:n {##2} }
- }
- }
- \cs_if_exist:NTF \punk
- { \RenewDocumentCommand{\punk}{m m}
- { \__avm_controls_punk:nn {##1}{##2} } }
- { \NewDocumentCommand{\punk}{m m}
- { \__avm_controls_punk:nn {##1}{##2} } }
- }
+ \DeclareDocumentCommand{\punk}{m m}{ \__avm_controls_punk:nn {##1}{##2} }
+ \DeclareDocumentCommand{\id}{m m}
+ {%
+ \hcoffin_set:Nw \l_tmpa_coffin
+ \bgroup
+ \def\arraystretch{.5}
+ \begin{tabular}[b]{@{}>{$\scriptstyle}i<{$}@{}}
+ ##1
+ \end{tabular}
+ \egroup
+ \hcoffin_set_end:
+ \hcoffin_set:Nw \l_tmpb_coffin ##2 \hcoffin_set_end:
+ \tl_if_eq:VnTF \l__avm_id_position_tl {south-west}
+ {%
+ \coffin_join:NnnNnnnn \l_tmpb_coffin {l}{H}
+ \l_tmpa_coffin {r}{H}{ 0pt }{ -\coffin_dp:N \l_tmpb_coffin }
+ }
+ {%
+ \tl_if_eq:VnTF \l__avm_id_position_tl {south-east}
+ {%
+ \coffin_join:NnnNnnnn \l_tmpb_coffin {l}{H}
+ \l_tmpa_coffin {l}{H}{ \coffin_wd:N \l_tmpb_coffin }
+ { -\coffin_dp:N \l_tmpb_coffin }
+ }
+ {
+ \msg_error:nn {avm}{idpositionunknown}
+ }
+ }
+ \coffin_typeset:Nnnnn \l_tmpb_coffin {l}{vc}{0pt}{0pt}
+ }
% \end{macrocode}
-% \end{macro}
-
-% \begin{macro}{\__avm_wrap:n}
-% The wrapper that first splits the input to \cs{avm} at each occurrence of \cs{__avm_mode_switch_character} and then inverses \cs{l__avm_mode_bool}. It then calls the parser (\cs{__avm_parse:n}) for each splitted sequence. This wrapping is necessary because there is no known expandable way to switch a boolean.
+% The last of the bunch is only loaded if Ti\emph{k}Z is loaded as well:
% \begin{macrocode}
-\cs_new_protected:Npn \__avm_wrap:n #1
- {
- \seq_set_split:NVn \l__avm_wrapper_seq
- \__avm_mode_switch_character { #1 }
- \seq_map_inline:Nn \l__avm_wrapper_seq
- {
- \exp_args:No \exp_not:o
- { \__avm_parse:n {##1} }
- \bool_set_inverse:N \l__avm_mode_bool
+ \bool_if:NT \l__avm_tikz_bool
+ {
+ \tl_if_eq:VnTF \l__avm_picture_name_tl {automatic}
+ {
+ \stepcounter{l__avm_picture_counter}
+ \tl_set:Nn \l__avm_picture_name_prefix_tl
+ {avm-\tl_use:N \thel__avm_picture_counter}
+ }
+ {
+ \tl_set_eq:NN \l__avm_picture_name_prefix_tl \l__avm_picture_name_tl
+ }
+ \DeclareDocumentCommand{\node}{m m}
+ {
+ \tikz [remember~picture,
+ baseline=(\l__avm_picture_name_prefix_tl-##1.base)]
+ \node [inner~sep=0pt] (\l__avm_picture_name_prefix_tl-##1)
+ {\strut ##2};
+ }
}
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\__avm_parse:n}
-% Finnaly, the parser. It is build on \cs{@@@@_act:NNNnn} from \cmd{l3tl} (see the sub-section \emph{Token by token changes}). Many thanks to Phelype Oleinik for help on this, and in particular on help with expansion.
+% Finally, the parser. It is build on \cs{@@@@_act:NNNnn} from \cmd{l3tl} (see the sub-section \emph{Token by token changes}). Many thanks to Phelype Oleinik for help on this, and in particular on help with expansion.
% \begin{macrocode}
\cs_new:Npn \__avm_parse:n #1
{
- \exp:w
- \group_align_safe_begin:
- \__avm_parse_loop:w #1
- \q_recursion_tail \q_recursion_stop
- \__avm_result:n { }
- }
-
-\cs_new:Npn \__avm_end:w \__avm_result:n #1
- {
- \group_align_safe_end:
- \exp_end:
- #1
- }
-
-\cs_new:Npn \__avm_parse_loop:w #1 \q_recursion_stop
- {
- \tl_if_head_is_N_type:nTF {#1}
- {
- \__avm_N_type:N #1 \q_recursion_stop
- }
- {
- \tl_if_head_is_group:nTF {#1}
- { \__avm_replace_group:nw #1 \q_recursion_stop }
- { \__avm_replace_space:w #1 \q_recursion_stop }
- }
- }
-
-\cs_new:Npn \__avm_N_type:N #1
- {
- \quark_if_recursion_tail_stop_do:Nn #1 { \__avm_end:w }
- \bool_if:NTF \l__avm_mode_bool
- { \__avm_replace:N #1 }
- { \__avm_replace_none:N #1 }
- }
-
-\cs_new:Npn \__avm_replace_none:N #1
- {
- \__avm_parse_output:nw {#1}
- }
-
-\cs_new:Npn \__avm_replace:N #1
- {
- \str_case:nnF {#1}
+ \group_align_safe_begin:
+ \tl_build_begin:N \l__avm_parsed_tl
+ \tl_build_put_right:Nn \l__avm_parsed_tl { \exp_not:n {\ignorespaces} }
+ \tl_analysis_map_inline:nn { #1 }
{
- { \+ }{ \__avm_replace_plus: }
- { \- }{ \__avm_replace_minus: }
- { \shuffle }{ \__avm_replace_circle: }
- { [ }{ \__avm_replace_lbrack: }
- { ] }{ \__avm_replace_rbrack: }
- { ( }{ \__avm_replace_lparen: }
- { ) }{ \__avm_replace_rparen: }
- { \{ }{ \__avm_replace_lbrace: }
- { \} }{ \__avm_replace_rbrace: }
- { < }{ \__avm_replace_langle: }
- { > }{ \__avm_replace_rangle: }
+ \int_case:nnF { ##2 }
+ {
+ { `& }{ \__avm_replace_ampersand: }
+ { `[ }{ \__avm_replace_lbrack: }
+ { `] }{ \__avm_replace_rbrack: }
+ { `( }{ \__avm_replace_lparen: }
+ { `) }{ \__avm_replace_rparen: }
+ { `< }{ \__avm_replace_langle: }
+ { `> }{ \__avm_replace_rangle: }
+ { \l__avm_mode_switch_character_int }
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl
+ { \exp_not:n { \__avm_mode_switch: } }
+ }
+ }
+ {
+ \tl_build_put_right:Nn \l__avm_parsed_tl { ##1 }
+ }
}
- { \__avm_replace_none:N #1 }
+ \tl_build_end:N \l__avm_parsed_tl
+ \tl_set:Nx \l__avm_parsed_tl {\l__avm_parsed_tl}
+ \tl_use:N \l__avm_parsed_tl
+ \group_align_safe_end:
}
-\cs_new:Npn \__avm_replace_group:nw #1
- { \exp_args:NNo \exp_args:No \__avm_replace_group:n { \__avm_parse:n {#1} } }
-
-\cs_new:Npn \__avm_replace_group:n #1 { \__avm_parse_output:nw { {#1} } }
-
-\exp_last_unbraced:NNo
-\cs_new:Npn \__avm_replace_space:w \c_space_tl { \__avm_parse_output:nw { ~ } }
-
-\cs_new:Npn \__avm_parse_output:nw #1 #2 \q_recursion_stop \__avm_result:n #3
- { \__avm_parse_loop:w #2 \q_recursion_stop \__avm_result:n {#3 #1 } }
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
diff --git a/macros/latex/contrib/langsci-avm/langsci-avm.ins b/macros/latex/contrib/langsci-avm/langsci-avm.ins
index a60e9b54e2..fe04e59c12 100644
--- a/macros/latex/contrib/langsci-avm/langsci-avm.ins
+++ b/macros/latex/contrib/langsci-avm/langsci-avm.ins
@@ -12,23 +12,18 @@
\preamble
------------------------------------------------------------------------------
-langsci-avm is aimed at typesetting beautiful feature structures,
-also known as attribute-value matrices (AVMs), for use in linguistics.
+A package for typesetting feature structures, also known as attribute-value
+matrices (AVMs), for use in linguistics.
-The package provides a minimal and easy to read syntax.
-It depends only on the array package and can be placed almost everywhere,
-in particular in footnotes or graphs and tree structures. The package is meant
-as an update to, and serves the same purpose as, Christopher Manning’s
-avm package, but shares no code base with that package.
+The package provides a minimal and easy to read syntax. It depends only on the
+array package and can be placed almost everywhere, in particular in footnotes or
+graphs and tree structures. The package serves the same purpose as, Christopher
+Manning’s avm package, but shares no code base with that package.
-langsci-avm was developed at Language Science Press to help in the
-production of scientific texts in linguistics.
+Copyright (C) 2023 by Felix Kopecky, Language Science Press
-Copyright (C) 2020 by Felix Kopecky, Language Science Press
-
-This work consists of the file langsci-avm.dtx
- and the derived files langsci-avm.ins,
- langsci-avm.pdf.
+This work consists of the file langsci-avm.dtx
+ and the derived file langsci-avm.pdf.
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/macros/latex/contrib/langsci-avm/langsci-avm.pdf b/macros/latex/contrib/langsci-avm/langsci-avm.pdf
index 73f036d8af..ff605e08d7 100644
--- a/macros/latex/contrib/langsci-avm/langsci-avm.pdf
+++ b/macros/latex/contrib/langsci-avm/langsci-avm.pdf
Binary files differ
diff --git a/macros/latex/contrib/naive-ebnf/DEPENDS.txt b/macros/latex/contrib/naive-ebnf/DEPENDS.txt
index 489f2ded15..6abbcb3ff6 100644
--- a/macros/latex/contrib/naive-ebnf/DEPENDS.txt
+++ b/macros/latex/contrib/naive-ebnf/DEPENDS.txt
@@ -1,3 +1,2 @@
hard pgfopts
-hard filecontentsdef
hard expl3 \ No newline at end of file
diff --git a/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx b/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx
index a69bc2f578..bbdbde0339 100644
--- a/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx
+++ b/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx
@@ -50,7 +50,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{naive-ebnf}
%<*package>
-[2023-02-03 0.0.4 EBNF in Plain Text]
+[2023-02-21 0.0.5 EBNF in Plain Text]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -90,9 +90,9 @@
% \usepackage{mathtools}
% \begin{document}
% \begin{ebnf}
-% <$\lambda$-Expr> := <Var>
-% | "$\lambda$" <Var> "." <Expr>
-% | "$\lparen$" <Expr> <Expr> "$\rparen$"
+% <$\lambda$-Expr> := <Var> \\
+% || "$\lambda$" <Var> "." <Expr> \\
+% || "$\lparen$" <Expr> <Expr> "$\rparen$"
% \end{ebnf}
% \end{document}
% \end{docshot}
@@ -107,6 +107,7 @@
% \item \texttt{(...\char`\|...)} denotes a series of options to choose from;
% \item |[...]| denotes an optional substitution;
% \item |{...}| denotes a zero or more times repetition;
+% \item \texttt{\char`\|\char`\|} denotes an indented vertical bar at the beginning of the string.
% \end{itemize}
% \textbf{Attention}: The usage of some symbols is prohibited inside terminals. Instead, the following substitutions are recommended:
@@ -118,6 +119,24 @@
% \item |$\vert$| instead of ``\texttt{\char`\|}''.
% \end{itemize}
+% \DescribeMacro{width}
+% There is an optional argument of |ebnf| environment, which sets the width of the left-hand side of each rule
+% (the default width is |6em|):
+% \docshotOptions{firstline=4,lastline=10}
+% \begin{docshot}
+% \documentclass{minimal}
+% \usepackage{naive-ebnf}
+% \begin{document}\noindent
+% This EBNF has a larger width of \\
+% the left hand side than usual: \par
+% \begin{ebnf}[1.5in]
+% <VeryLongVariable> := <X> | <Y> \\
+% <X> := "X" \\
+% <Y> := "Y"
+% \end{ebnf}
+% \end{document}
+% \end{docshot}
+
% \DescribeMacro{\terminal}
% \DescribeMacro{\nonterminal}
% Inside the text, terminals and non-terminals may be formatted using two supplementary commands:
@@ -166,12 +185,25 @@
%</verb>
%\fi
+% \DescribeMacro{trail}
+% The |ebnf| environment is doing pre-processing of the \TeX{} commands provided and then let \LaTeX{} render them. It may be useful to see the output generated by the pre-processing. The |trail| option (with a file name) asks the package to save the content of the environment after the pre-processing into the file:
+%\iffalse
+%<*verb>
+%\fi
+\begin{verbatim}
+\usepackage[trail=log.tex]{naive-ebnf}
+\end{verbatim}
+%\iffalse
+%</verb>
+%\fi
+
% \StopEventually{}
% \section{Implementation}
% \changes{0.0.1}{2023/01/28}{First draft.}
% \changes{0.0.2}{2023/01/29}{Proper parsing of grouping.}
% \changes{0.0.2}{2023/01/29}{Substitutions suggested for special symbols.}
+% \changes{0.0.5}{2023/02/04}{New package option \texttt{trail} added, to enable saving generated \TeX{} content to a file, for debugging purposes.}
% First, we process package options:
% \begin{macrocode}
@@ -179,13 +211,15 @@
\pgfkeys{
/ebnf/.cd,
bw/.store in=\ebnf@bw,
+ trail/.store in=\ebnf@trail,
+ trail/.default=naive-ebnf.tmp.tex,
+ trail
}
\ProcessPgfPackageOptions{/ebnf}
% \end{macrocode}
% Then, we include a few packages, mostly to deal with \LaTeX{}3 expressions:
% \begin{macrocode}
-\RequirePackage{filecontentsdef}
\RequirePackage{expl3}
% \end{macrocode}
@@ -254,7 +288,6 @@
{\ebnf@color{gray}{\(\to\)}}
\newcommand\ebnf@alternation
{\ebnf@color{gray}{\(\vert\)}}
-\newcommand\ebnf@eol{\\}
\makeatother
% \end{macrocode}
@@ -264,34 +297,40 @@
% \begin{macrocode}
\ExplSyntaxOn
\cs_generate_variant:Nn \tl_replace_all:Nnn {Nx}
-\NewDocumentEnvironment{ebnf}{}{\filecontentsdefmacro\l__ebnf_tmp_tl}{
- \endfilecontentsdefmacro
- \str_set:NV \l__ebnf_tmp_tl \l__ebnf_tmp_tl
- \str_set:Nx \l__ebnf_tmp_tl {\str_range:Nnn \l__ebnf_tmp_tl {1} {-2}}
- \regex_replace_all:nnN { \{(.+?)\} }
- {\c{ebnf@repetition}{\1}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { \((.+?)\) }
- {\c{ebnf@grouping}{\1}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { \[([^\]]+?)\] }
- {\c{ebnf@optional}{\1}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { <([^>]+)> }
- {\c{ebnf@nonterminal}{\1}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { "([^"]+)" }
- {\c{ebnf@terminal}{\1}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { \^^M\s*\| }
- {\^^M :=} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { \| }
- {\c{ebnf@alternation}{}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { \^^M\s*:= }
- {\^^M \c{-}\c{hspace}{3em}\c{ebnf@alternation}{}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { := }
- {\c{ebnf@to}{}} \l__ebnf_tmp_tl
- \regex_replace_all:nnN { \^^M }
- {\c{ebnf@eol}{}} \l__ebnf_tmp_tl
- \tl_put_left:Nn \l__ebnf_tmp_tl {}
+\makeatletter
+\NewDocumentEnvironment{ebnf}{O{4em}+b}
+ {\tl_set:Nn\l__ebnf_tmp_tl{#2}}
+ {%
+ \regex_replace_all:nnN { \{(.+?)\} }%
+ {\c{ebnf@repetition}{\1}} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { \((.+?)\) }%
+ {\c{ebnf@grouping}{\1}} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { \[(.+?)\] }%
+ {\c{ebnf@optional}{\1}} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { (<[^>]+?>\ :=) }%
+ {\c{makebox}[#1][r]{\1}} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { <(.+?)> }%
+ {\c{ebnf@nonterminal}{\1}} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { "(.+?)" }%
+ {\c{ebnf@terminal}{\1}} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { \|(\|) }%
+ {\c{makebox}[#1][r]{ \1 }} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { \| }%
+ {\c{ebnf@alternation}{}} \l__ebnf_tmp_tl%
+ \regex_replace_all:nnN { := }%
+ {\c{ebnf@to}{}} \l__ebnf_tmp_tl%
+ \tl_put_left:Nn \l__ebnf_tmp_tl {\noindent}
\tl_put_right:Nn \l__ebnf_tmp_tl {}
- \l__ebnf_tmp_tl
-}
+ \ifdefined\ebnf@trail%
+ \newwrite\ebnf@write%
+ \immediate\openout\ebnf@write\ebnf@trail\relax%
+ \immediate\write\ebnf@write{\unexpanded\expandafter{\l__ebnf_tmp_tl}}%
+ \immediate\closeout\ebnf@write%
+ \message{naive-ebnf:\space pre-processed\space TeX
+ \space saved\space to\space "\ebnf@trail"^^J}%
+ \fi%
+ \l__ebnf_tmp_tl}
+\makeatother
\ExplSyntaxOff
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf b/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf
index cd63e8dc84..5d346ded12 100644
--- a/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf
+++ b/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
index 5184ea0aed..8d789be01c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
@@ -5,6 +5,11 @@ first release 0.95a, 2021-02-23 will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
this project uses date-based 'snapshot' version identifiers.
+## [2023-02-20]
+
+### Added
+ - schema declaration for xmpMM:OriginalDocumentID added to xmp-Metadata.
+
## [2023-02-14]
### Added
diff --git a/macros/latex/contrib/pdfmanagement-testphase/README.md b/macros/latex/contrib/pdfmanagement-testphase/README.md
index 0374c9f268..427ecb77ed 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/README.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/README.md
@@ -1,6 +1,6 @@
# LaTeX PDF management testphase bundle
-Version: 0.95v, 2023-02-14
+Version: 0.95w, 2023-02-20
This package is used during a test phase to load the new PDF management code
of LaTeX.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
index 43f338e6da..a91b8a348a 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
@@ -24,7 +24,7 @@
%% This file has the LPPL maintenance status "maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2023-02-14 v0.95v
+\ProvidesPackage{color-ltx}[2023-02-20 v0.95w
Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
diff --git a/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
index ee704315ce..c60ee84fcf 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
%
% for those people who are interested.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2023-02-14}{0.95v}
+\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2023-02-20}{0.95w}
{temporay patches to for the colorspace package to test pdfresource management ... UF}
% colorspace can define more models, that l3color can't yet handle.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
index 40c56ef9c9..01f8530a65 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
@@ -40,7 +40,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-luatex-tmp-ltx}%
- {2022/01/15}{2023-02-14}{0.95v}
+ {2022/01/15}{2023-02-20}{0.95w}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
index a145b046ed..58851e7e5a 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
@@ -82,7 +82,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -969,7 +969,7 @@
%<@@=hyp>
% \end{macrocode}
% \begin{macrocode}
-\ProvidesFile{hgeneric-testphase.def}[2023-02-14 v0.95v %
+\ProvidesFile{hgeneric-testphase.def}[2023-02-20 v0.95w %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
index d225a49f2d..c5476881c0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
index 58a14075e8..e812e75256 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
@@ -45,7 +45,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
%
@@ -56,27 +56,27 @@
% \begin{macrocode}
%<drivers>\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-testphase-dvipdfmx.def}{2023-02-14}{}
+ {l3backend-testphase-dvipdfmx.def}{2023-02-20}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-testphase-dvips.def}{2023-02-14}{}
+ {l3backend-testphase-dvips.def}{2023-02-20}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-testphase-dvisvgm.def}{2023-02-14}{}
+ {l3backend-testphase-dvisvgm.def}{2023-02-20}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-testphase-luatex.def}{2023-02-14}{}
+ {l3backend-testphase-luatex.def}{2023-02-20}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-testphase-pdftex.def}{2023-02-14}{}
+ {l3backend-testphase-pdftex.def}{2023-02-20}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
%</pdftex>
%<*xdvipdfmx>
- {l3backend-testphase-xetex.def}{2023-02-14}{}
+ {l3backend-testphase-xetex.def}{2023-02-20}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
%</xdvipdfmx>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
index d1d9e1bedd..229895df9b 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
index 3073eeca7e..bd62c74dc4 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -432,7 +432,7 @@
% \begin{macrocode}
%<@@=pdfannot>
%<*header>
-\ProvidesExplPackage{l3pdfannot}{2023-02-14}{0.95v}
+\ProvidesExplPackage{l3pdfannot}{2023-02-20}{0.95w}
{PDF-annotations}
\RequirePackage{l3pdfdict}
%</header>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
index 7f5b77efd9..c8d599d700 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
index 8098f62774..b46a87348e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -208,7 +208,7 @@
% \begin{macrocode}
%<@@=pdfdict>
%<*header>
-\ProvidesExplPackage{l3pdfdict}{2023-02-14}{0.95v}
+\ProvidesExplPackage{l3pdfdict}{2023-02-20}{0.95w}
{Tools for PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
index 6ffccc6d0e..30c708719d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
index c0b448ca2e..f5f653cad7 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
index 30e213b3bd..1a07c64766 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
index e734ac71db..34e1d8b8e0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
@@ -64,7 +64,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
index f139a2d04a..8b051f6999 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
index 9b664ade97..8a3711b797 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
index 17eb232e70..000a7452d5 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
index c0a05b8a3c..f2df427ebf 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
@@ -55,7 +55,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
index e30221c289..b9b7bbb303 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
index 6207ffb2db..423231bf7c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
@@ -83,7 +83,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
index 7a253321fd..c95db774a0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
index c6807a162a..d4a6011750 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
index 87eb534dd2..608479e30b 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
index efb1171861..f972c7cf87 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
@@ -69,7 +69,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -973,7 +973,7 @@
%<*package>
%<@@=pdffield>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2023-02-14}{0.95v}%
+\ProvidesExplPackage{l3pdffield-testphase}{2023-02-20}{0.95w}%
{form fields}
% \end{macrocode}
% \subsection{hyperref specific command}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
index 9cbe0420f3..63440cf172 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
index e8f6b1c2f8..4582d4a99d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -398,7 +398,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdffile}{2023-02-14}{0.95v}
+\ProvidesExplPackage{l3pdffile}{2023-02-20}{0.95w}
{embedding and referencing files in PDF---LaTeX PDF management testphase bundle}
\RequirePackage{l3pdftools} %temporarly!!
%</header>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
index 26756d7287..e06e86127d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
index 9b9d86eb43..4fffefa1d7 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
@@ -57,7 +57,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -632,7 +632,7 @@
%<@@=pdfmanagement>
%<*header>
%
-\ProvidesExplPackage{l3pdfmanagement}{2023-02-14}{0.95v}
+\ProvidesExplPackage{l3pdfmanagement}{2023-02-20}{0.95w}
{Management of core PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
index 7c01923bdf..54c1ccae90 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
index 8fe1bf2859..ed08282b30 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -562,7 +562,7 @@
% \begin{macrocode}
%<@@=pdfmeta>
%<*header>
-\ProvidesExplPackage{l3pdfmeta}{2023-02-14}{0.95v}
+\ProvidesExplPackage{l3pdfmeta}{2023-02-20}{0.95w}
{PDF-Standards---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
@@ -1893,7 +1893,19 @@
% Renditionclass declared by hyperxmp.
% Properties InstanceID and OriginalDocumentID declared by pdfx (pdfx.xmp)
% With the exception of OriginalDocumentID all are already allowed and
-% predefined. We ignore OriginalDocumentID until requested.
+% predefined.
+% \begin{macrocode}
+\@@_xmp_schema_new:nnn
+ {XMP~Media~Management~Schema}
+ {xmpMM}
+ {http://ns.adobe.com/xap/1.0/mm/}
+\@@_xmp_property_new:nnnnn
+ {xmpMM}
+ {OriginalDocumentID}
+ {URI}
+ {internal}
+ {The~common~identifier~for~all~versions~and~renditions~of~a~document.}
+% \end{macrocode}
% \item[pdfaid] properties part and conformance are declared by hyperxmp, but
% no here as already in http://www.aiim.org/pdfa/ns/id/. But we declare
% year so that it can be used also with older A-standards.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
index 04f852c94e..2795c0188f 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
index 5d313f1570..d3ad09cbfb 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -211,7 +211,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdftools}{2023-02-14}{0.95v}
+\ProvidesExplPackage{l3pdftools}{2023-02-20}{0.95w}
{candidate commands for l3pdf---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
index 59ee93b0d1..e0b99f153f 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
index 63395542e1..c12604614d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -132,7 +132,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*header>
-\ProvidesExplPackage{l3pdfxform}{2023-02-14}{0.95v}
+\ProvidesExplPackage{l3pdfxform}{2023-02-20}{0.95w}
{command to create xforms (beta)---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
index e7e426a73b..b9261b84cb 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
index e7128d2c26..5fbd9314e6 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -215,7 +215,7 @@
% \begin{macrocode}
%<@@=pdfmanagement>
%<*header>
-\ProvidesExplPackage{ltdocinit}{2023-02-14}{0.95v}
+\ProvidesExplPackage{ltdocinit}{2023-02-20}{0.95w}
{Initialize document metadata}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
index 2607f576de..d7311dddb1 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
index 542dab7788..891af85d6d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
index 3e9810a925..2e40ed6814 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -63,7 +63,7 @@
% |debug={firstaidoff={name1,name2,...},...}|.
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{pdfmanagement-firstaid}{2023-02-14}{0.95v}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2023-02-20}{0.95w}
{LaTeX PDF management testphase bundle / firstaid-patches}
%<@@=pdfmanagement>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
index f9f33a201e..30aa895e05 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
index 17f7bc45cd..7b8a19d4cb 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.95v, released 2023-02-14}
+% \date{Version 0.95w, released 2023-02-20}
%
% \maketitle
% \begin{documentation}
@@ -386,7 +386,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*package>
-\ProvidesExplPackage{pdfmanagement-testphase}{2023-02-14}{0.95v}
+\ProvidesExplPackage{pdfmanagement-testphase}{2023-02-20}{0.95w}
{LaTeX PDF management testphase bundle}
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2020-10-01}{}{
@@ -414,7 +414,7 @@
% to allow to set it in the document.
% \begin{macrocode}
%<*header>
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-02-14}{0.95v}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-02-20}{0.95w}
{PDF~management~code~(testphase)}
%</header>
%<*package>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
index 681c789fe7..c4205bc6e4 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index 9e27131014..98baf67303 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
%% LaTeX2e file `xcolor-patches.sty'
%%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2023-02-14 v0.95v patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2023-02-20 v0.95w patch xcolor for l3color]
\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
\ExplSyntaxOn
diff --git a/macros/latex/contrib/postnotes/CHANGELOG.md b/macros/latex/contrib/postnotes/CHANGELOG.md
index b626145fd0..54cc0ec345 100644
--- a/macros/latex/contrib/postnotes/CHANGELOG.md
+++ b/macros/latex/contrib/postnotes/CHANGELOG.md
@@ -1,6 +1,12 @@
# Changelog
-## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.2...HEAD)
+## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.2.3...HEAD)
+
+## [v0.2.3](https://github.com/gusbrs/postnotes/compare/v0.2.2...v0.2.3) (2023-02-21)
+
+### Fixed
+- Don't apply fix for "perhaps a missing \item" error for option
+ `listenv=none`.
## [v0.2.2](https://github.com/gusbrs/postnotes/compare/v0.2.1...v0.2.2) (2023-02-15)
diff --git a/macros/latex/contrib/postnotes/postnotes-code.pdf b/macros/latex/contrib/postnotes/postnotes-code.pdf
index 76ed8d090b..9c1f7bc4dd 100644
--- a/macros/latex/contrib/postnotes/postnotes-code.pdf
+++ b/macros/latex/contrib/postnotes/postnotes-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/postnotes/postnotes.dtx b/macros/latex/contrib/postnotes/postnotes.dtx
index 47271ac97a..edf129ed9c 100644
--- a/macros/latex/contrib/postnotes/postnotes.dtx
+++ b/macros/latex/contrib/postnotes/postnotes.dtx
@@ -153,7 +153,7 @@
%
%
% \begin{macrocode}
-\ProvidesExplPackage {postnotes} {2023-02-15} {0.2.2}
+\ProvidesExplPackage {postnotes} {2023-02-21} {0.2.3}
{Endnotes for LaTeX}
% \end{macrocode}
%
@@ -771,7 +771,7 @@
% not all cases are as tricky as \cs{caption} or \cs{text}, and even that can
% be decently dealt with without a separation between ``mark'' and ``text''.
% Besides, in difficult cases, the package offers a \opt{nomark} option to
-% \cs{postnote} to place a note, but typeset no mark. Than we can typeset a
+% \cs{postnote} to place a note, but typeset no mark. Then we can typeset a
% mark with \cs{postnoteref} referring to a \cs{label} in the note of
% interest. This would result in a correct mark without duplicity, and in a
% correct link from there to the note's text at \cs{printpostnotes}. The
@@ -1377,10 +1377,6 @@
{ \l_postnotes_print_note_id_tl }
\l_@@_print_mark_tl
}
-% \end{macrocode}
-% Leave vertical mode to avoid ``perhaps a missing \cs{item}'' error.
-% \begin{macrocode}
- \mode_leave_vertical:
\l_@@_print_content_tl
\l_@@_post_printnote_tl
\group_end:
@@ -1464,7 +1460,14 @@
\cs_new_protected:Npn \@@_text_mark_wrapper:n #1
{
\bool_if:NTF \l_@@_print_as_list_bool
- { \item [ \l_@@_pre_textmark_tl #1 \l_@@_post_textmark_tl ] }
+ {
+ \item [ \l_@@_pre_textmark_tl #1 \l_@@_post_textmark_tl ]
+% \end{macrocode}
+% Leave vertical mode to avoid ``perhaps a missing \cs{item}'' error for empty
+% notes.
+% \begin{macrocode}
+ \mode_leave_vertical:
+ }
{ \l_@@_pre_textmark_tl #1 \l_@@_post_textmark_tl }
}
% \end{macrocode}
@@ -2454,6 +2457,12 @@
% \pkg{tabularray} a trial/measure pass from the final one. So we use
% \cs{@@_verify_multipass:N} for it.
%
+% See, however, \url{https://tex.stackexchange.com/q/675818} and
+% \url{https://github.com/lvjr/tabularray/issues/179} (thanks
+% \contributor{Ulrike Fischer}). In sum, there's a not yet released new
+% boolean \cs{lTblrMeasuringBool} provided by \pkg{tabularray}, use it when it
+% comes.
+%
% \begin{macrocode}
\AddToHook { package/tabularray/after }
{
diff --git a/macros/latex/contrib/postnotes/postnotes.pdf b/macros/latex/contrib/postnotes/postnotes.pdf
index 6a20c7ba76..0b0f803611 100644
--- a/macros/latex/contrib/postnotes/postnotes.pdf
+++ b/macros/latex/contrib/postnotes/postnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/postnotes/postnotes.tex b/macros/latex/contrib/postnotes/postnotes.tex
index 2496f32121..0be7d50573 100644
--- a/macros/latex/contrib/postnotes/postnotes.tex
+++ b/macros/latex/contrib/postnotes/postnotes.tex
@@ -302,7 +302,8 @@ Typesets a postnote reference to \meta{label}. Of course, \meta{label} must
have been set to a particular postnote, which can be done by the standard
\cs{label} command. The starred version of the command inhibits hyperlinking.
When the \pkg{zref-user} package is loaded, a corresponding \cs{postnotezref}
-is also provided.
+is also provided, and if \pkg{zref-hyperref} is also loaded, it is hyperlinked
+as its counterpart.
\section{Options}
@@ -964,6 +965,7 @@ provided by (in chronological order):
% 2022-03-31: https://github.com/latex3/hyperref/issues/230
% 2022-04-09: https://github.com/latex3/hyperref/issues/229
% 2023-02-10: https://chat.stackexchange.com/transcript/message/62955941#62955941 (and discussion)
+ % 2023-02-19: https://tex.stackexchange.com/q/675818#comment1678904_675818
David Carlisle,
% 2022-03-28: https://chat.stackexchange.com/transcript/message/60754383#60754383
% 2022-04-08: https://tex.stackexchange.com/a/640035 (comments)
diff --git a/macros/latex/contrib/recorder-fingering/README.md b/macros/latex/contrib/recorder-fingering/README.md
index 4116341d1d..8ac7acfac5 100644
--- a/macros/latex/contrib/recorder-fingering/README.md
+++ b/macros/latex/contrib/recorder-fingering/README.md
@@ -1,9 +1,9 @@
# recorder-fingering
-Version 1.1 February 20, 2023
+Version 1.1b February 21, 2023
-The `recorder-fingering` package provides support for generating fingering diagrams for baroque fingering recorders. Standard fingerings are provided for recorders in both C and F, along with methods to create and display alternate fingerings for trills, etc.
+The `recorder-fingering` package provides support for generating fingering diagrams for baroque fingering recorders. Standard fingerings are provided for recorders in both C and F, along with methods to create and display alternate fingerings for trills, etc.
# Sample of what you can do with it:
-![Fingering chart](RecorderInCchart.png)
+![Fingering chart](recorder-fingering-RecorderInCchart.png)
diff --git a/macros/latex/contrib/recorder-fingering/recorder-fingering-RecorderInCchart.png b/macros/latex/contrib/recorder-fingering/recorder-fingering-RecorderInCchart.png
new file mode 100644
index 0000000000..f8350a15d7
--- /dev/null
+++ b/macros/latex/contrib/recorder-fingering/recorder-fingering-RecorderInCchart.png
Binary files differ
diff --git a/macros/latex/contrib/recorder-fingering/recorder-fingering.pdf b/macros/latex/contrib/recorder-fingering/recorder-fingering.pdf
index 289cbdbe21..11762eaaf8 100644
--- a/macros/latex/contrib/recorder-fingering/recorder-fingering.pdf
+++ b/macros/latex/contrib/recorder-fingering/recorder-fingering.pdf
Binary files differ
diff --git a/macros/latex/contrib/recorder-fingering/recorder-fingering.sty b/macros/latex/contrib/recorder-fingering/recorder-fingering.sty
index 1b4aebc23c..fa65399f26 100644
--- a/macros/latex/contrib/recorder-fingering/recorder-fingering.sty
+++ b/macros/latex/contrib/recorder-fingering/recorder-fingering.sty
@@ -25,7 +25,7 @@
%
% recorder-fingering.tex, recorder-fingering.pdf
%
-% Version 1.1 2023/02/20
+% Version 1.1b 2023/02/21
\NeedsTeXFormat{LaTeX2e}[2022/11/01]
\ProvidesPackage{recorder-fingering}[2023/02/20 v1.1 Recorder fingering diagrams]
\RequirePackage{tikz}
@@ -60,6 +60,7 @@ t/.style={node split half=0}, % thumb half hole
h/.style={node split half=-90}, % finger half hole
top double/.style={circle,minimum size=7pt,inner sep=0pt,draw,##1},
bottom double/.style={circle,minimum size=6pt,inner sep=0pt,draw,##1},
+nodes={anchor=center}
}}
\ExplSyntaxOn
@@ -67,7 +68,7 @@ bottom double/.style={circle,minimum size=6pt,inner sep=0pt,draw,##1},
\msg_new:nnnn {recorder-fingering}{too-few}{\\You\ haven't\ provided\ enough\ holes!}{Fingerings\ must\ specify\ all\ 8\ holes\ (thumb\ +\ all\ 7\ fingers)}
\msg_new:nnnn {recorder-fingering}{key-exists}{\\This\ fingering\ is\ already\ defined!}{Use\ the\ starred\ version\ of\ the\ command\ or\ \token_to_str:N \AddFingerings\ instead\ to\ override\ existing\ fingerings.}
\msg_new:nnnn {recorder-fingering}{wrong-instrument}{\\This\ command\ only\ permits\ F\ and\ C\ fingerings!}{}
-\msg_new:nnnn {recorder-fingering}{deprecated}{\\This\ command\ is\ deprecated.\ Please\ use\ \token_to_str:N \alto\ or\ \token_to_str:N \soprano\ instead.}{}
+\msg_new:nnnn {recorder-fingering}{deprecated}{\\This\ command\ is\ deprecated.\ Please\ use\ \token_to_str:N \Alto\ or\ \token_to_str:N \Soprano\ instead.}{}
\msg_new:nnnn {recorder-fingering}{no-hole}{\\The\ recorder\ does't\ have\ enough\ holes\ to\ trill\ here.\ Please\ use\ hole\ numbers\ between\ 1\ and\ 7!}{}
\msg_new:nnnn {recorder-fingering}{key-not-found}{\\Key\ not\ found}{}
diff --git a/macros/latex/contrib/recorder-fingering/recorder-fingering.tex b/macros/latex/contrib/recorder-fingering/recorder-fingering.tex
index 066369408d..f68080b9e4 100644
--- a/macros/latex/contrib/recorder-fingering/recorder-fingering.tex
+++ b/macros/latex/contrib/recorder-fingering/recorder-fingering.tex
@@ -24,7 +24,7 @@
\DefineShortVerb{\|}
\title{The \texttt{recorder-fingering} package}
\author{Alan Munn\\amunn@msu.edu}
-\date{Version 1.1\\February 20, 2023}
+\date{Version 1.1b\\February 21, 2023}
\lstset{%
basicstyle=\ttfamily\small,
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index e71d02eabb..fe99aadd7a 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,15 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.2.1] - 2023-02-21
+
+### Fixed
+
+- Extend list of math mode symbols replaced in text mode (see issue
+ [\#640](https://github.com/josephwright/siunitx/issues/640))
+- Handling of uncertainty if larger than main value when rounding (see issue
+ [\#641](https://github.com/josephwright/siunitx/issues/641))
+
## [v3.2.0] - 2023-01-03
## Added
@@ -1857,7 +1866,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.0...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.1...HEAD
+[v3.2.1]: https://github.com/josephwright/siunitx/compare/v3.2.0...v3.2.1
[v3.2.0]: https://github.com/josephwright/siunitx/compare/v3.1.11...v3.2.0
[v3.1.11]: https://github.com/josephwright/siunitx/compare/v3.1.10...v3.1.11
[v3.1.10]: https://github.com/josephwright/siunitx/compare/v3.1.9...v3.1.10
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 4984647c28..7f915ef16f 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 007d0b0825..f4d44ea5cc 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-number.dtx Copyright (C) 2014-2019,2021,2022 Joseph Wright
+% File: siunitx-number.dtx Copyright (C) 2014-2019,2021-2023 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -3162,9 +3162,6 @@
% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnnnn}
% \begin{macro}[EXP]{\@@_round_uncertainty_end:nn}
% \begin{macro}[EXP]{\@@_round_uncertainty:nnn}
-% \begin{macro}[EXP]{\@@_round_uncertainty_check:nnnw}
-% \begin{macro}[EXP]{\@@_round_uncertainty_check:Nnnnw}
-% \begin{macro}[EXP]{\@@_round_uncertainty_aux:nnn}
% \begin{macro}[EXP]{\@@_round_uncertainty:nnnn}
% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnnn}
% \begin{macro}[EXP]
@@ -3213,35 +3210,11 @@
\cs_new:Npn \@@_round_uncertainty_end:nn #1#2
{ \exp_not:n { {#1} {#2} } }
% \end{macrocode}
-% Before doing any rounding, we need to be sure that the main value has
-% enough significant digits. If not, the result is zero.
-% \begin{macrocode}
-\cs_new:Npn \@@_round_uncertainty:nnn #1#2#3
- {
- \@@_round_uncertainty_check:nnnw {#1} {#2} {#3}
- #1#2 \q_recursion_tail \q_recursion_stop
- }
-\cs_new:Npn \@@_round_uncertainty_check:nnnw #1#2#3#4
- {
- \quark_if_recursion_tail_stop_do:Nn #4 { { 0 } { } { } }
- \int_compare:nNnTF {#4} = 0
- { \@@_round_uncertainty_check:nnnw }
- { \@@_round_uncertainty_check:Nnnnw #4 }
- {#1} {#2} {#3}
- }
-\cs_new:Npn \@@_round_uncertainty_check:Nnnnw #1#2#3#4#5
- \q_recursion_tail \q_recursion_stop
- {
- \int_compare:nNnTF { \tl_count:n {#1#5} } < { \tl_count:n {#4} }
- { { 0 } { } { } }
- { \@@_round_uncertainty_aux:nnn {#2} {#3} {#4} }
- }
-% \end{macrocode}
% Round the uncertainty first: this is needed to get the number of places
% correct. Once that is done, it's just a question of working out the digits
% in the main part.
% \begin{macrocode}
-\cs_new:Npn \@@_round_uncertainty_aux:nnn #1#2#3
+\cs_new:Npn \@@_round_uncertainty:nnn #1#2#3
{
\exp_args:Nf \@@_round_uncertainty:nnnn
{
@@ -3440,9 +3413,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \begin{macro}{\@@_zero_decimal:NN}
% \begin{macro}[EXP]{\@@_zero_decimal:nnnnnnn}
diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 0a7348ee66..d02eefdf51 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-print.dtx Copyright (C) 2016-2019,2021,2022 Joseph Wright
+% File: siunitx-print.dtx Copyright (C) 2016-2019,2021-2023 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -860,14 +860,14 @@
\tl_set:Nn \l_@@_tmp_tl {#1}
\tl_if_empty:NF \l_@@_tmp_tl
{
- \tl_if_empty:NF \l_siunitx_unit_font_tl
- { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
- \cs_set:Npn \mathord ##1
- { \@@_text_replace_first:N ##1 }
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+ { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
+ \cs_set:Npn \mathord ##1
+ { \@@_text_replace_first:N ##1 }
\group_begin:
\cs_set:Npn \pm { \: \exp_not:N \textpm \: }
\tl_map_inline:nn
- { \mp \ge \le \gg \ll \angle }
+ { \mp \approx \sim \ge \le \geq \leq \gg \ll \angle }
{
\cs_set:Npn ##1
{ \exp_not:N \ensuremath { \exp_not:N ##1 } }
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 0ca26ecc41..1d1d08e457 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2023-01-03} {3.2.0}
+\ProvidesExplPackage {siunitx} {2023-02-21} {3.2.1}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 6b7ff0d6ee..ee58cd5ff2 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/zref-clever/CHANGELOG.md b/macros/latex/contrib/zref-clever/CHANGELOG.md
index 210ad82ccc..8cbd673f55 100644
--- a/macros/latex/contrib/zref-clever/CHANGELOG.md
+++ b/macros/latex/contrib/zref-clever/CHANGELOG.md
@@ -1,6 +1,12 @@
# Changelog
-## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.3.5...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.3.6...HEAD)
+
+## [v0.3.6](https://github.com/gusbrs/zref-clever/compare/v0.3.5...v0.3.6) (2023-02-21)
+
+### Fixed
+- Avoid "Missing number, treated as zero" error for labels set before first
+ call to `\refstepcounter`.
## [v0.3.5](https://github.com/gusbrs/zref-clever/compare/v0.3.4...v0.3.5) (2023-02-18)
diff --git a/macros/latex/contrib/zref-clever/zref-clever-code.pdf b/macros/latex/contrib/zref-clever/zref-clever-code.pdf
index f1a3809bd0..87eb00b7d8 100644
--- a/macros/latex/contrib/zref-clever/zref-clever-code.pdf
+++ b/macros/latex/contrib/zref-clever/zref-clever-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/zref-clever/zref-clever.dtx b/macros/latex/contrib/zref-clever/zref-clever.dtx
index 69dbe2af0e..cee60860c3 100644
--- a/macros/latex/contrib/zref-clever/zref-clever.dtx
+++ b/macros/latex/contrib/zref-clever/zref-clever.dtx
@@ -165,7 +165,7 @@
%
% Identify the package.
% \begin{macrocode}
-\ProvidesExplPackage {zref-clever} {2023-02-18} {0.3.5}
+\ProvidesExplPackage {zref-clever} {2023-02-21} {0.3.6}
{Clever LaTeX cross-references based on zref}
% \end{macrocode}
%
@@ -274,15 +274,27 @@
% numeric values. So we store them in \texttt{zc@cntval} and
% \texttt{zc@pgval}. For this, we use \cs[no-index]{c@}\meta{counter}, which
% contains the counter's numerical value (see `texdoc source2e', section
-% `ltcounts.dtx').
+% `ltcounts.dtx'). Also, even if we can't find a valid \cs{@currentcounter},
+% we set the value of 0 to the property, so that it is never empty (the
+% property's default is not sufficient to avoid that), because we rely on this
+% value being a number and an empty value there will result in ``Missing
+% number, treated as zero.'' error. A typical situation where this might
+% occur is the user setting a label before \cs{refstepcounter} is called for
+% the first time in the document. A user error, no doubt, but we should avoid
+% a hard crash.
% \begin{macrocode}
\zref@newprop { zc@cntval } [0]
{
- \cs_if_exist:cTF { c@ \l_@@_current_counter_tl }
+ \bool_lazy_and:nnTF
+ { ! \tl_if_empty_p:N \l_@@_current_counter_tl }
+ { \cs_if_exist_p:c { c@ \l_@@_current_counter_tl } }
{ \int_use:c { c@ \l_@@_current_counter_tl } }
{
- \cs_if_exist:cT { c@ \@currentcounter }
+ \bool_lazy_and:nnTF
+ { ! \tl_if_empty_p:N \@currentcounter }
+ { \cs_if_exist_p:c { c@ \@currentcounter } }
{ \int_use:c { c@ \@currentcounter } }
+ { 0 }
}
}
\zref@addprop \ZREF@mainlist { zc@cntval }
diff --git a/macros/latex/contrib/zref-clever/zref-clever.pdf b/macros/latex/contrib/zref-clever/zref-clever.pdf
index d188a737f9..4a4bfb147f 100644
--- a/macros/latex/contrib/zref-clever/zref-clever.pdf
+++ b/macros/latex/contrib/zref-clever/zref-clever.pdf
Binary files differ