summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-02 03:04:23 +0000
committerNorbert Preining <norbert@preining.info>2021-06-02 03:04:23 +0000
commit138d0a6cfd5f2187973fb6b83ad2fb0dcf5a8348 (patch)
treea95fba7d01d57bba550f5114c936ec76d57a49ac /macros/latex/contrib
parent0f69e2fd4a9928663f0cc64b8cac1f0d8baee9d6 (diff)
CTAN sync 202106020304
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/graphics-def/README.md2
-rw-r--r--macros/latex/contrib/graphics-def/luatex.def3
-rw-r--r--macros/latex/contrib/hep-paper/bibliography.bib18
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper-documentation.pdfbin438581 -> 439620 bytes
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper-implementation.dtx561
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper-implementation.pdfbin1052262 -> 1063749 bytes
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper.ins11
-rw-r--r--macros/latex/contrib/hvarabic/CHANGELOG3
-rw-r--r--macros/latex/contrib/hvarabic/doc/hvarabic.pdfbin170869 -> 170708 bytes
-rw-r--r--macros/latex/contrib/hvarabic/doc/hvarabic.tex6
-rw-r--r--macros/latex/contrib/hvarabic/latex/hvarabic.sty4
-rw-r--r--macros/latex/contrib/l3kernel/CHANGELOG.md10
-rw-r--r--macros/latex/contrib/l3kernel/README.md2
-rw-r--r--macros/latex/contrib/l3kernel/expl3.dtx4
-rw-r--r--macros/latex/contrib/l3kernel/expl3.pdfbin623533 -> 623452 bytes
-rw-r--r--macros/latex/contrib/l3kernel/interface3.pdfbin1721309 -> 1721217 bytes
-rw-r--r--macros/latex/contrib/l3kernel/interface3.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3basics.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3bootstrap.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3box.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3candidates.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3cctab.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3clist.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3coffins.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3color.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3debug.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3deprecation.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3doc.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3docstrip.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3docstrip.pdfbin151851 -> 151731 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3expan.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3file.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3flag.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-assign.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-aux.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-basics.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-convert.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-expo.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-extended.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-logic.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-parse.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-random.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-round.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-traps.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-trig.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fparray.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3int.dtx4
-rw-r--r--macros/latex/contrib/l3kernel/l3intarray.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3kernel-functions.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3keys.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3legacy.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3luatex.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3msg.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3names.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3news.pdfbin395907 -> 395907 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news01.pdfbin122713 -> 122713 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news02.pdfbin150672 -> 150672 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news03.pdfbin148707 -> 148707 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news04.pdfbin114588 -> 114588 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news05.pdfbin112485 -> 112485 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news06.pdfbin151572 -> 151572 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news07.pdfbin128312 -> 128312 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news08.pdfbin163455 -> 163455 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news09.pdfbin250134 -> 250134 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news10.pdfbin150289 -> 150289 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news11.pdfbin170069 -> 170069 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news12.pdfbin204992 -> 204992 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3pdf.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3prefixes.csv2
-rw-r--r--macros/latex/contrib/l3kernel/l3prefixes.pdfbin79815 -> 80464 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3prg.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3prop.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3quark.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3regex.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3seq.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3skip.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3sort.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3str-convert.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3str.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3styleguide.pdfbin296254 -> 296155 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3styleguide.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3syntax-changes.pdfbin242929 -> 242838 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3syntax-changes.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3sys.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3term-glossary.pdfbin231312 -> 231224 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3term-glossary.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3text-case.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3text-purify.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3text.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3tl-analysis.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3tl.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3token.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3unicode.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/source3.pdfbin6838077 -> 6837890 bytes
-rw-r--r--macros/latex/contrib/l3kernel/source3.tex2
-rw-r--r--macros/latex/contrib/l3packages/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/l3packages/README.md2
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.dtx4
-rw-r--r--macros/latex/contrib/l3packages/l3keys2e.pdfbin369414 -> 369315 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfp.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xfp.pdfbin331827 -> 331713 bytes
-rw-r--r--macros/latex/contrib/l3packages/xfrac.dtx11
-rw-r--r--macros/latex/contrib/l3packages/xfrac.pdfbin484970 -> 484860 bytes
-rw-r--r--macros/latex/contrib/l3packages/xparse.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xparse.pdfbin534372 -> 534253 bytes
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.dtx4
-rw-r--r--macros/latex/contrib/l3packages/xtemplate.pdfbin440189 -> 440078 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md40
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1447215 -> 1447170 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-compound.dtx7
-rw-r--r--macros/latex/contrib/siunitx/siunitx-emulation.dtx1
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx139
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.dtx58
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.pdfbin0 -> 475888 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-unit.dtx20
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin603229 -> 607150 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex59
-rw-r--r--macros/latex/contrib/tiscreen/README2
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdfbin121968 -> 131993 bytes
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex34
-rw-r--r--macros/latex/contrib/tiscreen/tex/tiscreen.sty10
123 files changed, 820 insertions, 338 deletions
diff --git a/macros/latex/contrib/graphics-def/README.md b/macros/latex/contrib/graphics-def/README.md
index f59b060522..1c5915297d 100644
--- a/macros/latex/contrib/graphics-def/README.md
+++ b/macros/latex/contrib/graphics-def/README.md
@@ -1,7 +1,7 @@
LaTeX support for color and graphics
====================================
-Release 2021-05-27
+Release 2021-06-01
This bundle contains the 'engine-dependent' part of support for
color and graphics in LaTeX2e (the code here will also function
diff --git a/macros/latex/contrib/graphics-def/luatex.def b/macros/latex/contrib/graphics-def/luatex.def
index 4be9cc0f32..102e8974c6 100644
--- a/macros/latex/contrib/graphics-def/luatex.def
+++ b/macros/latex/contrib/graphics-def/luatex.def
@@ -20,7 +20,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{luatex.def}
- [2021/05/26 v1.2b Graphics/color driver for luatex]
+ [2021/06/01 v1.2c Graphics/color driver for luatex]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -148,7 +148,6 @@
{%
\let\current@color\current@page@color
\set@color
- \aftergroup\reset@color
\rule{\pagewidth}{\pageheight}%
}%
\fi
diff --git a/macros/latex/contrib/hep-paper/bibliography.bib b/macros/latex/contrib/hep-paper/bibliography.bib
index 6f37da89ef..b3e572a851 100644
--- a/macros/latex/contrib/hep-paper/bibliography.bib
+++ b/macros/latex/contrib/hep-paper/bibliography.bib
@@ -884,3 +884,21 @@ eprinttype = "ctan",
eprint = "cm",
}
+@article{subdepth,
+title = "The |subdepth| package",
+subtitle = "Unify maths subscript height",
+collaboration = "Will Robertson",
+date = "2007",
+eprinttype = "ctan",
+eprint = "subdepth",
+}
+
+@article{xpatch,
+title = "The |xpatch| package",
+subtitle = "Extending etoolbox patching commands",
+collaboration = "Enrico Gregorio",
+date = "2012",
+eprinttype = "ctan",
+eprint = "xpatch",
+}
+
diff --git a/macros/latex/contrib/hep-paper/hep-paper-documentation.pdf b/macros/latex/contrib/hep-paper/hep-paper-documentation.pdf
index 4b509e1c48..47244cfc40 100644
--- a/macros/latex/contrib/hep-paper/hep-paper-documentation.pdf
+++ b/macros/latex/contrib/hep-paper/hep-paper-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-paper/hep-paper-implementation.dtx b/macros/latex/contrib/hep-paper/hep-paper-implementation.dtx
index ea537d218e..f334f869e0 100644
--- a/macros/latex/contrib/hep-paper/hep-paper-implementation.dtx
+++ b/macros/latex/contrib/hep-paper/hep-paper-implementation.dtx
@@ -17,10 +17,13 @@
%
% \iffalse
-%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-paper}[2020/12/01 v1.6 Publications in High Energy Physics]
-%<datamodel>\ProvidesFile{hep-paper.dbx}[2020/12/01 v1.6 HEP-Paper biblatex data model]
-%<documentation>\ProvidesFile{hep-paper-documentation.tex}[2020/12/01 v1.6 HEP-Paper documentation]
+%<package|title|bibliography|acronyms>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<package>\ProvidesPackage{hep-paper}[2021/06/01 v1.7 Publications in High Energy Physics]
+%<title>\ProvidesPackage{hep-title}[2021/06/01 v1.7 Title macros for publications in High Energy Physics]
+%<bibliography>\ProvidesPackage{hep-bibliography}[2021/06/01 v1.7 Bibliography macros for publications in High Energy Physics]
+%<acronyms>\ProvidesPackage{hep-acronyms}[2021/06/01 v1.7 Acronym macros for publications in High Energy Physics]
+%<datamodel>\ProvidesFile{hep-paper.dbx}[2021/06/01 v1.7 HEP-Paper biblatex data model]
+%<documentation>\ProvidesFile{hep-paper-documentation.tex}[2021/06/01 v1.7 HEP-Paper documentation]
%
%<*documentation>
@@ -69,7 +72,7 @@
%
% \fi
%
-% \CheckSum{1673}
+% \CheckSum{2095}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -94,6 +97,7 @@
% \changes{v1.4}{2020/09/01}{If possible the compatibility options are selected automatically. Inclusion of PubMed IDs in bibliography.}
% \changes{v1.5}{2020/10/01}{Reduce the numer of math alphabets used in sans serif mode. Add more title options such as a subtitle. Use standard class options.}
% \changes{v1.6}{2020/12/01}{Implementation of the twocolumn mode.}
+% \changes{v1.7}{2021/16/01}{Introduction of dedicated style file for the title, acronyms and bibliography macros. Extension of the title macros.}
%
% \ifshort
%<*documentation>
@@ -104,7 +108,7 @@
\title{The \textsmaller[1.5]{HEP\raisebox{.25ex}{--}PAPER} package\thanks{This document corresponds to \software{hep-paper}~\fileversion.}}
\subtitle{Publications in high energy physics}
\author{Jan Hajer \email{jan.hajer@uclouvain.be}}
-\affiliation{Centre for Cosmology, Particle Physics and Phenomenology, Université catholique de Louvain, Louvain-la-Neuve B-1348, Belgium}
+\affiliation{Department of Physics, University of Basel, Klingelbergstraße 82, 4056 Basel, Switzerland}
\preprint{Preprint-Number}
\date{\filedate}
@@ -135,6 +139,10 @@ The paper and font sizes are set to A4 and \unit[11]{pt}, respectively.
Additionally, the paper geometry is adjusted using the \software{geometry} package \cite{geometry}.
Furthermore, the font is changed to \LM using the \software{cfr-lm} package \cite{cfr-lm} with \software{microtype} \cite{microtype} optimizations.
Finally, \PDF hyperlinks are implemented with the \software{hyperref} package \cite{hyperref}.
+\DescribeMacro{hep-title}
+\DescribeMacro{hep-bibliography}
+\DescribeMacro{hep-acronyms}
+If only subset of the functionality is needed one of the smaller style files \software{hep-title}, \software{hep-acronyms}, and \software{hep-bibliography} containing only the macros relevant to \cref{sec:title,sec:bibliography,sec:acronyms}, respectively.
\subsection{Options}
@@ -155,12 +163,15 @@ The possible \meta{sizes} are:
The default is \unit[11]{pt}.
\DescribeMacro{lang}
-The |lang|=\meta{name} option switches the document language to one of the values values provided by the \software{babel} package \cite{babel}.
+The |lang|=\meta{name} option switches the document language to one of the values provided by the \software{babel} package \cite{babel}.
The default is |british|.
\DescribeMacro{sansserif}
The |sansserif| option switches the document including math to sans serif font shape.
+\DescribeMacro{oldstyle}
+The |oldstyle| option activates the use of oldstyle text- (\texto{123}) in favour of lining- (\textl{123}) figures in text mode.
+
\DescribeMacro{parskip}
The |parskip| option changes how paragraphs are separated from each other using the \software{parskip} package \cite{parskip}.
The \hologo{LaTeX} default is separation via indentation the |parskip| option switches to separation via vertical space.
@@ -181,9 +192,6 @@ The deactivation options can prevent such and other adjustments.
\DescribeMacro{defaults}
The |defaults| option prevents the adjustment of the page geometry and the font size set by the document class.
-\DescribeMacro{lining}
-The |lining| option deactivates the use of text- (\texto{123}) in favour of lining- (\textl{123}) figures in text mode.
-
\DescribeMacro{title}
The |title=false| option deactivates the title page adjustments.
@@ -238,14 +246,18 @@ The |eqnarray| option reactivates the depreciated |eqnarray| environment.
If the global |twocolumn| option is present the page geometry is changed to cover almost the entire page.
Additionally the |abstract*| environment is defined that generates a one column abstract and takes care of placing the title information.
-\subsection{Title page}
+\subsection{Title page} \label{sec:title}
+
+\DescribeMacro{\series}
+The |\series|\marg{series} macro is defined using the \software{titling} package \cite{titling}.
\DescribeMacro{\title}
The \PDF meta information is set according to the |\title|\marg{text} and |\author| \marg{text} information.
\DescribeMacro{\subtitle}
-The |\subtitle|\marg{subtitle} macro is defined using the \software{titling} package \cite{titling}.
+The |\subtitle|\marg{subtitle} macro is defined.
+\DescribeMacro{\editor}
\DescribeMacro{\author}
\DescribeMacro{\affiliation}
\DescribeMacro{\email}
@@ -358,7 +370,7 @@ References are also adjusted to not start on a new line.
\DescribeMacro{\footnote}
Footnotes are adjusted to swallow white space before the footnote mark and at the beginning of the footnote text.
-\subsubsection{Acronyms}
+\subsubsection{Acronyms} \label{sec:acronyms}
\DescribeMacro{\acronym}
\DescribeMacro{\shortacronym}
@@ -552,12 +564,11 @@ The macro |\inv|\oarg{power}\marg{text} allows to avoid math mode also for inver
Greek letters are adjusted to always be italic and upright in math and text mode, respectively, using the \software{fixmath} \cite{fixmath} and \software{alphabeta} \cite{alphabeta} packages.
This allows differentiations like
-\begin{align}
-\sigma &= \unit[5]{fb} \ , & &\text{at \unit[5]{\sigma} C.L.} \ , & \mu &= \unit[5]{cm} \ , & l &= \unit[5]{\text \mu m} \ ,
-\label{eq:greek}
+\begin{align} \label{eq:greek}
+\sigma &= \unit[5]{fb} \ , & &\mbox{at \unit[5]{\sigma} C.L.} \ , & \mu &= \unit[5]{cm} \ , & l &= \unit[5]{\text \mu m} \ ,
\end{align}
and \eg to distinguish gauge $\nu$ and mass \nu\ eigenstates in models with massive neutrinos.
-Note that |\mathrm| and therefore |\unit| transform italic greek character to seemingly random upright characters, this can be avoided by using |\unit{\text\mu m}|.
+Note that |\mathrm| and therefore |\unit| transform italic Greek character to seemingly random upright characters, this can be avoided by using |\unit{\text\mu m}|.
Additionally, Greek letters can also be directly typed using Unicode.
\DescribeMacro{\ev}
@@ -603,17 +614,17 @@ The float environments have been adjusted to center their content.
The usual behaviour can be reactivated using |\raggedright|.
\begin{table}
-\begin{panels}{.6}
+\begin{panels}{2}
\begin{verbatim}
-\begin{panels}{.6}
+\begin{panels}{2}
code
-\panel{.4}
+\panel
\begin{tabular}...\end{tabular}
\end{panels}
\end{verbatim}
\caption{Code for this panel environment.}
\label{tab:panels}
-\panel{.4}
+\panel
\begin{tabular}{cccc}
\toprule
\multicolumn{2}{c}{one}& \multicolumn{2}{c}{two} \\ \cmidrule(r){1-2} \cmidrule(l){3-4}
@@ -644,7 +655,7 @@ The \software{booktabs} \cite{booktabs} and \software{multirow} \cite{multirow}
The \software{graphicx} package \cite{graphicx} is loaded and the |\graphic|\oarg{width}\marg{figure} macro is defined, which is a wrapper for the |\includegraphics|\marg{figure} macro and takes the figure width as fraction of the |\linewidth| as optional argument (default~1).
If the graphics are located in a sub-folder its path can be indicated by |\graphics|\marg{subfolder}.
-\subsection{Bibliography}
+\subsection{Bibliography} \label{sec:bibliography}
\DescribeMacro{\bibliography}
\DescribeMacro{\printbibliography}
@@ -693,6 +704,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \appendix
%
% \ifshort
+%<*package|title|bibliography|acronyms>
%<*package>
% \fi
%
@@ -784,7 +796,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \egroup
%
% Of the 16 available math alphabets, \hologo{TeX} loads four by default
-% \begin{enumdescript}[start=0]
+% \begin{enumdescript}[start=0,label=\arabic*)]
% \item{OT1} \label{it:math text} Text (latin, upper case greek, numerals, text symbols)
% \item{OML} \label{it:math italic} Math Italic (latin, greek, numerals, text symbols)
% \item{OMS} \label{it:math symbol} Symbol (|\mathcal|, operators)
@@ -795,7 +807,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% The symbol font \ref{it:math symbol}\strut\ of \CM is \textbf{cmsy10} |\OMS/cmsy/m/n/10|, and is replaced by \LM to be \textbf{lmsy10} |\OMS/lmsy/m/n/10|, the |sansserif| options uses \textbf{cmsssy10} |\OMS/cmsssy/m/n/10| from the \software{sansmathfonts} package \cite{sansmathfonts}.
% The extension font \ref{it:math extension}\strut\ of \CM is \textbf{cmex10} |\OMX/cmex/m/n/5|, and is replaced by the \software{exscale} package \cite{exscale} to be \textbf{cmex10} |\OMX/cmex/m/n/10|, the |sansserif| option loads \textbf{cmssex10} |\OMX/cmssex/m/n/10|.
% The \software{amssymb} (\software{amsfonts}) packages \cite{amssymb} load two more symbol fonts
-% \begin{enumdescript}[start=4]
+% \begin{enumdescript}[start=4,label=\arabic*)]
% \item{msam10} \label{it:math ams a} |\U/msa/m/n/10| AMS symbol font A (special math operators)
% \item{msbm10} \label{it:math ams b} |\U/msb/m/n/10| AMS symbol font B (|\mathbb|, negated operators)
% \end{enumdescript}
@@ -804,15 +816,15 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
%
% Other math alphabets are only loaded on demand, \eg |\mathsf| uses a sans serif font and |\mathbf| without the \software{bm} package uses a bold font.
% The |\mathscr| macro uses the script font from the \software{mathrsfs} package \cite{mathrsfs}
-% \begin{enumdescript}[start=9]
+% \begin{enumdescript}[start=9,label=\arabic*)]
% \item{rsfs10} |\U/rsfs/m/n/10| Math script font (capital letters)
% \end{enumdescript}
% The |\mathbb| macro loads the double stroke font from the \software{dsfont} package \cite{dsfont}, this can be prevented with the |symbols=ams| option.
-% \begin{enumdescript}[start=10]
+% \begin{enumdescript}[start=10,label=\arabic*)]
% \item{dsrom10} |\U/dsrom/m/n/10| Double stroke font
% \end{enumdescript}
% The |\mathfrak| macro loads the fractur font from the \software{amssymb} package \cite{amssymb}
-% \begin{enumdescript}[start=11]
+% \begin{enumdescript}[start=11,label=\arabic*)]
% \item{eufm10} |\U/euf/m/n/10| Math fraktur (Basic Latin)
% \end{enumdescript}
%
@@ -867,6 +879,14 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{lining}
+% Define the |lining| option deactivating the use of text figures in text mode.
+% \begin{macrocode}
+\DeclareBoolOption[true]{lining}
+\DeclareComplementaryOption{oldstyle}{lining}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{parskip}
% Define the option pair |parindent| and |parskip| controlling the separation of paragraphs.
% \begin{macrocode}
@@ -891,12 +911,6 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{lining}
-% Define the |lining| option deactivating the use of text figures in text mode.
-% \begin{macrocode}
-\DeclareBoolOption[false]{lining}
-% \end{macrocode}
-% \end{macro}
% \begin{macro}{title}
% Provide the |title| option deactivating redefinitions of title macros.
% \begin{macrocode}
@@ -1130,10 +1144,16 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \begin{macrocode}
\RequirePackage{fix-cm}
\RequirePackage{microtype}
-\ifhep@lining
- \RequirePackage[rm={lining},sf={lining},tt={lining}]{cfr-lm}
+\ifxetexorluatex
+ \RequirePackage{nfssext-cfr}
+ \RequirePackage{lmodern}
+% \RequirePackage{fontsetup} % problmatic
\else
- \RequirePackage{cfr-lm}
+ \ifhep@lining
+ \RequirePackage[rm={lining},sf={lining},tt={lining}]{cfr-lm}
+ \else
+ \RequirePackage{cfr-lm}
+ \fi
\fi
\RequirePackage{etoolbox}
% \AtBeginEnvironment{tabular}{\tlstyle}
@@ -1177,8 +1197,13 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
}{}
\else
\rmfamily
+ \RequirePackage{slantsc}
\hep@rm@fontshape{b}{sc}{<->ssub*cmr/bx/sc}{}
\hep@rm@fontshape{bx}{sc}{<->ssub*cmr/bx/sc}{}
+ \hep@rm@fontshape{b}{scsl}{<->ssub*cmr/bx/scsl}{}
+ \hep@rm@fontshape{bx}{scsl}{<->ssub*cmr/bx/scit}{}
+ \hep@rm@fontshape{b}{scit}{<->ssub*cmr/bx/scsl}{}
+ \hep@rm@fontshape{bx}{scit}{<->ssub*cmr/bx/scit}{}
\sffamily
\hep@sf@fontshape{m}{sc}{<->ssub*xcmss/m/sc}{}
\hep@sf@fontshape{b}{sc}{<->ssub*xcmss/bx/sc}{}
@@ -1186,6 +1211,10 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\hep@sf@fontshape{m}{scit}{<->ssub*xcmss/m/scit}{}
\hep@sf@fontshape{b}{scit}{<->ssub*xcmss/bx/scit}{}
\hep@sf@fontshape{bx}{scit}{<->ssub*xcmss/bx/scit}{}
+ \hep@sf@fontshape{m}{scsl}{<->ssub*xcmss/m/scit}{}
+ \hep@sf@fontshape{b}{scsl}{<->ssub*xcmss/bx/scit}{}
+ \hep@sf@fontshape{bx}{scsl}{<->ssub*xcmss/bx/scit}{}
+ \hep@sf@fontshape{m}{ui}{<->cmssu10}{}
\fi
% \end{macrocode}
%
@@ -1278,8 +1307,16 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% Define the |\online|\marg{text}\marg{url} macro combining the features of the |\href| and the |\url| macros.
% Define a macro for typesetting emails.
% \begin{macrocode}
-\newcommand{\online}[2]{\href{#1}{\nolinkurl{#2}}}
+%</package>
+%<*package|title|bibliography>
+\providecommand{\online}[2]{\ttfamily{#2}}%
\providecommand{\email}[1]{\online{mailto:#1}{#1}}
+\AtEndOfPackage{\@ifpackageloaded{hyperref}{%
+ \renewcommand{\online}[2]{\href{#1}{\nolinkurl{#2}}}%
+ }{}
+}
+%</package|title|bibliography>
+%<*package>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1323,6 +1360,28 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
}{\end{enum@descript}}
% \end{macrocode}
% \end{environment}
+%
+% \begin{environment}{commalist}
+% Define a commalist environment.
+% \begin{macrocode}
+%</package>
+%<*package|bibliography>
+\RequirePackage{xparse}
+\ExplSyntaxOn
+\NewDocumentEnvironment{commalist}{O{\space}+b}{
+ \hep@comma@list:n{#2}
+}{#1}
+\seq_new:N \hep@items@sequence
+\cs_new_protected:Npn \hep@comma@list:n #1{
+ \seq_set_split:Nnn \hep@items@sequence{\item}{#1}
+ \seq_pop_left:NN \hep@items@sequence \l_tmpa_tl
+ \seq_use:Nnnn \hep@items@sequence{~and~}{,~}{,~and~}
+}
+\ExplSyntaxOff
+%</package|bibliography>
+%<*package>
+% \end{macrocode}
+% \end{environment}
% \section{Geometry}
%
@@ -1368,9 +1427,12 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
%
% Load the \software{mathtools} package \cite{mathtools} which loads the \software{amsmath} package \cite{amsmath}.
% Allow page breaks within equations if necessary.
+% Adjust the thick and med mu skips slightly.
% \begin{macrocode}
\RequirePackage{mathtools}
\allowdisplaybreaks[1]
+\thickmuskip=5mu plus 3mu minus 1mu
+\medmuskip=4mu plus 2mu minus 3mu
% \end{macrocode}
%
% \begin{macro}{\diag}
@@ -1387,6 +1449,8 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% Define the |\mathdef|\marg{name}\oarg{arguments}\marg{macro} macro which \prefix{re}{defines} macros in math mode only.
% This macro is implemented using the \software{xparse} package \cite{xparse}.
% \begin{macrocode}
+%</package>
+%<*package|acronyms>
\RequirePackage{xparse}
\DeclareDocumentCommand{\mathdef}{mO{0}m}{%
\expandafter\let\csname text\string#1\endcsname=#1
@@ -1400,6 +1464,8 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\next
}%
}
+%</package|acronyms>
+%<*package>
% \end{macrocode}
% \end{macro}
%
@@ -1459,17 +1525,21 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\RequirePackage{fixmath}
\RequirePackage{alphabeta}
\RequirePackage{substitutefont}
- \substitutefont{LGR}{\rmdefault}{lmr}
- \DeclareFontFamily{LGR}{\rmdefault}{}
- \DeclareFontShape{LGR}{\rmdefault}{b}{n}{<->ssub*lmr/bx/n}{}
- \DeclareFontShape{LGR}{\rmdefault}{b}{sc}{<->ssub*lmr/bx/sc}{}
- \substitutefont{LGR}{\ttdefault}{lmtt}
- \DeclareFontFamily{LGR}{\ttdefault}{}
- \DeclareFontShape{LGR}{\ttdefault}{b}{n}{<->ssub*cmtt/bx/n}{}
- \substitutefont{LGR}{\sfdefault}{lmss}
- \DeclareFontFamily{LGR}{\sfdefault}{}
- \DeclareFontShape{LGR}{\sfdefault}{b}{n}{<->ssub*lmss/bx/n}{}
- \DeclareFontShape{LGR}{\sfdefault}{b}{sc}{<->ssub*lmss/bx/sc}{}
+ \ifxetexorluatex
+ % missing code
+ \else
+ \substitutefont{LGR}{\rmdefault}{lmr}
+ \DeclareFontFamily{LGR}{\rmdefault}{}
+ \DeclareFontShape{LGR}{\rmdefault}{b}{n}{<->ssub*lmr/bx/n}{}
+ \DeclareFontShape{LGR}{\rmdefault}{b}{sc}{<->ssub*lmr/bx/sc}{}
+ \substitutefont{LGR}{\ttdefault}{lmtt}
+ \DeclareFontFamily{LGR}{\ttdefault}{}
+ \DeclareFontShape{LGR}{\ttdefault}{b}{n}{<->ssub*cmtt/bx/n}{}
+ \substitutefont{LGR}{\sfdefault}{lmss}
+ \DeclareFontFamily{LGR}{\sfdefault}{}
+ \DeclareFontShape{LGR}{\sfdefault}{b}{n}{<->ssub*lmss/bx/n}{}
+ \DeclareFontShape{LGR}{\sfdefault}{b}{sc}{<->ssub*lmss/bx/sc}{}
+ \fi
% \end{macrocode}
%
% Either load the \software{MnSymbol} package \cite{MnSymbol} or the the \software{exscale} package in order to fix Latin Modern |lmex| fonts.
@@ -1607,20 +1677,58 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
%
% \begin{macro}{\cancel}
% \begin{macro}{\slashed}
-% \begin{macro}{\unit}
% Load the \software{physics} package \cite{physics} which provides macros useful for publications in physics.
+% Fix the |\eval| macro.
% Additionally, load the \software{cancel} \cite{cancel} and \software{slashed} \cite{slashed} packages which provide the |\cancel| and |\slashed| macros.
-% Finally, load the \software{units} package \cite{units} which provides the |\units| and |\nicefrac| macros.
% \begin{macrocode}
\ifhep@physics
\RequirePackage{physics}
\RequirePackage{cancel}
\RequirePackage{slashed}
-\RequirePackage{units}
-\newcommand{\textfrac}[2]{\ensuremath{\nicefrac{\text{#1}}{\text{#2}}}}
+\DeclareDocumentCommand\evaluated{sgd[|d(|}{%
+ \IfNoValueTF{#2}{%
+ \IfNoValueTF{#3}{%
+ \IfNoValueTF{#4}{\argopen.\argclose\rvert}{%
+ \IfBooleanTF{#1}{\vphantom{#4}}{}%
+ \left(\IfBooleanTF{#1}{\smash{#4}}{#4}\right\rvert%
+ }%
+ }{%
+ \IfBooleanTF{#1}{\vphantom{#3}}{}%
+ \left[\IfBooleanTF{#1}{\smash{#3}}{#3}\right\rvert%
+ \IfNoValueTF{#4}{}{(#4|}%
+ }%
+ }{%
+ \IfBooleanTF{#1}{\vphantom{#2}}{}%
+ \left.\IfBooleanTF{#1}{\smash{#2}}{#2}\right\rvert%
+ \IfNoValueTF{#3}{}{[#3|}\IfNoValueTF{#4}{}{(#4|}%
+ }%
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
+
+% \begin{macro}{\unit}
+% Load the \software{units} package \cite{units} which provides the |\units| and |\nicefrac| macros.
+% Patch the |\unit| and |\unitfrac| macros to work with lining numerals using the \software{xpatch} package \cite{xpatch}.
+% \begin{macrocode}
+\RequirePackage{units}
+\RequirePackage{xpatch}
+\ifhep@lining\else
+ \xpatchcmd{\unit}{\else#1}{%
+ \else\ifthenelse{\boolean{mmode}}{#1}{\textl{#1}}%
+ }{}{}
+ \xpatchcmd{\unitfrac}{\else#1}{%
+ \else\ifthenelse{\boolean{mmode}}{#1}{\textl{#1}}%
+ }{}{}
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\inv}
+% Provide the |\textfrac| macro.
+% \begin{macrocode}
+\newcommand{\textfrac}[2]{\ensuremath{\nicefrac{\text{#1}}{\text{#2}}}}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\inv}
@@ -1753,6 +1861,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \begin{macro}{\panel}
% Define the |panels| environment and the |\panel| macro.
% \begin{macrocode}
+\newcommand{\hep@panels@space}{20}
\newenvironment{panels}[2][b]{%
% \end{macrocode}
% Define an internal macro for global behaviour.
@@ -1765,10 +1874,15 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% Define the |\panel| macro for the case that the number of panels is given.
% \begin{macrocode}
\ifdim#2pt>1pt%
+ \newcommand{\hep@panel@space}{%
+ (1-#2+\hep@panels@space)/\hep@panels@space%
+ }%
\newcommand{\panel}[1][b]{%
- \endminipage\hfill\begin@subcaption@minipage[#1]{\linewidth/#2}%
+ \endminipage\hfill\begin@subcaption@minipage[#1]{%
+ \linewidth/#2*\hep@panel@space%
+ }%
}%
- \begin@subcaption@minipage[#1]{\linewidth/#2}%
+ \begin@subcaption@minipage[#1]{\linewidth/#2*\hep@panel@space}%
% \end{macrocode}
% Define the |\panel| macro for the case that the width of the panel is given.
% \begin{macrocode}
@@ -1827,15 +1941,26 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \section{Title page}
%
-% Begin of |title| conditional.
+% Begin of |title| conditional. Define internal conditionals outside. TODO: replace this hack
% \begin{macrocode}
+\newif\ifhep@first%
+\newif\ifnewaffil%
\ifhep@title
% \end{macrocode}
%
+%</package>
+%
+%
+% Redefine previous macros just for the title package.
+% \begin{macrocode}
+%<*package|title>
+%<title>\newif\ifhep@first%
+% \end{macrocode}
+%
% \begin{macro}{\date}
% Allow absent date field.
% \begin{macrocode}
-\date{}
+\date{\vspace{-4ex}}
% \end{macrocode}
% \end{macro}
%
@@ -1844,11 +1969,14 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% Extend the title using the \software{titling} package \cite{titling}.
% \begin{macrocode}
\RequirePackage{titling}
+\setlength{\thanksmarkwidth}{1.5em}
% \end{macrocode}
%
% \begin{macro}{\preprintfont}
+% \begin{macro}{\seriesfont}
% \begin{macro}{\titlefont}
% \begin{macro}{\subtitlefont}
+% \begin{macro}{\editorfont}
% \begin{macro}{\authorfont}
% \begin{macro}{\affiliationfont}
% \begin{macro}{\datefont}
@@ -1856,10 +1984,14 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \begin{macrocode}
\let\hep@preprint@font\relax
\newcommand{\preprintfont}[1]{\def\hep@preprint@font{#1}}
+\let\hep@series@font\relax
+\newcommand{\seriesfont}[1]{\def\hep@series@font{#1}}
\let\hep@title@font\relax
\newcommand{\titlefont}[1]{\def\hep@title@font{#1}}
\let\hep@subtitle@font\relax
\newcommand{\subtitlefont}[1]{\def\hep@subtitle@font{#1}}
+\let\hep@editor@font\relax
+\newcommand{\editorfont}[1]{\def\hep@editor@font{#1}}
\let\hep@author@font\relax
\newcommand{\authorfont}[1]{\def\hep@author@font{#1}}
\let\hep@affiliation@font\relax
@@ -1873,27 +2005,33 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\series}
+% Define a series.
+% \begin{macrocode}
+\newcommand{\preseries}[1]{\def\hep@pre@series{#1}}
+\newcommand{\series}[1]{\def\hep@series{#1}}
+\newcommand{\postseries}[1]{\def\hep@post@series{#1}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\subtitle}
% Define a subtitle.
% \begin{macrocode}
\newcommand{\presubtitle}[1]{\def\hep@pre@sub@title{#1}}
-\newcommand{\subtitle}[1]{\def\sub@title{#1}}
+\newcommand{\subtitle}[1]{\def\hep@sub@title{#1}}
\newcommand{\postsubtitle}[1]{\def\hep@post@sub@title{#1}}
-\renewcommand{\maketitlehookb}{%
- \@ifundefined{sub@title}{}{%
- \hep@pre@sub@title\sub@title\hep@post@sub@title%
- }%
-}
% \end{macrocode}
% \end{macro}
%
% Set standard values mostly taken from the \software{titling} package, add the font hook, and reduce the |date| font size.
% \begin{macrocode}
-\titlefont{\ifhep@serif\tistyle\else\qtstyle\fi}
+\preseries{\begin{center}\Large\hep@series@font}
+\postseries{\par\end{center}}
\pretitle{\begin{center}\LARGE\hep@title@font}
\posttitle{\par\end{center}}
-\subtitlefont{\ifhep@serif\tistyle\else\qtstyle\fi}
\presubtitle{\begin{center}\Large\hep@subtitle@font}
\postsubtitle{\par\end{center}}
\preauthor{%
@@ -1904,19 +2042,146 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\postdate{\par\end{center}}
% \end{macrocode}
%
+% \subsection{Editors}
+%
+% \begin{macrocode}
+\newcounter{editors}
+\newcommand\hep@editorlist{}
+\newcommand\hep@editors{}
+% \end{macrocode}
+%
+% \begin{macro}{\hep@multi@ref}
+% Transform reference list to list of references.
+% \begin{macrocode}
+\newcommand{\hep@multi@ref}[1]{%
+ \hep@firsttrue%
+ \forcsvlist{%
+ \ifhep@first\hep@firstfalse\else\textsuperscript,\fi\ref%
+ }{#1}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\editor}
+% Copy of the |authblk| author code adjusted for editors.
+% \begin{macrocode}
+\RequirePackage{authblk}
+\newcommand\editor[2][]{%
+ \renewcommand{\email}[1]{\unskip\thanks{\online{mailto:##1}{##1}}}%
+ \ifnewaffil%
+ \addtocounter{affil}{1}%
+ \edef\AB@thenote{\arabic{affil}}%
+ \fi%
+ \if\relax#1\relax%
+ \def\AB@note{\AB@thenote}%
+ \else%
+ \def\AB@note{#1}\setcounter{Maxaffil}{0}%
+ \fi%
+ \ifnum\value{editors}>1\relax%
+ \@namedef{@sep\number\c@editors}{\Authsep}%
+ \fi%
+ \addtocounter{editors}{1}%
+ \begingroup%
+ \let\protect\@unexpandable@protect \let\and\AB@pand%
+ \def\thanks{\protect\thanks}\def\footnote{\protect\footnote}%
+ \@temptokena=\expandafter{\hep@editors}{%
+ \def\\{%
+ \protect\\[\@affilsep]\protect\Affilfont\protect\AB@resetsep%
+ }%
+ \xdef\hep@editor{\AB@blk@and#2}%
+ \ifnewaffil%
+ \gdef\AB@las{}\gdef\AB@lasx{\protect\Authand}\gdef\AB@as{}%
+ \xdef\hep@editors{\the\@temptokena\AB@blk@and}%
+ \else%
+ \xdef\hep@editors{\the\@temptokena\AB@as\AB@au@str}%
+ \global\let\AB@las\AB@lasx\gdef\AB@lasx{\protect\Authands}%
+ \gdef\AB@as{\Authsep}%
+ \fi%
+ \gdef\AB@au@str{#2}%
+ }%
+ \@temptokena=\expandafter{\hep@editorlist}%
+ \let\\=\editorcr%
+ \xdef\hep@editorlist{%
+ \the\@temptokena%
+ \protect\@nameuse{@sep\number\c@editors}%
+ \protect\Authfont#2%
+ \if\relax#1\relax\else%
+ \ \protect\hep@multi@ref{\AB@note}%
+ \fi%
+ }%
+ \endgroup%
+ \ifnum\value{editors}>2\relax%
+ \@namedef{@sep\number\c@editors}{\Authands}%
+ \fi%
+ \newaffilfalse%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\preditor}
+% \begin{macro}{\postditor}
+% Set editor style
+% \begin{macrocode}
+\newcommand{\preeditor}[1]{\def\hep@pre@editor{#1}}
+\newcommand{\posteditor}[1]{\def\hep@post@editor{#1}}
+\preeditor{\begin{center}\large\hep@editor@font\lineskip.5em
+ \ifnum\value{editors}>1\relax Editors\else Editor\fi:
+}
+\posteditor{\par\end{center}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% Show subtitle and editor.
+% \begin{macrocode}
+\renewcommand{\maketitlehookb}{%
+ \@ifundefined{hep@sub@title}{}{%
+ \hep@pre@sub@title\hep@sub@title\hep@post@sub@title%
+ }%
+ \ifx\hep@editorlist\AB@empty\else%
+ \hep@pre@editor\hep@editorlist\hep@post@editor%
+ \fi
+}
+% \end{macrocode}
+%
% \subsection{Authors}
%
% \begin{macro}{\author}
% Allow absent author field.
% Enable the handling of multiple authors with different affiliations using the \software{authblk} package \cite{authblk}.
% \begin{macrocode}
-\author{}
-\RequirePackage{authblk}
-\renewcommand{\Affilfont}{\small\hep@affiliation@font}
+% \author{}
+%<title>\newif\ifhep@lining\hep@liningtrue
+\ifhep@lining
+ \renewcommand{\Affilfont}{\small\hep@affiliation@font}
+\else
+ \renewcommand{\Affilfont}{\small\ostyle\hep@affiliation@font}
+\fi
\renewcommand\Authfont{\hep@author@font}
% \end{macrocode}
% \end{macro}
%
+% Switch authblk to a label ref system for affiliations.
+% \begin{macrocode}
+\newcounter{affiliation}
+\renewcommand{\theaffiliation}{%
+ \textsuperscript{\normalfont\arabic{affiliation}}%
+}
+%<title>\RequirePackage{xpatch}
+\xpatchcmd{\author}{%
+ \protect\Authfont#2\AB@authnote{\AB@note}%
+}{%
+ \protect\Authfont#2%
+ \if\relax#1\relax\else\protect\hep@multi@ref{\AB@note}\fi%
+}{}{}
+\xpatchcmd{\affil}{%
+ \AB@affilnote{\AB@note}%
+}{%
+ \protect\refstepcounter{affiliation}\protect\label{\AB@note}%
+ \if\relax#1\relax\else\protect\ref{\AB@note}\fi%
+}{}{}
+% \end{macrocode}
+%
% \begin{macro}{\email}
% Redefine the email macro to place the email address in a footnote if called from within the |\author| macro |\author{|$\langle name\rangle$ |\email{|$\langle email\rangle$|}}|.
% \begin{macrocode}
@@ -1949,7 +2214,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
}
% \end{macrocode}
% \end{macro}
-
+%
% \subsection{Preprint}
%
% \begin{macro}{\preprint}
@@ -1958,6 +2223,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\let\hep@preprint\relax
\newcommand\preprint[1]{\def\hep@preprint{#1}}
\RequirePackage{varwidth}
+%<title>\RequirePackage{relsize}
\newcommand{\hep@preprint@box}{%
\begin{varwidth}{\textwidth}%
\smaller[.5]\hep@preprint@font\hep@preprint%
@@ -1970,6 +2236,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \begin{macro}{\placepreprint}
% Places a preprint number in the top right corner of the title page using the \software{atbegshi} \cite{atbegshi} and \software{picture} \cite{picture} packages.
% \begin{macrocode}
+%<title>\RequirePackage{calc}
\RequirePackage{atbegshi}
\RequirePackage{picture}
\newcommand{\placepreprint}{%
@@ -1980,7 +2247,12 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
){\normalfont\hep@preprint@box}
}
}
-\renewcommand{\maketitlehooka}{\placepreprint\vspace{-\bigskipamount}}
+\renewcommand{\maketitlehooka}{%
+ \placepreprint\vspace{-\bigskipamount}%
+ \@ifundefined{hep@series}{}{%
+ \hep@pre@series\hep@series\hep@post@series%
+ }%
+}
% \end{macrocode}
% \end{macro}
@@ -2003,15 +2275,19 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\RequirePackage{abstract}
\renewcommand{\abstitleskip}{-3ex}
\NewEnviron{abstract*}{%
- \twocolumn[\maketitle\vspace{-1.5cm}%
+ \twocolumn[\maketitle\vspace{-5ex}%
\begin{onecolabstract}\noindent\BODY\end{onecolabstract}%
\vspace{.5cm}]\saythanks%
}
\else
\newenvironment{abstract*}{\maketitle\begin{abstract}}{\end{abstract}}
\fi
+%</package|title>
% \end{macrocode}
% \end{environment}
+%
+%<*package>
+%
% End of |title| conditional.
% \begin{macrocode}
\fi
@@ -2024,6 +2300,14 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\ifnum\pdf@strcmp{\hep@bibliography}{false}=0\else
% \end{macrocode}
%
+%</package>
+%
+% \begin{macrocode}
+%<*package|bibliography>
+%<bibliography>\def\hep@bibliography{numeric-comp}
+%<bibliography>\newif\ifhep@journal\hep@journalfalse
+% \end{macrocode}
+%
% \begin{macro}{\bibliography}
% Load the \software{biblatex} package \cite{biblatex} with the datamodel defined in \cref{sec:data model}.
% \begin{macrocode}
@@ -2053,11 +2337,11 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\ExecuteBibliographyOptions{
sorting=hep-paper,
safeinputenc,
- giveninits=true
+ giveninits=true,
+ maxbibnames=7
}
% \end{macrocode}
%
-%
% Shrink the biblography in two column mode.
% \begin{macrocode}
\ifhep@journal\else
@@ -2069,6 +2353,13 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
%
% \begin{macro}{erratum}
+% Redefine the |translationof| string to fit better to documents without a original title.
+% \begin{macrocode}
+\DefineBibliographyStrings{english}{translationof={Original}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{erratum}
% Add new bibliography string \enquote{Erratum} for the use in the |relatedtype| field.
% \begin{macrocode}
\NewBibliographyString{erratum,erratums}
@@ -2077,6 +2368,12 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% \end{macro}
%
+% Activate the Oxford comma when using |british| and separate title and subtitle with a colon.
+% \begin{macrocode}
+\DefineBibliographyExtras{british}{\def\finalandcomma{\addcomma}}
+\renewcommand{\subtitlepunct}{\addcolon\addspace}
+% \end{macrocode}
+%
% \begin{macro}{\printbibliography}
% Allow the bibliography to be printed sloppy
% \begin{macrocode}
@@ -2131,6 +2428,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% Move letters from the volume field to the journal field.
% \begin{macrocode}
\map[overwrite]{
+ \pertype{article}
\step[fieldsource=volume, match=\reg@exp@one, final]
\step[fieldsource=volume, match=\reg@exp@two, replace={$2}]
\step[fieldsource=journal, fieldtarget=journaltitle]
@@ -2200,6 +2498,19 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{reportnumber}
+% Print the |reportnumber| as commalist
+% \begin{macrocode}
+%<bibliography>\RequirePackage{relsize}
+\DeclareFieldFormat{reportnumber}{%
+ \edef\commalistbody{\forcsvfield{%
+ \egroup\noexpand\item\unexpanded{\bgroup\smaller[.5]\textsc}
+ }{reportnumber}}%
+ \expandafter\commalist\commalistbody\egroup\endcommalist%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{url}
% Show \URLs without the protocol.
% \begin{macrocode}
@@ -2247,8 +2558,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
}{\printfield{pmc}\newunit}
\iffieldundef{reportnumber}{}{%
\newunitpunct\textnumero\intitlepunct%
- \textsc{\smaller[.5]\printfield{reportnumber}}%
- \newunit%
+ \printfield{reportnumber}\newunit%
}%
}
% \end{macrocode}
@@ -2325,9 +2635,11 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
HEPForge\addcolon\space\bib@online{https://#1/hepforge.org}{#1}%
}
\DeclareFieldAlias{eprint:HEPForge}{eprint:hepforge}
+%</package|bibliography>
% \end{macrocode}
% \end{macro}
%
+%<*package>
%
% End check for bibliography option.
% \begin{macrocode}
@@ -2350,6 +2662,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
%
% \begin{macrocode}
\pdfstringdefDisableCommands{\def\varepsilon{\textepsilon}}
+\pdfstringdefDisableCommands{\def\to{\textrightarrow}}
\AtBeginDocument{
\pdfstringdefDisableCommands{\let\ensuremath\@gobble}
\pdfstringdefDisableCommands{\let\mathsurround\@gobble}
@@ -2369,7 +2682,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\AtBeginDocument{\hypersetup{pdfauthor=\AB@authlist}}
\else
\ifhep@beamer\else
- \AtBeginDocument{\hypersetup{pdfauthor={\@author}}}
+ \ifhep@pos\else\AtBeginDocument{\hypersetup{pdfauthor={\@author}}}\fi
\fi
\fi
% \end{macrocode}
@@ -2476,6 +2789,19 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% \end{macro}
%
+% Adjust the title page
+% \begin{macrocode}
+\ifhep@title
+ \labelcrefmultiformat{affiliation}{#2#1#3}{%
+ \textsuperscript,#2#1#3}{\textsuperscript,#2#1#3%
+ }{%
+ \textsuperscript,#2#1#3%
+ }
+ \labelcrefrangeformat{affiliation}{#3#1#4\textsuperscript{--}#5#2#6}
+% \thanksmarkseries{alph}
+\fi
+% \end{macrocode}
+%
% End of |references| conditional
% \begin{macrocode}
\fi
@@ -2532,10 +2858,14 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \section{Acronyms}
%
-% Acronyms are implemented with the \software{glossaries-extra} package \cite{glossaries-extra} which is an extension of the \software{glossaries} package \cite{glossaries} and must be loaded after the \software{hyperref} pacakge in \cref{sec:hyperlinks}.
+% Acronyms are implemented with the \software{glossaries-extra} package \cite{glossaries-extra} which is an extension of the \software{glossaries} package \cite{glossaries} and must be loaded after the \software{hyperref} package in \cref{sec:hyperlinks}.
+% Set the abbreviation style.
% \begin{macrocode}
\ifhep@glossaries
+%</package>
+%<*package|acronyms>
\RequirePackage[nostyles]{glossaries-extra}
+\setabbreviationstyle{long-hyphen-short-hyphen}
% \end{macrocode}
% The entry count feature is used.
% \begin{macrocode}
@@ -2544,26 +2874,30 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% Provide macros for older |glossaries-extra| installations.
% \begin{macrocode}
-\providecommand{\glsxtrusefield}[2]{\@gls@entry@field{#1}{#2}}
-\providecommand{\glsxtrsetfieldifexists}[3]{\glsdoifexists{#1}{#3}}
-\providecommand{\gGlsXtrSetField}[3]{%
- \glsxtrsetfieldifexists{#1}{#2}{%
- \csgdef{glo@\glsdetoklabel{#1}@#2}{#3}%
- }%
-}
+\AtEndOfPackage{
+ \@ifpackageloaded{hyperref}{
+ \providecommand{\glsxtrusefield}[2]{\@gls@entry@field{#1}{#2}}
+ \providecommand{\glsxtrsetfieldifexists}[3]{\glsdoifexists{#1}{#3}}
+ \providecommand{\gGlsXtrSetField}[3]{%
+ \glsxtrsetfieldifexists{#1}{#2}{%
+ \csgdef{glo@\glsdetoklabel{#1}@#2}{#3}%
+ }%
+ }
% \end{macrocode}
% Hyperlinks from the abbreviation to their definition in the text are set.
% \begin{macrocode}
-\glssetcategoryattribute{abbreviation}{nohyperfirst}{true}
-\renewcommand*{\glsdonohyperlink}[2]{{%
- \glsxtrprotectlinks\edef\fieldvalue{%
- \glsxtrusefield{\glslabel}{hastarget}%
- }%
- \ifdefstring\fieldvalue{true}{#2}{%
- \gGlsXtrSetField{\glslabel}{hastarget}{true}%
- \glsdohypertarget{#1}{#2}%
- }%
-}}
+ \glssetcategoryattribute{abbreviation}{nohyperfirst}{true}
+ \renewcommand*{\glsdonohyperlink}[2]{{%
+ \glsxtrprotectlinks\edef\fieldvalue{%
+ \glsxtrusefield{\glslabel}{hastarget}%
+ }%
+ \ifdefstring\fieldvalue{true}{#2}{%
+ \gGlsXtrSetField{\glslabel}{hastarget}{true}%
+ \glsdohypertarget{#1}{#2}%
+ }%
+ }}
+ }{\providecommand{\pdfstringdefDisableCommands}[1]{}}
+}
% \end{macrocode}
%
% \begin{macro}{\begin@sentence}
@@ -2609,6 +2943,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \item optional plural long form
% \end{enumerate}
% \begin{macrocode}
+%<acronyms>\usepackage{xspace}
\NewDocumentCommand{\acronym}{somsmo}{
\newabbreviation[
type=\acronymtype,
@@ -2619,10 +2954,10 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% Provide the singular acronym macro.
% \begin{macrocode}
- \expandafter\newcommand\csname#3\endcsname{%
+ \expandafter\newcommand\csname#3\endcsname[1][]{%
\if@begin@of@sentence{%
- \ifglsused{#3}{\cgls{#3}}{\cGls{#3}}%
- }{\cgls{#3}}%
+ \ifglsused{#3}{\cgls{#3}[##1]}{\cGls{#3}[##1]}%
+ }{\cgls{#3}[##1]}%
\ifnum\glsentrycurrcount{#3}>1\relax
\IfBooleanTF{#4}{}{\@\xspace}%
\else\@\xspace\fi
@@ -2642,8 +2977,8 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% Provide the plural acronym macro.
% \begin{macrocode}
- \expandafter\newcommand\csname#3s\endcsname{%
- \if@begin@of@sentence{\cGlspl{#3}}{\cglspl{#3}}%
+ \expandafter\newcommand\csname#3s\endcsname[1][]{%
+ \if@begin@of@sentence{\cGlspl{#3}[##1]}{\cglspl{#3}[##1]}%
\IfBooleanTF{#4}{}{\@\xspace}%
}
% \end{macrocode}
@@ -2669,8 +3004,8 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% Provide the singular acronym macro.
% \begin{macrocode}
- \expandafter\newcommand\csname#3\endcsname{%
- \IfNoValueTF{#2}{#3}{#2}\IfBooleanTF{#4}{}{\@\xspace}%
+ \expandafter\newcommand\csname#3\endcsname[1][]{%
+ \IfNoValueTF{#2}{#3}{#2}\IfBooleanTF{#4}{}{\@\xspace}##1%
}
% \end{macrocode}
% Expand the singular acronym macro in \PDF labels.
@@ -2687,9 +3022,9 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% Provide the plural acronym macro.
% \begin{macrocode}
- \expandafter\newcommand\csname#3s\endcsname{%
+ \expandafter\newcommand\csname#3s\endcsname[1][]{%
\IfBooleanTF{#1}{#3}{\IfNoValueTF{#2}{#3s}{#2s}}%
- \IfBooleanTF{#4}{}{\@\xspace}%
+ \IfBooleanTF{#4}{}{\@\xspace}##1%
}
% \end{macrocode}
% Expand the plural acronym macro in \PDF labels.
@@ -2713,10 +3048,10 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\NewDocumentCommand{\longacronym}{somsmo}{
% \end{macrocode}
% Provide the singular acronym macro.
-% \begin{macrocode}
- \expandafter\newcommand\csname#3\endcsname{%
+% \begin{macrocode}acronyms
+ \expandafter\newcommand\csname#3\endcsname[1][]{%
\if@begin@of@sentence{\MakeUppercase#5}{#5}%
- \IfBooleanTF{#4}{}{\@\xspace}%
+ \IfBooleanTF{#4}{}{\@\xspace}##1%
}
% \end{macrocode}
% Expand the singular acronym macro in \PDF labels.
@@ -2725,11 +3060,11 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
% \end{macrocode}
% Provide the plural acronym macro.
% \begin{macrocode}
- \expandafter\newcommand\csname#3s\endcsname{%
+ \expandafter\newcommand\csname#3s\endcsname[1][]{%
\if@begin@of@sentence{%
\IfNoValueTF{#6}{\MakeUppercase#5s}{\MakeUppercase#6}%
}{%
- \IfNoValueTF{#6}{#5s}{#6}}\IfBooleanTF{#4}{}{\@\xspace}%
+ \IfNoValueTF{#6}{#5s}{#6}}\IfBooleanTF{#4}{}{\@\xspace}##1%
}
% \end{macrocode}
% Expand the plural acronym macro in \PDF labels.
@@ -2819,30 +3154,36 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
%
% End of glossaries if.
% \begin{macrocode}
+%</package|acronyms>
+%<*package>
\fi
% \end{macrocode}
%
% \ifshort
%</package>
+%</package|title|bibliography|acronyms>
%<*datamodel>
% \fi
%
% \section{Biblatex datamodel file} \label{sec:data model}
%
% \begin{macro}{collaboration}
-% \begin{macro}{reportnumber}
% \begin{macro}{pmid}
% \begin{macro}{pmcid}
% \begin{macro}{pmc}
+% \begin{macro}{reportnumber}
% \begin{macro}{protocollessurl}
% Define the |dbx| file containing the |hep-paper| datamodel.
% \begin{macrocode}
\DeclareDatamodelFields[type=field, datatype=literal]{
- collaboration, reportnumber, pmid, pmcid, pmc,
+ collaboration, pmid, pmcid, pmc,
+}
+\DeclareDatamodelFields[type=field, format=xsv, datatype=literal]{
+ reportnumber,
}
\DeclareDatamodelFields[type=field, datatype=uri]{protocollessurl}
\DeclareDatamodelEntryfields{
- collaboration, reportnumber, pmid, pmcid, pmc, protocollessurl,
+ collaboration, pmid, pmcid, pmc, reportnumber, protocollessurl,
}
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/hep-paper/hep-paper-implementation.pdf b/macros/latex/contrib/hep-paper/hep-paper-implementation.pdf
index e9025b7d09..b46a793ae9 100644
--- a/macros/latex/contrib/hep-paper/hep-paper-implementation.pdf
+++ b/macros/latex/contrib/hep-paper/hep-paper-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-paper/hep-paper.ins b/macros/latex/contrib/hep-paper/hep-paper.ins
index ab97a338cf..aac97891ee 100644
--- a/macros/latex/contrib/hep-paper/hep-paper.ins
+++ b/macros/latex/contrib/hep-paper/hep-paper.ins
@@ -27,9 +27,12 @@ LaTeX version 2005/12/01 or later.
\endpreamble
\generate{
- \file{hep-paper.sty}{\from{hep-paper-implementation.dtx}{package}}
- \file{hep-paper.dbx}{\from{hep-paper-implementation.dtx}{datamodel}}
\file{hep-paper-documentation.tex}{\from{hep-paper-implementation.dtx}{documentation}}
+ \file{hep-paper.dbx}{\from{hep-paper-implementation.dtx}{datamodel}}
+ \file{hep-paper.sty}{\from{hep-paper-implementation.dtx}{package}}
+ \file{hep-title.sty}{\from{hep-paper-implementation.dtx}{title}}
+ \file{hep-bibliography.sty}{\from{hep-paper-implementation.dtx}{bibliography}}
+ \file{hep-acronyms.sty}{\from{hep-paper-implementation.dtx}{acronyms}}
}
\Msg{*********************************************************}
@@ -39,8 +42,8 @@ LaTeX version 2005/12/01 or later.
\Msg{*}
\Msg{* \space\space hep-paper.sty}
\Msg{*}
-\Msg{* To produce the documentation run the file hep-paper.dtx}
-\Msg{* through LaTeX.}
+\Msg{* To produce the documentation run the file}
+\Msg{* hep-paper-documentation.dtx through LaTeX.}
\Msg{*}
\Msg{* Happy TeXing!}
\Msg{*********************************************************}
diff --git a/macros/latex/contrib/hvarabic/CHANGELOG b/macros/latex/contrib/hvarabic/CHANGELOG
index feeb6b920f..d93e607111 100644
--- a/macros/latex/contrib/hvarabic/CHANGELOG
+++ b/macros/latex/contrib/hvarabic/CHANGELOG
@@ -1 +1,2 @@
-0.01 2020-06-08 - first CTAN version
+0.01a 2021-06-01 - fix typo in the documentation
+0.01 2020-06-08 - first CTAN version
diff --git a/macros/latex/contrib/hvarabic/doc/hvarabic.pdf b/macros/latex/contrib/hvarabic/doc/hvarabic.pdf
index 476d1bf356..7545e92dcc 100644
--- a/macros/latex/contrib/hvarabic/doc/hvarabic.pdf
+++ b/macros/latex/contrib/hvarabic/doc/hvarabic.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvarabic/doc/hvarabic.tex b/macros/latex/contrib/hvarabic/doc/hvarabic.tex
index 8b879fdfda..741f73f4f2 100644
--- a/macros/latex/contrib/hvarabic/doc/hvarabic.tex
+++ b/macros/latex/contrib/hvarabic/doc/hvarabic.tex
@@ -1,4 +1,4 @@
-%% $Id: fbox.tex 1128 2020-01-03 20:57:59Z herbert $
+%% $Id: hvarabic.tex 104 2021-06-01 06:01:56Z herbert $
%
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
@@ -65,7 +65,7 @@
\usepackage[colorlinks,linktocpage]{hyperref}
-\setVersion{version = 0.01}%
+\setVersion{version = 0.01a}%
\title{Package \texttt{hvarabic} \\--\\ Provide macros for RTL typesetting. \\ \normalsize \hvarabicVersion\ (\today)}
\author{Herbert Voß\thanks{\url{hvoss@tug.org}}}
@@ -296,7 +296,7 @@ monospace, the ALM (Arabic Latin Modern). It is available by using the macro \Lc
and is scaled down to 85\%.:
\begin{verbatim}
-\providefamily\RTLfont
+\providefontfamily\RTLfont
[Script=Arabic, % to get correct arabic shaping
Scale=1.2]{Scheherazade} % whatever Arabic font you like
\newfontfamily\hvALM{ALM Fixed}[Scale=0.9]
diff --git a/macros/latex/contrib/hvarabic/latex/hvarabic.sty b/macros/latex/contrib/hvarabic/latex/hvarabic.sty
index e1d00bacd0..381a15009f 100644
--- a/macros/latex/contrib/hvarabic/latex/hvarabic.sty
+++ b/macros/latex/contrib/hvarabic/latex/hvarabic.sty
@@ -1,6 +1,6 @@
%% This is file `hvarabic.sty',
%%
-%% Copyright (C) 2020
+%% Copyright (C) 2021
%% Herbert Voss <hvoss@tug.org>
%%
%% It may be distributed and/or modified under the
@@ -12,7 +12,7 @@
%% version 2005/12/01 or later.
%
% -------------------------------------
-\ProvidesPackage{hvarabic}[2020/06/08 v. 0.01 define macros for RTL typesetting (hv)]
+\ProvidesPackage{hvarabic}[2021/06/01 v. 0.01a define macros for RTL typesetting (hv)]
%
\RequirePackage{iftex}
\iftutex
diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md
index d08863238c..c50ec1abb6 100644
--- a/macros/latex/contrib/l3kernel/CHANGELOG.md
+++ b/macros/latex/contrib/l3kernel/CHANGELOG.md
@@ -7,10 +7,15 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2021-06-01]
+
+### Fixed
+- Loading when `\expanded` is not available
+
## [2021-05-27]
### Fixed
-- Correctly detect local formats in “Mismatched LaTeX support files” error.
+- Correctly detect local formats in `Mismatched LaTeX support files` error.
## [2021-05-25]
@@ -925,7 +930,8 @@ this project uses date-based 'snapshot' version identifiers.
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2021-05-27...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2021-06-01...HEAD
+[2021-06-01]: https://github.com/latex3/latex3/compare/2021-05-27...2021-06-01
[2021-05-27]: https://github.com/latex3/latex3/compare/2021-05-25...2021-05-27
[2021-05-25]: https://github.com/latex3/latex3/compare/2021-05-11...2021-05-25
[2021-05-11]: https://github.com/latex3/latex3/compare/2021-05-07...2021-05-11
diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md
index 8cea8a937d..a3a5246eb7 100644
--- a/macros/latex/contrib/l3kernel/README.md
+++ b/macros/latex/contrib/l3kernel/README.md
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2021-05-27
+Release 2021-06-01
Overview
--------
diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx
index 1c80f33bbc..d5c4846435 100644
--- a/macros/latex/contrib/l3kernel/expl3.dtx
+++ b/macros/latex/contrib/l3kernel/expl3.dtx
@@ -24,7 +24,7 @@
%
%<*driver|generic|package|2ekernel>
%</driver|generic|package|2ekernel>
-\def\ExplFileDate{2021-05-27}%
+\def\ExplFileDate{2021-06-01}%
%<*driver>
\documentclass[full]{l3doc}
\usepackage{graphicx}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf
index a6ba77697d..f16cd6a56e 100644
--- a/macros/latex/contrib/l3kernel/expl3.pdf
+++ b/macros/latex/contrib/l3kernel/expl3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf
index c5bc4e5b1d..1e117704a3 100644
--- a/macros/latex/contrib/l3kernel/interface3.pdf
+++ b/macros/latex/contrib/l3kernel/interface3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex
index f23d059b56..60ce5fa910 100644
--- a/macros/latex/contrib/l3kernel/interface3.tex
+++ b/macros/latex/contrib/l3kernel/interface3.tex
@@ -54,7 +54,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2021-05-27}
+\date{Released 2021-06-01}
\pagenumbering{roman}
\maketitle
diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx
index 79cce800c4..32ba653cdf 100644
--- a/macros/latex/contrib/l3kernel/l3basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3basics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
index d6f665b395..68e473afba 100644
--- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx
+++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx
index 90d5b5e4a4..363f808d04 100644
--- a/macros/latex/contrib/l3kernel/l3box.dtx
+++ b/macros/latex/contrib/l3kernel/l3box.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx
index a8adb4c51c..6d8b6ce3cf 100644
--- a/macros/latex/contrib/l3kernel/l3candidates.dtx
+++ b/macros/latex/contrib/l3kernel/l3candidates.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx
index 0d3ecd3e2a..5e5ab15853 100644
--- a/macros/latex/contrib/l3kernel/l3cctab.dtx
+++ b/macros/latex/contrib/l3kernel/l3cctab.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx
index 590144e850..45f801cd22 100644
--- a/macros/latex/contrib/l3kernel/l3clist.dtx
+++ b/macros/latex/contrib/l3kernel/l3clist.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx
index a094b6db18..3c58a7e1fa 100644
--- a/macros/latex/contrib/l3kernel/l3coffins.dtx
+++ b/macros/latex/contrib/l3kernel/l3coffins.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx
index af264cea45..621a3f9137 100644
--- a/macros/latex/contrib/l3kernel/l3color.dtx
+++ b/macros/latex/contrib/l3kernel/l3color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx
index c952ee3543..20302524a4 100644
--- a/macros/latex/contrib/l3kernel/l3debug.dtx
+++ b/macros/latex/contrib/l3kernel/l3debug.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx
index 10f4645ad7..bd3a81327d 100644
--- a/macros/latex/contrib/l3kernel/l3deprecation.dtx
+++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx
index 8a2f592cb9..6a46df0608 100644
--- a/macros/latex/contrib/l3kernel/l3doc.dtx
+++ b/macros/latex/contrib/l3kernel/l3doc.dtx
@@ -79,7 +79,7 @@ and all files in that bundle must be distributed together.
%
% \title{The \cls{l3doc} class}
% \author{\Team}
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
% \maketitle
% \tableofcontents
%
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx
index 0089353b14..46914ab674 100644
--- a/macros/latex/contrib/l3kernel/l3docstrip.dtx
+++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf
index 83cdb663cb..b026a33009 100644
--- a/macros/latex/contrib/l3kernel/l3docstrip.pdf
+++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx
index 401e81636a..c6ed80179f 100644
--- a/macros/latex/contrib/l3kernel/l3expan.dtx
+++ b/macros/latex/contrib/l3kernel/l3expan.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx
index 442cde73e3..008f3022ce 100644
--- a/macros/latex/contrib/l3kernel/l3file.dtx
+++ b/macros/latex/contrib/l3kernel/l3file.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx
index 20f86c4e12..7aba908314 100644
--- a/macros/latex/contrib/l3kernel/l3flag.dtx
+++ b/macros/latex/contrib/l3kernel/l3flag.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
index ee89c5025d..4edf5519ac 100644
--- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
% \maketitle
%
% \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
index 76911805c8..aeba0d0b05 100644
--- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
index 53a8ae2d62..5c02e1a440 100644
--- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
index e8f28583b0..0d645b863b 100644
--- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
index ee48054e0b..a36ccafc4e 100644
--- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
index 2ffa83d61f..114acefe54 100644
--- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
index bf731c0ab6..aa9c963d4f 100644
--- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
index 507cf0e374..f1b9ad5625 100644
--- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx
index c004db474b..59ebc24e08 100644
--- a/macros/latex/contrib/l3kernel/l3fp-random.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx
index 4c9e75b829..f17bf63110 100644
--- a/macros/latex/contrib/l3kernel/l3fp-round.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
index 58d3b7f1ab..e9f0a81052 100644
--- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
% \maketitle
%
% \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
index 7c386b2106..508426b0bb 100644
--- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx
index 9474ea3cb3..f645df8901 100644
--- a/macros/latex/contrib/l3kernel/l3fp.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx
index a452a213a9..d5fb50aeef 100644
--- a/macros/latex/contrib/l3kernel/l3fparray.dtx
+++ b/macros/latex/contrib/l3kernel/l3fparray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx
index b3063ecb3f..eff6136914 100644
--- a/macros/latex/contrib/l3kernel/l3int.dtx
+++ b/macros/latex/contrib/l3kernel/l3int.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
@@ -1295,7 +1295,7 @@
% enabled) this runs some checks that constants would fail.
% \begin{macrocode}
\cs_new_protected:Npn \int_const:Nn #1#2
- { \exp_args:Ne \@@_const:nN { \int_eval:n {#2} } #1 }
+ { \exp_args:Nx \@@_const:nN { \int_eval:n {#2} } #1 }
\cs_new_protected:Npn \@@_const:nN #1#2
{
\int_compare:nNnTF {#1} < \c_zero_int
diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx
index d7434b9a3a..03b82260e1 100644
--- a/macros/latex/contrib/l3kernel/l3intarray.dtx
+++ b/macros/latex/contrib/l3kernel/l3intarray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
index 8ba3733326..fc23a46791 100644
--- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
+++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx
index 682ff3d16b..f1b9c97ba8 100644
--- a/macros/latex/contrib/l3kernel/l3keys.dtx
+++ b/macros/latex/contrib/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx
index 04ae9b5d92..3df7ca9463 100644
--- a/macros/latex/contrib/l3kernel/l3legacy.dtx
+++ b/macros/latex/contrib/l3kernel/l3legacy.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx
index e5b2795d22..05518b1164 100644
--- a/macros/latex/contrib/l3kernel/l3luatex.dtx
+++ b/macros/latex/contrib/l3kernel/l3luatex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx
index 665004c211..4b615b6be3 100644
--- a/macros/latex/contrib/l3kernel/l3msg.dtx
+++ b/macros/latex/contrib/l3kernel/l3msg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx
index 7a76edca25..b3e5b55914 100644
--- a/macros/latex/contrib/l3kernel/l3names.dtx
+++ b/macros/latex/contrib/l3kernel/l3names.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf
index 45941370e1..0d9bfb99ba 100644
--- a/macros/latex/contrib/l3kernel/l3news.pdf
+++ b/macros/latex/contrib/l3kernel/l3news.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf
index 247d2c7e8a..d63b059689 100644
--- a/macros/latex/contrib/l3kernel/l3news01.pdf
+++ b/macros/latex/contrib/l3kernel/l3news01.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf
index 2281216c78..67ee9869fd 100644
--- a/macros/latex/contrib/l3kernel/l3news02.pdf
+++ b/macros/latex/contrib/l3kernel/l3news02.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf
index 1537854d78..d094ebe5c6 100644
--- a/macros/latex/contrib/l3kernel/l3news03.pdf
+++ b/macros/latex/contrib/l3kernel/l3news03.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf
index 4fab8f4a89..20e2e3f7bc 100644
--- a/macros/latex/contrib/l3kernel/l3news04.pdf
+++ b/macros/latex/contrib/l3kernel/l3news04.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf
index f61f2f29a8..26412071f4 100644
--- a/macros/latex/contrib/l3kernel/l3news05.pdf
+++ b/macros/latex/contrib/l3kernel/l3news05.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf
index b0bc3399b1..3955aadf7c 100644
--- a/macros/latex/contrib/l3kernel/l3news06.pdf
+++ b/macros/latex/contrib/l3kernel/l3news06.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf
index f2c4a7a228..554b6fcfce 100644
--- a/macros/latex/contrib/l3kernel/l3news07.pdf
+++ b/macros/latex/contrib/l3kernel/l3news07.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf
index 0ce574fb57..e14980c997 100644
--- a/macros/latex/contrib/l3kernel/l3news08.pdf
+++ b/macros/latex/contrib/l3kernel/l3news08.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf
index 964ef68f53..13de207bab 100644
--- a/macros/latex/contrib/l3kernel/l3news09.pdf
+++ b/macros/latex/contrib/l3kernel/l3news09.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf
index 014b33f22d..d1746e581a 100644
--- a/macros/latex/contrib/l3kernel/l3news10.pdf
+++ b/macros/latex/contrib/l3kernel/l3news10.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf
index 14409d2abd..cdebc4911f 100644
--- a/macros/latex/contrib/l3kernel/l3news11.pdf
+++ b/macros/latex/contrib/l3kernel/l3news11.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf
index 714ef11abe..17503b055e 100644
--- a/macros/latex/contrib/l3kernel/l3news12.pdf
+++ b/macros/latex/contrib/l3kernel/l3news12.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx
index edd06b19f0..31ce1eade9 100644
--- a/macros/latex/contrib/l3kernel/l3pdf.dtx
+++ b/macros/latex/contrib/l3kernel/l3pdf.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3prefixes.csv b/macros/latex/contrib/l3kernel/l3prefixes.csv
index 9be48664a0..9bf91296d0 100644
--- a/macros/latex/contrib/l3kernel/l3prefixes.csv
+++ b/macros/latex/contrib/l3kernel/l3prefixes.csv
@@ -27,6 +27,7 @@ catcode,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,htt
cctab,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-28,2012-09-28,
cellprops,cellprops,Julien Rivaud,,,,2018-06-13,2018-06-13,
char,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
+chaos,"chaos,schleuderpackung",Marei Peischl,https://ds.ccc.de/,,,2021-05-28,2021-05-28,
chemformula,chemformula,Clemens Niederberger,https://github.com/cgnieder/chemformula/,https://github.com/cgnieder/chemformula.git,https://github.com/cgnieder/chemformula/issues,2013-03-16,2020-04-14,
chemmacros,chemmacros,Clemens Niederberger,https://github.com/cgnieder/chemmacros/,https://github.com/cgnieder/chemmacros.git,https://github.com/cgnieder/chemmacros/issues,2013-03-16,2020-04-14,
chemnum,chemnum,Clemens Niederberger,https://github.com/cgnieder/chemnum/,https://github.com/cgnieder/chemnum.git,https://github.com/cgnieder/chemnum/issues,2013-03-16,2020-04-14,
@@ -113,6 +114,7 @@ kernel,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,http
keys,"l3kernel,l3keys2e",The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
keyval,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
kgl,kantlipsum,Enrico Gregorio,,,,2013-03-16,2013-03-16,
+kivitendo,"kiviletter, kivitables",Marei Peischl for Kivitendo,https://www.kivitendo.de/,https://github.com/kivitendo/kivitendo-erp,https://forum.kivitendo.de/,2021-05-28,2021-05-28,
left,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
lltxmath,lualatex-math,Philipp Stephani,https://github.com/phst/lualatex-math,https://github.com/phst/lualatex-math.git,https://github.com/phst/lualatex-math/issues,2012-11-07,2012-11-07,
log,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf
index 05f000e579..9a4676923d 100644
--- a/macros/latex/contrib/l3kernel/l3prefixes.pdf
+++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx
index f6dfc43bb3..b0dd7e18fa 100644
--- a/macros/latex/contrib/l3kernel/l3prg.dtx
+++ b/macros/latex/contrib/l3kernel/l3prg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx
index b81a09aec7..75dbce2d58 100644
--- a/macros/latex/contrib/l3kernel/l3prop.dtx
+++ b/macros/latex/contrib/l3kernel/l3prop.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx
index 8404f92448..705bcad2ea 100644
--- a/macros/latex/contrib/l3kernel/l3quark.dtx
+++ b/macros/latex/contrib/l3kernel/l3quark.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx
index bff288988b..336ee3dcbf 100644
--- a/macros/latex/contrib/l3kernel/l3regex.dtx
+++ b/macros/latex/contrib/l3kernel/l3regex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx
index 281c84b292..cb652f1986 100644
--- a/macros/latex/contrib/l3kernel/l3seq.dtx
+++ b/macros/latex/contrib/l3kernel/l3seq.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx
index 59ca43945c..6bc8c7528a 100644
--- a/macros/latex/contrib/l3kernel/l3skip.dtx
+++ b/macros/latex/contrib/l3kernel/l3skip.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx
index 09e44776f1..c03cebf414 100644
--- a/macros/latex/contrib/l3kernel/l3sort.dtx
+++ b/macros/latex/contrib/l3kernel/l3sort.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx
index ed87f0444a..cb9fc40441 100644
--- a/macros/latex/contrib/l3kernel/l3str-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx
index 9260a79f86..772f2eab89 100644
--- a/macros/latex/contrib/l3kernel/l3str.dtx
+++ b/macros/latex/contrib/l3kernel/l3str.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf
index 910a263462..2a86a2817e 100644
--- a/macros/latex/contrib/l3kernel/l3styleguide.pdf
+++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex
index c2226ad454..683c13fb3e 100644
--- a/macros/latex/contrib/l3kernel/l3styleguide.tex
+++ b/macros/latex/contrib/l3kernel/l3styleguide.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2021-05-27}
+\date{Released 2021-06-01}
\begin{document}
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
index 2bd1a03935..86ab67a0ec 100644
--- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
+++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
index 14e0e0d2ae..9230f5231d 100644
--- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex
+++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2021-05-27}
+\date{Released 2021-06-01}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx
index 9bc20dae4c..98954c4a33 100644
--- a/macros/latex/contrib/l3kernel/l3sys.dtx
+++ b/macros/latex/contrib/l3kernel/l3sys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf
index 2972ab0f6a..312860e101 100644
--- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf
+++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex
index f827a9b55c..1182b98079 100644
--- a/macros/latex/contrib/l3kernel/l3term-glossary.tex
+++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2021-05-27}
+\date{Released 2021-06-01}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx
index efcc6a5f8f..0b32e63997 100644
--- a/macros/latex/contrib/l3kernel/l3text-case.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-case.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx
index 8b330b479d..b4be856f81 100644
--- a/macros/latex/contrib/l3kernel/l3text-purify.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx
index 2393f5ee77..724c190681 100644
--- a/macros/latex/contrib/l3kernel/l3text.dtx
+++ b/macros/latex/contrib/l3kernel/l3text.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
index c240018df6..443fbd49e7 100644
--- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx
index 04a522eb53..1be92dc30a 100644
--- a/macros/latex/contrib/l3kernel/l3tl.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx
index 711623cfe5..3f3ee57d91 100644
--- a/macros/latex/contrib/l3kernel/l3token.dtx
+++ b/macros/latex/contrib/l3kernel/l3token.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx
index d7f2445a70..f8a05f0ec6 100644
--- a/macros/latex/contrib/l3kernel/l3unicode.dtx
+++ b/macros/latex/contrib/l3kernel/l3unicode.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf
index 34a09e3829..285bfec232 100644
--- a/macros/latex/contrib/l3kernel/source3.pdf
+++ b/macros/latex/contrib/l3kernel/source3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex
index 41c2e36c39..b48ff25fba 100644
--- a/macros/latex/contrib/l3kernel/source3.tex
+++ b/macros/latex/contrib/l3kernel/source3.tex
@@ -53,7 +53,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2021-05-27}
+\date{Released 2021-06-01}
\pagenumbering{roman}
\maketitle
diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md
index b6323017d3..bfe53c2b72 100644
--- a/macros/latex/contrib/l3packages/CHANGELOG.md
+++ b/macros/latex/contrib/l3packages/CHANGELOG.md
@@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2021-06-01]
+
+### Fixed
+
+- Restore one parameter in `xfrac`
+
## [2021-05-27]
### Changed
@@ -136,7 +142,8 @@ this project uses date-based 'snapshot' version identifiers.
- Switch to ISO date format
- Improve cross-module use of internal functions
-[Unreleased]: https://github.com/latex3/latex3/compare/2021-05-27...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2021-06-01...HEAD
+[2021-06-01]: https://github.com/latex3/latex3/compare/2021-05-27...2021-06-01
[2021-05-27]: https://github.com/latex3/latex3/compare/2021-05-07...2021-05-27
[2021-05-07]: https://github.com/latex3/latex3/compare/2021-03-12...2021-05-07
[2021-03-12]: https://github.com/latex3/latex3/compare/2021-02-02...2021-03-12
diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md
index 81f1166f90..543fc348bb 100644
--- a/macros/latex/contrib/l3packages/README.md
+++ b/macros/latex/contrib/l3packages/README.md
@@ -1,7 +1,7 @@
LaTeX3 High-Level Concepts
==========================
-Release 2021-05-27
+Release 2021-06-01
Overview
--------
diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx
index 912cdabbb7..e544c17987 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.dtx
+++ b/macros/latex/contrib/l3packages/l3keys2e.dtx
@@ -62,7 +62,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
@@ -139,7 +139,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3keys2e}{2021-05-27}{}
+\ProvidesExplPackage{l3keys2e}{2021-06-01}{}
{LaTeX2e option processing using LaTeX3 keys}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf
index 967b926593..ac8a276327 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.pdf
+++ b/macros/latex/contrib/l3packages/l3keys2e.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xfp.dtx b/macros/latex/contrib/l3packages/xfp.dtx
index 800a9433b7..91f96ca568 100644
--- a/macros/latex/contrib/l3packages/xfp.dtx
+++ b/macros/latex/contrib/l3packages/xfp.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
@@ -166,7 +166,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfp}{2021-05-27}{}
+\ProvidesExplPackage{xfp}{2021-06-01}{}
{L3 Floating point unit}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf
index f950eababf..90c8efca28 100644
--- a/macros/latex/contrib/l3packages/xfp.pdf
+++ b/macros/latex/contrib/l3packages/xfp.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xfrac.dtx b/macros/latex/contrib/l3packages/xfrac.dtx
index d6efa64a93..51cd687575 100644
--- a/macros/latex/contrib/l3packages/xfrac.dtx
+++ b/macros/latex/contrib/l3packages/xfrac.dtx
@@ -65,7 +65,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
@@ -535,7 +535,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xfrac}{2021-05-27}{}
+\ProvidesExplPackage{xfrac}{2021-06-01}{}
{L3 Experimental split-level fractions}
% \end{macrocode}
%
@@ -995,9 +995,12 @@
\DeclareInstance { xfrac } { default } { text } { }
% \end{macrocode}
%
-% The default \enquote{math(s)} instance.
+% The default \enquote{math(s)} instance. We annot set the
+% |numerator-top-sep| in the restricted template above as it clashes
+% with the requirements of the |plainmath| collection which comes next.
% \begin{macrocode}
-\DeclareInstance { xfrac } { mathdefault } { math } { }
+\DeclareInstance { xfrac } { mathdefault } { math }
+ { numerator-top-sep = 0pt }
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf
index 3ae812fcd8..d3540dc2fe 100644
--- a/macros/latex/contrib/l3packages/xfrac.pdf
+++ b/macros/latex/contrib/l3packages/xfrac.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xparse.dtx b/macros/latex/contrib/l3packages/xparse.dtx
index 89bc69e748..e34990588a 100644
--- a/macros/latex/contrib/l3packages/xparse.dtx
+++ b/macros/latex/contrib/l3packages/xparse.dtx
@@ -67,7 +67,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
@@ -1064,7 +1064,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xparse}{2021-05-27}{}
+\ProvidesExplPackage{xparse}{2021-06-01}{}
{L3 Experimental document command parser}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf
index 3f27891fe9..32764368c3 100644
--- a/macros/latex/contrib/l3packages/xparse.pdf
+++ b/macros/latex/contrib/l3packages/xparse.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3packages/xtemplate.dtx b/macros/latex/contrib/l3packages/xtemplate.dtx
index ba09c8df3a..8bc76461dc 100644
--- a/macros/latex/contrib/l3packages/xtemplate.dtx
+++ b/macros/latex/contrib/l3packages/xtemplate.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-27}
+% \date{Released 2021-06-01}
%
% \maketitle
%
@@ -682,7 +682,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{xtemplate}{2021-05-27}{}
+\ProvidesExplPackage{xtemplate}{2021-06-01}{}
{L3 Experimental prototype document functions}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf
index a82cc7bdc0..3359b8fe1c 100644
--- a/macros/latex/contrib/l3packages/xtemplate.pdf
+++ b/macros/latex/contrib/l3packages/xtemplate.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 2e71ec3eca..6cde2cdc72 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,12 +7,25 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.9]
+
+### Changed
+- Documentation improvements
+- Add a hint for formatting regression tables
+
+### Fixed
+- Suppress some spurious overfull box warnings
+- Issue an error with `output-product`
+- Rounding of uncertainties falling in the integer part (issue #454)
+- Printing in text mode for compound quantities (issue #463)
+- Correctly handle `\protect` in literal units (issue #464)
+- Interpretation of uncertainties in integers (issue #465)
+
## [v3.0.8]
### Changed
- Documentation improvements
-- Add `\barn`, `\knot`, `\mmHg`, `\nauticalmile` to list of
- deprecated units
+- Add `\barn`, `\knot`, `\mmHg`, `\nauticalmile` to list of deprecated units
- Provide a fallback route for deprecated units
### Fixed
@@ -23,10 +36,9 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Fixed
- Formatting of some literal units (issue #449)
-- Issue a warning for removed option `load-configurations`
- (issue #455)
-- Printing of `\times` and `\cdot` in text mode when using a
- locale (issue #457)
+- Issue a warning for removed option `load-configurations` (issue #455)
+- Printing of `\times` and `\cdot` in text mode when using a locale
+ (issue #457)
- Implement missing `output-exponent-marker` (issue #458)
## [v3.0.6]
@@ -35,10 +47,9 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
- Documentation improvements
### Fixed
-- Avoid error if `forbid-literal-units` is set in the preamble
- (issue #452)
-- Format separate uncertainty correctly where it falls purely
- in the integer part (issue #454)
+- Avoid error if `forbid-literal-units` is set in the preamble (issue #452)
+- Format separate uncertainty correctly where it falls purely in the integer
+ part (issue #454)
## [v3.0.5]
@@ -46,8 +57,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
- Documentation improvements
### Fixed
-- Bracket separate uncertainties in compound quantities
- (issue #441)
+- Bracket separate uncertainties in compound quantities (issue #441)
- Color negative values in table cells correctly (issue #444)
- Avoid consumption of any math alphabets (issue #445)
- Mark `\bar` as removed (issue #448)
@@ -98,8 +108,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Fixed
- Printing of fractional units in text mode (issue #418)
-- Include `siunitx-abbreviations.cfg` in fallback v2 files
- (issue #419)
+- Include `siunitx-abbreviations.cfg` in fallback v2 files (issue #419)
- French translation of 'to' for ranges (issue #421)
## [v3.0.0]
@@ -1334,7 +1343,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.0.8...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.9...HEAD
+[v3.0.9]: https://github.com/josephwright/siunitx/compare/v3.0.8...v3.0.9
[v3.0.8]: https://github.com/josephwright/siunitx/compare/v3.0.7...v3.0.8
[v3.0.7]: https://github.com/josephwright/siunitx/compare/v3.0.6...v3.0.7
[v3.0.6]: https://github.com/josephwright/siunitx/compare/v3.0.5...v3.0.6
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 6ba4bd131f..3c20dfb0f6 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-compound.dtx b/macros/latex/contrib/siunitx/siunitx-compound.dtx
index a164d883b7..f377585b78 100644
--- a/macros/latex/contrib/siunitx/siunitx-compound.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-compound.dtx
@@ -669,7 +669,7 @@
\str_if_eq:VnT \l_siunitx_quantity_prefix_mode_tl { combine-exponent }
{ \tl_clear:N \l_@@_exp_tl }
\bool_if:NTF \l_@@_unit_repeat_bool
- { \@@_print:N \@@_print_quantity:n }
+ { \@@_print:N \@@_print_quantity:x }
{
\bool_lazy_and:nnTF
{ \l_@@_unit_bracket_bool }
@@ -692,6 +692,8 @@
% \begin{macro}{\@@_print:nnnN}
% \begin{macro}{\@@_print_aux:n}
% \begin{macro}{\@@_print_aux:nn}
+% \begin{macro}{\@@_print_quantity:n, \@@_print_quantity:x}
+% \begin{macro}{\@@_print_separator:n, \@@_print_separator:V}
% We now need to know how many entries there are: the reason we don't use
% \cs{seq_use:Nnnn} is that we want to be able to insert
% \cs{siunitx_print_\dots:n} in a controlled way.
@@ -794,6 +796,7 @@
}
\cs_new_protected:Npn \@@_print_quantity:n #1
{ \siunitx_quantity_print:nV {#1} \l_@@_unit_tl }
+\cs_generate_variant:Nn \@@_print_quantity:n { x }
\cs_new_protected:Npn \@@_print_separator:n #1
{
\bool_if:NTF \l_@@_separator_text_bool
@@ -807,6 +810,8 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}[EXP]{\@@_uncert_bracket:N}
% \begin{macro}[EXP]{\@@_uncert_bracket:w}
diff --git a/macros/latex/contrib/siunitx/siunitx-emulation.dtx b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
index 0878c37d74..3d2e0370f1 100644
--- a/macros/latex/contrib/siunitx/siunitx-emulation.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
@@ -393,6 +393,7 @@
{
input-protect-tokens ,
input-quotient ,
+ output-product ,
quotient-mode
}
{
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 070b9c5e9d..b304a573c9 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -2708,7 +2708,8 @@
%
% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnnnn}
% \begin{macro}[EXP]{\@@_round_uncertainty:nnn}
-% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnn}
+% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnn, \@@_round_uncertainty_aux:nnnnn}
+% \begin{macro}[EXP]{\@@_round_uncertainty_aux:nnnnnn}
% Rounding to an uncertainty can only happen where the result will have some
% uncertainty left: otherwise we simply drop the uncertainty entirely. Only
% |S|-type uncertainties can be used for rounding.
@@ -2740,28 +2741,54 @@
\exp_last_unbraced:Nf \@@_round_uncertainty:nnnnn
{
\@@_round:fnn
- { \tl_count:n {#3} - \l_@@_round_precision_int } { } {#3}
+ {
+ \int_eval:n
+ { \tl_count:n {#3} - \l_@@_round_precision_int }
+ }
+ { } {#3}
}
{#1} {#2} {#3}
}
\cs_new:Npn \@@_round_uncertainty:nnnnn #1#2#3#4#5
{
- \tl_if_blank:nTF {#1}
+ \exp_args:Nf \@@_round_uncertainty_aux:nnnnn
+ { \int_eval:n { \tl_count:n {#5} - \tl_count:n {#2} } }
+ {#1} {#2} {#3} {#4}
+ }
+% \end{macrocode}
+% The first argument here deals with the case where we've lost digits
+% in the uncertainty and it's purely located in the integer part.
+% \begin{macrocode}
+\cs_new:Npn \@@_round_uncertainty_aux:nnnnn #1#2#3#4#5
+ {
+ \exp_args:Nf \@@_round_uncertainty_aux:nnnnnn
{
- \@@_round:fnn
- { \tl_count:n {#5} - \tl_count:n {#2} } {#3} {#4}
- { { S } {#2} }
+ \tl_if_blank:nT {#5}
+ { \prg_replicate:nn {#1} { 0 } }
+ }
+ {#1} {#2} {#3} {#4} {#5}
+ }
+\cs_new:Npn \@@_round_uncertainty_aux:nnnnnn #1#2#3#4#5#6
+ {
+ \tl_if_blank:nTF {#3}
+ {
+ \@@_round:nnn
+ {#2}
+ {#5} {#6}
+ { { S } { #4 #1 } }
}
{
\@@_round:fnn
- { \tl_count:n {#5} - \tl_count:n {#2} + 1 } {#3} {#4}
- { { S } { #1 \@@_round_truncate_direct:n {#2} } }
+ { \int_eval:n { #2 + 1 } }
+ {#5} {#6}
+ { { S } { #3 \@@_round_truncate_direct:n {#4} #1 } }
}
}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@@_zero_decimal:NN}
% \begin{macro}[EXP]{\@@_zero_decimal:nnnnnnn}
@@ -2966,17 +2993,14 @@
% \begin{macro}[rEXP]{\@@_output_decimal_loop:NNNN}
% \begin{macro}[rEXP]{\@@_output_integer_first:nnNN}
% \begin{macro}[rEXP]{\@@_output_integer_loop:NNNN}
-% \begin{macro}[rEXP]{\@@_output_uncertainty:nnnn}
+% \begin{macro}[rEXP]{\@@_output_uncertainty:nnn}
% \begin{macro}[rEXP]{\@@_output_uncertainty_unaligned:n}
-% \begin{macro}[rEXP]{\@@_output_uncert_S:nnnnw}
-% \begin{macro}[rEXP]{\@@_output_uncert_S_auxi:nn}
-% \begin{macro}[rEXP]{\@@_output_uncert_S_auxii:nnN}
-% \begin{macro}[rEXP]{\@@_output_uncert_S_auxiii:nnn}
+% \begin{macro}[rEXP]{\@@_output_uncert_S:nnnw}
% \begin{macro}[rEXP]
-% {\@@_output_uncert_S_auxiv:nnn, \@@_output_uncert_S_auxiv:fnn}
+% {\@@_output_uncert_S_aux:nnn, \@@_output_uncert_S_aux:fnn}
% \begin{macro}[rEXP]
-% {\@@_output_uncert_S_auxv:nnnw, \@@_output_uncert_S_auxv:fnnw}
-% \begin{macro}[rEXP]{\@@_output_uncert_S_auxvi:nnw}
+% {\@@_output_uncert_S:nnnw, \@@_output_uncert_S:fnw}
+% \begin{macro}[rEXP]{\@@_output_uncert_S:nnw}
% \begin{macro}[rEXP]
% {
% \@@_output_uncert_S_compact:nn ,
@@ -3022,7 +3046,7 @@
\@@_output_sign:nnn {#1} {#2} {#8}
\@@_output_integer:nnn {#3} {#4} {#7}
\@@_output_decimal:nn {#4} {#8}
- \@@_output_uncertainty:nnnn {#5} {#3} {#4} {#8}
+ \@@_output_uncertainty:nnn {#5} {#4} {#8}
\@@_output_exponent:nnnn {#6} {#7} { #3 . #4 } {#8}
\@@_output_end:
}
@@ -3232,77 +3256,41 @@
% digit tokens need to be removed from the start of the uncertainty and
% the split result sent to the appropriate auxiliaries.
% \begin{macrocode}
-\cs_new:Npn \@@_output_uncertainty:nnnn #1#2#3#4
+\cs_new:Npn \@@_output_uncertainty:nnn #1#2#3
{
\tl_if_blank:nTF {#1}
- { \@@_output_uncertainty_unaligned:n {#4} }
+ { \@@_output_uncertainty_unaligned:n {#3} }
{
- \use:c { @@_output_uncert_ \tl_head:n {#1} :nnnnw }
- {#2} {#3} {#4} #1
+ \use:c { @@_output_uncert_ \tl_head:n {#1} :nnnw }
+ {#2} {#3} #1
}
}
\cs_new:Npn \@@_output_uncertainty_unaligned:n #1
{ \exp_not:n { #1 #1 #1 #1 } }
-% \end{macrocode}
-% There is a bit more to do here if the uncertainty is purely in the integer
-% part and printed separately. We need to pad it by the number of
-% non-significant figures, then pass on to allow digit separation.
-% \begin{macrocode}
-\cs_new:Npn \@@_output_uncert_S:nnnnw #1#2#3#4#5
+\cs_new:Npn \@@_output_uncert_S:nnnw #1#2#3#4
{
\str_if_eq:VnTF \l_@@_uncert_mode_tl { separate }
{
- \exp_not:n {#3}
+ \exp_not:n {#2}
\@@_output_sign:N \pm
- \exp_not:n {#3}
- \tl_if_blank:nTF {#2}
- { \@@_output_uncert_S_auxi:nnn {#1} {#5} {#3} }
- {
- \@@_output_uncert_S_auxiv:fnn
- { \int_eval:n { \tl_count:n {#5} - \tl_count:n {#2} } }
- {#5} {#3}
- }
+ \exp_not:n {#2}
+ \@@_output_uncert_S_aux:nnn
+ { \int_eval:n { \tl_count:n {#4} - \tl_count:n {#1} } }
+ {#4} {#2}
}
{
\exp_not:V \l_@@_uncert_separator_tl
\exp_not:V \l_@@_output_uncert_open_tl
- \use:c { @@_output_uncert_S_ \l_@@_uncert_mode_tl :nn } {#2} {#5}
+ \use:c { @@_output_uncert_S_ \l_@@_uncert_mode_tl :nn } {#1} {#4}
\exp_not:V \l_@@_output_uncert_close_tl
- \@@_output_uncertainty_unaligned:n {#3}
- }
- }
-\cs_new:Npn \@@_output_uncert_S_auxi:nnn #1#2#3
- {
- \@@_output_uncert_S_auxii:nnN { 0 } {#2} #1
- \q_recursion_tail \q_recursion_stop {#3}
- }
-\cs_new:Npn \@@_output_uncert_S_auxii:nnN #1#2#3
- {
- \quark_if_recursion_tail_stop_do:Nn #3
- {
- \exp_args:Nf \@@_output_uncert_S_auxiii:nnn
- { \prg_replicate:nn {#1} { 0 } } {#2}
- }
- \str_if_eq:nnTF {#3} { 0 }
- {
- \exp_args:Nf \@@_output_uncert_S_auxii:nnN
- { \int_eval:n { #1 + 1 } } {#2}
+ \@@_output_uncertainty_unaligned:n {#2}
}
- { \@@_output_uncert_S_auxii:nnN { 0 } {#2} }
}
-\cs_new:Npn \@@_output_uncert_S_auxiii:nnn #1#2#3
- {
- \@@_output_uncert_S_auxiv:fnn
- { \int_eval:n { \tl_count:n {#2#1} } } {#2#1} {#3}
- }
-% \end{macrocode}
-% All separated uncertainties bring us to here.
-% \begin{macrocode}
-\cs_new:Npn \@@_output_uncert_S_auxiv:nnn #1#2#3
+\cs_new:Npn \@@_output_uncert_S_aux:nnn #1#2#3
{
\int_compare:nNnTF {#1} > 0
{
- \@@_output_uncert_S_auxv:fnnw
+ \@@_output_uncert_S_aux:fnnw
{ \int_eval:n { #1 - 1 } }
{#3}
{ }
@@ -3318,23 +3306,23 @@
{#3}
}
}
-\cs_generate_variant:Nn \@@_output_uncert_S_auxiv:nnn { f }
-\cs_new:Npn \@@_output_uncert_S_auxv:nnnw #1#2#3#4
+\cs_generate_variant:Nn \@@_output_uncert_S_aux:nnn { f }
+\cs_new:Npn \@@_output_uncert_S_aux:nnnw #1#2#3#4
{
\quark_if_nil:NF #4
{
\int_compare:nNnTF {#1} = 0
- { \@@_output_uncert_S_auxvi:nnw {#3#4} {#2} }
+ { \@@_output_uncert_S_aux:nnw {#3#4} {#2} }
{
- \@@_output_uncert_S_auxv:fnnw
+ \@@_output_uncert_S_aux:fnnw
{ \int_eval:n { #1 - 1 } }
{#2}
{#3#4}
}
}
}
-\cs_generate_variant:Nn \@@_output_uncert_S_auxv:nnnw { f }
-\cs_new:Npn \@@_output_uncert_S_auxvi:nnw #1#2#3 \q_nil
+\cs_generate_variant:Nn \@@_output_uncert_S_aux:nnnw { f }
+\cs_new:Npn \@@_output_uncert_S_aux:nnw #1#2#3 \q_nil
{
\@@_output_digits:nn { integer } {#1}
\@@_output_decimal:nn {#3} {#2}
@@ -3356,7 +3344,7 @@
}
\cs_new:Npn \@@_output_uncert_S_full:nn #1#2
{
- \@@_output_uncert_S_auxiv:fnn
+ \@@_output_uncert_S_aux:fnn
{ \int_eval:n { \tl_count:n {#2} - \tl_count:n {#1} } }
{#2} { }
}
@@ -3455,9 +3443,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \subsection{Miscellaneous tools}
%
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index c033090022..269015d857 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -1027,6 +1027,15 @@
% \end{macrocode}
% \end{variable}
%
+% \begin{variable}{\l_@@_before_dim}
+% Space reserved for any non-numerical text before the number: as we need
+% to allow for this to be available after setting the integer part, we need
+% to carry it along for a bit.
+% \begin{macrocode}
+\dim_new:N \l_@@_before_dim
+% \end{macrocode}
+% \end{variable}
+%
% \begin{variable}{\l_@@_carry_dim}
% Used to \enquote{carry forward} the amount of white space which needs to
% be inserted after the decimal marker.
@@ -1067,14 +1076,19 @@
% \begin{macro}{\@@_print_marker:w}
% \begin{macro}[EXP]{\@@_print_marker_aux:w}
% \begin{macro}{\@@_print_format:nnn}
+% \begin{macro}[EXP]{\@@_print_format:nnnnnn}
% \begin{macro}
% {
-% \@@_print_marker_auxi:w,
-% \@@_print_marker_auxii:w,
-% \@@_print_marker_auxiii:w
+% \@@_print_format_auxi:w ,
+% \@@_print_format_auxii:w ,
+% \@@_print_format_auxiii:w ,
+% \@@_print_format_auxiv:w ,
+% \@@_print_format_auxv:w ,
+% \@@_print_format_auxvi:w ,
+% \@@_print_format_auxvii:w
% }
-% \begin{macro}{\@@_print_format_after:N}
% \begin{macro}{\@@_print_format_box:Nn}
+% \begin{macro}{\@@_print_format_after:N}
% \begin{macro}{\@@_print_none:nnn}
% \begin{macrocode}
\cs_new_protected:Npn \@@_print:nnn #1#2#3
@@ -1157,7 +1171,9 @@
% are a number of alignment points to get right. As for the |marker| approach,
% first we check if the material before the numerical content is of zero
% width. Next we need to format the model and content numbers, before
-% starting an auxiliary chain to pick out the various parts in order.
+% starting an auxiliary chain to pick out the various parts in order. We have
+% to carry the amount of space for the non-numerical material before the cell
+% forward: this may end up being enlarged by unused parts of the integer.
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_format:nnn #1#2#3
{
@@ -1168,12 +1184,7 @@
\box_clear:N \l_@@_before_box
#1
}
- \hbox_set_to_wd:Nnn \l_@@_before_box
- { \box_wd:N \l_@@_tmp_box }
- {
- \@@_fil:
- \hbox_unpack:N \l_@@_before_box
- }
+ \dim_set:Nn \l_@@_before_dim { \box_wd:N \l_@@_tmp_box }
\siunitx_number_parse:nN {#2} \l_@@_tmp_tl
\group_begin:
\bool_if:NT \l_@@_auto_round_bool
@@ -1239,16 +1250,11 @@
}
{
\@@_print_format_box:Nn \l_@@_integer_box {#3}
- \hbox_set_to_wd:Nnn \l_@@_before_box
+ \dim_add:Nn \l_@@_before_dim
{
- \box_wd:N \l_@@_before_box
- + \box_wd:N \l_@@_tmp_box
+ \box_wd:N \l_@@_tmp_box
- \box_wd:N \l_@@_integer_box
}
- {
- \@@_fil:
- \hbox_unpack:N \l_@@_before_box
- }
}
\@@_print_format_auxii:w #2 \q_mark #4 \q_stop
}
@@ -1259,6 +1265,9 @@
% much \emph{extra} material has been added. To avoid using more boxes
% or re-setting, we do that by recording sizes before and after the change.
% (In effect, \cs{l_@@_tmp_dim} is here \enquote{l_@@_comparator_dim}.)
+% As the integer part is completed here, we are able to finalise the width
+% of the pre-numeral part, reboxing it to have the correct width and possibly
+% to force a single overfull warning if appropriate.
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_format_auxii:w
#1 \q_nil #2 \q_nil #3 \q_mark #4 \q_nil #5 \q_nil #6 \q_stop
@@ -1301,19 +1310,19 @@
\hbox_unpack:N \l_@@_integer_box
\siunitx_print_number:n {#4#5}
}
- \hbox_set_to_wd:Nnn \l_@@_before_box
+ \dim_add:Nn \l_@@_before_dim
{
- \box_wd:N \l_@@_before_box
+ \box_wd:N \l_@@_tmp_box
+ \l_@@_tmp_dim
- \box_wd:N \l_@@_integer_box
}
- {
- \@@_fil:
- \hbox_unpack:N \l_@@_before_box
- }
}
}
+ \hbox_set_to_wd:Nnn \l_@@_before_box \l_@@_before_dim
+ {
+ \@@_fil:
+ \hbox_unpack:N \l_@@_before_box
+ }
\@@_print_format_auxiii:w #3 \q_mark #6 \q_stop
}
% \end{macrocode}
@@ -1458,6 +1467,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \subsection{Standard settings for module options}
%
diff --git a/macros/latex/contrib/siunitx/siunitx-table.pdf b/macros/latex/contrib/siunitx/siunitx-table.pdf
new file mode 100644
index 0000000000..6c241941b5
--- /dev/null
+++ b/macros/latex/contrib/siunitx/siunitx-table.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-unit.dtx b/macros/latex/contrib/siunitx/siunitx-unit.dtx
index 604883dfa6..782ac23dcf 100644
--- a/macros/latex/contrib/siunitx/siunitx-unit.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-unit.dtx
@@ -1181,7 +1181,12 @@
% \begin{macro}{\@@_format_literal_auxiii:w}
% \begin{macro}{\@@_format_literal_auxiv:n}
% \begin{macro}{\@@_format_literal_auxv:nw}
-% \begin{macro}{\@@_format_literal_auxvi:nN}
+% \begin{macro}
+% {
+% \@@_format_literal_auxvi:nN ,
+% \@@_format_literal_auxvii:nN ,
+% \@@_format_literal_auxviii:nN
+% }
% \begin{macro}{\@@_format_literal_super:nn, \@@_format_literal_sub:nn}
% \begin{macro}{\@@_format_literal_add:n}
% \begin{macro}{\@@_format_literal_auxvii:nn}
@@ -1293,9 +1298,20 @@
\exp_not:N \token_if_eq_meaning:NNTF
#2 \c_@@_math_subscript_tl
{ \exp_not:N \@@_format_literal_sub:nn {#1} }
- { \exp_not:N \@@_format_literal_auxvi:nN {#1#2} }
+ { \exp_not:N \@@_format_literal_auxvii:nN {#1} #2 }
}
}
+% \end{macrocode}
+% We need to make sure |\protect| sticks with the next token.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_format_literal_auxvii:nN #1#2
+ {
+ \str_if_eq:nnTF {#2} { \protect }
+ { \@@_format_literal_auxviii:nN {#1} }
+ { \@@_format_literal_auxvi:nN {#1#2} }
+ }
+\cs_new_protected:Npn \@@_format_literal_auxviii:nN #1#2
+ { \@@_format_literal_auxv:nw { #1 \protect #2 } }
\cs_new_protected:Npn \@@_format_literal_super:nn #1#2
{
\quark_if_recursion_tail_stop:n {#2}
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 33b6776591..cd0c5ca2c9 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} {2021-05-31} {3.0.8}
+\ProvidesExplPackage {siunitx} {2021-06-01} {3.0.9}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 4388753d2f..356fee236b 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index 76afc34861..86db9afa6c 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -3219,6 +3219,54 @@ also be done using \pkg{siunitx} (Table~\ref{tbl:xmpl:unrel}).
\end{table}
\end{LaTeXdemo}
+\subsection{Regression tables%
+ \label{sec:hint:regression}}
+
+In some subject areas, it is common to present regression values or similar,
+which feature an uncertainty value in parenthesis on the line below the main
+value. As these are separate cells, they cannot be entered using \pkg{siunitx}
+in one value. There are a couple of ways of formatting them using the package,
+depending on whether the values also need to be parsed.
+
+Where parsing is not required, the most straight-forward method is available:
+provide a model format allowing space for an extra \enquote{digit} at each end,
+which will then allow for the parenthesis. If a sign is applied to the number,
+it may not be necessary to add a \enquote{digit} for the leading bracket. If
+parsing is also required, this approach cannot be employed. Instead, the
+parsing needs to be adjusted such that |(| and |)| are not treated as part of
+the number, and \opt{table-align-text-pre} is set to |false| such that these
+will be placed next to the numerical part. These methods are illustrated in
+Table~\ref{tab:regression}.
+
+\begin{LaTeXdemo}[code and float]
+ \begin{table}
+ \caption{Regression tables%
+ \label{tab:regression}
+ }
+ \begin{tabular}
+ {
+ @{}
+ S[table-format = 2.4, parse-numbers = false]
+ S[table-format = +1.4, parse-numbers = false]
+ S[
+ input-open-uncertainty = ,
+ input-close-uncertainty = ,
+ minimum-decimal-digits = 3, % (
+ table-format = +1.3),
+ table-align-text-pre = false
+ ]
+ @{}
+ }
+ \toprule
+ {Header} &{Header} & {Header} \\
+ \midrule
+ 1.234 & -1.234 & -1.23 \\
+ (0.053) & (0.053) & (0.053) \\
+ \bottomrule
+ \end{tabular}
+ \end{table}
+\end{LaTeXdemo}
+
\subsection{Maximising performance%
\label{sec:hint:performance}}
@@ -3235,6 +3283,17 @@ systems:
]{7.3}{\Hz}
\end{LaTeXdemo}
+For tables, any settings that can be given before the table are only parsed once,
+whereas given in the optional argument to |S| they are read in ever cell. As such,
+you should favour
+\begin{LaTeXdemo}[code only]
+ \begin{table}
+ \sisetup{...}
+ \begin{tabular}{S}
+ ...
+\end{LaTeXdemo}
+for common settings.
+
\subsection{Special considerations for the \cs{kWh} unit%
\label{sec:hint:kWh}}
diff --git a/macros/latex/contrib/tiscreen/README b/macros/latex/contrib/tiscreen/README
index 55292264d4..651328b28e 100644
--- a/macros/latex/contrib/tiscreen/README
+++ b/macros/latex/contrib/tiscreen/README
@@ -1,10 +1,10 @@
tiscreen (TI calculator screen)
-v1.0.1
This package mimics the screen of older Texas instruments dot matrix display
calculators, specifically the TI-82 STATS.
Changes:
+- 2021/06/01 Added more characters
- 2021/05/21 Minor README and documentation issues
- 2021/05/17 Initial version
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
index de6991dc04..dfb03700e2 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
index 22baf4949b..adf8b59ca3 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
@@ -71,7 +71,7 @@
\section{Package option(s)}
\subsection{Color}
Using the \texttt{color} option will change the colors used by the
-\texttt{\textbackslash LCD} command. The colors are defined as
+\textbackslash\texttt{LCD} command. The colors are defined as
\texttt{tiscreenfg} (foreground. i.e. font color) and \texttt{tiscreenbg}
(background). These colors can be redefined like this:
@@ -102,26 +102,34 @@ or by using the original {\textbackslash LCD} command.
\section{Additional defined characters} \LCDcolors{black}{white}
\begin{tabular}{l|l|l}
- Name & Symbol & Code \\
+ Name & Symbol & Code \\
\hline
- E (scientific notation) & \LCDsymb{sciE} & \LCDcode{sciE} \\
- Sigma (lowercase) & \LCDsymb{sigma} & \LCDcode{sigma} \\
- $\bar x$ & \LCDsymb{barx} & \LCDcode{barx} \\
- $\bar y$ & \LCDsymb{bary} & \LCDcode{bary} \\
- $^\wedge 2$ (square root) & \LCDsymb{sq} & \LCDcode{sq} \\
- $^\wedge (-1)$ & \LCDsymb{ar} & \LCDcode{ar} \\
+ E (scientific notation) & \LCDsymb{sciE} & \LCDcode{sciE} \\
+ Sigma (lowercase) & \LCDsymb{sigma} & \LCDcode{sigma} \\
+ $\bar x$ & \LCDsymb{barx} & \LCDcode{barx} \\
+ $\bar y$ & \LCDsymb{bary} & \LCDcode{bary} \\
+ $^\wedge 2$ (power of two) & \LCDsymb{sq} & \LCDcode{sq} \\
+ $^\wedge (-1)$ & \LCDsymb{ar} & \LCDcode{ar} \\
+ $_1$ & \LCDsymb{sub1} & \LCDcode{sub1} \\
+ $_2$ & \LCDsymb{sub2} & \LCDcode{sub2} \\
+ $_3$ & \LCDsymb{sub3} & \LCDcode{sub3} \\
+ $_4$ & \LCDsymb{sub4} & \LCDcode{sub4} \\
+ $_5$ & \LCDsymb{sub5} & \LCDcode{sub5} \\
+ $_6$ & \LCDsymb{sub6} & \LCDcode{sub6} \\
\end{tabular}
\subsection{Redefined characters}
Predefined characters that where redefined to match the TI-82 STATS.
\begin{tabular}{l|l|l}
- Name & Symbol & Code \\
+ Name & Symbol & Code \\
\hline
- e & \LCDsymb{e} & \texttt{e} \\
- i & \LCDsymb{i} & \texttt{i} \\
- Square root & \LCDsymb{sqrt} & \LCDcode{sqrt} \\
- ! & \LCDsymb{!} & \LCDcode{!} \\
+ ! & \LCDsymb{!} & \LCDcode{!} \\
+ $\sqrt{\hphantom{0}}$ (Square root) & \LCDsymb{sqrt} & \LCDcode{sqrt} \\
+ e & \LCDsymb{e} & \texttt{e} \\
+ i & \LCDsymb{i} & \texttt{i} \\
+ v & \LCDsymb{v} & \texttt{v} \\
+ w & \LCDsymb{w} & \texttt{w} \\
\end{tabular}
\end{document}
diff --git a/macros/latex/contrib/tiscreen/tex/tiscreen.sty b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
index 45c2b46292..e227e11bac 100644
--- a/macros/latex/contrib/tiscreen/tex/tiscreen.sty
+++ b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
@@ -13,18 +13,26 @@
\def\tiscreenY{8}
\RequirePackage{lcd}
-% Undefine
+% Define
\DefineLCDchar{barx}{11111000001000101010001000101010001}
\DefineLCDchar{bary}{11111000001000110001011110000101110}
\DefineLCDchar{ar}{00011000011100100001000010000000000}
\DefineLCDchar{sciE}{00000000000111101000011100100001111}
\DefineLCDchar{sigma}{00000000000111110010100101001001100}
\DefineLCDchar{sq}{01100000100010001000011100000000000}
+\DefineLCDchar{sub1}{00000000000010001100001000010000100}
+\DefineLCDchar{sub2}{00000000000110000010001000100001110}
+\DefineLCDchar{sub3}{00000000000110000010001000001001100}
+\DefineLCDchar{sub4}{00000000000100001010011100001000010}
+\DefineLCDchar{sub5}{00000000000111001000011000001001100}
+\DefineLCDchar{sub6}{00000000000011001000011100101001110}
% Redefine
\DefineLCDchar{sqrt}{00111001000010000100101000110000100}
\DefineLCDchar{!}{00100001000010000100000000010000100}
\DefineLCDchar{e}{00000000000111010001111101000001100}
\DefineLCDchar{i}{01000000001100001000010000101000100}
+\DefineLCDchar{w}{00000000001000110001101011010101010}
+\DefineLCDchar{v}{00000000001000110001100010101000100}
\RequirePackage{xcolor}
\definecolor{tiscreenfg}{HTML}{000000}