summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-07-15 03:00:53 +0000
committerNorbert Preining <norbert@preining.info>2023-07-15 03:00:53 +0000
commitf506889527fff6570e2878d55abbacf7227f2b3e (patch)
treecd24fedd1e37c61b098b38f95487b69d29e37397 /macros/latex
parentd4f9602cb865c2132ad3893fdb906be0f87f4d06 (diff)
CTAN sync 202307150300
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/biblatex-contrib/hep-bibliography/README.md12
-rw-r--r--macros/latex/contrib/biblatex-contrib/hep-bibliography/bibliography.bib46
-rw-r--r--macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-documentation.pdfbin258755 -> 310153 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.dtx244
-rw-r--r--macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.pdfbin348359 -> 366410 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography.ins4
-rw-r--r--macros/latex/contrib/colorist/README.md6
-rw-r--r--macros/latex/contrib/colorist/colorart.cls5
-rw-r--r--macros/latex/contrib/colorist/colorbook.cls5
-rw-r--r--macros/latex/contrib/colorist/colorist-fancy.sty14
-rw-r--r--macros/latex/contrib/colorist/colorist.sty2
-rw-r--r--macros/latex/contrib/create-theorem/README.md2
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem-doc.pdfbin84332 -> 82573 bytes
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem-doc.tex6
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem.sty16
-rw-r--r--macros/latex/contrib/hep-acronym/README.md11
-rw-r--r--macros/latex/contrib/hep-acronym/bibliography.bib46
-rw-r--r--macros/latex/contrib/hep-acronym/hep-acronym-documentation.pdfbin273258 -> 324023 bytes
-rw-r--r--macros/latex/contrib/hep-acronym/hep-acronym-implementation.dtx156
-rw-r--r--macros/latex/contrib/hep-acronym/hep-acronym-implementation.pdfbin334479 -> 357593 bytes
-rw-r--r--macros/latex/contrib/hep-acronym/hep-acronym.ins4
-rw-r--r--macros/latex/contrib/hep-float/README.md13
-rw-r--r--macros/latex/contrib/hep-float/bibliography.bib46
-rw-r--r--macros/latex/contrib/hep-float/hep-float-documentation.pdfbin284489 -> 346092 bytes
-rw-r--r--macros/latex/contrib/hep-float/hep-float-implementation.dtx250
-rw-r--r--macros/latex/contrib/hep-float/hep-float-implementation.pdfbin348867 -> 384741 bytes
-rw-r--r--macros/latex/contrib/hep-float/hep-float.ins5
-rw-r--r--macros/latex/contrib/hep-graphic/README.md21
-rw-r--r--macros/latex/contrib/hep-graphic/bibliography.bib1260
-rw-r--r--macros/latex/contrib/hep-graphic/hep-graphic-documentation.pdfbin0 -> 273234 bytes
-rw-r--r--macros/latex/contrib/hep-graphic/hep-graphic-implementation.dtx559
-rw-r--r--macros/latex/contrib/hep-graphic/hep-graphic-implementation.pdfbin0 -> 335211 bytes
-rw-r--r--macros/latex/contrib/hep-graphic/hep-graphic.ins51
-rw-r--r--macros/latex/contrib/hep-graphic/license.md416
-rw-r--r--macros/latex/contrib/hep-math/README.md10
-rw-r--r--macros/latex/contrib/hep-math/bibliography.bib46
-rw-r--r--macros/latex/contrib/hep-math/hep-math-documentation.pdfbin358652 -> 411549 bytes
-rw-r--r--macros/latex/contrib/hep-math/hep-math-implementation.dtx96
-rw-r--r--macros/latex/contrib/hep-math/hep-math-implementation.pdfbin421232 -> 470224 bytes
-rw-r--r--macros/latex/contrib/hep-math/hep-math.ins4
-rw-r--r--macros/latex/contrib/hep-paper/README.md17
-rw-r--r--macros/latex/contrib/hep-paper/bibliography.bib46
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper-documentation.pdfbin425016 -> 510607 bytes
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper-implementation.dtx55
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper-implementation.pdfbin493690 -> 553013 bytes
-rw-r--r--macros/latex/contrib/hep-paper/hep-paper.ins4
-rw-r--r--macros/latex/contrib/hep-reference/README.md17
-rw-r--r--macros/latex/contrib/hep-reference/bibliography.bib46
-rw-r--r--macros/latex/contrib/hep-reference/hep-reference-documentation.pdfbin254739 -> 292396 bytes
-rw-r--r--macros/latex/contrib/hep-reference/hep-reference-implementation.dtx85
-rw-r--r--macros/latex/contrib/hep-reference/hep-reference-implementation.pdfbin338175 -> 347850 bytes
-rw-r--r--macros/latex/contrib/hep-reference/hep-reference.ins4
-rw-r--r--macros/latex/contrib/hep-text/README.md10
-rw-r--r--macros/latex/contrib/hep-text/bibliography.bib46
-rw-r--r--macros/latex/contrib/hep-text/hep-text-documentation.pdfbin301540 -> 370668 bytes
-rw-r--r--macros/latex/contrib/hep-text/hep-text-implementation.dtx32
-rw-r--r--macros/latex/contrib/hep-text/hep-text-implementation.pdfbin355711 -> 392254 bytes
-rw-r--r--macros/latex/contrib/hep-text/hep-text.ins4
-rw-r--r--macros/latex/contrib/hep-title/README.md10
-rw-r--r--macros/latex/contrib/hep-title/bibliography.bib46
-rw-r--r--macros/latex/contrib/hep-title/hep-title-documentation.pdfbin267000 -> 318690 bytes
-rw-r--r--macros/latex/contrib/hep-title/hep-title-implementation.dtx37
-rw-r--r--macros/latex/contrib/hep-title/hep-title-implementation.pdfbin351389 -> 393480 bytes
-rw-r--r--macros/latex/contrib/hep-title/hep-title.ins4
-rw-r--r--macros/latex/contrib/minimalist/README.md6
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty6
-rw-r--r--macros/latex/contrib/minimalist/minimalist-flow.sty6
-rw-r--r--macros/latex/contrib/minimalist/minimalist-plain.sty6
-rw-r--r--macros/latex/contrib/minimalist/minimalist-stream.sty27
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty2
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls5
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls5
-rw-r--r--macros/latex/contrib/naive-ebnf/naive-ebnf.dtx8
-rw-r--r--macros/latex/contrib/naive-ebnf/naive-ebnf.pdfbin717939 -> 718356 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.dtx614
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin581086 -> 580350 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex83
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.ins2
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin596800 -> 598482 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.tex83
-rw-r--r--macros/latex/contrib/projlib/ProjLib.dtx58
-rw-r--r--macros/latex/contrib/projlib/README.md14
82 files changed, 4064 insertions, 680 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/hep-bibliography/README.md b/macros/latex/contrib/biblatex-contrib/hep-bibliography/README.md
index d2532e357c..849f376854 100644
--- a/macros/latex/contrib/biblatex-contrib/hep-bibliography/README.md
+++ b/macros/latex/contrib/biblatex-contrib/hep-bibliography/README.md
@@ -6,8 +6,9 @@ Bibliographies for high energy physics
## Introduction
-The `hep-bibliography` package extends the `biblatex` package with some functionality mostly useful for high energy physics.
-In particular it makes full use of all `bibtex` fields provided by `inspirehep.net`.
+The `hep-bibliography` package extends the `biblatex` package with some
+functionality mostly useful for high energy physics. In particular it
+makes full use of all `bibtex` fields provided by `inspirehep.net`.
The package can be loaded via `\usepackage{hep-bibliography}`.
@@ -17,6 +18,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/biblatex-contrib/hep-bibliography/bibliography.bib b/macros/latex/contrib/biblatex-contrib/hep-bibliography/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/biblatex-contrib/hep-bibliography/bibliography.bib
+++ b/macros/latex/contrib/biblatex-contrib/hep-bibliography/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-documentation.pdf b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-documentation.pdf
index e61eff4b7f..eeedcba12c 100644
--- a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-documentation.pdf
+++ b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.dtx b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.dtx
index 96a94f48ca..db8c66d224 100644
--- a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.dtx
+++ b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,31 +18,28 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-bibliography}[2022/11/01 v1.1 HEP-Bibliography]
-%<datamodel>\ProvidesFile{hep-bibliography.dbx}[2022/11/01 v1.1 HEP-Bibliography biblatex data model]
-%<documentation>\ProvidesFile{hep-bibliography-documentation.tex}[2022/11/01 v1.1 HEP-Bibliography documentation]
+%<package>\ProvidesPackage{hep-bibliography}[2023/07/01 v1.2 HEP-Bibliography]
+%<datamodel>\ProvidesFile{hep-bibliography.dbx}[2023/07/01 v1.2 HEP-Bibliography biblatex data model]
+%<documentation>\ProvidesFile{hep-bibliography-documentation.tex}[2023/07/01 v1.2 HEP-Bibliography documentation]
%
%<*documentation>
-
\RequirePackage[l2tabu, orthodox]{nag}
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
-\usepackage[parskip]{hep-paper}
+\usepackage{hologo}
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
\bibliography{bibliography}
-
\acronym{URL}{uniform resource locator}
-
-\usepackage{hologo}
-
-\MacroIndent=1.5em
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
%</documentation>
%<*driver>
@@ -74,7 +71,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2021/09/01}{Initial version of the style file.}
-% \changes{v1.1}{2022/11/01}{Bug fixes.}
+% \changes{v1.1}{2023/07/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -108,7 +105,7 @@ The \software{biblatex} package \cite{biblatex} is loaded for bibliography manag
The user has to add the line "\bibliography"\marg{my.bib} to the preamble of the document and "\printbibliography" at the end of the document.
The bibliography is generated by \software{Biber} \cite{biber}.
"biblatex" is extended to be able to cope with the "collaboration" and "reportNumber" fields provided by \online{https://inspirehep.net}{inspirehep.net} and a bug in the volume number is fixed.
-Additionally, the PubMed IDs are recognized and \online{https://ctan.org}{ctan.org}, \online{https://github.com}{github.com}, \online{https://gitlab.com}{gitlab.com}, \online{https://bitbucket.org}{bitbucket.org}, \online{https://www.launchpad.net}{launchpad.net}, \online{https://sourceforge.net}{sourceforge.net}, and \online{https://hepforge.org}{hepforge.org} are valid "eprinttype"s.
+Additionally, \online{https://ctan.org}{ctan.org}, \online{https://github.com}{github.com}, \online{https://gitlab.com}{gitlab.com}, \online{https://bitbucket.org}{bitbucket.org}, \online{https://www.launchpad.net}{launchpad.net}, \online{https://sourceforge.net}{sourceforge.net}, and \online{https://hepforge.org}{hepforge.org} are valid "eprinttype"s.
\DescribeMacro{erratum}
Errata can be included using the "related" feature.
\begin{verbatim}
@@ -199,7 +196,10 @@ Errata can be included using the "related" feature.
% \begin{macro}{\bibliography}
% Load the \software{biblatex} package \cite{biblatex} with the datamodel defined in \cref{sec:data model}.
% \begin{macrocode}
-\PassOptionsToPackage{style=\hepbib@style, datamodel=hep-bibliography}{biblatex}
+\PassOptionsToPackage{
+ style=\hepbib@style,
+ datamodel=hep-bibliography
+}{biblatex}
\RequirePackage{biblatex}
% \end{macrocode}
% \end{macro}
@@ -228,39 +228,81 @@ Errata can be included using the "related" feature.
safeinputenc,
giveninits=true,
maxbibnames=7,
- backref=true
}
% \end{macrocode}
%
-% Hide the backrefs but use the information to link the index to the page of first citation.
+%
+% Redefine the "pages" filed such that leading zeros are stripped from the page numbers.
+% \begin{macrocode}
+\newcommand\hep@strip@zero[1]{\expandafter\hep@strip@zero@helper#1}
+\newcommand\hep@strip@zero@helper[1]{%
+ \ifx0#1\expandafter\hep@strip@zero@helper\else#1\fi%
+}
+\DeclareFieldFormat{pages}{%
+ \mkpageprefix[bookpagination][{\mknormrange[][\hep@strip@zero]}]{#1}%
+}
+% \end{macrocode}
+%
+% Define an internal bibhypertarget.
% \begin{macrocode}
-\renewbibmacro*{pageref}{}%
-\def\blxjk@grabfirslisttitem#1#2\@nil{#1}
-\DeclareFieldFormat{labelnumberwidth}{%
- \iflistundef{pageref}{%
- \mkbibbrackets{#1}%
- }{%
- \edef\blxjk@firstpage{%
- \expandafter\blxjk@grabfirslisttitem\abx@list@pageref{}\@nil%
- }%
- \ifhyperref{%
- \hyperlink{page.\blxjk@firstpage}{\mkbibbrackets{#1}}%
- }{%
- \mkbibbrackets{#1}%
- }%
+\DeclareFieldFormat{bibhypertarget}{%
+ \bibhypertarget{\thefield{entrykey}:\the\value{instcount}}{#1}%
+}
+% \end{macrocode}
+% Redefine the citation command to set the bibhypertarget and call the cite:save macro.
+% \begin{macrocode}
+\renewbibmacro*{cite:comp}{%
+ \printtext[bibhypertarget]{%
+ \stepcounter{cbx@tempcntb}%
+ \iffieldundef{shorthand}{%
+ \ifbool{bbx:subentry}{%
+ \iffieldundef{entrysetcount}{%
+ \usebibmacro{cite:comp:comp}}{\usebibmacro{cite:comp:inset}%
+ }%
+ }{\usebibmacro{cite:comp:comp}}%
+ }{\usebibmacro{cite:comp:shand}}%
}%
+ \usebibmacro{cite:save}%
+}
+% \end{macrocode}
+% Define the cite:safe macro
+% \begin{macrocode}
+\newbibmacro*{cite:save}{%
+ \ifcsundef{cbx@\thefield{entrykey}}{%
+ \csxdef{cbx@\thefield{entrykey}}{\the\value{instcount}}%
+ }{}%
+}
+% \end{macrocode}
+% Link from the bibliography to the first cite.
+% \begin{macrocode}
+\newbibmacro{cbx:linktofirstcite}[1]{%
+ \ifcsdef{cbx@\thefield{entrykey}}{%
+ \bibhyperlink{%
+ \thefield{entrykey}:\csuse{cbx@\thefield{entrykey}}%
+ }{#1}%
+ }{#1}%
+}
+% \end{macrocode}
+% Ensure table style numbers in the bibliography labels.
+% \begin{macrocode}
+\providecommand{\tstyle}{}
+\DeclareFieldFormat{labelnumberwidth}{%
+ \usebibmacro{cbx:linktofirstcite}{\mkbibbrackets{\tstyle#1}}%
+}
+% \end{macrocode}
+% Deactivate counting during caption measurement.
+% \begin{macrocode}
+\AtBeginDocument{\@ifpackageloaded{caption}{%
+ \g@addto@macro\caption@prepareslc{\let\blx@citeprint\relax}}{}%
}
% \end{macrocode}
%
% Shrink the biblography in two column mode.
% \begin{macrocode}
-% \newif\ifhep@journal\hep@journalfalse
-% \ifhep@journal\else
- \if@twocolumn
- \AtBeginBibliography{\small}
- \setlength\biblabelsep{\labelsep}
- \fi
-% \fi
+\if@twocolumn
+ \AtBeginBibliography{\small}
+ \setlength\biblabelsep{\labelsep}
+\fi
% \end{macrocode}
%
% \begin{macro}{translationof}
@@ -295,16 +337,16 @@ Errata can be included using the "related" feature.
% \subsection{Sourcemap}
%
-% \begin{macro}{\reg@exp@one}
-% \begin{macro}{\reg@exp@two}
-% \begin{macro}{\reg@exp@url}
-% \begin{macro}{\reg@exp@pmc}
+% \begin{macro}{\hep@reg@exp@one}
+% \begin{macro}{\hep@reg@exp@two}
+% \begin{macro}{\hep@reg@exp@url}
+% \begin{macro}{\hep@reg@exp@pmc}
% Define regular expressions in order to deal with inconsistent journal title and volume naming as well as \URL protocols and the PMCID.
% \begin{macrocode}
-\newcommand{\reg@exp@one}{\regexp{\A(\p{L}+)?\d+(\p{L}+)?\Z}}
-\newcommand{\reg@exp@two}{\regexp{\A(\p{L}+)?(\d+)(\p{L}+)?\Z}}
-\newcommand{\reg@exp@url}{\regexp{\A(ht|f)tp(s)?:\/\/}}
-\newcommand{\reg@exp@pmc}{\regexp{\A(PMC)?}}
+\newcommand{\hep@reg@exp@one}{\regexp{\A(\p{L}+)?\d+(\p{L}+)?\Z}}
+\newcommand{\hep@reg@exp@two}{\regexp{\A(\p{L}+)?(\d+)(\p{L}+)?\Z}}
+\newcommand{\hep@reg@exp@url}{\regexp{\A(ht|f)tp(s)?:\/\/}}
+\newcommand{\hep@reg@exp@pmc}{\regexp{\A(PMC)?}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -340,8 +382,8 @@ Errata can be included using the "related" feature.
% \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=volume, match=\hep@reg@exp@one, final]
+ \step[fieldsource=volume, match=\hep@reg@exp@two, replace={$2}]
\step[fieldsource=journal, fieldtarget=journaltitle]
\step[fieldset=journaltitle, fieldvalue={\space$1$2}, append=true]
}
@@ -353,7 +395,8 @@ Errata can be included using the "related" feature.
\map{
\step[fieldsource=url, final=true]
\step[fieldset=protocollessurl, origfieldval, final=true]
- \step[fieldsource=protocollessurl, match=\reg@exp@url, replace={}]
+ \step[fieldsource=protocollessurl,
+ match=\hep@reg@exp@url, replace={}]
}
% \end{macrocode}
% \end{macro}
@@ -363,7 +406,7 @@ Errata can be included using the "related" feature.
\map{
\step[fieldsource=pmcid, final=true]
\step[fieldset=pmc, origfieldval, final=true]
- \step[fieldsource=pmc, match=\reg@exp@pmc, replace={}]
+ \step[fieldsource=pmc, match=\hep@reg@exp@pmc, replace={}]
}
}%
}
@@ -431,10 +474,10 @@ Errata can be included using the "related" feature.
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\bib@online}
-% Private "\bib@online" macro
+% \begin{macro}{\hep@bib@online}
+% Private "\hep@bib@online" macro
% \begin{macrocode}
-\newcommand{\bib@online}[2]{%
+\newcommand{\hep@bib@online}[2]{%
\ifhyperref{\online{#1}{#2}}{\nolinkurl{#2}}%
}
% \end{macrocode}
@@ -446,11 +489,11 @@ Errata can be included using the "related" feature.
% \begin{macrocode}
\DeclareFieldFormat{pmid}{%
\mkbibacro{PM}\addcolon\space%
- \bib@online{https://www.ncbi.nlm.nih.gov/pubmed/#1}{#1}%
+ \hep@bib@online{https://www.ncbi.nlm.nih.gov/pubmed/#1}{#1}%
}
\DeclareFieldFormat{pmc}{%
\mkbibacro{PMC}\addcolon\space%
- \bib@online{https://www.ncbi.nlm.nih.gov/pmc/articles/PMC#1}{#1}%
+ \hep@bib@online{https://www.ncbi.nlm.nih.gov/pmc/articles/PMC#1}{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -479,22 +522,38 @@ Errata can be included using the "related" feature.
% \subsection{Eprints}
%
-% \begin{macro}{\new@eprint}
-% Private "\new@eprint" macro
+% \begin{macro}{\hep@eprint}
+% Private "\hep@eprint" macro
% \begin{macrocode}
-\NewDocumentCommand{\new@eprint}{smm}{
+\NewDocumentCommand{\hep@eprint}{smm}{
\DeclareFieldFormat{eprint:#2}{%
\newcommand{\@path}{\IfBooleanT{#1}{\thefield{eprintclass}/}##1}%
- #2\addcolon\space\bib@online{#3/\@path}{\@path}%
+ #2\addcolon\space\hep@bib@online{#3/\@path}{\@path}%
}%
}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{CDS}
+% Add CERN Document server as a eprint option
+% \begin{macrocode}
+\hep@eprint{CDS}{https://cds.cern.ch/record}
+\DeclareFieldAlias{eprint:cds}{eprint:CDS}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{HEPData}
+% Add the repository for publication-related High-Energy Physics data as a eprint option
+% \begin{macrocode}
+\hep@eprint{HEPData}{https://www.hepdata.net/record}
+\DeclareFieldAlias{eprint:hepdata}{eprint:HEPData}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{CTAN}
% Add CTAN as a eprint option
% \begin{macrocode}
-\new@eprint{CTAN}{https://ctan.org/pkg}
+\hep@eprint{CTAN}{https://ctan.org/pkg}
\DeclareFieldAlias{eprint:ctan}{eprint:CTAN}
% \end{macrocode}
% \end{macro}
@@ -502,7 +561,7 @@ Errata can be included using the "related" feature.
% \begin{macro}{GitHub}
% Add GitHub as a eprint option
% \begin{macrocode}
-\new@eprint*{GitHub}{https://github.com}
+\hep@eprint*{GitHub}{https://github.com}
\DeclareFieldAlias{eprint:github}{eprint:GitHub}
% \end{macrocode}
% \end{macro}
@@ -510,7 +569,7 @@ Errata can be included using the "related" feature.
% \begin{macro}{GitLab}
% Add GitLab as a eprint option
% \begin{macrocode}
-\new@eprint*{GitLab}{https://gitlab.com}
+\hep@eprint*{GitLab}{https://gitlab.com}
\DeclareFieldAlias{eprint:gitlab}{eprint:GitLab}
% \end{macrocode}
% \end{macro}
@@ -518,7 +577,7 @@ Errata can be included using the "related" feature.
% \begin{macro}{Bitbucket}
% Add Bitbucket as a eprint option
% \begin{macrocode}
-\new@eprint*{Bitbucket}{https://bitbucket.org}
+\hep@eprint*{Bitbucket}{https://bitbucket.org}
\DeclareFieldAlias{eprint:bitbucket}{eprint:Bitbucket}
% \end{macrocode}
% \end{macro}
@@ -526,7 +585,7 @@ Errata can be included using the "related" feature.
% \begin{macro}{Launchpad}
% Add Launchpad as a eprint option
% \begin{macrocode}
-\new@eprint{Launchpad}{https://launchpad.net}
+\hep@eprint{Launchpad}{https://launchpad.net}
\DeclareFieldAlias{eprint:launchpad}{eprint:Launchpad}
% \end{macrocode}
% \end{macro}
@@ -534,7 +593,7 @@ Errata can be included using the "related" feature.
% \begin{macro}{SourceForge}
% Add SourceForge as a eprint option
% \begin{macrocode}
-\new@eprint{SourceForge}{https://sourceforge.net/projects}
+\hep@eprint{SourceForge}{https://sourceforge.net/projects}
\DeclareFieldAlias{eprint:sourceforge}{eprint:SourceForge}
% \end{macrocode}
% \end{macro}
@@ -543,7 +602,7 @@ Errata can be included using the "related" feature.
% Add HEPForge as a eprint option
% \begin{macrocode}
\DeclareFieldFormat{eprint:hepforge}{%
- HEPForge\addcolon\space\bib@online{https://#1/hepforge.org}{#1}%
+ HEPForge\addcolon\space\hep@bib@online{https://#1/hepforge.org}{#1}%
}
\DeclareFieldAlias{eprint:HEPForge}{eprint:hepforge}
% \end{macrocode}
@@ -665,7 +724,8 @@ Errata can be included using the "related" feature.
@article{Aad:2012tfa,
author = "Aad, Georges and others",
collaboration = "ATLAS",
- title = "{Observation of a new particle in the search for the Standard Model Higgs boson with the ATLAS detector at the LHC}",
+ title = "{Observation of a new particle in the search for
+ the Standard Model Higgs boson with the ATLAS detector at the LHC}",
eprint = "1207.7214",
archivePrefix = "arXiv",
primaryClass = "hep-ex",
@@ -680,7 +740,8 @@ Errata can be included using the "related" feature.
@article{Chatrchyan:2012ufa,
author = "Chatrchyan, Serguei and others",
collaboration = "CMS",
- title = "{Observation of a New Boson at a Mass of 125 GeV with the CMS Experiment at the LHC}",
+ title = "{Observation of a New Boson at a Mass of 125 GeV with the
+ CMS Experiment at the LHC}",
eprint = "1207.7235",
archivePrefix = "arXiv",
primaryClass = "hep-ex",
@@ -741,7 +802,8 @@ Errata can be included using the "related" feature.
}
@article{Sjostrand:2006za,
- author = "Sjostrand, Torbjorn and Mrenna, Stephen and Skands, Peter Z.",
+ author = "Sjostrand, Torbjorn and Mrenna, Stephen
+ and Skands, Peter Z.",
title = "{PYTHIA 6.4 Physics and Manual}",
eprint = "hep-ph/0603175",
archivePrefix = "arXiv",
@@ -756,7 +818,8 @@ Errata can be included using the "related" feature.
@article{Spergel:2003cb,
author = "Spergel, D. N. and others",
collaboration = "WMAP",
- title = "{First year Wilkinson Microwave Anisotropy Probe (WMAP) observations: Determination of cosmological parameters}",
+ title = "{First year Wilkinson Microwave Anisotropy Probe (WMAP)
+ observations: Determination of cosmological parameters}",
eprint = "astro-ph/0302209",
archivePrefix = "arXiv",
doi = "10.1086/377226",
@@ -770,7 +833,8 @@ Errata can be included using the "related" feature.
author = "Agostinelli, S. and others",
collaboration = "GEANT4",
title = "{GEANT4--a simulation toolkit}",
- reportNumber = "SLAC-PUB-9350, FERMILAB-PUB-03-339, CERN-IT-2002-003",
+ reportNumber = "SLAC-PUB-9350, FERMILAB-PUB-03-339,
+ CERN-IT-2002-003",
doi = "10.1016/S0168-9002(03)01368-8",
journal = "Nucl. Instrum. Meth. A",
volume = "506",
@@ -794,7 +858,8 @@ Errata can be included using the "related" feature.
@article{Perlmutter:1998np,
author = "Perlmutter, S. and others",
collaboration = "Supernova Cosmology Project",
- title = "{Measurements of $\Omega$ and $\Lambda$ from 42 high redshift supernovae}",
+ title = "{Measurements of $\Omega$ and $\Lambda$ from 42 high
+ redshift supernovae}",
eprint = "astro-ph/9812133",
archivePrefix = "arXiv",
reportNumber = "LBNL-41801, LBL-41801",
@@ -808,7 +873,8 @@ Errata can be included using the "related" feature.
@article{Riess:1998cb,
author = "Riess, Adam G. and others",
collaboration = "Supernova Search Team",
- title = "{Observational evidence from supernovae for an accelerating universe and a cosmological constant}",
+ title = "{Observational evidence from supernovae for an accelerating
+ universe and a cosmological constant}",
eprint = "astro-ph/9805201",
archivePrefix = "arXiv",
doi = "10.1086/300499",
@@ -832,7 +898,8 @@ Errata can be included using the "related" feature.
}
@article{Gubser:1998bc,
- author = "Gubser, S. S. and Klebanov, Igor R. and Polyakov, Alexander M.",
+ author = "Gubser, S. S. and Klebanov, Igor R.
+ and Polyakov, Alexander M.",
title = "{Gauge theory correlators from noncritical string theory}",
eprint = "hep-th/9802109",
archivePrefix = "arXiv",
@@ -846,7 +913,8 @@ Errata can be included using the "related" feature.
@article{Maldacena:1997re,
author = "Maldacena, Juan Martin",
- title = "{The Large N limit of superconformal field theories and supergravity}",
+ title = "{The Large N limit of superconformal field
+ theories and supergravity}",
eprint = "hep-th/9711200",
archivePrefix = "arXiv",
reportNumber = "HUTP-97-A097, HUTP-98-A097",
@@ -858,8 +926,10 @@ Errata can be included using the "related" feature.
}
@article{Schlegel:1997yv,
- author = "Schlegel, David J. and Finkbeiner, Douglas P. and Davis, Marc",
- title = "{Maps of dust IR emission for use in estimation of reddening and CMBR foregrounds}",
+ author = "Schlegel, David J. and Finkbeiner, Douglas P.
+ and Davis, Marc",
+ title = "{Maps of dust IR emission for use in estimation
+ of reddening and CMBR foregrounds}",
eprint = "astro-ph/9710327",
archivePrefix = "arXiv",
doi = "10.1086/305772",
@@ -872,7 +942,8 @@ Errata can be included using the "related" feature.
@article{Guth:1980zm,
author = "Guth, Alan H.",
editor = "Fang, Li-Zhi and Ruffini, R.",
- title = "{The Inflationary Universe: A Possible Solution to the Horizon and Flatness Problems}",
+ title = "{The Inflationary Universe: A Possible Solution
+ to the Horizon and Flatness Problems}",
reportNumber = "SLAC-PUB-2576",
doi = "10.1103/PhysRevD.23.347",
journal = "Phys. Rev. D",
@@ -907,7 +978,8 @@ Errata can be included using the "related" feature.
@article{Kobayashi:1973fv,
author = "Kobayashi, Makoto and Maskawa, Toshihide",
- title = "{CP Violation in the Renormalizable Theory of Weak Interaction}",
+ title = "{CP Violation in the Renormalizable Theory of
+ Weak Interaction}",
reportNumber = "KUNS-242",
doi = "10.1143/PTP.49.652",
journal = "Prog. Theor. Phys.",
@@ -966,8 +1038,9 @@ Bibliographies for high energy physics
## Introduction
-The `hep-bibliography` package extends the `biblatex` package with some functionality mostly useful for high energy physics.
-In particular it makes full use of all `bibtex` fields provided by `inspirehep.net`.
+The `hep-bibliography` package extends the `biblatex` package with some
+functionality mostly useful for high energy physics. In particular it
+makes full use of all `bibtex` fields provided by `inspirehep.net`.
The package can be loaded via `\usepackage{hep-bibliography}`.
@@ -977,8 +1050,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.pdf b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.pdf
index 9c6ed855c3..0276bace5b 100644
--- a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.pdf
+++ b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography.ins b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography.ins
index 06c54faa88..89fadae4cf 100644
--- a/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography.ins
+++ b/macros/latex/contrib/biblatex-contrib/hep-bibliography/hep-bibliography.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019-2020 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
diff --git a/macros/latex/contrib/colorist/README.md b/macros/latex/contrib/colorist/README.md
index 8e281b3e90..c72a30f9fd 100644
--- a/macros/latex/contrib/colorist/README.md
+++ b/macros/latex/contrib/colorist/README.md
@@ -2,7 +2,7 @@
# `colorist` bundle: write you documents in a colorful way
-> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).**
+> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).**
## Introduction
@@ -33,15 +33,17 @@ It mainly consists of two parts.
typesetting, and also use more beautiful fonts.
### How to get these files
-You can get the `.sty` and `.cls` files mentioned above simply by compiling
+You can get the `.sty` and `.cls` files mentioned above by compiling
`colorist.ins`:
```
latex colorist.ins
```
+<!--
To get the `.tex` source files of the documentation, compile `colorist-doc.ins`:
```
latex colorist-doc.ins
```
+-->
## Features
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls
index 6ef63c0179..278cf0f335 100644
--- a/macros/latex/contrib/colorist/colorart.cls
+++ b/macros/latex/contrib/colorist/colorart.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{colorart}
- {2023/03/07} {}
+ {2023/07/14} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
@@ -60,6 +60,9 @@
, b5paper .bool_set:N = \l__colorclass_b_five_paper_bool
, b5paper .initial:n = { false }
+ , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+ , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+
, 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
, 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls
index 6b19466127..1c39ab987f 100644
--- a/macros/latex/contrib/colorist/colorbook.cls
+++ b/macros/latex/contrib/colorist/colorbook.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{colorbook}
- {2023/03/07} {}
+ {2023/07/14} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
@@ -60,6 +60,9 @@
, b5paper .bool_set:N = \l__colorclass_b_five_paper_bool
, b5paper .initial:n = { false }
+ , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+ , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+
, 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
, 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
diff --git a/macros/latex/contrib/colorist/colorist-fancy.sty b/macros/latex/contrib/colorist/colorist-fancy.sty
index 0afe2b971d..1fddb04d17 100644
--- a/macros/latex/contrib/colorist/colorist-fancy.sty
+++ b/macros/latex/contrib/colorist/colorist-fancy.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{colorist-fancy}
- {2023/03/07} {}
+ {2023/07/14} {}
{The fancy style of colorist}
\IfPackageLoadedTF { colorist } {}
@@ -1206,6 +1206,18 @@ heading_suffix "}\n"
\PassOptionsToPackage { amsfashion } { projlib-author }
\RequirePackage { projlib-author }
+%%================================
+%% Special adjustment
+%%================================
+\crefformat { chapter } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \normalfont\textcolor{maintheme} {\larger #1} #3 }
+\labelcrefformat { chapter } { #2 \normalfont\textcolor{maintheme} {\larger #1} #3 }
+\crefformat { section } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \color{maintheme} \g_colorist_title_font_section_tl {#1} #3 }
+\labelcrefformat { section } { #2 \color{maintheme} \g_colorist_title_font_section_tl {#1} #3 }
+\crefformat { subsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \g_colorist_title_font_subsection_tl {#1} #3 }
+\labelcrefformat { subsection } { #2 \g_colorist_title_font_subsection_tl {#1} #3 }
+\crefformat { subsubsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \color{main-text!70!paper} \g_colorist_title_font_subsubsection_tl {#1} #3 }
+\labelcrefformat { subsubsection } { #2 \color{main-text!70!paper} \g_colorist_title_font_subsubsection_tl {#1} #3 }
+
\endinput
%%
%% End of file `colorist/colorist-fancy.sty'.
diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty
index 083a67f51c..b750f4d1ef 100644
--- a/macros/latex/contrib/colorist/colorist.sty
+++ b/macros/latex/contrib/colorist/colorist.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{colorist}
- {2023/03/07} {}
+ {2023/07/14} {}
{A colorful style for articles and books}
\keys_define:nn { colorist }
diff --git a/macros/latex/contrib/create-theorem/README.md b/macros/latex/contrib/create-theorem/README.md
index 4da4d7324b..5b741c38c5 100644
--- a/macros/latex/contrib/create-theorem/README.md
+++ b/macros/latex/contrib/create-theorem/README.md
@@ -1,4 +1,4 @@
-<!-- Copyright (C) 2021-2022 by Jinwen XU -->
+<!-- Copyright (C) 2021-2023 by Jinwen XU -->
# `create-theorem` - Initializing theorem-like environments with multilingual support
diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
index 6d62f0dcd6..977be9c913 100644
--- a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
+++ b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.tex b/macros/latex/contrib/create-theorem/create-theorem-doc.tex
index f25bf10a89..d7ef8a56d9 100644
--- a/macros/latex/contrib/create-theorem/create-theorem-doc.tex
+++ b/macros/latex/contrib/create-theorem/create-theorem-doc.tex
@@ -106,13 +106,13 @@
\begin{document}
-\def\PackageVersion{2022/08/08}
-\def\PackageSubVersion{a}
+\def\PackageVersion{2023/07/14}
+\def\PackageSubVersion{}
\title{\createtheorempackage{}\\\smallskip\itshape Initializing theorem-like environments with multilingual support}
\author{Jinwen XU}
\thanks{Corresponding to: \texttt{\createtheorempackage{} \PackageVersion\PackageSubVersion}}
-\date{\TheDate{\PackageVersion}[only-year-month], in Paris}
+\date{\TheDate{\PackageVersion}[only-year-month], in Beijing}
\maketitle
diff --git a/macros/latex/contrib/create-theorem/create-theorem.sty b/macros/latex/contrib/create-theorem/create-theorem.sty
index 1286548a98..7eefe80b81 100644
--- a/macros/latex/contrib/create-theorem/create-theorem.sty
+++ b/macros/latex/contrib/create-theorem/create-theorem.sty
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2021-2022 by Jinwen XU
+%% Copyright (C) 2021-2023 by Jinwen XU
%% ------------------------------------
%%
%% This file may be distributed and/or modified under the conditions of
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{create-theorem}
- {2022/08/08a} {}
+ {2023/07/14} {}
{Initializing theorem-like environments with multilingual support}
\keys_define:nn { create-theorem }
@@ -224,8 +224,8 @@
{
\tl_gset:cn { g_crthm_core_name_ #7 ref_article_singular_ #1 _ #2 _tl } { }
\tl_gset:cn { g_crthm_core_name_ #7 ref_article_plural_ #1 _ #2 _tl } { }
- \tl_gset:cn { g_crthm_name_ #7 ref_article_singular_ #1 _ #2 _tl } { \nobreak \crefthemark { \skip_horizontal:n { -\crefthe_width_of_space_dim } } \nobreak }
- \tl_gset:cn { g_crthm_name_ #7 ref_article_plural_ #1 _ #2 _tl } { \nobreak \crefthemark { \skip_horizontal:n { -\crefthe_width_of_space_dim } } \nobreak }
+ \tl_gset:cn { g_crthm_name_ #7 ref_article_singular_ #1 _ #2 _tl } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak }
+ \tl_gset:cn { g_crthm_name_ #7 ref_article_plural_ #1 _ #2 _tl } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak }
}
{
\tl_gset:cn { g_crthm_core_name_ #7 ref_article_singular_ #1 _ #2 _tl } { #3 }
@@ -241,7 +241,7 @@
\tl_if_blank:eTF { #4 }
{
- \tl_gset:cn { g_crthm_name_ #7 ref_singular_ #1 _ #2 _tl } { \nobreak \skip_horizontal:n { -\crefthe_width_of_space_dim } \nobreak }
+ \tl_gset:cn { g_crthm_name_ #7 ref_singular_ #1 _ #2 _tl } { \nobreak \crefthe_retrieve_space: \nobreak }
}
{
\tl_gset:cn { g_crthm_name_ #7 ref_singular_ #1 _ #2 _tl } { \tl_use:c { g_crthm_style_ #7 refname_ #1 _ #2 _tl } { #4 } }
@@ -249,7 +249,7 @@
\tl_if_blank:eTF { #6 }
{
- \tl_gset:cn { g_crthm_name_ #7 ref_plural_ #1 _ #2 _tl } { \nobreak \skip_horizontal:n { -\crefthe_width_of_space_dim } \nobreak }
+ \tl_gset:cn { g_crthm_name_ #7 ref_plural_ #1 _ #2 _tl } { \nobreak \crefthe_retrieve_space: \nobreak }
}
{
\tl_gset:cn { g_crthm_name_ #7 ref_plural_ #1 _ #2 _tl } { \tl_use:c { g_crthm_style_ #7 refname_ #1 _ #2 _tl } { #6 } }
@@ -1618,7 +1618,7 @@
}
, crefname = {
, english = {example}{examples}
- , french = [l']{example}[les]{examples}
+ , french = [l']{exemple}[les]{exemples}
, ngerman = {Beispiel}{Beispiele}
, italian = [l']{esempio}[gli]{esempi}
, portuguese = [o]{exemplo}[os]{exemplos}
@@ -1631,7 +1631,7 @@
}
, Crefname = {
, english = {Example}{Examples}
- , french = [L']{example}[Les]{examples}
+ , french = [L']{exemple}[Les]{exemples}
, ngerman = {Beispiel}{Beispiele}
, italian = [L']{esempio}[Gli]{esempi}
, portuguese = [O]{exemplo}[Os]{exemplos}
diff --git a/macros/latex/contrib/hep-acronym/README.md b/macros/latex/contrib/hep-acronym/README.md
index f7958ab064..dfff0f07ed 100644
--- a/macros/latex/contrib/hep-acronym/README.md
+++ b/macros/latex/contrib/hep-acronym/README.md
@@ -5,8 +5,8 @@ An acronym extension for glossaries
## Introduction
-The `hep-acronym` package provides an acronym macro based on the `glossaries` package.
-It can be loaded using `\usepackage{hep-acronym}`.
+The `hep-acronym` package provides an acronym macro based on the
+`glossaries` package. It can be loaded using `\usepackage{hep-acronym}`.
## Author
@@ -14,6 +14,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/hep-acronym/bibliography.bib b/macros/latex/contrib/hep-acronym/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/hep-acronym/bibliography.bib
+++ b/macros/latex/contrib/hep-acronym/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-acronym/hep-acronym-documentation.pdf b/macros/latex/contrib/hep-acronym/hep-acronym-documentation.pdf
index c4e91def91..5adef17ad2 100644
--- a/macros/latex/contrib/hep-acronym/hep-acronym-documentation.pdf
+++ b/macros/latex/contrib/hep-acronym/hep-acronym-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-acronym/hep-acronym-implementation.dtx b/macros/latex/contrib/hep-acronym/hep-acronym-implementation.dtx
index ded23522db..43a4dd900e 100644
--- a/macros/latex/contrib/hep-acronym/hep-acronym-implementation.dtx
+++ b/macros/latex/contrib/hep-acronym/hep-acronym-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,29 +18,27 @@
% \iffalse
%
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-acronym}[2022/11/01 v1.1 Acronyms using glossaries]
-%<documentation>\ProvidesFile{hep-acronym-documentation.tex}[2022/11/01 v1.1 hep-acronym documentation]
+%<package>\ProvidesPackage{hep-acronym}[2023/07/01 v1.2 Acronyms using glossaries]
+%<documentation>\ProvidesFile{hep-acronym-documentation.tex}[2023/07/01 v1.2 hep-acronym documentation]
%
%<*documentation>
-
\RequirePackage[l2tabu, orthodox]{nag}
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
\usepackage{hologo}
-\usepackage[parskip]{hep-paper}
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
\bibliography{bibliography}
-
\acronym{PDF}{portable document format}
-
-\MacroIndent=1.5em
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
%</documentation>
%<*driver>
@@ -72,7 +70,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2021/09/01}{Initial version of the style file.}
-% \changes{v1.1}{2022/11/01}{Bug fixes.}
+% \changes{v1.1}{2023/07/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -101,7 +99,7 @@ Acronyms are implemented using the \software{glossaries-extra} package \cite{glo
It can be loaded using "\usepackage{hep-acronym}".
\DescribeMacro{\acronym}
-The "\acronym"\meta{*}\oarg{typeset abbreviation}\marg{abbreviation}\meta{*}\marg{definition}\oarg{plural\linebreak[4]definition} macro generates the singular "\"\meta{abbreviation} and plural "\"\meta{abbreviation}"s" macros.
+The "\acronym"\meta{*}\oarg{typeset abbreviation}\marg{abbreviation}\meta{*}\marg{definition}\oarg{plural definition} macro generates the singular "\"\meta{abbreviation} and plural "\"\meta{abbreviation}"s" macros.
The first star prevents the addition of an \enquote{s} to the abbreviation plural.
The second star restores the \hologo{TeX} default of swallowing subsequent white space.
@@ -119,12 +117,13 @@ The "\sentence" macro ensures that the directly following abbreviation is capita
The "\shortacronym" and "\longacronym" macros are drop-in replacements of the "\acronym" macro showing only the short or long form of their acronym.
\DescribeMacro{\resetacronym}
-\DescribeMacro{\dummyacronym}
The first use form of the acronym can be enforced by resetting the acronym counter with "\resetacronym"\marg{key}.
+\DescribeMacro{\dummyacronym}
If the acronym counter equals one at the end of the document the short form of the acronym is not introduced.
Placing a "\dummyacronym"\marg{key} at the end of the document ensures that the short form is introduced.
+\DescribeMacro{warning}
In order to reduce the number of potentially conflicting packages the \software{glossaries} package is loaded without any glossary style.
In the case that the glossary should be printed additional packages must be loaded via \eg "\usepackage{glossary-list}".
@@ -147,11 +146,32 @@ In the case that the glossary should be printed additional packages must be load
%
%<*package>
%
+% Define a hepacronym namespace for the options using the \software{kvoptions} package \cite{kvoptions}.
+% \begin{macrocode}
+\RequirePackage{kvoptions}
+\SetupKeyvalOptions{
+ family=hepacronym,
+ prefix=hepacronym@
+}
+% \end{macrocode}
+%
+% \begin{macro}{hyper}
+% Define the "hyper" option controlling the hyperlink to the first appearance of the acronyms.
+% \begin{macrocode}
+\DeclareBoolOption[true]{hyper}
+% \end{macrocode}
+% \end{macro}
+%
+% Process options.
+% \begin{macrocode}
+\ProcessKeyvalOptions*
+% \end{macrocode}
+%
% Load the base package \cite{glossaries, glossaries-extra} and set the abbreviation style.
% \begin{macrocode}
\PassOptionsToPackage{nostyles}{glossaries-extra}
\RequirePackage{glossaries-extra}
-\setabbreviationstyle{long-hyphen-short-hyphen}
+% \setabbreviationstyle{long-hyphen-short-hyphen}
% \end{macrocode}
% Use the entry count feature.
% \begin{macrocode}
@@ -191,6 +211,12 @@ In the case that the glossary should be printed additional packages must be load
\@ifpackageloaded{hyperref}{\pdfstringdefDisableCommands{#1}}{}%
}
% \end{macrocode}
+% Deactivate hyperrefs if requested.
+% \begin{macrocode}
+\ifhepacronym@hyper\else
+ \glsdisablehyper
+\fi
+% \end{macrocode}
%
% \begin{macro}{\begin@sentence}
% Mark the beginning of a paragraph as if it would follow a full stop using the \software{everyhook} package \cite{everyhook}.
@@ -290,7 +316,7 @@ In the case that the glossary should be printed additional packages must be load
% Provide the singular acronym macro in math mode.
% \begin{macrocode}
\expandafter\mathdef\csname#3\endcsname{%
- \text{\glsxtrshort{#3}}\@gls@increment@currcount{#3}%
+ \mathinner{\text{\glsxtrshort{#3}}}\@gls@increment@currcount{#3}%
}
% \end{macrocode}
% Provide the plural acronym macro.
@@ -309,7 +335,7 @@ In the case that the glossary should be printed additional packages must be load
% Provide the plural acronym macro in math mode.
% \begin{macrocode}
\expandafter\mathdef\csname#3s\endcsname{%
- \text{\glsxtrshortpl{#3}}\@gls@increment@currcount{#3}%
+ \mathinner{\text{\glsxtrshortpl{#3}}}\@gls@increment@currcount{#3}%
}
% \end{macrocode}
% Provide an enforced long form.
@@ -364,7 +390,7 @@ In the case that the glossary should be printed additional packages must be load
% Provide the singular acronym macro in math mode.
% \begin{macrocode}
\expandafter\mathdef\csname#3\endcsname{%
- \text{\IfNoValueTF{#2}{#3}{#2}}%
+ \mathinner{\text{\IfNoValueTF{#2}{#3}{#2}}}%
}
% \end{macrocode}
% Provide the plural acronym macro.
@@ -383,7 +409,7 @@ In the case that the glossary should be printed additional packages must be load
% Provide the plural acronym macro in math mode.
% \begin{macrocode}
\expandafter\mathdef\csname#3s\endcsname{%
- \text{\IfBooleanTF{#1}{#3}{\IfNoValueTF{#2}{#3s}{#2s}}}%
+ \mathinner{\text{\IfBooleanTF{#1}{#3}{\IfNoValueTF{#2}{#3s}{#2s}}}}%
}%
% \end{macrocode}
% Ensure that long form also exists.
@@ -438,6 +464,89 @@ In the case that the glossary should be printed additional packages must be load
}
% \end{macrocode}
% \end{macro}
+
+% \begin{macro}{\acronymalternative}
+% Allow for alternative long text in abbreviation.
+% \begin{macrocode}
+\NewDocumentCommand{\acronymalternative}{mmsm}{%
+% \end{macrocode}
+% Store it in the "useri" field.
+% \begin{macrocode}
+ \GlsXtrSetField{#1}{useri}{#4}%
+% \end{macrocode}
+% Define the acronym
+% \begin{macrocode}
+ \expandafter\newcommand\csname#2\endcsname[1][]{%
+% \end{macrocode}
+% Redirect the relevant macros to the useri field.
+% \begin{macrocode}
+ \let\hep@glsaccesslong\glsaccesslong%
+ \let\hep@Glsaccesslong\Glsaccesslong%
+ \let\glsaccesslong\glsuseri%
+ \let\Glsaccesslong\Glsuseri%
+% \end{macrocode}
+% Execute abbreviation macros.
+% \begin{macrocode}
+ \if@begin@of@sentence{%
+ \ifglsused{#1}{\cgls{#1}[##1]}{\cGls{#1}[##1]}%
+ }{\cgls{#1}[##1]}%
+% \end{macrocode}
+% Undo the redirection.
+% \begin{macrocode}
+ \let\glsaccesslong\hep@glsaccesslong%
+ \let\Glsaccesslong\hep@Glsaccesslong%
+% \end{macrocode}
+% Spacing code.
+% \begin{macrocode}
+ \ifnum\glsentrycurrcount{#1}>1\relax%
+ \IfBooleanTF{#3}{}{\@\xspace}%
+ \else\@\xspace\fi%
+ }
+% \end{macrocode}
+% Redirect \PDF code to original acronym.
+% \begin{macrocode}
+ \hep@disable{\expandafter\def\csname#2\endcsname{%
+ \csname#1\endcsname }%
+ }
+% \end{macrocode}
+% Redirect math macro to original acronym.
+% \begin{macrocode}
+ \expandafter\mathdef\csname#2\endcsname{%
+ \mathinner{\text{\glsxtrshort{#1}}}\@gls@increment@currcount{#1}%
+ }
+% \end{macrocode}
+% Provie long version of acronym.
+% \begin{macrocode}
+ \expandafter\newcommand\csname#2long\endcsname[1][]{%
+% \end{macrocode}
+% Redirect relevant macros.
+% \begin{macrocode}
+ \let\hep@glsentrydesc\glsentrydesc%
+ \let\hep@Glsentrydesc\Glsentrydesc%
+ \renewrobustcmd*{\glsentrydesc}[1]{\@gls@entry@field{#1}{useri}}%
+ \renewrobustcmd*{\Glsentrydesc}[1]{\@Gls@entry@field{#1}{useri}}%
+% \end{macrocode}
+% Execute relevant macro.
+% \begin{macrocode}
+ \if@begin@of@sentence{\Glsdesc*{#1}[##1]}{\glsdesc*{#1}[##1]}%
+ \IfBooleanTF{#3}{}{\@\xspace}%
+% \end{macrocode}
+% Undo redefinition.
+% \begin{macrocode}
+ \let\glsentrydesc\hep@glsentrydesc%
+ \let\Glsentrydesc\hep@Glsentrydesc%
+ }
+% \end{macrocode}
+% Provie \PDF code.
+% \begin{macrocode}
+ \hep@disable{%
+ \expandafter\def\csname#2long\endcsname{%
+ \@Gls@entry@field{#1}{useri} %
+ }%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
% Silence warning if no acronyms are defined.
% \begin{macrocode}
\renewcommand*{\@gls@write@entrycounts}{%
@@ -562,8 +671,8 @@ An acronym extension for glossaries
## Introduction
-The `hep-acronym` package provides an acronym macro based on the `glossaries` package.
-It can be loaded using `\usepackage{hep-acronym}`.
+The `hep-acronym` package provides an acronym macro based on the
+`glossaries` package. It can be loaded using `\usepackage{hep-acronym}`.
## Author
@@ -571,8 +680,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/hep-acronym/hep-acronym-implementation.pdf b/macros/latex/contrib/hep-acronym/hep-acronym-implementation.pdf
index d3553fb776..106d9c83ba 100644
--- a/macros/latex/contrib/hep-acronym/hep-acronym-implementation.pdf
+++ b/macros/latex/contrib/hep-acronym/hep-acronym-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-acronym/hep-acronym.ins b/macros/latex/contrib/hep-acronym/hep-acronym.ins
index ca6cb5b42a..6cb8e09ed6 100644
--- a/macros/latex/contrib/hep-acronym/hep-acronym.ins
+++ b/macros/latex/contrib/hep-acronym/hep-acronym.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
diff --git a/macros/latex/contrib/hep-float/README.md b/macros/latex/contrib/hep-float/README.md
index eb36c56eec..d0b5dee8c1 100644
--- a/macros/latex/contrib/hep-float/README.md
+++ b/macros/latex/contrib/hep-float/README.md
@@ -6,9 +6,9 @@ Convenience package for float placement
## Introduction
-The `hep-float` package redefines some `LaTeX` float placement defaults and defines convenience wrappers for floats.
-
-The `hep-float` package can be loaded with `\usepackage{hep-float}`.
+The `hep-float` package redefines some `LaTeX` float placement defaults
+and defines convenience wrappers for floats. The `hep-float` package can
+be loaded with `\usepackage{hep-float}`.
## Author
@@ -16,6 +16,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/hep-float/bibliography.bib b/macros/latex/contrib/hep-float/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/hep-float/bibliography.bib
+++ b/macros/latex/contrib/hep-float/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-float/hep-float-documentation.pdf b/macros/latex/contrib/hep-float/hep-float-documentation.pdf
index bda4b095f0..be362e9df4 100644
--- a/macros/latex/contrib/hep-float/hep-float-documentation.pdf
+++ b/macros/latex/contrib/hep-float/hep-float-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-float/hep-float-implementation.dtx b/macros/latex/contrib/hep-float/hep-float-implementation.dtx
index 55811d9c1d..7bb77d67c1 100644
--- a/macros/latex/contrib/hep-float/hep-float-implementation.dtx
+++ b/macros/latex/contrib/hep-float/hep-float-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,29 +18,25 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-float}[2022/11/01 v1.1 Float adjustments ]
-%<documentation>\ProvidesFile{hep-float-documentation.tex}[2022/11/01 v1.1 hep-float documentation]
+%<package>\ProvidesPackage{hep-float}[2023/07/01 v1.2 Float adjustments]
+%<documentation>\ProvidesFile{hep-float-documentation.tex}[2023/07/01 v1.2 hep-float documentation]
%
%<*documentation>
-
-\RequirePackage[l2tabu, orthodox]{nag}
-
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
-\usepackage[parskip, oldstyle]{hep-paper}
-
-\bibliography{bibliography}
-
\usepackage{hologo}
-\MacroIndent=1.5em
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
+\bibliography{bibliography}
%</documentation>
%<*driver>
@@ -72,7 +68,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2021/09/01}{Initial version of the style file.}
-% \changes{v1.1}{2022/11/01}{Bug fixes.}
+% \changes{v1.1}{2023/07/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -224,17 +220,17 @@ If the graphics are located in a sub-folder its path can be indicated by "\graph
\let\end@hep@table\endtable%
\ifhepfloat@manualplacement%
\renewenvironment{figure}[1][tbp]{%
- \hep@figure[#1]\centering%
+ \hep@figure[#1]\centering\small%
}{\end@hep@figure}%
\renewenvironment{table}[1][tbp]{%
- \hep@table[#1]\centering%
+ \hep@table[#1]\centering\small%
}{\end@hep@table}%
\else%
\renewenvironment{figure}[1][]{%
- \hep@figure\centering%
+ \hep@figure\centering\small%
}{\end@hep@figure}%
\renewenvironment{table}[1][]{%
- \hep@table\centering%
+ \hep@table\centering\small%
}{\end@hep@table}
\fi%
% \end{macrocode}
@@ -242,6 +238,79 @@ If the graphics are located in a sub-folder its path can be indicated by "\graph
% \end{environment}
%
%
+% \subsection{floats}
+%
+% \begin{environment}{figures}
+% \begin{macro}{\figure}
+% Define the "figures" environment that places figures next to each other.
+% \begin{macrocode}
+\newcommand{\figurehspace}{0.0333}
+\newcommand{\figurevspace}{.5\baselineskip}
+\newenvironment{figures}[2][b]{%
+ \begin{figure}
+ \let\oldcaption\caption
+ \renewcommand{\caption}[1]{%
+ \renewcommand{\caption}{\oldcaption}%
+ \captionof{figure}{##1}\vspace{\figurevspace}%
+ }
+ \ifdim#2pt>1pt%
+ \newcommand{\hep@figure@space}{\figurehspace\linewidth/#2}%
+ \renewcommand{\figure}[1][b]{%
+ \end{minipage}\hfill%
+ \begin{minipage}[##1]{\linewidth/#2-\hep@figure@space}%
+ }
+ \begin{minipage}[#1]{\linewidth/#2-\hep@figure@space}
+ \else%
+ \newcommand{\hep@figure@space}[1]{##1\linewidth*\real{\figurehspace}}
+ \renewcommand{\figure}[2][b]{%
+ \end{minipage}\hfill%
+ \begin{minipage}[##1]{##2\linewidth-\hep@figure@space{##2}}%
+ }
+ \begin{minipage}[#1]{#2\linewidth-\hep@figure@space{#2}}
+ \fi%
+}{%
+\end{minipage}\end{figure}%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{environment}
+% \begin{environment}{tables}
+% \begin{macro}{\table}
+% Define the "tables" environment that places tables next to each other.
+% \begin{macrocode}
+\newcommand{\tablehspace}{0.0333}
+\newcommand{\tablevspace}{.5\baselineskip}
+\newenvironment{tables}[2][b]{%
+ \begin{table}
+ \let\oldcaption\caption
+ \renewcommand{\caption}[1]{%
+ \renewcommand{\caption}{\oldcaption}%
+ \captionof{table}{##1}\vspace{\tablevspace}%
+ }
+ \ifdim#2pt>1pt%
+ \newcommand{\hep@table@space}{\tablehspace\linewidth/#2}%
+ \renewcommand{\table}[1][b]{%
+ \end{minipage}\hfill%
+ \begin{minipage}[##1]{\linewidth/#2-\hep@table@space}\centering%
+ }
+ \begin{minipage}[#1]{\linewidth/#2-\hep@table@space}\centering
+ \else%
+ \newcommand{\hep@table@space}[1]{##1\linewidth*\real{\tablehspace}}
+ \renewcommand{\table}[2][b]{%
+ \end{minipage}\hfill%
+ \begin{minipage}[##1]{##2\linewidth-\hep@table@space{##2}}%
+ \centering%
+ }
+ \begin{minipage}[#1]{#2\linewidth-\hep@table@space{#2}}%
+ \centering
+ \fi%
+}{%
+\end{minipage}\end{table}%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{environment}
+%
% \subsection{Sub-floats}
%
% Load the \software{subcaption} package \cite{subcaption}.
@@ -298,18 +367,19 @@ If the graphics are located in a sub-folder its path can be indicated by "\graph
% Define the "\panel" macro for the case that the width of the panel is given.
% \begin{macrocode}
\else%
+ \newcommand{\hep@panel@space}[1]{##1\linewidth*\real{\panelhspace}}%
\newcommand{\panel}[2][b]{%
\endminipage\hfill\begin@subcaption@minipage[#1]{%
- ##2\linewidth-##2\linewidth*\real{\panelhspace}%
+ ##2\linewidth-\hep@panel@space{##2}%
}%
}%
\begin@subcaption@minipage[#1]{%
- #2\linewidth-#2\linewidth*\real{\panelhspace}%
+ #2\linewidth-\hep@panel@space{#2}%
}%
\fi%
-}{
-\endsubcaptionblock
-\vspace{-\panelvspace}
+}{%
+\endsubcaptionblock%
+\vspace{-\panelvspace}%
}
% \end{macrocode}
% \end{macro}
@@ -349,6 +419,127 @@ If the graphics are located in a sub-folder its path can be indicated by "\graph
%
%</package>
%
+% \section{Test}
+%
+%<*test>
+%
+% \begin{macrocode}
+\documentclass{article}
+
+\usepackage[showframe]{geometry}
+\usepackage{hep-float}
+
+\begin{document}
+
+\begin{figure}
+\graphic[.5]{example-image-4x3}
+\caption{test}
+\end{figure}
+
+\begin{figures}{.3}
+\graphic{example-image-4x3}
+\caption{one}
+\figure{.4}
+\graphic{example-image-16x9}
+\caption{two}
+\figure{.3}
+\graphic{example-image-4x3}
+\caption{three}
+\figure{.3}
+\graphic{example-image-4x3}
+\caption{one}
+\figure{.4}
+\graphic{example-image-16x9}
+\caption{two}
+\figure{.3}
+\graphic{example-image-4x3}
+\caption{three}
+\end{figures}
+
+\begin{figures}{3}
+\graphic{example-image-1x1}
+\caption{one}
+\figure
+\graphic{example-image-1x1}
+\caption{two}
+\figure
+\graphic{example-image-1x1}
+\caption{three}
+\figure
+\graphic{example-image-1x1}
+\caption{one}
+\figure
+\graphic{example-image-1x1}
+\caption{two}
+\figure
+\graphic{example-image-1x1}
+\caption{three}
+\end{figures}
+
+
+\begin{figure}
+\begin{panels}{3}
+\graphic{example-image-1x1}
+\caption{a}
+\panel
+\graphic{example-image-1x1}
+\caption{b}
+\panel
+\graphic{example-image-1x1}
+\caption{c}
+\panel
+\graphic{example-image-1x1}
+\caption{d}
+\panel
+\graphic{example-image-1x1}
+\caption{e}
+\panel
+\graphic{example-image-1x1}
+\caption{f}
+\end{panels}
+\caption{Panels}
+\end{figure}
+
+\begin{figure}
+\begin{panels}{.3}
+\graphic{example-image-4x3}
+\caption{a}
+\panel{.4}
+\graphic{example-image-16x9}
+\caption{b}
+\panel{.3}
+\graphic{example-image-4x3}
+\caption{c}
+\panel{.225}
+\graphic{example-image-1x1}
+\caption{d}
+\panel{.4}
+\graphic{example-image-16x9}
+\caption{e}
+\panel{.225}
+\graphic[.8]{example-image-1x1}
+\caption{f}
+\end{panels}
+\caption{Panels 2}
+\end{figure}
+
+\begin{tables}{2}
+\begin{tabular}{cc}\toprule
+a & b \\
+\bottomrule\end{tabular}
+\caption{a}
+\table
+\begin{tabular}{cc}\toprule
+a & b \\
+\bottomrule\end{tabular}
+\caption{b}
+\end{tables}
+
+\end{document}
+% \end{macrocode}
+%
+%</test>
+%
% \section{Readme}
%
%<*readme>
@@ -360,9 +551,9 @@ Convenience package for float placement
## Introduction
-The `hep-float` package redefines some `LaTeX` float placement defaults and defines convenience wrappers for floats.
-
-The `hep-float` package can be loaded with `\usepackage{hep-float}`.
+The `hep-float` package redefines some `LaTeX` float placement defaults
+and defines convenience wrappers for floats. The `hep-float` package can
+be loaded with `\usepackage{hep-float}`.
## Author
@@ -370,8 +561,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/hep-float/hep-float-implementation.pdf b/macros/latex/contrib/hep-float/hep-float-implementation.pdf
index 6960ff8581..22ea36456f 100644
--- a/macros/latex/contrib/hep-float/hep-float-implementation.pdf
+++ b/macros/latex/contrib/hep-float/hep-float-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-float/hep-float.ins b/macros/latex/contrib/hep-float/hep-float.ins
index be734d91b7..0290c3c1ad 100644
--- a/macros/latex/contrib/hep-float/hep-float.ins
+++ b/macros/latex/contrib/hep-float/hep-float.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019-2020 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
@@ -29,6 +29,7 @@ LaTeX version 2005/12/01 or later.
\generate{
\file{hep-float-documentation.tex}{\from{hep-float-implementation.dtx}{documentation}}
\file{hep-float.sty}{\from{hep-float-implementation.dtx}{package}}
+ \file{hep-float-test.tex}{\from{hep-float-implementation.dtx}{test}}
\nopreamble\nopostamble\file{README-hep-float.md}{\from{hep-float-implementation.dtx}{readme}}
}
diff --git a/macros/latex/contrib/hep-graphic/README.md b/macros/latex/contrib/hep-graphic/README.md
new file mode 100644
index 0000000000..98924b6021
--- /dev/null
+++ b/macros/latex/contrib/hep-graphic/README.md
@@ -0,0 +1,21 @@
+
+# The `hep-graphic` package
+
+A `LaTeX` package for publications in High Energy Physics.
+
+## Introduction
+
+...
+
+## Author
+
+Jan Hajer
+
+## License
+
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
+
diff --git a/macros/latex/contrib/hep-graphic/bibliography.bib b/macros/latex/contrib/hep-graphic/bibliography.bib
new file mode 100644
index 0000000000..1b79887246
--- /dev/null
+++ b/macros/latex/contrib/hep-graphic/bibliography.bib
@@ -0,0 +1,1260 @@
+@article{hep-paper,
+title = "The |hep-paper| package",
+subtitle = "Publications in high energy physics",
+author = "Jan Hajer",
+year = "2019",
+eprinttype = "ctan",
+eprint = "hep-paper",
+related = "hep-paper-1",
+}
+
+@manual{hep-paper-1,
+doi = "10.5281/zenodo.3606436",
+eprinttype = "github",
+eprintclass = "janhajer",
+eprint = "hep-paper",
+}
+
+@article{hep-acronym,
+title = "The |hep-acronym| package",
+subtitle = "An acronym extension for glossaries",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-acronym",
+related = "hep-paper-1",
+}
+
+@article{hep-bibliography,
+title = "The |hep-bibliography| package",
+subtitle = "Bibliographies for high energy physics",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-bibliography",
+related = "hep-paper-1",
+}
+
+@article{hep-float,
+title = "The |hep-float| package",
+subtitle = "Convenience package for float placement",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-float",
+related = "hep-paper-1",
+}
+
+@article{hep-font,
+title = "The |hep-font| package",
+subtitle = "Latin modern extended by computer modern",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-font",
+related = "hep-paper-1",
+}
+
+@article{hep-math-font,
+title = "The |hep-math-font| package",
+subtitle = "Extended Greek and sans serif math",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-math-font",
+related = "hep-paper-1",
+}
+
+@article{hep-math,
+title = "The |hep-math| package",
+subtitle = "Extended math macros",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-math",
+related = "hep-paper-1",
+}
+
+@article{hep-text,
+title = "The |hep-text| package",
+subtitle = "List and text extensions",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-text",
+related = "hep-paper-1",
+}
+
+@article{hep-title,
+title = "The |hep-title| package",
+subtitle = "Extensions for the title page",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-title",
+related = "hep-paper-1",
+}
+
+@article{hep-reference,
+title = "The |hep-reference| package",
+subtitle = "Selection of reference improvements",
+author = "Jan Hajer",
+year = "2021",
+eprinttype = "ctan",
+eprint = "hep-reference",
+related = "hep-paper-1",
+}
+
+@article{hep-cv,
+title = "The |hep-cv| package",
+subtitle = "Appealing curricula vitarum",
+author = "Jan Hajer",
+year = "2020",
+related = "hep-paper-1",
+}
+
+@article{kvoptions,
+title = "The |kvoptions| package",
+subtitle = "Key value format for package options",
+author = "Heiko Oberdiek",
+year = "2004",
+eprinttype = "ctan",
+eprint = "kvoptions",
+related = "kvoptions-1",
+}
+
+@manual{kvoptions-1,
+eprinttype = "github",
+eprintclass = "ho-tex",
+eprint = "kvoptions",
+}
+
+@article{cleveref,
+title = "The |cleveref| package",
+subtitle = "Intelligent cross-referencing",
+author = "Toby Cubitt",
+date = "2006",
+url = "http://dr-qubit.org/cleveref",
+eprinttype = "ctan",
+eprint = "cleveref",
+}
+
+@article{foreign,
+title = "The |foreign| package for \hologo{LaTeX2e}",
+subtitle = "Systematic treatment of \enquote{foreign} words in documents",
+author = "Philip G. Ratcliffe",
+date = "2012",
+eprinttype = "ctan",
+eprint = "foreign",
+}
+
+@article{geometry,
+title = "The |geometry| package",
+subtitle = "Flexible and complete interface to document dimensions",
+author = "David Carlisle and Hideo Umeki",
+date = "1996",
+eprinttype = "ctan",
+eprint = "geometry",
+related = "geometry-1",
+}
+
+@manual{geometry-1,
+eprinttype = "github",
+eprintclass = "davidcarlisle",
+eprint = "geometry",
+}
+
+@article{a4wide,
+title = "The |a4wide| package",
+subtitle = "\enquote{Wide} a4 layout",
+author = "Alexander Holt and Jean-François Lamy",
+date = "1986",
+eprinttype = "ctan",
+eprint = "a4wide",
+note = "depreciated and not used",
+}
+
+@article{microtype,
+title = "The |microtype| package",
+subtitle = "Subliminal refinements towards typographical perfection",
+author = "Robert Schlicht",
+date = "2004",
+eprinttype = "ctan",
+eprint = "microtype",
+}
+
+@article{authblk,
+title = "A \hologo{LaTeX} Package to Prepare Author and Affiliation Blocks",
+subtitle = "Support for footnote style author/affiliation",
+author = "Patrick W. Daly",
+date = "2001",
+eprinttype = "ctan",
+eprint = "authblk",
+}
+
+@article{bm,
+title = "The |bm| package",
+subtitle = "Access bold symbols in maths mode",
+author = "David Carlisle and Frank Mittelbach",
+collaboration = "\hologo{LaTeX} Team",
+date = "1993",
+eprinttype = "ctan",
+eprint = "bm",
+}
+
+@article{empheq,
+title = "The |empheq| package",
+author = "Lars Madsen and Morten Høgholm and Will Robertson and Joseph Wright",
+eprinttype = "ctan",
+eprint = "empheq",
+}
+
+@article{mathtools,
+title = "The |mathtools| package",
+subtitle = "Mathematical tools to use with |amsmath|",
+author = "Lars Madsen and Morten Høgholm and Will Robertson and Joseph Wright",
+date = "2004",
+eprinttype = "ctan",
+eprint = "mathtools",
+}
+
+@article{amsmath,
+title = "The |amsmath| package",
+subtitle = "AMS mathematical facilities for \hologo{LaTeX}",
+collaboration = "\hologo{LaTeX} Team",
+date = "1994",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsmath",
+}
+
+@article{amstext,
+title = "The |amstext| package",
+subtitle = "Typeset text fragments in mathematics",
+collaboration = "\hologo{LaTeX} Team",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amstext",
+}
+
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
+@article{amsfonts,
+title = "The |amsfonts| package",
+subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
+author = "Michael Downes and David M. Jones and Frank Mittelbach and Rainer Schöpf",
+collaboration = "American Mathematical Society",
+date = "1995",
+url = "https://ams.org/tex/amsfonts",
+eprinttype = "ctan",
+eprint = "amsfonts",
+}
+
+@article{amssymb,
+title = "The |amssymb| package",
+author = "Michael Downes and David M. Jones and Frank Mittelbach and Rainer Schöpf",
+collaboration = "American Mathematical Society",
+date = "1995",
+eprinttype = "ctan",
+eprint = "amsfonts",
+}
+
+@article{slashed,
+title = "The |slashed| package",
+subtitle = "Put a slash through characters",
+author = "David Carlisle",
+date = "1987",
+eprinttype = "ctan",
+eprint = "slashed",
+}
+
+@article{physics,
+title = "The |physics| package",
+subtitle = "Macros supporting the Mathematics of Physics",
+author = "Sergio C. de la Barrera",
+date = "2012",
+eprinttype = "ctan",
+eprint = "physics",
+}
+
+@article{units,
+title = "The |units| and |nicefrac| packages",
+subtitle = "Typeset units",
+author = "Axel Reichert",
+date = "1998",
+eprinttype = "ctan",
+eprint = "units",
+}
+
+@article{subcaption,
+title = "The |subcaption| package",
+subtitle = "Support for sub-captions",
+author = "Axel Sommerfeldt",
+date = "2007",
+eprinttype = "ctan",
+eprint = "subcaption",
+related = "caption-1",
+}
+
+@article{caption,
+title = "The |caption| package",
+subtitle = "Customising captions in floating environments",
+author = "Axel Sommerfeldt",
+date = "1994",
+eprinttype = "ctan",
+eprint = "caption",
+related = "caption-1",
+}
+
+@manual{caption-1,
+eprinttype = "gitlab",
+eprintclass = "axelsommerfeldt",
+eprint = "caption",
+}
+
+
+@article{biblatex,
+title = "The |biblatex| Package",
+subtitle = "Sophisticated Bibliographies in \hologo{LaTeX}",
+author = "Philipp Lehman and Joseph Wright and Audrey Boruvka and Philip Kime",
+date = "2006",
+eprinttype = "ctan",
+eprint = "biblatex",
+related = "biblatex-1",
+}
+
+@manual{biblatex-1,
+eprinttype = "github",
+eprintclass = "plk",
+eprint = "biblatex",
+}
+
+@article{hyperref,
+title = "Hypertext marks in \hologo{LaTeX}: a manual for |hyperref|",
+subtitle = "Extensive support for hypertext in \hologo{LaTeX}",
+author = "Sebastian Rahtz and Heiko Oberdiek",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+eprinttype = "ctan",
+eprint = "hyperref",
+related = "hyperref-1",
+}
+
+@manual{hyperref-1,
+eprinttype = "github",
+eprintclass = "latex3",
+eprint = "hyperref",
+}
+
+@article{graphicx,
+title = "Packages in the \enquote{graphics} bundle",
+subtitle = "Enhanced support for graphics",
+author = "David Carlisle and Sebastian Rahtz",
+date = "1994",
+eprinttype = "ctan",
+eprint = "graphicx",
+}
+
+@article{booktabs,
+title = "The |booktabs| package",
+subtitle = "Publication quality tables in \hologo{LaTeX}",
+author = "Danie Els and Simon Fear",
+date = "1995",
+eprinttype = "ctan",
+eprint = "booktabs",
+}
+
+@article{multirow,
+title = "The |multirow|, |bigstrut| and |bigdelim| packages",
+subtitle = "Create tabular cells spanning multiple rows",
+author = "Piet van Oostrum and Jerry Leichter",
+date = "1994",
+eprinttype = "ctan",
+eprint = "multirow",
+}
+
+@article{fixmath,
+title = "The |fixmath| package for \hologo{LaTeX2e}",
+subtitle = "Make maths comply with ISO 31-0:1992 to ISO 31-13:1992",
+author = "Walter Schmidt",
+date = "2000",
+eprinttype = "ctan",
+eprint = "fixmath",
+}
+
+@article{alphabeta,
+title = "The |alphabeta| package",
+subtitle = "LICR macros and encoding definition files for Greek",
+author = "Günter Milde",
+date = "2013",
+eprinttype = "ctan",
+eprint = "greek-fontenc",
+}
+
+@article{textalpha,
+title = "The |textalpha| package",
+subtitle = "LICR macros and encoding definition files for Greek",
+author = "Günter Milde",
+date = "2010",
+eprinttype = "ctan",
+eprint = "greek-fontenc",
+}
+
+@article{arxiv-collector,
+title = "|arxiv-collector|",
+subtitle = "A little Python script to collect \hologo{LaTeX} sources for upload to the arXiv",
+author = "Dougal Sutherland",
+date = "2018",
+eprinttype = "github",
+eprintclass = "dougalsutherland",
+eprint = "arxiv-collector",
+}
+
+@article{biber,
+title = "\hologo{biber}",
+subtitle = "Backend processor for Bib\hologo{LaTeX}",
+author = "François Charette and Philip Kime",
+date = "2009",
+eprinttype = "github",
+eprintclass = "plk",
+eprint = "biber",
+related = "biber-1",
+}
+
+@manual{biber-1,
+eprinttype = "sourceforge",
+eprint = "biblatex-biber",
+}
+
+@article{lmodern,
+title = "Latin Modern Family of Fonts",
+subtitle = "Latin modern fonts in outline formats",
+date = "2003",
+author = "B. Jackowski and J.M. Nowacki",
+url = "http://gust.org.pl/projects/e-foundry/latin-modern",
+eprinttype = "ctan",
+eprint = "lm",
+}
+
+@article{ifluatex,
+title = "The |ifluatex| package",
+subtitle = "Provides the |\textbackslash ifluatex| switch",
+author = "Heiko Oberdiek",
+collaboration = "\hologo{LaTeX} Team",
+date = "2007",
+eprinttype = "ctan",
+eprint = "ifluatex",
+}
+
+@article{ifxetex,
+title = "The |iftex| package",
+subtitle = "Am I running under \hologo{XeTeX}?",
+collaboration = "\hologo{LaTeX} Team",
+author = "Will Robertson",
+date = "2006",
+eprinttype = "ctan",
+eprint = "ifxetex",
+related = "ifxetex-1",
+}
+
+@manual{ifxetex-1,
+eprinttype = "github",
+eprintclass = "latex3",
+eprint = "iftex",
+}
+
+@article{fontspec,
+title = "The |fontspec| package",
+subtitle = "Advanced font selection in \hologo{XeLaTeX} and \hologo{LuaLaTeX}",
+author = "Will Robertson and Khaled Hosny",
+date = "2004",
+eprinttype = "ctan",
+eprint = "fontspec",
+}
+
+@article{fontenc,
+title = "The |fontenc| package",
+subtitle = "Standard package for selecting font encodings",
+collaboration = "\hologo{LaTeX} Team",
+author = "Frank Mittelbach and Robin Fairbairns and Werner Lemberg",
+date = "1995",
+eprinttype = "ctan",
+eprint = "fontenc",
+}
+
+@article{inputenc,
+title = "The |inputenc| package",
+subtitle = "Accept different input encodings",
+collaboration = "\hologo{LaTeX} Team",
+author = "Frank Mittelbach and Alan Jeffrey",
+date = "1989",
+eprinttype = "ctan",
+eprint = "inputenc",
+}
+
+@article{textcomp,
+title = "The |textcomp| package",
+subtitle = "\hologo{LaTeX} support for the Text Companion fonts",
+collaboration = "\hologo{LaTeX} Team",
+author = "Sebastian Rahtz",
+date = "1995",
+eprinttype = "ctan",
+eprint = "textcomp",
+}
+
+@article{enumitem,
+title = "Customizing lists with the |enumitem| package",
+subtitle = "Control layout of itemize, enumerate, description",
+author = "Javier Bezos",
+date = "2003",
+url = "https://texnia.com/enumitem.html",
+eprinttype = "ctan",
+eprint = "enumitem",
+related = "enumitem-1",
+}
+
+@manual{enumitem-1,
+eprinttype = "github",
+eprintclass = "jbezos",
+eprint = "enumitem",
+}
+
+@article{atbegshi,
+title = "The |atbegshi| package",
+subtitle = "Execute stuff at |shipout| time",
+author = "Heiko Oberdiek",
+date = "2007",
+eprinttype = "ctan",
+eprint = "atbegshi",
+related = "atbegshi-1",
+}
+
+@manual{atbegshi-1,
+eprinttype = "github",
+eprintclass = "ho-tex",
+eprint = "atbegshi",
+}
+
+@article{picture,
+title = "The |picture| package",
+subtitle = "Dimens for picture macros",
+author = "Heiko Oberdiek",
+date = "2006",
+eprinttype = "ctan",
+eprint = "picture",
+related = "picture-1",
+}
+
+@manual{picture-1,
+eprinttype = "github",
+eprintclass = "ho-tex",
+eprint = "picture",
+}
+
+@article{varwidth,
+title = "The |varwidth| package",
+subtitle = "A variable-width minipage",
+author = "Donald Arseneau",
+date = "2003",
+eprinttype = "ctan",
+eprint = "varwidth",
+}
+
+@article{csquotes,
+title = "The |csquotes| Package",
+subtitle = "Context sensitive quotation facilities",
+author = "Philipp Lehman and Joseph Wright",
+date = "2003",
+eprinttype = "ctan",
+eprint = "csquotes",
+}
+
+@article{babel,
+title = "|Babel| Localization and internationalization",
+subtitle = "Multilingual support for Plain \hologo{TeX} or \hologo{LaTeX}",
+author = "Johannes Braams and Javier Bezos and at al.",
+date = "1989",
+eprinttype = "ctan",
+eprint = "babel",
+related = "babel-1",
+}
+
+@manual{babel-1,
+eprinttype = "github",
+eprintclass = "latex3",
+eprint = "babel",
+}
+
+@article{polyglossia,
+title = "The |polyglossia| package",
+author = "Arthur Reutenauer and François Charette and Elie Roux and Bastien Roucariès and Jürgen Spitzmüller",
+eprinttype = "ctan",
+eprint = "polyglossia",
+}
+
+@article{parskip,
+title = "The |parskip| package",
+subtitle = "Layout with zero |\textbackslash parindent|, non-zero |\textbackslash parskip|",
+author = "Robin Fairbairns and Frank Mittelbach and H. Partl",
+date = "1989",
+eprinttype = "ctan",
+eprint = "parskip",
+related = "parskip-1",
+}
+
+@manual{parskip-1,
+eprinttype = "github",
+eprintclass = "FrankMittelbach",
+eprint = "fmitex",
+}
+
+
+@article{fntguide,
+title = "\hologo{LaTeX2e}\ font selection",
+subtitle = "Docmentation of \hologo{LaTeX} font commands",
+collaboration = "\hologo{LaTeX} Team",
+date = "1995",
+eprinttype = "ctan",
+eprint = "fntguide",
+}
+
+@article{euenc,
+title = "The Experimental Unicode `EUx’ Encodings",
+author = "Will Robertson and Elie Roux and Khaled Hosny",
+eprinttype = "ctan",
+eprint = "euenc",
+}
+
+@article{soul,
+title = "The |soul| package",
+subtitle = "Hyphenation for letterspacing, underlining, and more",
+author = "Melchior Franz",
+date = "1998",
+eprinttype = "ctan",
+eprint = "soul",
+}
+
+@article{ulem,
+title = "The |ulem| package",
+subtitle = "Package for underlining",
+author = "Donald Arseneau",
+date = "1989",
+eprinttype = "ctan",
+eprint = "ulem",
+}
+
+@article{glossaries,
+title = "The |glossaries| package",
+subtitle = "Create glossaries and lists of acronyms",
+author = "Nicola Talbot",
+date = "2007",
+eprinttype = "ctan",
+eprint = "glossaries",
+}
+
+@article{glossaries-extra,
+title = "The |glossaries-extra| package",
+subtitle = "An extension to the |glossaries| package",
+author = "Dickimaw Books, Nicola Talbot",
+date = "2015",
+eprinttype = "ctan",
+eprint = "glossaries-extra",
+}
+
+@article{xparse,
+title = "The |xparse| package",
+subtitle = "A generic document command parser",
+author = "Frank Mittelbach and Chris Rowley and David Carlisle",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1999",
+eprinttype = "ctan",
+eprint = "xparse",
+}
+
+@article{pdftexcmds,
+title = "The |pdftexcmds| package",
+subtitle = "\hologo{LuaTeX} support for \hologo{pdfTeX} utility functions",
+author = "Heiko Oberdiek",
+date = "2007",
+eprinttype = "ctan",
+eprint = "pdftexcmds",
+}
+
+@article{fix-cm,
+title = "The |fix-cm| package",
+subtitle = "Permit Computer Modern fonts at arbitrary sizes",
+author = "Frank Mittelbach and David Carlisle and Chris Rowley and Walter Schmidt",
+date = "1993",
+eprinttype = "ctan",
+eprint = "fix-cm",
+}
+
+@article{revtex,
+title = "The REV\hologo{TeX} class",
+subtitle = "Styles for various Physics Journals",
+author = "Mark Doyle and Arthur Ogawa",
+collaboration = "American Physical Society",
+date = "1999",
+url = "https://journals.aps.org/revtex",
+eprinttype = "ctan",
+eprint = "revtex",
+}
+
+@article{encguide,
+title = "\hologo{LaTeX} font encodings",
+subtitle = "Documentation of \hologo{LaTeX} font encodings",
+author = "Frank Mittelbach and Robin Fairbairns and Werner Lemberg",
+collaboration = "\hologo{LaTeX3} Project Team",
+date = "1995",
+eprinttype = "ctan",
+eprint = "encguide",
+}
+
+@article{sfmath,
+title = "The |sfmath| package",
+subtitle = "Sans-serif mathematics",
+author = "Olaf Dietrich",
+date = "2005",
+url = "https://dtrx.de/od/tex/sfmath",
+eprinttype = "ctan",
+eprint = "sfmath",
+}
+
+@article{relsize,
+title = "The |relsize| package",
+subtitle = "Set the font size relative to the current font size",
+author = "Donald Arseneau and Matt Swift",
+date = "2011",
+eprinttype = "ctan",
+eprint = "relsize",
+}
+
+@article{everyhook,
+title = "The |everyhook| package",
+subtitle = "Hooks for standard \hologo{TeX} token lists",
+author = "Stephen Checkoway",
+date = "2010",
+eprinttype = "ctan",
+eprint = "everyhook",
+}
+
+
+@article{sansmathfonts,
+title = "The |sansmathfonts| package",
+subtitle = "Correct placement of accents in sans-serif maths",
+author = "Ariel Barton",
+date = "2013",
+eprinttype = "ctan",
+eprint = "sansmathfonts",
+}
+
+@article{xspace,
+title = "The |xspace| package",
+subtitle = "Define commands that appear not to eat spaces",
+author = "David Carlisle and Morten Høgholm",
+collaboration = "\hologo{LaTeX} Team",
+date = "1993",
+eprinttype = "ctan",
+eprint = "xspace",
+}
+
+@article{ragged2e,
+title = "The |ragged2e|-package",
+subtitle = "Alternative versions of \enquote{ragged}-type commands",
+author = "Martin Schröder",
+date = "1996",
+eprinttype = "ctan",
+eprint = "ragged2e",
+related = "ragged2e-1",
+}
+
+@manual{ragged2e-1,
+eprinttype = "gitlab",
+eprintclass = "hagenbuch",
+eprint = "ragged2e",
+}
+
+@article{url,
+title = "The |url| package",
+subtitle = "Verbatim with URL-sensitive line breaks",
+author = "Donald Arseneau",
+date = "1996",
+eprinttype = "ctan",
+eprint = "url",
+}
+
+@article{jhep,
+title = "The |JHEP| package",
+collaboration = "SISSA Medialab",
+date = "1997",
+url = "https://jhep.sissa.it/jhep/help/JHEP_TeXclass.jsp",
+}
+
+@article{jcap,
+title = "The |JCAP| package",
+collaboration = "SISSA Medialab",
+date = "2002",
+url = "https://jcap.sissa.it/jcap/help/JCAP_TeXclass.jsp",
+}
+
+@article{bbm-macros,
+title = "A package for using the |bbm| fonts in math environment",
+author = "Torsten Hilbrich",
+date = "1994",
+eprinttype = "ctan",
+eprint = "bbm-macros",
+related = "bbm"
+}
+
+@article{bbm,
+title = "|bbm|",
+subtitle = "\enquote{Blackboard-style} cm fonts",
+author = "Gilles Robert",
+date = "1993",
+eprinttype = "ctan",
+eprint = "bbm",
+}
+
+@article{arxiv,
+title = "arXiv",
+subtitle = "free distribution service and an open archive for scholarly articles",
+url = "https://arxiv.org",
+author = "Paul Ginsparg",
+collaboration = "arXiv Team",
+year = "1991",
+organization = "Cornell University",
+}
+
+@article{dsfont,
+title = "The |doublestroke| font",
+subtitle = "Typeset mathematical double stroke symbols",
+author = "Olaf Kummer",
+date = "1995",
+eprinttype = "ctan",
+eprint = "doublestroke",
+}
+
+@article{mleftright,
+title = "The |mleftright| package",
+subtitle = "Variants of delimiters that act as maths open/close",
+author = "Heiko Oberdiek",
+date = "2010",
+eprinttype = "ctan",
+eprint = "mleftright",
+}
+
+@article{urwchancal,
+title = "A virtual font for URW Chancery Math",
+subtitle = "Use URW's clone of Zapf Chancery as a maths alphabet",
+author = "Michael Sharpe",
+date = "2011",
+eprinttype = "ctan",
+eprint = "urwchancal",
+}
+
+@article{footnotebackref,
+title = "The |footnotebackref| package",
+subtitle = "Back-references from footnotes",
+author = "Holger Lange",
+date = "2012",
+eprinttype = "ctan",
+eprint = "footnotebackref",
+}
+
+@article{cancel,
+title = "The |cancel| package",
+subtitle = "Place lines through maths formulae",
+author = "Donald Arseneau",
+date = "2013",
+eprinttype = "ctan",
+eprint = "cancel",
+}
+
+@article{beamer,
+title = "The |beamer| class",
+subtitle = "A \hologo{LaTeX} class for producing presentations and slides",
+author = "Till Tantau and Joseph Wright and Vedran Miletić",
+date = "2003",
+eprinttype = "ctan",
+eprint = "beamer",
+related = "beamer-1",
+}
+
+@manual{beamer-1,
+eprinttype = "github",
+eprintclass = "josephwright",
+eprint = "beamer",
+}
+
+@article{exscale,
+title = "The |exscale| package",
+subtitle = "Implements scaling of the \enquote{cmex} fonts",
+author = "Frank Mittelbach and Rainer Schöpf",
+date = "1993",
+eprinttype = "ctan",
+eprint = "exscale",
+}
+
+@article{mathrsfs,
+title = "The |mathrsfs| package",
+subtitle = "Support for using RSFS fonts in maths",
+author = "Jörg Knappen",
+date = "1995",
+eprinttype = "ctan",
+eprint = "mathrsfs",
+}
+
+@article{esint,
+title = "The |esint| package",
+subtitle = "Extended set of integrals for Computer Modern",
+author = "Eddie Saudrais",
+date = "2005",
+eprinttype = "ctan",
+eprint = "esint",
+}
+
+@article{cmbright,
+title = "The |cmbright| package",
+subtitle = "Using the CM Bright typeface with \hologo{LaTeX}",
+author = "Walter A. Schmidt",
+date = "1996",
+eprinttype = "ctan",
+eprint = "cmbright",
+}
+
+@article{titling,
+title = "The |titling| package",
+subtitle = "Control over the typesetting of the |\textbackslash maketitle| command",
+author = "Peter R. Wilson",
+date = "2000",
+eprinttype = "ctan",
+eprint = "titling",
+}
+
+@article{MnSymbol,
+title = "The |MnSymbol| package",
+subtitle = "Mathematical symbol font for Adobe MinionPro",
+author = "Achim Blumensath",
+date = "2005",
+eprinttype = "ctan",
+eprint = "MnSymbol",
+}
+
+@article{environ,
+title = "The |environ| package",
+subtitle = "A new interface for environments in \hologo{LaTeX}",
+author = "Will Robertson",
+date = "2007",
+eprinttype = "ctan",
+eprint = "environ",
+}
+
+@article{abstract,
+title = "The |abstract| package",
+subtitle = "Control the typesetting of the abstract environment",
+author = "Peter R. Wilson",
+date = "2000",
+eprinttype = "ctan",
+eprint = "abstract",
+}
+
+@article{cfr-lm,
+title = "The |cfr-lm| package",
+subtitle = "Enhanced support for the Latin Modern fonts",
+author = "Clea F. Rees",
+date = "2008",
+eprinttype = "ctan",
+eprint = "cfr-lm",
+}
+
+@article{etoolbox,
+title = "The |etoolbox| package",
+subtitle = "e-\hologo{TeX} tools for \hologo{LaTeX}",
+author = "Philipp Lehman and Joseph Wright",
+date = "2007",
+eprinttype = "ctan",
+eprint = "etoolbox",
+}
+
+@article{substitutefont,
+title = "The |substitutefont| package",
+subtitle = "Easy font substitution",
+author = "Günter Milde",
+date = "2010",
+eprinttype = "ctan",
+eprint = "substitutefont",
+}
+
+@article{svjour,
+title = "The |svjour| package",
+subtitle = "Macros for Springer journals",
+collaboration = "Springer Verlag",
+date = "1997",
+eprinttype = "ctan",
+eprint = "springer",
+}
+
+@article{cm,
+title = "Computer Modern fonts",
+author = "Donald E. Knuth",
+date = "1986",
+eprinttype = "ctan",
+eprint = "cm",
+}
+
+@article{subdepth,
+title = "The |subdepth| package",
+subtitle = "Unify maths subscript height",
+author = "Will Robertson",
+date = "2007",
+eprinttype = "ctan",
+eprint = "subdepth",
+}
+
+@article{xpatch,
+title = "The |xpatch| package",
+subtitle = "Extending etoolbox patching commands",
+author = "Enrico Gregorio",
+date = "2012",
+eprinttype = "ctan",
+eprint = "xpatch",
+}
+
+@article{hfoldsty,
+title = "The |hfoldsty| package",
+subtitle = "Old style numerals with EC fonts",
+author = "Harald Harders",
+date = "2004",
+eprinttype = "ctan",
+eprint = "hfoldsty",
+}
+
+@article{slantsc,
+title = "The |slantsc| package",
+subtitle = "Access different-shaped small-caps fonts",
+author = "Harald Harders",
+date = "2003",
+eprinttype = "ctan",
+eprint = "slantsc",
+}
+
+@article{nfssext-cfr,
+title = "The |nfssext-cfr| package",
+subtitle = "Extensions to the \hologo{LaTeX} NFSS",
+author = "Clea F. Rees and Philipp Lehman",
+date = "2003",
+eprinttype = "ctan",
+eprint = "nfssext-cfr",
+}
+
+@article{xstring,
+title = "The |xstring| package",
+subtitle = "String manipulation for \hologo{LaTeX}",
+author = "Christian Tellechea",
+date = "2008",
+eprinttype = "ctan",
+eprint = "xstring",
+}
+
+@article{gregorio:2020,
+title = "\hologo{TeX}, \hologo{LaTeX} and math",
+author = "Enrico Gregorio",
+date = "2020",
+url = "https://latex-project.org/publications/2020-egreg-TUB-tb127gregorio-math.pdf",
+}
+
+@article{soulutf8,
+title = "The |soulutf8| package",
+subtitle = "Permit use of UTF-8 characters in |soul|",
+author = "Heiko Oberdiek",
+date = "2007",
+eprinttype = "ctan",
+eprint = "soulutf8",
+}
+
+@article{moderncv,
+title = "The |moderncv| package",
+subtitle = "A modern curriculum vitae class",
+author = "Xavier Danaux",
+year = "2006",
+eprinttype = "ctan",
+eprint = "moderncv",
+related = "moderncv-1",
+}
+
+@article{anyfontsize,
+title = "The |anyfontsize| package",
+subtitle = "Select any font size in \hologo{LaTeX}",
+author = "Péter Szabó",
+date = "2007",
+eprinttype = "ctan",
+eprint = "anyfontsize",
+}
+
+@article{array,
+title = "A new implementation of \hologo{LaTeX}’s |tabular| and |array| environment",
+subtitle = "Extending the |array| and |tabular| environments",
+author = "Frank Mittelbach, David Carlisle",
+collaboration= "\hologo{LaTeX} Team",
+year = "1993",
+eprinttype = "ctan",
+eprint = "array",
+}
+
+@article{dashrule,
+title = "The |dashrule| package",
+subtitle = "Draw dashed rules",
+author = "Scott Pakin",
+date = "2008",
+eprinttype = "ctan",
+eprint = "dashrule",
+}
+
+@article{fancyhdr,
+title = "The |fancyhdr| and |extramarks| packages",
+subtitle = "Extensive control of page headers and footers in \hologo{LaTeX2e}",
+author = "Piet van Oostrum",
+date = "1994",
+eprinttype = "ctan",
+eprint = "fancyhdr",
+}
+
+@article{lastpage,
+title = "The |lastpage| package",
+subtitle = "Reference last page for Page $N$ of $M$ type footers",
+author = "Hans-Martin Münch and Jeffrey Goldberg",
+date = "1994",
+eprinttype = "ctan",
+eprint = "lastpage",
+}
+
+@article{textpos,
+title = "|Textpos|: absolute positioning of text on the page",
+subtitle = "Place boxes at arbitrary positions on the \hologo{LaTeX} page",
+author = "Norman Gray",
+date = "1999",
+eprinttype = "ctan",
+eprint = "textpos",
+related = "textpos-1",
+}
+
+@manual{textpos-1,
+eprinttype = "bitbucket",
+eprintclass = "nxg",
+eprint = "textpos",
+}
+
+@article{subfiles,
+title = "The |subfiles| package: A Document Class and a Package for Handling Multi-File Projects",
+subtitle = "Individual typesetting of subfiles of a \enquote{main} document",
+author = "Federico Garcia and Gernot Salzer",
+date = "2002",
+eprinttype = "ctan",
+eprint = "subfiles",
+related = "subfiles-1",
+}
+
+@manual{subfiles-1,
+eprinttype = "github",
+eprintclass = "gsalzer",
+eprint = "subfiles",
+}
+
+@article{titlesec,
+title = "The |titlesec|, |titleps| and |titletoc| packages",
+subtitle = "Select alternative section titles",
+author = "Javier Bezos",
+year = "1998",
+eprinttype = "ctan",
+eprint = "titlesec",
+related = "titlesec-1",
+}
+
+@manual{titlesec-1,
+eprinttype = "github",
+eprintclass = "jbezos",
+eprint = "titlesec",
+}
+
+@article{calc,
+title = "The |calc| package",
+subtitle = "Simple arithmetic in \hologo{LaTeX} commands",
+author = "Kresten Krab Thorup and Frank Jensen",
+collaboration = "\hologo{LaTeX3} Project",
+year = "1992",
+eprinttype = "ctan",
+eprint = "calc",
+}
+
+@article{tabulary,
+title = "The |tabulary| package",
+subtitle = "Tabular with variable width columns balanced",
+author = "David Carlisle",
+year = "1995",
+eprinttype = "ctan",
+eprint = "tabulary",
+}
+
+@article{xcolor,
+title = "The |xcolor| package",
+subtitle = "Driver-independent color extensions for \hologo{LaTeX} and \hologo{pdfLaTeX}",
+author = "Uwe Kern",
+collaboration = "\hologo{LaTeX} Project",
+year = "2003",
+eprinttype = "ctan",
+eprint = "xcolor",
+}
+
+@article{overlays,
+title = "The |overlays| package",
+subtitle = "Incremental slides",
+author = "Andreas Nolda",
+year = "2016",
+eprinttype = "ctan",
+eprint = "overlays",
+}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-graphic/hep-graphic-documentation.pdf b/macros/latex/contrib/hep-graphic/hep-graphic-documentation.pdf
new file mode 100644
index 0000000000..8c40b98f25
--- /dev/null
+++ b/macros/latex/contrib/hep-graphic/hep-graphic-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-graphic/hep-graphic-implementation.dtx b/macros/latex/contrib/hep-graphic/hep-graphic-implementation.dtx
new file mode 100644
index 0000000000..cb1a41e4c2
--- /dev/null
+++ b/macros/latex/contrib/hep-graphic/hep-graphic-implementation.dtx
@@ -0,0 +1,559 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2023 by Jan Hajer
+% -----------------------------------
+%
+% This file may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% \fi
+%
+% \iffalse
+%
+%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<package>\ProvidesPackage{hep-graphic}[2023/07/01 v1.0 Graphics in High Energy Physics]
+%<plot>\ProvidesPackage{hep-plot}[2023/07/01 v1.0 Plots in High Energy Physics]
+%<feynman>\ProvidesPackage{hep-feynman}[2023/07/01 v1.0 Feynman diagrams in High Energy Physics]
+%<documentation>\ProvidesFile{hep-graphic-documentation.tex}[2023/07/01 v1.0 HEP-graphic documentation]
+%
+%<*documentation>
+%
+\RequirePackage[l2tabu, orthodox]{nag}
+\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
+\AtBeginDocument{\DeleteShortVerb{\|}}
+\AtBeginDocument{\MakeShortVerb{\"}}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+
+\usepackage{hologo}
+
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
+\bibliography{bibliography}
+%</documentation>
+
+%<*driver>
+\expandafter\newif\csname ifshort\endcsname
+\shortfalse
+\begin{document}
+\DocInput{hep-graphic-implementation.dtx}
+\end{document}
+%</driver>
+%
+% \fi
+%
+% \CheckSum{0}
+%
+% \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
+% Lower-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
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+% \ifshort
+%<*documentation>
+% \fi
+%
+\GetFileInfo{hep-graphic.sty}
+
+% \title{The \software{hep-graphic} package\thanks{This document corresponds to \software{hep-graphic}~\fileversion.}}
+\title{The \software{hep-graphic} package\thanks{This document corresponds to \software{hep-graphic}~v1.0.}}
+\subtitle{Plot macros}
+\author{Jan Hajer \email{jan.hajer@tecnico.ulisboa.pt}}
+% \date{\filedate}
+\date{2023/07/01}
+
+% \ifshort
+\begin{document}
+% \fi
+
+\newgeometry{vscale=.8, vmarginratio=3:4, includeheadfoot, left=11em, marginparwidth=4.6cm, marginparsep=3mm, right=7em}
+
+\maketitle
+
+\begin{abstract}
+The \software{hep-graphic} is a convenience wrapper for the \software{pgf/tikz}, \software{pgfplots}, and \software{standalone} packages.
+\end{abstract}
+
+\section{Graphic}
+
+After loading the "hep-graphic" package the \software{pgf/tikz} \cite{pgf} and \software{standalone} \cite{standalone} packages are loaded and externalisation is activated.
+The "plot" and "feynman" options load the neccessary packages for plotting and feynman diagrams.
+The macro "\includetikz"\oarg{width}\marg{name} loads "tikz" pictures.
+
+\subsection{Plot}
+
+The \software{hep-plot} package loads the \software{pgfplots} package \cite{pgfplots} and applies some optimisation.
+
+\subsection{Feynman}
+
+The \software{hep-feynman} package loads the \software{tikz-feynman} package \cite{tikz-feynman} and applies some optimisation.
+
+% \ifshort
+\printbibliography
+
+\end{document}
+%
+%</documentation>
+% \fi
+%
+% \StopEventually{
+% \printbibliography
+% \PrintChanges
+% }
+%
+% \appendix
+%
+% \section{Implementation}
+%
+% \subsection{Graphic}
+%
+%<*package>
+%
+% Define a hepgraphic namespace for the options using the \software{kvoptions} package \cite{kvoptions}.
+% \begin{macrocode}
+\RequirePackage{kvoptions}
+\SetupKeyvalOptions{
+ family=hepgraphic,
+ prefix=hepgraphic@
+}
+% \end{macrocode}
+%
+% \begin{macro}{plot}
+% Define the "plot" switch for loading plot code.
+% \begin{macrocode}
+\DeclareBoolOption[false]{plot}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{feynman}
+% Define the "feynman" switch for loading feynman code.
+% \begin{macrocode}
+\DeclareBoolOption[false]{feynman}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\ProcessKeyvalOptions*
+% \end{macrocode}
+%
+% Load the \software{hep-plot} and \software{hep-feynman} packages when required.
+% \begin{macrocode}
+\ifhepgraphic@plot\RequirePackage{hep-plot}\fi
+\ifhepgraphic@feynman\RequirePackage{hep-feynman}\fi
+% \end{macrocode}
+%
+% Load the \software{tikz} package with the \software{external} library \cite{pgf}.
+% \begin{macrocode}
+\RequirePackage{tikz}
+\usetikzlibrary{external}
+\tikzexternalize[
+ optimize=false,
+ only named=true,
+]
+% \end{macrocode}
+%
+% \begin{macro}{\graphicpath}
+% Load the \software{standalone} package \cite{standalone} and define the "\graphicpath" pointing to the folder with "pgf" files.
+% \begin{macrocode}
+\RequirePackage{standalone}
+\def\hep@graphic@path{.}
+\newcommand{\graphicpath}[1]{\def\hep@graphic@path{#1}}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\includetikz}
+% Define a macro to include "tikz" figures using the \software{xparse} package \cite{xparse}.
+% \begin{macrocode}
+\RequirePackage{xparse}
+\NewDocumentCommand{\includetikz}{sO{1}m}{%
+ \tikzsetnextfilename{#3}%
+ \IfBooleanTF{#1}{%
+ \includestandalone{\hep@graphic@path/#3}%
+ }{%
+ \linewidth=#2\linewidth
+ \includestandalone[width=\linewidth]{\hep@graphic@path/#3}%
+ }%
+}
+\newcommand{\includefeynman}[1]{%
+ \vcenter{\hbox{\includestandalone{\hep@graphic@path/#1}}}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%</package>
+%
+% \subsection{Plots}
+%
+%<*plot>
+%
+% Load the \software{pgf/tikz} package \cite{pgf}.
+% \begin{macrocode}
+\RequirePackage{tikz}
+% \end{macrocode}
+%
+% \begin{macro}{dashdotdotdotted}
+% \begin{macro}{dashdotdotdotdotted}
+% Add new line styles.
+% \begin{macrocode}
+\tikzset{
+ dashdotdotdotted/.style={dash pattern=on 3pt off 2pt
+ on \the\pgflinewidth off 2pt on \the\pgflinewidth off 2pt
+ on \the\pgflinewidth off 2pt
+ },
+ dashdotdotdotdotted/.style={dash pattern=on 3pt off 2pt
+ on \the\pgflinewidth off 2pt on \the\pgflinewidth off 2pt
+ on \the\pgflinewidth off 2pt on \the\pgflinewidth off 2pt
+ },
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% Change thousand separator
+% \begin{macrocode}
+\pgfkeys{/pgf/number format/.cd,1000 sep={\,}}%
+% \end{macrocode}
+%
+% Load the \software{pgfplots} package \cite{pgfplots} and set global options.
+% \begin{macrocode}
+\RequirePackage{pgfplots}
+\pgfplotsset{
+ compat=newest,
+ width=\linewidth,
+ height=\linewidth,
+ enlargelimits=false,
+}
+% \end{macrocode}
+%
+% Fix glitch.
+% \begin{macrocode}
+\pgfplotsset{
+ every y tick scale label/.append style={
+ inner sep=1pt,
+ xshift=-1pt,
+ yshift=-1pt,
+ },
+}
+% \end{macrocode}
+%
+% Set default font size
+% \begin{macrocode}
+\pgfplotsset{
+ legend style={font=\footnotesize},
+ tick label style={font=\footnotesize},
+ label style={font=\small},
+ title style={font=\small},
+ max space between ticks=30,
+}
+% \end{macrocode}
+% \begin{macro}{three panels}
+% Set font size three panel versions
+% \begin{macrocode}
+\pgfplotsset{
+ three panels/.style={
+ legend style={font=\scriptsize},
+ tick label style={font=\scriptsize},
+ label style={font=\footnotesize},
+ title style={font=\footnotesize},
+ max space between ticks=25,
+ /tikz/mark size=1.5pt,
+ major tick length=1mm,
+ minor tick length=0.66mm,
+ every axis title shift=0pt,
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{colors}
+% \begin{macro}{line styles}
+% \begin{macro}{marks}
+% \begin{macro}{horizontal marks}
+% \begin{macro}{vertical marks}
+% Create cycle lists
+% \begin{macrocode}
+\colorlet{darkgreen}{green!50!black}
+\pgfplotscreateplotcyclelist{colors}{
+ blue, red, darkgreen, violet, orange, yellow!25!orange,
+ brown, black
+}
+\pgfplotscreateplotcyclelist{line styles}{
+ solid, dashed, {densely dotted, semithick}, dashdotted,
+ dashdotdotted, dashdotdotdotted, dashdotdotdotdotted
+}
+\pgfplotscreateplotcyclelist{marks}{
+ -, |, Mercedes star flipped, Mercedes star, +, x, star,
+ asterisk, 10-pointed star
+}
+\pgfplotscreateplotcyclelist{vertical marks}{
+ |, Mercedes star flipped, Mercedes star, x, star,
+ asterisk, 10-pointed star
+}
+\pgfplotscreateplotcyclelist{horizontal marks}{
+ -, Mercedes star flipped, Mercedes star, x, star, %asterisk,
+ 10-pointed star
+}
+\pgfplotsset{
+ cycle multiindex* list={colors\nextlist line styles},
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\cyclelistshift}
+% Define the "\cyclelistshift" macro skiping one step in a cyclelist.
+% Must be used in combination with "\setcounter{cyclelistshift}{0}".
+% \begin{macrocode}
+\newcounter{cyclelistshift}
+\newcommand\cyclelistshift{
+ \globaldefs=1\relax
+% \stepcounter{cyclelistshift}
+ \addtocounter{cyclelistshift}{1}
+ \pgfplotsset{cycle list shift=\value{cyclelistshift}}
+ \globaldefs=0\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{legend}
+% Set the legend style.
+% \begin{macrocode}
+\pgfplotsset{
+ legend cell align=left,
+ legend style={
+ at={(1,1)},
+ anchor=north east,
+ inner sep=1pt,
+ outer sep=6pt,
+ draw=none,
+ fill opacity=.9,
+ draw opacity=1,
+ text opacity=1,
+ cells={align=left},
+ /tikz/every even column/.append style={column sep=.5em},
+% fill=none,
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{contour legend}
+% Define basic contour legend
+% \begin{macrocode}
+\pgfplotsset{
+ contour legend/.style={
+ contour prepared={labels=false},
+ colorbar sampled line,
+ colorbar style={
+ mark size=7pt,
+ mark options={semithick},
+ tickwidth=0pt,
+ subtickwidth=0pt,
+ },
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{contour legend x}
+% Define horizontal contour legend.
+% \begin{macrocode}
+\usepgfplotslibrary{colormaps}
+\pgfplotsset{
+ contour legend x/.style={
+ colorbar horizontal,
+ colormap/jet,
+ contour legend,
+ colorbar style={
+ at={(0.5,1.025)},
+ anchor=south,
+ mark=|,
+ axis x line*=top,
+ axis y line=none,
+ xticklabel pos=upper,
+ title style={
+ at={(-0.05,1)},
+ anchor=east,
+ },
+ xlabel style={
+ at={(-0.06,1)},
+ anchor=south east,
+ },
+ },
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{contour legend y}
+% Define vertical contour legend.
+% \begin{macrocode}
+\pgfplotsset{
+ contour legend y/.style={
+ contour legend,
+ colorbar style={
+ at={(1.025,0.5)},
+ anchor=west,
+ mark=-,
+ axis x line=none,
+ title style={
+ at={(1,-0.1)},
+ anchor=north west,
+ },
+ },
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{contour plot x}
+% \begin{macro}{contour plot y}
+% Define vertical contour legend.
+% \begin{macrocode}
+\pgfplotsset{
+ contour plot x/.style={
+ contour legend x,
+ contour prepared={labels=false},
+ },
+ contour plot y/.style={
+ contour legend y,
+ contour prepared={labels=false},
+ },
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{error legend}
+% Define error legend.
+% \begin{macrocode}
+\pgfplotsset{
+ error legend/.style n args={3}{
+ legend image code/.code={
+ \draw[draw=none,fill=#1,#3](0mm,-1mm)rectangle(6mm,1mm);
+ \draw[draw=#1,#2] (0mm,0mm)--(6mm,0mm);
+ }
+ },
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\addlegendtitle}
+% Define a legend title macro.
+% \begin{macrocode}
+\newcommand{\addlegendtitle}[2][]{
+ \addlegendimage{empty legend}
+ \addlegendentry[#1]{\hspace{-7mm}#2}
+}%
+% \end{macrocode}
+% \end{macro}
+%
+%</plot>
+%
+% \subsection{Feynman graphs}
+%
+%<*feynman>
+%
+% Load \software{tikz-feynman} package \cite{tikz-feynman} to enable the drawing of Feynman diagrams.
+% Deactivate warning
+% \begin{macrocode}
+\RequirePackage{tikz-feynman}
+\tikzfeynmanset{
+ compat=1.1.0,
+ warn luatex=false,
+}
+\makeatletter\def\tikzfeynman@luatex@required@path{}\makeatother
+% \end{macrocode}
+%
+% Redfine the arrow style
+% \begin{macrocode}
+\tikzfeynmanset{
+ with arrow/.style={%
+ decoration={markings,mark=at position#1with\arrow{>}},
+ postaction=decorate
+ },
+ with reversed arrow/.style={%
+ decoration={markings,mark=at position#1with\arrow{<}},
+ postaction=decorate
+ },
+ momentum/arrow style={->},
+}
+% \end{macrocode}
+%
+%</feynman>
+%
+% \section{Tests}
+%
+%<*test>
+%
+% \begin{macrocode}
+\documentclass{article}
+
+\usepackage{hep-graphic}
+
+\begin{document}
+
+\end{document}
+% \end{macrocode}
+%
+%</test>
+%
+% \section{Readme}
+%
+%<*readme>
+%
+% \begin{macrocode}
+# The `hep-graphic` package
+
+A `LaTeX` package for publications in High Energy Physics.
+
+## Introduction
+
+...
+
+## Author
+
+Jan Hajer
+
+## License
+
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
+% \end{macrocode}
+%
+%</readme>
+%
+% \Finale
+
+\endinput
+
+% \PrintIndex
+% makeindex -s gglo.ist -o hep-graphic-implementation.gls hep-graphic-implementation.glo
+% makeindex -s gglo.ist -o hep-graphic-implementation.ind hep-graphic-implementation.idx
diff --git a/macros/latex/contrib/hep-graphic/hep-graphic-implementation.pdf b/macros/latex/contrib/hep-graphic/hep-graphic-implementation.pdf
new file mode 100644
index 0000000000..259d814a68
--- /dev/null
+++ b/macros/latex/contrib/hep-graphic/hep-graphic-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-graphic/hep-graphic.ins b/macros/latex/contrib/hep-graphic/hep-graphic.ins
new file mode 100644
index 0000000000..5291b44843
--- /dev/null
+++ b/macros/latex/contrib/hep-graphic/hep-graphic.ins
@@ -0,0 +1,51 @@
+%% Copyright (C) 2019-2023 by Jan Hajer
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3c or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+
+\input docstrip.tex
+\keepsilent
+\usedir{tex/latex/hep-graphic}
+
+\preamble
+This is a generated file.
+Copyright (C) 2019-2023 by Jan Hajer
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3c of this license or (at your option) any later
+version. The latest version of this license is in:
+http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
+\endpreamble
+
+\generate{
+ \file{hep-graphic-documentation.tex}{\from{hep-graphic-implementation.dtx}{documentation}}
+ \file{hep-graphic.sty}{\from{hep-graphic-implementation.dtx}{package}}
+ \file{hep-plot.sty}{\from{hep-graphic-implementation.dtx}{plot}}
+ \file{hep-feynman.sty}{\from{hep-graphic-implementation.dtx}{feynman}}
+ \file{hep-graphic-test.tex}{\from{hep-graphic-implementation.dtx}{test}}
+ \nopreamble\nopostamble\file{README-hep-graphic.md}{\from{hep-graphic-implementation.dtx}{readme}}
+}
+
+\Msg{*********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space hep-graphic.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file}
+\Msg{* hep-graphic-documentation.dtx through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*********************************************************}
+
+\endbatchfile
diff --git a/macros/latex/contrib/hep-graphic/license.md b/macros/latex/contrib/hep-graphic/license.md
new file mode 100644
index 0000000000..494f58131f
--- /dev/null
+++ b/macros/latex/contrib/hep-graphic/license.md
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
diff --git a/macros/latex/contrib/hep-math/README.md b/macros/latex/contrib/hep-math/README.md
index 6e94fa4a7f..68f23faf0d 100644
--- a/macros/latex/contrib/hep-math/README.md
+++ b/macros/latex/contrib/hep-math/README.md
@@ -6,7 +6,8 @@ Extended math macros
## Introduction
-The `hep-math` package provides some additional features beyond the `mathtools` and `amsmath` packages.
+The `hep-math` package provides some additional features beyond the
+`mathtools` and `amsmath` packages.
To use the package place `\usepackage{hep-math}` in the preamble.
@@ -16,6 +17,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/hep-math/bibliography.bib b/macros/latex/contrib/hep-math/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/hep-math/bibliography.bib
+++ b/macros/latex/contrib/hep-math/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-math/hep-math-documentation.pdf b/macros/latex/contrib/hep-math/hep-math-documentation.pdf
index 2d2e68648d..06ad1299ca 100644
--- a/macros/latex/contrib/hep-math/hep-math-documentation.pdf
+++ b/macros/latex/contrib/hep-math/hep-math-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-math/hep-math-implementation.dtx b/macros/latex/contrib/hep-math/hep-math-implementation.dtx
index 26b9c0ea5b..9c4284081b 100644
--- a/macros/latex/contrib/hep-math/hep-math-implementation.dtx
+++ b/macros/latex/contrib/hep-math/hep-math-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,23 +18,28 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-math}[2022/11/01 v1.1 Math and physics macros]
-%<documentation>\ProvidesFile{hep-math-documentation.tex}[2022/11/01 v1.1 hep-math documentation]
+%<package>\ProvidesPackage{hep-math}[2023/07/01 v1.2 Math and physics macros]
+%<documentation>\ProvidesFile{hep-math-documentation.tex}[2023/07/01 v1.2 hep-math documentation]
%
%<*documentation>
-
\RequirePackage[l2tabu, orthodox]{nag}
-
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
-\usepackage[parskip,oldstyle]{hep-paper}
+\usepackage{hologo}
+
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
+\bibliography{bibliography}
+\setlength{\fboxsep}{1pt}
\newenvironment{columns}[1][.5]{%
\par\vspace{-\bigskipamount}%
\begin{minipage}[t]{\linewidth}%
@@ -44,14 +49,6 @@
\begin{minipage}[t]{\linewidth-#1\linewidth}%
}%
}{\end{minipage}\end{minipage}\par}
-
-\bibliography{bibliography}
-
-\usepackage{hologo}
-
-\MacroIndent=1.5em
-\setlength{\fboxsep}{1pt}
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
%</documentation>
%<*driver>
@@ -64,7 +61,7 @@
%
% \fi
%
-% \CheckSum{657}
+% \CheckSum{702}
%
% \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
@@ -83,7 +80,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2021/09/01}{Initial version of the style file.}
-% \changes{v1.1}{2022/11/01}{Bug fixes.}
+% \changes{v1.1}{2023/07/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -171,7 +168,7 @@ Finer details about mathematical typesetting can be found in \cite{gregorio:2020
\DescribeMacro{\differential}
\DescribeMacro{\newderivative}
\DescribeMacro{\newpartialderivative}
-The three macros "\differential"\marg{symbol}, "\newderivative""{\name}"\marg{symbol}, and "\newpartialderivative""{\name}"\marg{symbol} allow to define a differential with correct spacing, a derivative using this differential, and if necessary a partial derivative that can handle three dimensional derivatives.
+The three macros "\differential"\marg{symbol}, "\newderivative" "{\name}"\marg{symbol}, and "\newpartialderivative" "{\name}"\marg{symbol} allow to define a differential with correct spacing, a derivative using this differential, and if necessary a partial derivative that can handle three dimensional derivatives.
\DescribeMacro{\d}
\DescribeMacro{\dv}
@@ -185,7 +182,9 @@ $\dv xf$ & $\dv*xf$ & $\dv x*f$ & $\dv*x*f$
\end{tabular}
\end{center}
via "\dv*"\oarg{f}\marg{x}"*""^"\marg{n}.
-Upright differential can be produced via "\renewcommand" "{\diffsymbol}""{\mathrm d}".
+Upright differential can be produced via "\renewcommand""{\diffsymbol}" "{\mathrm d}".
+The differential takes care of the correct spacing as long as it is placed at the end of the integral $\int f(x)\d x$.
+In order to archive correct spacing when it is placed at the beginning of the integral it is advisable to place the whole expression in a "\mathop{\int\d x} f(x)" such that $\mathop{\int\d x} f(x)$.
\DescribeMacro{\pd}
\DescribeMacro{\pdv}
@@ -450,7 +449,8 @@ As a rule of thumb if you have to use "\notag", "\nonumber", or perform manual s
% \begin{macro}{\i}
% Provide an upright imaginary unit in math mode.
% \begin{macrocode}
-\AtBeginDocument{\mathdef{\i}{\operatorname{i}}}
+\newcommand{\imaginaryunit}{\text{i}}
+\AtBeginDocument{\mathdef{\i}{\imaginaryunit}}
% \end{macrocode}
% \end{macro}
%
@@ -616,8 +616,25 @@ As a rule of thumb if you have to use "\notag", "\nonumber", or perform manual s
%
% \begin{macro}{\unit}
% Load the \software{units} package \cite{units} which provides the "\units" and "\nicefrac" macros.
+% Patch the "\unit" macros to behave like "\mathinner" within an equation
% \begin{macrocode}
\RequirePackage{units}
+\let\oldunit\unit
+\renewcommand{\unit}[2][]{%
+ \ifthenelse{\boolean{mmode}}{%
+ \mathinner{\oldunit[#1]{#2}}%
+ }{%
+ \oldunit[#1]{#2}%
+ }%
+}
+\let\oldunitfrac\unitfrac
+\renewcommand{\unitfrac}[3][]{%
+ \ifthenelse{\boolean{mmode}}{%
+ \mathinner{\oldunitfrac[#1]{#2}{#3}}%
+ }{%
+ \oldunitfrac[#1]{#2}{#3}%
+ }%
+}
% \end{macrocode}
% \end{macro}
%
@@ -639,10 +656,11 @@ As a rule of thumb if you have to use "\notag", "\nonumber", or perform manual s
% Provide a flat fraction.
% \begin{macrocode}
\DeclarePairedDelimiterX{\hep@flatfrac}[2]{.}{.}{%
- \kern-\nulldelimiterspace#1\delimsize/\hep@left@delim#2\kern-\nulldelimiterspace%
+ \kern-\nulldelimiterspace#1\delimsize/%
+ \hep@left@delim#2\kern-\nulldelimiterspace%
}
\NewDocumentCommand{\flatfrac}{somm}{%
- \mathop{
+ \mathinner{%
\IfBooleanTF{#1}{%
\hep@flatfrac*{#3}{#4}%
}{%
@@ -658,6 +676,17 @@ As a rule of thumb if you have to use "\notag", "\nonumber", or perform manual s
%
% \subsubsection{Differentials and derivatives}
%
+% \begin{macro}{\int}
+% Redefine "\int".
+% \begin{macrocode}
+\let\hep@int\int
+\RenewDocumentCommand{\int}{oe{_^}}{%
+ \def\temp{\hep@int_{\IfValueT{#2}{#2}}^{\IfValueT{#3}{#3}}}%
+ \IfValueTF{#1}{\mathop{\temp#1}}{\temp}%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\differential}
% Define a generic differential "\differential".
% \begin{macrocode}
@@ -837,6 +866,16 @@ As a rule of thumb if you have to use "\notag", "\nonumber", or perform manual s
% \end{macro}
% \end{macro}
+% \begin{macro}{\floor}
+% \begin{macro}{\ceil}
+% Floor and ceiling paired delimiters.
+% \begin{macrocode}
+\DeclarePairedDelimiter\ceil{\lceil}{\rceil}
+\DeclarePairedDelimiter\floor{\lfloor}{\rfloor}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+
% \begin{macro}{\ordersymbol}
% \begin{macro}{\order}
% Order symbol and macro.
@@ -1017,7 +1056,8 @@ As a rule of thumb if you have to use "\notag", "\nonumber", or perform manual s
% Define the bra macro.
% \begin{macrocode}
\DeclarePairedDelimiterXPP\hep@bra[1]{%
- }{\langle}{\rvert}{\braketinnerspace}{\braketouterspace#1\braketinnerspace%
+ }{\langle}{\rvert}{\braketinnerspace%
+ }{\braketouterspace#1\braketinnerspace%
}
\NewDocumentCommand{\bra}{smt\ket sgt\ketbra sgg}{%
\IfBooleanTF{#6}{%
@@ -1135,7 +1175,8 @@ Extended math macros
## Introduction
-The `hep-math` package provides some additional features beyond the `mathtools` and `amsmath` packages.
+The `hep-math` package provides some additional features beyond the
+`mathtools` and `amsmath` packages.
To use the package place `\usepackage{hep-math}` in the preamble.
@@ -1145,8 +1186,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/hep-math/hep-math-implementation.pdf b/macros/latex/contrib/hep-math/hep-math-implementation.pdf
index c0c8a6e6c8..b27f3c48d6 100644
--- a/macros/latex/contrib/hep-math/hep-math-implementation.pdf
+++ b/macros/latex/contrib/hep-math/hep-math-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-math/hep-math.ins b/macros/latex/contrib/hep-math/hep-math.ins
index 1d02e20dce..aca65004d0 100644
--- a/macros/latex/contrib/hep-math/hep-math.ins
+++ b/macros/latex/contrib/hep-math/hep-math.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019-2020 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
diff --git a/macros/latex/contrib/hep-paper/README.md b/macros/latex/contrib/hep-paper/README.md
index 1cffa529b0..7b76d91a0f 100644
--- a/macros/latex/contrib/hep-paper/README.md
+++ b/macros/latex/contrib/hep-paper/README.md
@@ -5,10 +5,14 @@ A `LaTeX` package for publications in High Energy Physics.
## Introduction
-The `hep-paper` package aims to provide a single style file containing most configurations and macros necessary to write appealing publications in High Energy Physics.
-Instead of reinventing the wheel by introducing newly created macros `hep-paper` preferably loads third party packages as long as they are lightweight enough.
+The `hep-paper` package aims to provide a single style file containing
+most configurations and macros necessary to write appealing publications
+in High Energy Physics. Instead of reinventing the wheel by introducing
+newly created macros `hep-paper` preferably loads third party packages as
+long as they are lightweight enough.
-For usual publications it is enough to load additionally to the `article` class without optional arguments only the `hep-paper` package.
+For usual publications it is enough to load additionally to the `article`
+class without optional arguments only the `hep-paper` package.
\documentclass{article}
\usepackage{hep-paper}
@@ -19,6 +23,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/hep-paper/bibliography.bib b/macros/latex/contrib/hep-paper/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/hep-paper/bibliography.bib
+++ b/macros/latex/contrib/hep-paper/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-paper/hep-paper-documentation.pdf b/macros/latex/contrib/hep-paper/hep-paper-documentation.pdf
index dd00f397d6..4373feea07 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 1fe7658b0a..b0b1b39ca6 100644
--- a/macros/latex/contrib/hep-paper/hep-paper-implementation.dtx
+++ b/macros/latex/contrib/hep-paper/hep-paper-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019-2022 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,31 +18,28 @@
% \iffalse
%
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-paper}[2022/11/01 v2.1 Publications in High Energy Physics]
-%<documentation>\ProvidesFile{hep-paper-documentation.tex}[2022/11/01 v2.1 HEP-Paper documentation]
+%<package>\ProvidesPackage{hep-paper}[2023/07/01 v2.2 Publications in High Energy Physics]
+%<documentation>\ProvidesFile{hep-paper-documentation.tex}[2023/07/01 v2.2 HEP-Paper documentation]
%
%<*documentation>
-%
\RequirePackage[l2tabu, orthodox]{nag}
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
-\usepackage[parskip]{hep-paper}
+\usepackage{hologo}
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
\bibliography{bibliography}
-
\acronym{PDF}{portable document format}
\acronym{LM}{latin modern}
-
-\usepackage{hologo}
-
-\MacroIndent=1.5em
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
%</documentation>
%<*driver>
@@ -65,7 +62,7 @@
% \changes{v1.7}{2021/06/01}{Introduction of dedicated style file for the title, acronyms and bibliography macros. Extension of the title macros.}
% \changes{v1.8}{2021/08/01}{Expand thanks to allow for reference label and fine tune the title page. Reimplement the must relevant macros from the physics package. Make mathrm produce upright Greek.}
% \changes{v2.0}{2021/09/01}{Move independent logic into dedicated packages.}
-% \changes{v2.1}{2022/11/01}{Bug fixes in the underlying packages.}
+% \changes{v2.1}{2023/07/01}{Bug fixes in the underlying packages.}
%
% \ifshort
%<*documentation>
@@ -703,13 +700,11 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
\AtBeginDocument{\renewcommand{\foreignabbrfont}{}}
\fi
\ifhep@jhep
- \hoffset 0in
- \voffset 0in
- \RequirePackage{geometry}
- \AtBeginDocument{\newgeometry{
- textheight=.757\paperheight,
- textwidth=.72\paperwidth,
- }}
+ \PassOptionsToPackage{\hep@paper paper}{geometry}
+ \RequirePackage{geometry}
+ \geometry{
+ offset=0in,textheight=.762\paperheight,textwidth=.72\paperwidth
+ }
\fi
% \end{macrocode}
%
@@ -1058,7 +1053,8 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t
First affiliation\\
E-mail: \email{second@email.com}
}
-\author{Third author \thanks{\email{third@email.com}}\\Second affiliation}
+\author{Third author \thanks{\email{third@email.com}}\\
+Second affiliation}
\author{Fourth author\\Third affiliation}
\FullConference{Full conference}
\ShortTitle{Short title}
@@ -1185,10 +1181,14 @@ A `LaTeX` package for publications in High Energy Physics.
## Introduction
-The `hep-paper` package aims to provide a single style file containing most configurations and macros necessary to write appealing publications in High Energy Physics.
-Instead of reinventing the wheel by introducing newly created macros `hep-paper` preferably loads third party packages as long as they are lightweight enough.
+The `hep-paper` package aims to provide a single style file containing
+most configurations and macros necessary to write appealing publications
+in High Energy Physics. Instead of reinventing the wheel by introducing
+newly created macros `hep-paper` preferably loads third party packages as
+long as they are lightweight enough.
-For usual publications it is enough to load additionally to the `article` class without optional arguments only the `hep-paper` package.
+For usual publications it is enough to load additionally to the `article`
+class without optional arguments only the `hep-paper` package.
\documentclass{article}
\usepackage{hep-paper}
@@ -1199,8 +1199,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/hep-paper/hep-paper-implementation.pdf b/macros/latex/contrib/hep-paper/hep-paper-implementation.pdf
index 99012f2277..bf3edc6508 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 eddbb9aafe..b65927a2e6 100644
--- a/macros/latex/contrib/hep-paper/hep-paper.ins
+++ b/macros/latex/contrib/hep-paper/hep-paper.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2022 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019-2022 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
diff --git a/macros/latex/contrib/hep-reference/README.md b/macros/latex/contrib/hep-reference/README.md
index c25d4dc002..1141b2aa58 100644
--- a/macros/latex/contrib/hep-reference/README.md
+++ b/macros/latex/contrib/hep-reference/README.md
@@ -5,13 +5,9 @@ A `LaTeX` package for publications in High Energy Physics.
## Introduction
-The `hep-reference` package aims to provide a single style file containing most configurations and macros necessary to write appealing publications in High Energy Physics.
-Instead of reinventing the wheel by introducing newly created macros `hep-reference` preferably loads third party packages as long as they are lightweight enough.
-
-For usual publications it is enough to load additionally to the `article` class without optional arguments only the `hep-reference` package.
-
- \documentclass{article}
- \usepackage{hep-reference}
+The `hep-reference` package applies some light convenience modifications
+to the reference, citation and footnote macros after loading standard
+classes improving on the default LaTeX behaviour.
## Author
@@ -19,6 +15,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/hep-reference/bibliography.bib b/macros/latex/contrib/hep-reference/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/hep-reference/bibliography.bib
+++ b/macros/latex/contrib/hep-reference/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-reference/hep-reference-documentation.pdf b/macros/latex/contrib/hep-reference/hep-reference-documentation.pdf
index bacea46800..fa0fd7adc5 100644
--- a/macros/latex/contrib/hep-reference/hep-reference-documentation.pdf
+++ b/macros/latex/contrib/hep-reference/hep-reference-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-reference/hep-reference-implementation.dtx b/macros/latex/contrib/hep-reference/hep-reference-implementation.dtx
index 03722624cb..507647ac98 100644
--- a/macros/latex/contrib/hep-reference/hep-reference-implementation.dtx
+++ b/macros/latex/contrib/hep-reference/hep-reference-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,30 +18,26 @@
% \iffalse
%
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-reference}[2022/11/01 v1.1 Publications in High Energy Physics]
-%<documentation>\ProvidesFile{hep-reference-documentation.tex}[2022/11/01 v1.1 HEP-Paper documentation]
+%<package>\ProvidesPackage{hep-reference}[2023/07/01 v1.2 Convenience macros for references]
+%<documentation>\ProvidesFile{hep-reference-documentation.tex}[2023/07/01 v1.2 HEP-reference documentation]
%
%<*documentation>
-%
-\RequirePackage[l2tabu, orthodox]{nag}
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
-\usepackage[parskip]{hep-paper}
+\usepackage{hologo}
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
\bibliography{bibliography}
-
\shortacronym{PDF}{portable document format}
-
-\usepackage{hologo}
-
-\MacroIndent=1.5em
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
%</documentation>
%<*driver>
@@ -54,7 +50,7 @@
%
% \fi
%
-% \CheckSum{179}
+% \CheckSum{180}
%
% \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
@@ -73,7 +69,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2011/08/01}{Initial version of the style file.}
-% \changes{v1.1}{2022/11/01}{Bug fixes.}
+% \changes{v1.1}{2023/07/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -147,8 +143,8 @@ Additionally the reference back to the text where they are called from.
}
\AtBeginDocument{\@ifpackageloaded{doc}{\hypersetup{hidelinks}}{}}
% \end{macrocode}
-% Set the \PDF meta data according to the paper information and ensure that unnecessary information is suppressed.
%
+% Ensure that unnecessary information is suppressed.
% \begin{macrocode}
\pdfstringdefDisableCommands{\def\varepsilon{\textepsilon}}
\pdfstringdefDisableCommands{\def\to{\textrightarrow}}
@@ -160,11 +156,22 @@ Additionally the reference back to the text where they are called from.
\pdfstringdefDisableCommands{\let\footnote\@gobble}
\pdfstringdefDisableCommands{\let\\\@gobble}
}
-\AtBeginDocument{\hypersetup{pdftitle={\@title}}}
-\AtBeginDocument{\hypersetup{pdfauthor={\@author}}}
-\AtBeginDocument{\@ifundefined{hep@key@words}{}{%
- \hypersetup{pdfkeywords={\hep@key@words}}%
-}}
+% \end{macrocode}
+%
+% Set the \PDF meta data according to the paper information
+%
+% \begin{macrocode}
+\AtBeginDocument{
+ \@ifundefined{hep@sub@title}{
+ \hypersetup{pdftitle={\@title}}
+ }{
+ \hypersetup{pdftitle={\@title: \hep@sub@title}}
+ }
+ \hypersetup{pdfauthor={\@author}}
+ \@ifundefined{hep@key@words}{}{%
+ \hypersetup{pdfkeywords={\hep@key@words}}%
+ }
+}
% \end{macrocode}
% \subsection{Footnotes}
@@ -207,16 +214,17 @@ Additionally the reference back to the text where they are called from.
% \begin{macro}{\usecommand}
% Define the "\usecommand" macro providing an anonymous function.
% \begin{macrocode}
-\providecommand\use@command{}
+\providecommand\hep@use@command{}
\newcommand\usecommand[2][1]{%
- \renewcommand\use@command[#1]{#2}\use@command%
+ \renewcommand\hep@use@command[#1]{#2}\hep@use@command%
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\textlabel}
-% Define the "\textlabel" macro allowing to link to a piece of text.
+% Define the "\textlabel" macro allowing to link to a piece of text using the \software{etoolbox} pcakage \cite{etoolbox}.
% \begin{macrocode}
+\RequirePackage{etoolbox}
\NewDocumentCommand\textlabel{O{}mO{}m}{%
\protected@write\@auxout{}{%
\string\newlabel{#2}{%
@@ -335,13 +343,17 @@ Additionally the reference back to the text where they are called from.
\section{Section} \label{sec:Section}
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam lobortis section \ref{sec:Section}
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+Etiam lobortis section \ref{sec:Section}
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam lobortis \cref{sec:Section}
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+Etiam lobortis \cref{sec:Section}
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam loborti equation \eqref{eq:Equation}
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+Etiam loborti equation \eqref{eq:Equation}
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam loborti reference \cite{cite}
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+Etiam loborti reference \cite{cite}
Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
\footnote{
@@ -373,13 +385,9 @@ A `LaTeX` package for publications in High Energy Physics.
## Introduction
-The `hep-reference` package aims to provide a single style file containing most configurations and macros necessary to write appealing publications in High Energy Physics.
-Instead of reinventing the wheel by introducing newly created macros `hep-reference` preferably loads third party packages as long as they are lightweight enough.
-
-For usual publications it is enough to load additionally to the `article` class without optional arguments only the `hep-reference` package.
-
- \documentclass{article}
- \usepackage{hep-reference}
+The `hep-reference` package applies some light convenience modifications
+to the reference, citation and footnote macros after loading standard
+classes improving on the default LaTeX behaviour.
## Author
@@ -387,8 +395,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/hep-reference/hep-reference-implementation.pdf b/macros/latex/contrib/hep-reference/hep-reference-implementation.pdf
index b25dd57e2d..c29352bc2d 100644
--- a/macros/latex/contrib/hep-reference/hep-reference-implementation.pdf
+++ b/macros/latex/contrib/hep-reference/hep-reference-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-reference/hep-reference.ins b/macros/latex/contrib/hep-reference/hep-reference.ins
index c2ed685ccf..40390ff977 100644
--- a/macros/latex/contrib/hep-reference/hep-reference.ins
+++ b/macros/latex/contrib/hep-reference/hep-reference.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019-2020 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
diff --git a/macros/latex/contrib/hep-text/README.md b/macros/latex/contrib/hep-text/README.md
index f815820aeb..24bdb3c255 100644
--- a/macros/latex/contrib/hep-text/README.md
+++ b/macros/latex/contrib/hep-text/README.md
@@ -6,7 +6,8 @@ List and text extensions
## Introduction
-The `hep-text` package extends `LaTeX` lists using the `enumitem package and provides some text macros.
+The `hep-text` package extends `LaTeX` lists using the `enumitem package
+and provides some text macros.
The package can be loaded by `\usepackage{hep-text}`.
@@ -16,6 +17,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/hep-text/bibliography.bib b/macros/latex/contrib/hep-text/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/hep-text/bibliography.bib
+++ b/macros/latex/contrib/hep-text/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-text/hep-text-documentation.pdf b/macros/latex/contrib/hep-text/hep-text-documentation.pdf
index 42b9228569..08a7e2a13f 100644
--- a/macros/latex/contrib/hep-text/hep-text-documentation.pdf
+++ b/macros/latex/contrib/hep-text/hep-text-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-text/hep-text-implementation.dtx b/macros/latex/contrib/hep-text/hep-text-implementation.dtx
index cb1228d9fa..cec31e7636 100644
--- a/macros/latex/contrib/hep-text/hep-text-implementation.dtx
+++ b/macros/latex/contrib/hep-text/hep-text-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,30 +18,31 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-text}[2022/11/01 v1.1 Some text macros]
-%<documentation>\ProvidesFile{hep-text-documentation.tex}[2022/11/01 v1.1 HEP-Text documentation]
+%<package>\ProvidesPackage{hep-text}[2023/07/01 v1.2 Some text macros]
+%<documentation>\ProvidesFile{hep-text-documentation.tex}[2023/07/01 v1.2 HEP-Text documentation]
%
%<*documentation>
\RequirePackage[l2tabu, orthodox]{nag}
-
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
-\usepackage[parskip]{hep-paper}
+\usepackage{hologo}
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
\bibliography{bibliography}
\acronym{CM}{computer modern}
\acronym{LM}{latin modern}
-\usepackage{hologo}
-
\newenvironment{columns}[1][.5]{%
\par\vspace{-\bigskipamount}%
\begin{minipage}[t]{\linewidth}%
@@ -51,9 +52,6 @@
\begin{minipage}[t]{\linewidth-#1\linewidth}%
}%
}{\end{minipage}\end{minipage}\par}
-
-\MacroIndent=1.5em
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
%</documentation>
%<*driver>
@@ -85,7 +83,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2019/01/01}{Initial version of the style file.}
-% \changes{v1.1}{2022/11/01}{Bug fixes.}
+% \changes{v1.1}{2023/07/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -365,7 +363,8 @@ List and text extensions
## Introduction
-The `hep-text` package extends `LaTeX` lists using the `enumitem package and provides some text macros.
+The `hep-text` package extends `LaTeX` lists using the `enumitem package
+and provides some text macros.
The package can be loaded by `\usepackage{hep-text}`.
@@ -375,8 +374,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/hep-text/hep-text-implementation.pdf b/macros/latex/contrib/hep-text/hep-text-implementation.pdf
index f117bdf322..c6011e501e 100644
--- a/macros/latex/contrib/hep-text/hep-text-implementation.pdf
+++ b/macros/latex/contrib/hep-text/hep-text-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-text/hep-text.ins b/macros/latex/contrib/hep-text/hep-text.ins
index 1b8b9381d5..d94b15b001 100644
--- a/macros/latex/contrib/hep-text/hep-text.ins
+++ b/macros/latex/contrib/hep-text/hep-text.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019-2020 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
diff --git a/macros/latex/contrib/hep-title/README.md b/macros/latex/contrib/hep-title/README.md
index 0c203a3a09..a5498e037f 100644
--- a/macros/latex/contrib/hep-title/README.md
+++ b/macros/latex/contrib/hep-title/README.md
@@ -6,7 +6,8 @@ Extensions for the title page
## Introduction
-The `hep-title` package extends the title macros of the standard classes with macros for a preprint, affiliation, editors, and endorsers.
+The `hep-title` package extends the title macros of the standard classes
+with macros for a preprint, affiliation, editors, and endorsers.
To use the `hep-title` package include it with `\usepackage{hep-title}`.
@@ -16,6 +17,9 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/macros/latex/contrib/hep-title/bibliography.bib b/macros/latex/contrib/hep-title/bibliography.bib
index 5b217a2aad..1b79887246 100644
--- a/macros/latex/contrib/hep-title/bibliography.bib
+++ b/macros/latex/contrib/hep-title/bibliography.bib
@@ -238,6 +238,16 @@ eprinttype = "ctan",
eprint = "amstext",
}
+@article{amsopn,
+title = "The |amsopn| package",
+subtitle = "Typeset mathematical operator names",
+collaboration = "\hologo{LaTeX3} Project",
+date = "1995",
+url = "https://ams.org/tex/amslatex",
+eprinttype = "ctan",
+eprint = "amsopn",
+}
+
@article{amsfonts,
title = "The |amsfonts| package",
subtitle = "\hologo{TeX} fonts from the American Mathematical Society",
@@ -1212,3 +1222,39 @@ year = "2016",
eprinttype = "ctan",
eprint = "overlays",
}
+
+@article{pgfplots,
+title = "The |pgfplots| package",
+subtitle = "Create normal/logarithmic plots in two and three dimensions",
+author = "Christian Feuersänger",
+year = "2007",
+eprinttype = "ctan",
+eprint = "pgfplots",
+}
+
+@article{pgf,
+title = "The |pgf| package",
+subtitle = "Create PostScript and PDF graphics in \hologo{TeX}",
+author = "Tantau, Till and Menke, Henri",
+year = "2005",
+eprinttype = "ctan",
+eprint = "pgf",
+}
+
+@article{tikz-feynman,
+title = "The |pgf| package",
+subtitle = "Feynman diagrams with TikZ",
+author = "Joshua Ellis",
+year = "2016",
+eprinttype = "ctan",
+eprint = "tikz-feynman",
+}
+
+@article{standalone,
+title = "The |standalone| package",
+subtitle = "Compile \hologo{TeX} pictures stand-alone or as part of a document",
+author = "Martin Scharrer",
+year = "2010",
+eprinttype = "ctan",
+eprint = "standalone",
+}
diff --git a/macros/latex/contrib/hep-title/hep-title-documentation.pdf b/macros/latex/contrib/hep-title/hep-title-documentation.pdf
index 5efb25df63..bc159ff796 100644
--- a/macros/latex/contrib/hep-title/hep-title-documentation.pdf
+++ b/macros/latex/contrib/hep-title/hep-title-documentation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-title/hep-title-implementation.dtx b/macros/latex/contrib/hep-title/hep-title-implementation.dtx
index da2445a4d1..195f54ec91 100644
--- a/macros/latex/contrib/hep-title/hep-title-implementation.dtx
+++ b/macros/latex/contrib/hep-title/hep-title-implementation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Jan Hajer
+% Copyright (C) 2019-2023 by Jan Hajer
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -18,32 +18,31 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-title}[2022/11/01 v1.1 Extend title page macros]
-%<documentation>\ProvidesFile{hep-title-documentation.tex}[2022/11/01 v1.1 hep-title documentation]
+%<package>\ProvidesPackage{hep-title}[2023/07/01 v1.2 Extend title page macros]
+%<documentation>\ProvidesFile{hep-title-documentation.tex}[2023/07/01 v1.2 hep-title documentation]
%
%<*documentation>
\RequirePackage[l2tabu, orthodox]{nag}
\documentclass{ltxdoc}
+
+\renewcommand\theCodelineNo{\rmfamily\tstyle\footnotesize\arabic{CodelineNo}}
+\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
+\renewcommand{\MacroFont}{\codestyle}
\AtBeginDocument{\DeleteShortVerb{\|}}
\AtBeginDocument{\MakeShortVerb{\"}}
-
\EnableCrossrefs
\CodelineIndex
\RecordChanges
-\usepackage[parskip]{hep-paper}
+\usepackage{hologo}
+\usepackage[parskip,oldstyle,font=10pt]{hep-paper}
\bibliography{bibliography}
\acronym{PDF}{portable document format}
-\usepackage{hologo}
-
-\MacroIndent=1.5em
-\AtBeginEnvironment{macrocode}{\renewcommand{\ttdefault}{clmt}}
-
%</documentation>
%<*driver>
@@ -75,7 +74,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2021/09/01}{Initial version of the style file.}
-% \changes{v1.1}{2022/11/01}{Bug fixes.}
+% \changes{v1.1}{2023/07/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -152,7 +151,7 @@ Their font can be adjusted by the "\editorfont"\marg{font} and "\endorserfont"\m
\DescribeMacro{\editortitlefont}
\DescribeMacro{\endorsertitlefont}
The titles of these lines can be adjusted using the "\editortitle"\marg{singluar}\marg{plural} and "\endorsertitle"\marg{singluar}\marg{plural} macros.
-Their font can be adjust with the "\editortitlefont"\marg{font} and "\endorsertitlefont"\marg{font}.
+Their font can be adjust with the "\editortitlefont"\marg{font} and "\endorsertitlefont"\allowbreak\marg{font}.
\subsection{Abstract}
@@ -552,7 +551,9 @@ The "\preprintfont" macro can be used to change the font of the preprint.
% \begin{macro}{\endorser}
% Copy of the "authblk" author code adjusted for endorsers.
% \begin{macrocode}
-\DeclareRobustCommand\endorser{\@ifnextchar[{\hep@@endorser}{\hep@@@endorser}}
+\DeclareRobustCommand\endorser{%
+ \@ifnextchar[{\hep@@endorser}{\hep@@@endorser}%
+}
\def\hep@@endorser[#1]#2{\hep@@@@endorser[#1]{#2}}
\def\hep@@@endorser#1{\hep@@@@endorser{#1}}
\newcommand\hep@@@@endorser[2][]{%
@@ -913,7 +914,8 @@ Extensions for the title page
## Introduction
-The `hep-title` package extends the title macros of the standard classes with macros for a preprint, affiliation, editors, and endorsers.
+The `hep-title` package extends the title macros of the standard classes
+with macros for a preprint, affiliation, editors, and endorsers.
To use the `hep-title` package include it with `\usepackage{hep-title}`.
@@ -923,8 +925,11 @@ Jan Hajer
## License
-This file may be distributed and/or modified under the conditions of the `LaTeX` Project Public License, either version 1.3c of this license or (at your option) any later version.
-The latest version of this license is in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later.
+This file may be distributed and/or modified under the conditions of the
+`LaTeX` Project Public License, either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is
+in `http://www.latex-project.org/lppl.txt` and version 1.3c or later is
+part of all distributions of LaTeX version 2005/12/01 or later.
% \end{macrocode}
%
%</readme>
diff --git a/macros/latex/contrib/hep-title/hep-title-implementation.pdf b/macros/latex/contrib/hep-title/hep-title-implementation.pdf
index 1fad6acc93..73fc350a2f 100644
--- a/macros/latex/contrib/hep-title/hep-title-implementation.pdf
+++ b/macros/latex/contrib/hep-title/hep-title-implementation.pdf
Binary files differ
diff --git a/macros/latex/contrib/hep-title/hep-title.ins b/macros/latex/contrib/hep-title/hep-title.ins
index 7ad98b6490..cef4b265c2 100644
--- a/macros/latex/contrib/hep-title/hep-title.ins
+++ b/macros/latex/contrib/hep-title/hep-title.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 by Jan Hajer
+%% Copyright (C) 2019-2023 by Jan Hajer
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
\preamble
This is a generated file.
-Copyright (C) 2019-2020 by Jan Hajer
+Copyright (C) 2019-2023 by Jan Hajer
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3c of this license or (at your option) any later
diff --git a/macros/latex/contrib/minimalist/README.md b/macros/latex/contrib/minimalist/README.md
index a86486ba21..03402471ee 100644
--- a/macros/latex/contrib/minimalist/README.md
+++ b/macros/latex/contrib/minimalist/README.md
@@ -2,7 +2,7 @@
# `minimalist` bundle: write you documents in a simple and clear way
-> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).**
+> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).**
## Introduction
@@ -36,16 +36,18 @@ It mainly consists of two parts.
typesetting, and also use more beautiful fonts.
### How to get these files
-You can get the `.sty` and `.cls` files mentioned above simply by compiling
+You can get the `.sty` and `.cls` files mentioned above by compiling
`minimalist.ins`:
```
latex minimalist.ins
```
+<!--
To get the `.tex` source files of the documentation, compile
`minimalist-doc.ins`:
```
latex minimalist-doc.ins
```
+-->
## Features
diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty
index 31bbbdf00b..43e69a81ff 100644
--- a/macros/latex/contrib/minimalist/minimalist-classical.sty
+++ b/macros/latex/contrib/minimalist/minimalist-classical.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-classical}
- {2023/03/07} {}
+ {2023/07/14} {}
{The "classical" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -340,10 +340,10 @@
}
-\bool_if:NTF \l__minimalist_is_book_bool
- {
\setcounter{secnumdepth}{3}
+\bool_if:NTF \l__minimalist_is_book_bool
+ {
%% Part
\titleclass{\part}{top} % make part like a chapter
\titleformat{\part}[display]
diff --git a/macros/latex/contrib/minimalist/minimalist-flow.sty b/macros/latex/contrib/minimalist/minimalist-flow.sty
index 106d18dc0b..5eabb82c3b 100644
--- a/macros/latex/contrib/minimalist/minimalist-flow.sty
+++ b/macros/latex/contrib/minimalist/minimalist-flow.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-flow}
- {2023/03/07} {}
+ {2023/07/14} {}
{The "flow" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -338,10 +338,10 @@
}
-\bool_if:NTF \l__minimalist_is_book_bool
- {
\setcounter{secnumdepth}{3}
+\bool_if:NTF \l__minimalist_is_book_bool
+ {
%% Part
\titleclass{\part}{top} % make part like a chapter
\titleformat{\part}[display]
diff --git a/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty
index 134fb89080..5ce38ad163 100644
--- a/macros/latex/contrib/minimalist/minimalist-plain.sty
+++ b/macros/latex/contrib/minimalist/minimalist-plain.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-plain}
- {2023/03/07} {}
+ {2023/07/14} {}
{The "plain" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -338,10 +338,10 @@
}
-\bool_if:NTF \l__minimalist_is_book_bool
- {
\setcounter{secnumdepth}{3}
+\bool_if:NTF \l__minimalist_is_book_bool
+ {
%% Part
\titleclass{\part}{top} % make part like a chapter
\titleformat{\part}[display]
diff --git a/macros/latex/contrib/minimalist/minimalist-stream.sty b/macros/latex/contrib/minimalist/minimalist-stream.sty
index d81bcbd059..3f84aaedc5 100644
--- a/macros/latex/contrib/minimalist/minimalist-stream.sty
+++ b/macros/latex/contrib/minimalist/minimalist-stream.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-stream}
- {2023/03/07} {}
+ {2023/07/14} {}
{The "stream" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -308,12 +308,23 @@
\regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl
\regex_replace_all:nnN { (\d) } { {\c{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl
\exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int
- \int_case:nn { \l_tmpa_int }
+ \bool_if:NTF \l__minimalist_is_book_bool
{
- { 0 } { \textcolor { main-text!39!paper } }
- { 1 } { \textcolor { main-text!39!paper } }
- { 2 } { \textcolor { main-text!39!paper } }
- { 3 } { \smaller[2] \textcolor { main-text!24!paper } }
+ \int_case:nn { \l_tmpa_int }
+ {
+ { 0 } { \textcolor { main-text!39!paper } }
+ { 1 } { \textcolor { main-text!39!paper } }
+ { 2 } { \textcolor { main-text!39!paper } }
+ { 3 } { \smaller \textcolor { main-text!24!paper } }
+ }
+ }
+ {
+ \int_case:nn { \l_tmpa_int }
+ {
+ { 0 } { \textcolor { main-text!39!paper } }
+ { 1 } { \textcolor { main-text!39!paper } }
+ { 2 } { \smaller[2] \textcolor { main-text!24!paper } }
+ }
}
\l_tmpa_tl
\group_end:
@@ -341,10 +352,10 @@
\dim_new:N \l_minimalist_title_sep_dim
\dim_set:Nn \l_minimalist_title_sep_dim { 1em }
-\bool_if:NTF \l__minimalist_is_book_bool
- {
\setcounter{secnumdepth}{4}
+\bool_if:NTF \l__minimalist_is_book_bool
+ {
%% Part
\titleclass{\part}{top} % make part like a chapter
\titleformat{\part}[display]
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index 8eeb64e747..2cf94896b8 100644
--- a/macros/latex/contrib/minimalist/minimalist.sty
+++ b/macros/latex/contrib/minimalist/minimalist.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist}
- {2023/03/07} {}
+ {2023/07/14} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index 04e877e103..db63066809 100644
--- a/macros/latex/contrib/minimalist/minimart.cls
+++ b/macros/latex/contrib/minimalist/minimart.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimart}
- {2023/03/07} {}
+ {2023/07/14} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -67,6 +67,9 @@
, b5paper .bool_set:N = \l__minimclass_b_five_paper_bool
, b5paper .initial:n = { false }
+ , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
+ , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
+
, 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
, 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index 536a23fe55..6e52b41bff 100644
--- a/macros/latex/contrib/minimalist/minimbook.cls
+++ b/macros/latex/contrib/minimalist/minimbook.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimbook}
- {2023/03/07} {}
+ {2023/07/14} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -67,6 +67,9 @@
, b5paper .bool_set:N = \l__minimclass_b_five_paper_bool
, b5paper .initial:n = { false }
+ , oneside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
+ , twoside .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
+
, 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
, 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__minimclass_base_class_tl } }
diff --git a/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx b/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx
index 0fee1be6a5..804e2121b9 100644
--- a/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx
+++ b/macros/latex/contrib/naive-ebnf/naive-ebnf.dtx
@@ -50,7 +50,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{naive-ebnf}
%<*package>
-[2023-07-13 0.0.12 EBNF in Plain Text]
+[2023-07-14 0.0.13 EBNF in Plain Text]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -185,7 +185,7 @@
% \DescribeMacro{\EbnfRegex}
% A regular expression is possible too:
-% \docshotOptions{firstline=6,lastline=11}
+% \docshotOptions{firstline=6,lastline=12}
% \begin{docshot}
% \documentclass{article}
% \pagestyle{empty}
@@ -197,6 +197,7 @@
% <bool> := "TRUE" | "FALSE" \\
% <integer> := /(+\char`\|-)?[0-9]+/ \\
% <byte> := /[0-9a-f]\char`\{2\char`\}/ \\
+% <number> := /[1-9]+/ /[0-9]+/
% \end{ebnf}
% \end{document}
% \end{docshot}
@@ -406,7 +407,8 @@
\regex_replace_all:nnN
{ ([^\s])\|([^\s]) } {\1\\textbar{}\2} \ebnf_tmp%
%
- \regex_replace_all:nnN { \s/(.+?)/\s }%
+ \regex_replace_all:nnN
+ { /(.+?)/ }%
{\c{ebnf@regexp}{\1}} \ebnf_tmp%
\cs_new:Npn\ebnf_curled{%
\regex_replace_all:nnNT
diff --git a/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf b/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf
index 14ab57dbd2..ee1c39c6b9 100644
--- a/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf
+++ b/macros/latex/contrib/naive-ebnf/naive-ebnf.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 86e54a5643..cd4e1fd25b 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.20a}
-\def\myfiledate{2023/06/30}
+\def\myfileversion{6.21}
+\def\myfiledate{2023/07/14}
%
%
%<*batchfile>
@@ -384,7 +384,7 @@ version 2005/12/01 or later.
%
% \bigskip
% The following regex will be used to modify the preamble of the array when the
-% key |colortbl-like| is used.
+% key |color-inside| is used.
% \begin{macrocode}
\regex_const:Nn \c_@@_columncolor_regex { \c { columncolor } }
% \end{macrocode}
@@ -598,7 +598,7 @@ version 2005/12/01 or later.
% The following command is a small shortcut.
% \begin{macrocode}
\cs_new:Npn \@@_math_toggle_token:
- { \bool_if:NF \l_@@_NiceTabular_bool \c_math_toggle_token }
+ { \bool_if:NF \l_@@_tabular_bool \c_math_toggle_token }
% \end{macrocode}
%
% \bigskip
@@ -737,7 +737,40 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_qpoint:n #1
{ \pgfpointanchor { \@@_env: - #1 } { center } }
% \end{macrocode}
-%
+%
+% \bigskip
+% If the user uses |{NiceTabular}|, |{NiceTabular*}| or |{NiceTabularX}|, we
+% will raise the following flag.
+% \begin{macrocode}
+\bool_new:N \l_@@_tabular_bool
+% \end{macrocode}
+%
+% \bigskip
+% |\g_@@_delims_bool| will be true for the environments with delimiters (ex. :
+% |{pNiceMatrix}|, |{pNiceArray}|, |\pAutoNiceMatrix|, etc.).
+% \begin{macrocode}
+\bool_new:N \g_@@_delims_bool
+\bool_gset_true:N \g_@@_delims_bool
+% \end{macrocode}
+% In fact, if there is delimiters in the preamble of |{NiceArray}| (eg:
+% |[cccc]|), this boolean will be set to false.
+%
+% \medskip
+% The following boolean will be equal to |true| in the environments which have
+% an environment (provided by the final user): |{NiceTabular}|, |{NiceArray}|,
+% |{pNiceArray}|, etc.
+% \begin{macrocode}
+\bool_new:N \l_@@_preamble_bool
+\bool_set_true:N \l_@@_preamble_bool
+% \end{macrocode}
+%
+% \medskip
+% We need a special treatment for |{NiceMatrix}| when |vlines| is not used, in
+% order to retrieve |\arraycolsep| on both sides.
+% \begin{macrocode}
+\bool_new:N \l_@@_NiceMatrix_without_vlines_bool
+% \end{macrocode}
+%
% \bigskip
% The following counter will count the environments |{NiceMatrixBlock}|.
% \begin{macrocode}
@@ -861,22 +894,6 @@ version 2005/12/01 or later.
\bool_new:N \l_@@_notes_detect_duplicates_bool
\bool_set_true:N \l_@@_notes_detect_duplicates_bool
% \end{macrocode}
-%
-% \bigskip
-% If the user uses |{NiceArray}| or |{NiceTabular}| the flag
-% |\g_@@_NiceArray_bool| will be raised.
-% \begin{macrocode}
-\bool_new:N \g_@@_NiceArray_bool
-% \end{macrocode}
-% In fact, if there is delimiters in the preamble of |{NiceArray}| (eg:
-% |[cccc]|), this boolean will be set to false.
-%
-% \bigskip
-% If the user uses |{NiceTabular}|, |{NiceTabular*}| or |{NiceTabularX}|, we
-% will raise the following flag.
-% \begin{macrocode}
-\bool_new:N \l_@@_NiceTabular_bool
-% \end{macrocode}
%
% \bigskip
% If the user uses |{NiceTabular*}|, the width of the tabular (in the first
@@ -894,19 +911,19 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% If the user uses an environment without preamble, we will raise the following
-% flag.
-% \begin{macrocode}
-\bool_new:N \l_@@_Matrix_bool
-% \end{macrocode}
-%
-% \bigskip
% The following boolean will be raised when the command |\rotate| is used.
% \begin{macrocode}
\bool_new:N \g_@@_rotate_bool
% \end{macrocode}
%
% \bigskip
+% The following boolean will be raise then the command |\rotate| is used with
+% the key |c|.
+% \begin{macrocode}
+\bool_new:N \g_@@_rotate_c_bool
+% \end{macrocode}
+%
+% \bigskip
% In a cell, it will be possible to know whether we are in a cell of a column of
% type |X| thanks to that flag.
% \begin{macrocode}
@@ -1002,14 +1019,6 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \bigskip
-% The following token list corresponds to the option |code-after| (it's also
-% possible to set the value of that parameter with the keyword |\CodeAfter|).
-% That parameter is \emph{public}.
-% \begin{macrocode}
-\tl_new:N \g_nicematrix_code_after_tl
-\bool_new:N \l_@@_in_code_after_bool
-% \end{macrocode}
%
% \bigskip
% For the key |code| of the command |\SubMatrix| (itself in the main
@@ -1032,16 +1041,33 @@ version 2005/12/01 or later.
% |\g_@@_pre_code_after_tl| because we must take care of the order in which
% instructions stored in that parameters are executed.
% \begin{macrocode}
-\tl_new:N \g_@@_pre_code_after_tl
+
% \end{macrocode}
%
% \bigskip
+% The so-called `\CodeBefore` is splitted in two parts because we want to control
+% the order of execution of some instructions.
+% \begin{macrocode}
+\tl_new:N \g_@@_pre_code_before_tl
+\tl_new:N \g_nicematrix_code_before_tl
+% \end{macrocode}
% The value of the key |code-before| will be added to the left of
% |\g_@@_pre_code_before_tl|. Idem for the code between |\CodeBefore| and
% |\Body|.
-% \begin{macrocode}
-\tl_new:N \g_nicematrix_code_before_tl
-\tl_new:N \g_@@_pre_code_before_tl
+%
+% \bigskip
+% The so-called `\CodeAfter` is splitted in two parts because we want to control
+% the order of execution of some instructions.
+% \begin{macrocode}
+\tl_new:N \g_@@_pre_code_after_tl
+\tl_new:N \g_nicematrix_code_after_tl
+% \end{macrocode}
+% The `\CodeAfter` provided by the final user (with the key |code-after| or the
+% keyword |\CodeAfter|) will be stored in the second token list.
+%
+% \bigskip
+% \begin{macrocode}
+\bool_new:N \l_@@_in_code_after_bool
% \end{macrocode}
%
% \bigskip
@@ -1353,7 +1379,6 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_new:N \l_@@_draw_first_bool
% \end{macrocode}
-%
%
% \medskip
% The following flag corresponds to the keys |vlines| and |hlines| of the
@@ -1496,6 +1521,13 @@ version 2005/12/01 or later.
\bool_new:N \g_@@_last_col_found_bool
% \end{macrocode}
% This boolean is set to |false| at the end of |\@@_pre_array_ii:|.
+%
+% \medskip
+% In the last column, we will raise the following flag (it will be used by
+% |\OnlyMainNiceMatrix|).
+% \begin{macrocode}
+\bool_new:N \l_@@_in_last_col_bool
+% \end{macrocode}
% \end{itemize}
%
% \bigskip
@@ -1536,7 +1568,8 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-%
+%
+%
% \bigskip
% \section{The command \textbackslash tabularnote}
%
@@ -1694,7 +1727,7 @@ version 2005/12/01 or later.
{
\bool_if:nT { \cs_if_exist_p:N \@captype || \l_@@_in_env_bool }
{
- \bool_if:nTF { ! \l_@@_NiceTabular_bool && \l_@@_in_env_bool }
+ \bool_if:nTF { ! \l_@@_tabular_bool && \l_@@_in_env_bool }
{ \@@_error:n { tabularnote~forbidden } }
{
\bool_if:NTF \l_@@_in_caption_bool
@@ -1981,10 +2014,10 @@ version 2005/12/01 or later.
% \bigskip
% By default, the commands |\cellcolor| and |\rowcolor| are available for the
% user in the cells of the tabular (the user may use the commands provided by
-% |\colortbl|). However, if the key |colortbl-like| is used, these
+% |\colortbl|). However, if the key |color-inside| is used, these
% commands are available.
% \begin{macrocode}
-\bool_new:N \l_@@_colortbl_like_bool
+\bool_new:N \l_@@_color_inside_bool
% \end{macrocode}
%
% \bigskip
@@ -2308,6 +2341,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\keys_define:nn { NiceMatrix / Global }
{
+ rounded-corners .dim_set:N = \l_@@_tab_rounded_corners_dim ,
+ rounded-corners .default:n = 4 pt ,
custom-line .code:n = \@@_custom_line:n { #1 } ,
rules .code:n = \keys_set:nn { NiceMatrix / rules } { #1 } ,
rules .value_required:n = true ,
@@ -2446,10 +2481,11 @@ version 2005/12/01 or later.
name .value_required:n = true ,
code-after .tl_gset:N = \g_nicematrix_code_after_tl ,
code-after .value_required:n = true ,
- colortbl-like .code:n =
- \bool_set_true:N \l_@@_colortbl_like_bool
+ color-inside .code:n =
+ \bool_set_true:N \l_@@_color_inside_bool
\bool_set_true:N \l_@@_code_before_bool ,
- colortbl-like .value_forbidden:n = true
+ color-inside .value_forbidden:n = true ,
+ colortbl-like .meta:n = color-inside
}
% \end{macrocode}
%
@@ -2734,8 +2770,6 @@ version 2005/12/01 or later.
width .code:n = \dim_set:Nn \l_@@_width_dim { #1 }
\bool_set_true:N \l_@@_width_used_bool ,
width .value_required:n = true ,
- rounded-corners .dim_set:N = \l_@@_tab_rounded_corners_dim ,
- rounded-corners .default:n = 4 pt ,
notes .code:n = \keys_set:nn { NiceMatrix / notes } { #1 } ,
tabularnote .tl_gset:N = \g_@@_tabularnote_tl ,
tabularnote .value_required:n = true ,
@@ -2794,7 +2828,7 @@ version 2005/12/01 or later.
% |\@@_cell_end:| (and the potential |\c_math_toggle_token| also).
% \begin{macrocode}
\hbox_set:Nw \l_@@_cell_box
- \bool_if:NF \l_@@_NiceTabular_bool
+ \bool_if:NF \l_@@_tabular_bool
{
\c_math_toggle_token
\bool_if:NT \l_@@_small_bool \scriptstyle
@@ -2888,16 +2922,28 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_rotate_cell_box:
{
\box_rotate:Nn \l_@@_cell_box { 90 }
- \int_compare:nNnT \c@iRow = \l_@@_last_row_int
- {
- \vbox_set_top:Nn \l_@@_cell_box
+ \bool_if:NTF \g_@@_rotate_c_bool
+ {
+ \hbox_set:Nn \l_@@_cell_box
{
- \vbox_to_zero:n { }
- \skip_vertical:n { - \box_ht:N \@arstrutbox + 0.8 ex }
- \box_use:N \l_@@_cell_box
+ \c_math_toggle_token
+ \vcenter { \box_use:N \l_@@_cell_box }
+ \c_math_toggle_token
}
- }
+ }
+ {
+ \int_compare:nNnT \c@iRow = \l_@@_last_row_int
+ {
+ \vbox_set_top:Nn \l_@@_cell_box
+ {
+ \vbox_to_zero:n { }
+ \skip_vertical:n { - \box_ht:N \@arstrutbox + 0.8 ex }
+ \box_use:N \l_@@_cell_box
+ }
+ }
+ }
\bool_gset_false:N \g_@@_rotate_bool
+ \bool_gset_false:N \g_@@_rotate_c_bool
}
% \end{macrocode}
%
@@ -3179,7 +3225,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_array:n
{
- \bool_if:NTF \l_@@_NiceTabular_bool
+ \bool_if:NTF \l_@@_tabular_bool
{ \dim_set_eq:NN \col@sep \tabcolsep }
{ \dim_set_eq:NN \col@sep \arraycolsep }
\dim_compare:nNnTF \l_@@_tabular_width_dim = \c_zero_dim
@@ -3339,13 +3385,15 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% When the key |colortbl-like| is used, the following code will be executed.
+% When the key |color-inside| is used, the following code will be executed.
% \begin{macrocode}
\cs_new_protected:Npn \@@_colortbl_like:
{
\cs_set_eq:NN \cellcolor \@@_cellcolor_tabular
\cs_set_eq:NN \rowcolor \@@_rowcolor_tabular
\cs_set_eq:NN \columncolor \@@_columncolor_preamble
+ \cs_set_eq:NN \rowcolors \@@_rowcolors_tabular
+ \cs_set_eq:NN \rowlistcolors \@@_rowlistcolors_tabular
}
% \end{macrocode}
%
@@ -3494,7 +3542,7 @@ version 2005/12/01 or later.
\cs_set_eq:NN \RowStyle \@@_RowStyle:n
\seq_map_inline:Nn \l_@@_custom_line_commands_seq
{ \cs_set_eq:cc { ##1 } { nicematrix - ##1 } }
- \bool_if:NT \l_@@_colortbl_like_bool \@@_colortbl_like:
+ \bool_if:NT \l_@@_color_inside_bool \@@_colortbl_like:
\bool_if:NT \l_@@_renew_dots_bool \@@_renew_dots:
% \end{macrocode}
% We redefine |\multicolumn| and, since we want |\multicolumn| to be available
@@ -3596,9 +3644,6 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_pre_array:
{
-% \end{macrocode}
-%
-% \begin{macrocode}
\cs_if_exist:NT \theiRow { \int_set_eq:NN \l_@@_old_iRow_int \c@iRow }
\int_gzero_new:N \c@iRow
\cs_if_exist:NT \thejCol { \int_set_eq:NN \l_@@_old_jCol_int \c@jCol }
@@ -3703,11 +3748,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\dim_zero_new:N \l_@@_left_delim_dim
\dim_zero_new:N \l_@@_right_delim_dim
- \bool_if:NTF \g_@@_NiceArray_bool
- {
- \dim_gset:Nn \l_@@_left_delim_dim { 2 \arraycolsep }
- \dim_gset:Nn \l_@@_right_delim_dim { 2 \arraycolsep }
- }
+ \bool_if:NTF \g_@@_delims_bool
{
% \end{macrocode}
% The command |\bBigg@| is a command of \pkg{amsmath}.
@@ -3717,6 +3758,10 @@ version 2005/12/01 or later.
\hbox_set:Nn \l_tmpa_box { $ \bBigg@ 5 \g_@@_right_delim_tl $ }
\dim_set:Nn \l_@@_right_delim_dim { \box_wd:N \l_tmpa_box }
}
+ {
+ \dim_gset:Nn \l_@@_left_delim_dim { 2 \arraycolsep }
+ \dim_gset:Nn \l_@@_right_delim_dim { 2 \arraycolsep }
+ }
% \end{macrocode}
%
% \bigskip
@@ -3759,7 +3804,8 @@ version 2005/12/01 or later.
% \bigskip
% \section{The \textbackslash CodeBefore}
%
-% The following command will be executed if the |\CodeBefore| has to be actually executed.
+% The following command will be executed if the |\CodeBefore| has to be actually
+% executed (that commmand will be used only once and is present only for legibility).
% \begin{macrocode}
\cs_new_protected:Npn \@@_pre_code_before:
{
@@ -3861,7 +3907,7 @@ version 2005/12/01 or later.
% We compose the |\CodeBefore| in math mode in order to nullify the spaces put
% by the user between instructions in the |\CodeBefore|.
% \begin{macrocode}
- \bool_if:NT \l_@@_NiceTabular_bool \c_math_toggle_token
+ \bool_if:NT \l_@@_tabular_bool \c_math_toggle_token
% \end{macrocode}
%
% \bigskip
@@ -3895,7 +3941,7 @@ version 2005/12/01 or later.
\@@_actually_color:
\l_@@_code_before_tl
\q_stop
- \bool_if:NT \l_@@_NiceTabular_bool \c_math_toggle_token
+ \bool_if:NT \l_@@_tabular_bool \c_math_toggle_token
\group_end:
\bool_if:NT \g_@@_recreate_cell_nodes_bool
{ \tl_put_left:Nn \@@_node_for_cell: \@@_patch_node_for_cell: }
@@ -3927,7 +3973,7 @@ version 2005/12/01 or later.
%
% We have extracted the options of the keyword |\CodeBefore| in order to see
% whether the key |create-cell-nodes| has been used. Now, you can execute the
-% rest of the |\CodeAfter|, excepted, of course, if we are in the first
+% rest of the |\CodeBefore|, excepted, of course, if we are in the first
% compilation.
% \begin{macrocode}
\cs_new_protected:Npn \@@_CodeBefore:w #1 \q_stop
@@ -3940,8 +3986,6 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \bigskip
-%
%
% \bigskip
% By default, if the user uses the |\CodeBefore|, only the |col| nodes, |row|
@@ -4094,7 +4138,7 @@ version 2005/12/01 or later.
\bool_gset_false:N \g_@@_row_of_col_done_bool
\str_if_empty:NT \g_@@_name_env_str
{ \str_gset:Nn \g_@@_name_env_str { NiceArrayWithDelims } }
- \bool_if:NTF \l_@@_NiceTabular_bool
+ \bool_if:NTF \l_@@_tabular_bool
\mode_leave_vertical:
\@@_test_if_math_mode:
\bool_if:NT \l_@@_in_env_bool { \@@_fatal:n { Yet~in~env } }
@@ -4182,9 +4226,9 @@ version 2005/12/01 or later.
% of |{NiceArray}| (|{pNiceArray}|, |{bNiceArray}|, etc.) because, for
% |{NiceArray}|, we have the options |t|, |c|, |b| and |baseline|.
% \begin{macrocode}
- \bool_if:NTF \g_@@_NiceArray_bool
- { \keys_set:nn { NiceMatrix / NiceArray } }
+ \bool_if:NTF \g_@@_delims_bool
{ \keys_set:nn { NiceMatrix / pNiceArray } }
+ { \keys_set:nn { NiceMatrix / NiceArray } }
{ #3 , #5 }
% \end{macrocode}
%
@@ -4319,13 +4363,10 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% The construction of the real box is different when |\g_@@_NiceArray_bool| is
-% true (|{NiceArray}| or |{NiceTabular}|) and in the other environments because,
-% in |{NiceArray}| or |{NiceTabular}|, we have no delimiter to put (but we have
-% tabular notes to put). We begin with this case.
-%
+% The construction of the real box is different whether we have delimiters to
+% put.
% \begin{macrocode}
- \bool_if:NTF \g_@@_NiceArray_bool
+ \bool_if:nTF { ! \g_@@_delims_bool }
{
\str_case:VnF \l_@@_baseline_tl
{
@@ -4336,9 +4377,9 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% Now, in the case of an environment |{pNiceArray}|, |{bNiceArray}|, etc. We
-% compute |\l_tmpa_dim| which is the total height of the ``first row'' above the
-% array (when the key |first-row| is used).
+% Now, in the case of an environment with delimiters. We compute |\l_tmpa_dim|
+% which is the total height of the ``first row'' above the array (when the key
+% |first-row| is used).
% \begin{macrocode}
{
\int_compare:nNnTF \l_@@_first_row_int = 0
@@ -4379,11 +4420,11 @@ version 2005/12/01 or later.
\skip_vertical:n { -\l_tmpa_dim - \arrayrulewidth }
\hbox
{
- \bool_if:NTF \l_@@_NiceTabular_bool
+ \bool_if:NTF \l_@@_tabular_bool
{ \skip_horizontal:N -\tabcolsep }
{ \skip_horizontal:N -\arraycolsep }
\@@_use_arraybox_with_notes_c:
- \bool_if:NTF \l_@@_NiceTabular_bool
+ \bool_if:NTF \l_@@_tabular_bool
{ \skip_horizontal:N -\tabcolsep }
{ \skip_horizontal:N -\arraycolsep }
}
@@ -4427,8 +4468,8 @@ version 2005/12/01 or later.
\skip_horizontal:N \g_@@_width_last_col_dim
\skip_horizontal:N \col@sep
}
- \bool_if:NF \l_@@_Matrix_bool
- {
+ \bool_if:NT \l_@@_preamble_bool
+ {
\int_compare:nNnT \c@jCol < \g_@@_static_num_of_col_int
{ \@@_warning_gredirect_none:n { columns~not~used } }
}
@@ -4468,17 +4509,24 @@ version 2005/12/01 or later.
% \bigskip
% The transformation of the preamble is an operation in several
% steps.\footnote{Be careful: the transformation of the preamble may also have
-% by-side effects, for example, the boolean |\g_@@_NiceArray_bool| will be set
-% to |false| if we detect in the preamble a delimiter at the beginning or at the
+% by-side effects, for example, the boolean |\g_@@_delims_bool| will be set
+% to |true| if we detect in the preamble a delimiter at the beginning or at the
% end.}
%
% \bigskip
% The preamble given by the final user is in |\g_@@_preamble_tl| and the modified
% version will be stored in |\g_@@_preamble_tl| also.
-%
% \begin{macrocode}
\cs_new_protected:Npn \@@_transform_preamble:
{
+ \bool_if:NT \l_@@_preamble_bool \@@_transform_preamble_i:
+ \@@_transform_preamble_ii:
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_transform_preamble_i:
+ {
% \end{macrocode}
% First, we will do an ``expansion'' of the preamble with the tools of the
% package \pkg{array} itself. This ``expansion'' will expand all the constructions
@@ -4499,100 +4547,82 @@ version 2005/12/01 or later.
% That's why we do those redefinitions in a TeX group.
% \begin{macrocode}
\group_begin:
-% \end{macrocode}
-%
-% If we are in an environment without explicit preamble, we have nothing to do
-% (excepted the treatment on both sides of the preamble which will be done at
-% the end).
-% \begin{macrocode}
- \bool_if:NF \l_@@_Matrix_bool
- {
- \@@_newcolumntype w [ 2 ] { \@@_w: { ##1 } { ##2 } }
- \@@_newcolumntype W [ 2 ] { \@@_W: { ##1 } { ##2 } }
+ \@@_newcolumntype w [ 2 ] { \@@_w: { ##1 } { ##2 } }
+ \@@_newcolumntype W [ 2 ] { \@@_W: { ##1 } { ##2 } }
% \end{macrocode}
%
% \bigskip
% If the package \pkg{varwidth} has defined the column type |V|, we protect from
% expansion by redefining it to |\@@_V:| (which will be catched by our system).
% \begin{macrocode}
- \cs_if_exist:NT \NC@find@V { \@@_newcolumntype V { \@@_V: } }
+ \cs_if_exist:NT \NC@find@V { \@@_newcolumntype V { \@@_V: } }
% \end{macrocode}
%
% First, we have to store our preamble in the token register |\@temptokena|
% (those ``token registers'' are \emph{not} supported by the L3 programming layer).
% \begin{macrocode}
- \exp_args:NV \@temptokena \g_@@_preamble_tl
+ \exp_args:NV \@temptokena \g_@@_preamble_tl
% \end{macrocode}
% Initialisation of a flag used by \pkg{array} to detect the end of the expansion.
% \begin{macrocode}
- \@tempswatrue
+ \@tempswatrue
% \end{macrocode}
% The following line actually does the expansion (it's has been copied from
% |array.sty|). The expanded version is still in |\@temptokena|.
% \begin{macrocode}
- \@whilesw \if@tempswa \fi { \@tempswafalse \the \NC@list }
-% \end{macrocode}
-%
-%
-% \bigskip
-% Now, we have to ``patch'' that preamble by transforming some columns.
-% We will insert in the TeX flow the preamble in its actual form (that is to say
-% after the ``expansion'') following by a marker |\q_stop| and we will consume
-% these tokens constructing the (new form of the) preamble in
-% |\g_@@_preamble_tl|. This is done recursively with the command
-% |\@@_patch_preamble:n|. In the same time, we will count the columns with the
-% counter |\c@jCol|.
-% \begin{macrocode}
- \int_gzero:N \c@jCol
- \tl_gclear:N \g_@@_preamble_tl
+ \@whilesw \if@tempswa \fi { \@tempswafalse \the \NC@list }
+ \int_gzero:N \c@jCol
+ \tl_gclear:N \g_@@_preamble_tl
% \end{macrocode}
% |\g_tmpb_bool| will be raised if you have a \verb+|+ at the end of the preamble.
% \begin{macrocode}
- \bool_gset_false:N \g_tmpb_bool
- \tl_if_eq:NnTF \l_@@_vlines_clist { all }
+ \bool_gset_false:N \g_tmpb_bool
+ \tl_if_eq:NnTF \l_@@_vlines_clist { all }
+ {
+ \tl_gset:Nn \g_@@_preamble_tl
+ { ! { \skip_horizontal:N \arrayrulewidth } }
+ }
+ {
+ \clist_if_in:NnT \l_@@_vlines_clist 1
{
\tl_gset:Nn \g_@@_preamble_tl
{ ! { \skip_horizontal:N \arrayrulewidth } }
}
- {
- \clist_if_in:NnT \l_@@_vlines_clist 1
- {
- \tl_gset:Nn \g_@@_preamble_tl
- { ! { \skip_horizontal:N \arrayrulewidth } }
- }
- }
+ }
% \end{macrocode}
% The sequence |\g_@@_cols_vlsim_seq| will contain the numbers of the columns
% where you will to have to draw vertical lines in the potential sub-matrices
% (hence the name |vlism|).
% \begin{macrocode}
- \seq_clear:N \g_@@_cols_vlism_seq
+ \seq_clear:N \g_@@_cols_vlism_seq
% \end{macrocode}
%
% \bigskip
% The following sequence will store the arguments of the successive |>| in the
% preamble.
% \begin{macrocode}
- \tl_gclear_new:N \g_@@_pre_cell_tl
+ \tl_gclear_new:N \g_@@_pre_cell_tl
% \end{macrocode}
%
% The counter |\l_tmpa_int| will count the number of consecutive occurrences
% of the symbol \verb+|+.
% \begin{macrocode}
- \int_zero:N \l_tmpa_int
+ \int_zero:N \l_tmpa_int
% \end{macrocode}
% Now, we actually patch the preamble (and it is constructed in
% |\g_@@_preamble_tl|).
% \begin{macrocode}
- \exp_after:wN \@@_patch_preamble:n \the \@temptokena \q_stop
- \int_gset_eq:NN \g_@@_static_num_of_col_int \c@jCol
- }
+ \exp_after:wN \@@_patch_preamble:n \the \@temptokena \q_stop
+ \int_gset_eq:NN \g_@@_static_num_of_col_int \c@jCol
% \end{macrocode}
+% Remark that |\g_@@_static_num_of_col_int| will stay equel to zero in the
+% environments without preamble since we are in a code that is executed only
+% in the environments \emph{with} preamble.
%
% \medskip
% Now, we replace |\columncolor| by |\@@_columncolor_preamble|.
% \begin{macrocode}
- \bool_if:NT \l_@@_colortbl_like_bool
+ \bool_if:NT \l_@@_color_inside_bool
{
\regex_replace_all:NnN
\c_@@_columncolor_regex
@@ -4606,7 +4636,22 @@ version 2005/12/01 or later.
% the columns of type |w| and~|W|.
% \begin{macrocode}
\group_end:
+ }
% \end{macrocode}
+%
+%
+%
+% \bigskip
+% Now, we have to ``patch'' that preamble by transforming some columns.
+% We will insert in the TeX flow the preamble in its actual form (that is to say
+% after the ``expansion'') following by a marker |\q_stop| and we will consume
+% these tokens constructing the (new form of the) preamble in
+% |\g_@@_preamble_tl|. This is done recursively with the command
+% |\@@_patch_preamble:n|. In the same time, we will count the columns with the
+% counter |\c@jCol|.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_transform_preamble_ii:
+ {
%
% \medskip
% If there was delimiters at the beginning or at the end of the preamble, the
@@ -4615,7 +4660,7 @@ version 2005/12/01 or later.
\bool_lazy_or:nnT
{ ! \str_if_eq_p:Vn \g_@@_left_delim_tl { . } }
{ ! \str_if_eq_p:Vn \g_@@_right_delim_tl { . } }
- { \bool_gset_false:N \g_@@_NiceArray_bool }
+ { \bool_gset_true:N \g_@@_delims_bool }
% \end{macrocode}
%
% \medskip
@@ -4632,8 +4677,8 @@ version 2005/12/01 or later.
{
\bool_lazy_all:nT
{
- \g_@@_NiceArray_bool
- { \bool_not_p:n \l_@@_NiceTabular_bool }
+ { \bool_not_p:n \g_@@_delims_bool }
+ { \bool_not_p:n \l_@@_tabular_bool }
{ \tl_if_empty_p:N \l_@@_vlines_clist }
{ \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
}
@@ -4644,8 +4689,8 @@ version 2005/12/01 or later.
{
\bool_lazy_all:nT
{
- \g_@@_NiceArray_bool
- { \bool_not_p:n \l_@@_NiceTabular_bool }
+ { \bool_not_p:n \g_@@_delims_bool }
+ { \bool_not_p:n \l_@@_tabular_bool }
{ \tl_if_empty_p:N \l_@@_vlines_clist }
{ \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
}
@@ -5268,8 +5313,6 @@ version 2005/12/01 or later.
< {
\@@_cell_end:
\hbox_set_end:
- % The following line is probably pointless
- % \bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
#1
\@@_adjust_size_box:
\makebox [ #4 ] [ #3 ] { \box_use_drop:N \l_@@_cell_box }
@@ -5985,7 +6028,7 @@ version 2005/12/01 or later.
% that's why we can't put |@{}| at the end of the preamble. That's why we remove
% a |\arraycolsep| now.
% \begin{macrocode}
- \bool_lazy_and:nnT \l_@@_Matrix_bool \g_@@_NiceArray_bool
+ \bool_if:NT \l_@@_NiceMatrix_without_vlines_bool
{
\box_set_wd:Nn \l_@@_the_array_box
{ \box_wd:N \l_@@_the_array_box - \arraycolsep }
@@ -6492,6 +6535,8 @@ version 2005/12/01 or later.
\@@_transform_preamble:
% \end{macrocode}
%
+%
+%
% The call to |\array| is in the following command (we have a dedicated macro
% |\@@_array:n| because of compatibility with the classes \cls{revtex4-1} and
% \cls{revtex4-2}).
@@ -6710,8 +6755,8 @@ version 2005/12/01 or later.
\int_gincr:N \g_tmpa_int
\bool_lazy_all:nT
{
- \g_@@_NiceArray_bool
- { \bool_not_p:n \l_@@_NiceTabular_bool }
+ { \bool_not_p:n \g_@@_delims_bool }
+ { \bool_not_p:n \l_@@_tabular_bool }
{ \clist_if_empty_p:N \l_@@_vlines_clist }
{ \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
{ ! \l_@@_bar_at_end_of_pream_bool }
@@ -6728,13 +6773,12 @@ version 2005/12/01 or later.
% that's why we can't put |@{}| at the end of the preamble. That's why we remove
% a |\arraycolsep| now.
% \begin{macrocode}
- \bool_lazy_and:nnT \l_@@_Matrix_bool \g_@@_NiceArray_bool
+ \bool_if:NT \l_@@_NiceMatrix_without_vlines_bool
{ \skip_horizontal:N -\arraycolsep }
\pgfsys@markposition
- { \@@_env: - col - \int_eval:n {
- \g_tmpa_int + 1 } }
+ { \@@_env: - col - \int_eval:n { \g_tmpa_int + 1 } }
\skip_horizontal:N 0.5\arrayrulewidth
- \bool_lazy_and:nnT \l_@@_Matrix_bool \g_@@_NiceArray_bool
+ \bool_if:NT \l_@@_NiceMatrix_without_vlines_bool
{ \skip_horizontal:N \arraycolsep }
}
}
@@ -6742,7 +6786,7 @@ version 2005/12/01 or later.
\pgfrememberpicturepositiononpagetrue
\pgfcoordinate { \@@_env: - col - \int_eval:n { \g_tmpa_int + 1 } }
{
- \bool_lazy_and:nnTF \l_@@_Matrix_bool \g_@@_NiceArray_bool
+ \bool_if:NT \l_@@_NiceMatrix_without_vlines_bool
{
\pgfpoint
{ - 0.5 \arrayrulewidth - \arraycolsep }
@@ -6877,6 +6921,7 @@ version 2005/12/01 or later.
{
>
{
+ \bool_set_true:N \l_@@_in_last_col_bool
% \end{macrocode}
% At the beginning of the cell, we link |\CodeAfter| to a command which
% begins with |\\| (whereas the standard version of |\CodeAfter| begins does
@@ -6949,19 +6994,17 @@ version 2005/12/01 or later.
%
% \interitem
% The environment |{NiceArray}| is constructed upon the environment
-% |{NiceArrayWithDelims}| but, in fact, there is a flag |\g_@@_NiceArray_bool|.
-% In |{NiceArrayWithDelims}|, some special code will be executed if this flag is
-% raised.
+% |{NiceArrayWithDelims}|.
% \begin{macrocode}
\NewDocumentEnvironment { NiceArray } { }
{
- \bool_gset_true:N \g_@@_NiceArray_bool
+ \bool_gset_false:N \g_@@_delims_bool
\str_if_empty:NT \g_@@_name_env_str
{ \str_gset:Nn \g_@@_name_env_str { NiceArray } }
% \end{macrocode}
% We put . and . for the delimiters but, in fact, that doesn't matter because
% these arguments won't be used in |{NiceArrayWithDelims}| (because the flag
-% |\g_@@_NiceArray_bool| is raised).
+% |\g_@@_delims_bool| is set to false).
% \begin{macrocode}
\NiceArrayWithDelims . .
}
@@ -6977,7 +7020,7 @@ version 2005/12/01 or later.
{
\NewDocumentEnvironment { #1 NiceArray } { }
{
- \bool_gset_false:N \g_@@_NiceArray_bool
+ \bool_gset_true:N \g_@@_delims_bool
\str_if_empty:NT \g_@@_name_env_str
{ \str_gset:Nn \g_@@_name_env_str { #1 NiceArray } }
\@@_test_if_math_mode:
@@ -7003,9 +7046,12 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_begin_of_NiceMatrix:nn #1 #2
{
- \bool_set_true:N \l_@@_Matrix_bool
- \use:c { #1 NiceArray }
- {
+ \bool_set_false:N \l_@@_preamble_bool
+ \tl_clear:N \l_tmpa_tl
+ \bool_if:NT \l_@@_NiceMatrix_without_vlines_bool
+ { \tl_set:Nn \l_tmpa_tl { @ { } } }
+ \tl_put_right:Nn \l_tmpa_tl
+ {
*
{
\int_case:nnF \l_@@_last_col_int
@@ -7021,6 +7067,8 @@ version 2005/12/01 or later.
}
{ #2 }
}
+ \tl_set:Nn \l_tmpb_tl { \use:c { #1 NiceArray } }
+ \exp_args:NV \l_tmpb_tl \l_tmpa_tl
}
% \end{macrocode}
%
@@ -7033,7 +7081,7 @@ version 2005/12/01 or later.
{
\NewDocumentEnvironment { #1 NiceMatrix } { ! O { } }
{
- \bool_gset_false:N \g_@@_NiceArray_bool
+ \bool_gset_true:N \g_@@_delims_bool
\str_gset:Nn \g_@@_name_env_str { #1 NiceMatrix }
\keys_set:nn { NiceMatrix / NiceMatrix } { ##1 }
\@@_begin_of_NiceMatrix:nV { #1 } \l_@@_columns_type_tl
@@ -7047,9 +7095,12 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentEnvironment { NiceMatrix } { ! O { } }
{
- \bool_gset_false:N \g_@@_NiceArray_bool
\str_gset:Nn \g_@@_name_env_str { NiceMatrix }
\keys_set:nn { NiceMatrix / NiceMatrix } { #1 }
+ \bool_lazy_or:nnT
+ { \clist_if_empty_p:N \l_@@_vlines_clist }
+ { \l_@@_except_borders_bool }
+ { \bool_set_true:N \l_@@_NiceMatrix_without_vlines_bool }
\@@_begin_of_NiceMatrix:nV { } \l_@@_columns_type_tl
}
{ \endNiceArray }
@@ -7077,36 +7128,6 @@ version 2005/12/01 or later.
{ \dim_set_eq:NN \l_@@_width_dim \linewidth }
\str_gset:Nn \g_@@_name_env_str { NiceTabular }
\keys_set:nn { NiceMatrix / NiceTabular } { #1 , #3 }
- \int_compare:nNnT \l_@@_tab_rounded_corners_dim > \c_zero_dim
- {
- \bool_if:NT \l_@@_hvlines_bool
- {
- \bool_set_true:N \l_@@_except_borders_bool
- % we should try to be more efficient in the number of lines of code here
- \tl_if_empty:NTF \l_@@_rules_color_tl
- {
- \tl_gput_right:Nn \g_@@_pre_code_after_tl
- {
- \@@_stroke_block:nnn
- { rounded-corners = \dim_use:N \l_@@_tab_rounded_corners_dim }
- { 1-1 }
- { \int_use:N \c@iRow - \int_use:N \c@jCol }
- }
- }
- {
- \tl_gput_right:Nn \g_@@_pre_code_after_tl
- {
- \@@_stroke_block:nnn
- {
- rounded-corners = \dim_use:N \l_@@_tab_rounded_corners_dim ,
- draw = \l_@@_rules_color_tl
- }
- { 1-1 }
- { \int_use:N \c@iRow - \int_use:N \c@jCol }
- }
- }
- }
- }
\tl_if_empty:NF \l_@@_short_caption_tl
{
\tl_if_empty:NT \l_@@_caption_tl
@@ -7131,7 +7152,7 @@ version 2005/12/01 or later.
}
}
{ }
- \bool_set_true:N \l_@@_NiceTabular_bool
+ \bool_set_true:N \l_@@_tabular_bool
\NiceArray { #2 }
}
{ \endNiceArray }
@@ -7166,7 +7187,7 @@ version 2005/12/01 or later.
\dim_zero_new:N \l_@@_width_dim
\dim_set:Nn \l_@@_width_dim { #1 }
\keys_set:nn { NiceMatrix / NiceTabular } { #2 , #4 }
- \bool_set_true:N \l_@@_NiceTabular_bool
+ \bool_set_true:N \l_@@_tabular_bool
\NiceArray { #3 }
}
{ \endNiceArray }
@@ -7179,7 +7200,7 @@ version 2005/12/01 or later.
\str_gset:Nn \g_@@_name_env_str { NiceTabular* }
\dim_set:Nn \l_@@_tabular_width_dim { #1 }
\keys_set:nn { NiceMatrix / NiceTabular } { #2 , #4 }
- \bool_set_true:N \l_@@_NiceTabular_bool
+ \bool_set_true:N \l_@@_tabular_bool
\NiceArray { #3 }
}
{ \endNiceArray }
@@ -7189,6 +7210,33 @@ version 2005/12/01 or later.
% \bigskip
% \section{After the construction of the array}
%
+% \bigskip
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_deal_with_rounded_corners:
+ {
+ \bool_lazy_all:nT
+ {
+ { \int_compare_p:nNn \l_@@_tab_rounded_corners_dim > \c_zero_dim }
+ \l_@@_hvlines_bool
+ { ! \g_@@_delims_bool }
+ { ! \l_@@_except_borders_bool }
+ }
+ {
+ \bool_set_true:N \l_@@_except_borders_bool
+ \tl_gput_right:Nn \g_@@_pre_code_after_tl
+ {
+ \_@@_stroke_block:nnn
+ {
+ rounded-corners = \dim_use:N \l_@@_tab_rounded_corners_dim ,
+ draw = \l_@@_rules_color_tl
+ }
+ { 1-1 }
+ { \int_use:N \c@iRow - \int_use:N \c@jCol }
+ }
+ }
+ }
+%
+%
% \medskip
% \begin{macrocode}
\cs_new_protected:Npn \@@_after_array:
@@ -7383,6 +7431,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
+ \@@_deal_with_rounded_corners:
\tl_if_empty:NF \l_@@_hlines_clist \@@_draw_hlines:
\tl_if_empty:NF \l_@@_vlines_clist \@@_draw_vlines:
% \end{macrocode}
@@ -7450,7 +7499,7 @@ version 2005/12/01 or later.
%
% \medskip
% |\g_@@_pre_code_before_tl| is for instructions in the cells of the array such as
-% |\rowcolor| and |\cellcolor| (when the key |colortbl-like| is in
+% |\rowcolor| and |\cellcolor| (when the key |color-inside| is in
% force). These instructions will be written on the |aux| file to be added to
% the |code-before| in the next run.
% \begin{macrocode}
@@ -9258,10 +9307,24 @@ version 2005/12/01 or later.
% The command |\@@_rotate:| will be linked to |\rotate| in
% |{NiceArrayWithDelims}|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_rotate: { \bool_gset_true:N \g_@@_rotate_bool }
+\NewDocumentCommand \@@_rotate: { O { } }
+ {
+ \bool_gset_true:N \g_@@_rotate_bool
+ \keys_set:nn { NiceMatrix / rotate } { #1 }
+ }
% \end{macrocode}
%
% \bigskip
+% \begin{macrocode}
+\keys_define:nn { NiceMatrix / rotate }
+ {
+ c .code:n = \bool_gset_true:N \g_@@_rotate_c_bool ,
+ c .value_forbidden:n = true ,
+ unknown .code:n = \@@_error:n { Unknown~key~for~rotate }
+ }
+% \end{macrocode}
+%
+% \bigskip
% \section{The command \textbackslash line accessible in code-after}
%
% In the |\CodeAfter|, the command |\@@_line:nn| will be linked to |\line|. This
@@ -9858,6 +9921,9 @@ version 2005/12/01 or later.
% However, the command |\rowcolors| of \pkg{nicematrix} has \emph{not} the
% optional argument of the command |\rowcolors| of \pkg{xcolor}. Here is an
% example: |\rowcolors{1}{blue!10}{}[respect-blocks]|.
+%
+% In \pkg{nicematrix}, the commmand |\@@_rowcolors| apperas as a special case of
+% |\@@_rowlistcolors|.
%
% |#1| (optional) is the color space ;
% |#2| is a list of intervals of rows ;
@@ -9909,9 +9975,8 @@ version 2005/12/01 or later.
% index of the loop over the rows.
% \begin{macrocode}
\int_set:Nn \l_tmpa_int \l_tmpa_tl
- \bool_if:NTF \l_@@_rowcolors_restart_bool
- { \int_set:Nn \l_@@_color_int 1 }
- { \int_set:Nn \l_@@_color_int \l_tmpa_tl }
+ \int_set:Nn \l_@@_color_int
+ { \bool_if:NTF \l_@@_rowcolors_restart_bool 1 \l_tmpa_tl }
\int_zero_new:N \l_@@_tmpc_int
\int_set:Nn \l_@@_tmpc_int \l_tmpb_tl
\int_do_until:nNnn \l_tmpa_int > \l_@@_tmpc_int
@@ -9979,10 +10044,11 @@ version 2005/12/01 or later.
%
% \bigskip
% The command |\rowcolors| (available in the |\CodeBefore|) is a specialisation
-% of the most general command |\rowlistcolors|.
+% of the most general command |\rowlistcolors|. The last argument, which is a
+% optional argument between square brackets is provided by curryfication.
% \begin{macrocode}
-\NewDocumentCommand \@@_rowcolors { O { } m m m O { } }
- { \@@_rowlistcolors [ #1 ] { #2 } { { #3 } , { #4 } } [ #5 ] }
+\NewDocumentCommand \@@_rowcolors { O { } m m m }
+ { \@@_rowlistcolors [ #1 ] { #2 } { { #3 } , { #4 } } }
% \end{macrocode}
%
% \bigskip
@@ -10155,7 +10221,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% When the user uses the key |colortbl-like|, the following command will
+% When the user uses the key |color-inside|, the following command will
% be linked to |\cellcolor| in the tabular.
% \begin{macrocode}
\NewDocumentCommand \@@_cellcolor_tabular { O { } m }
@@ -10175,7 +10241,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% When the user uses the key |colortbl-like|, the following command will
+% When the user uses the key |color-inside|, the following command will
% be linked to |\rowcolor| in the tabular.
% \begin{macrocode}
\NewDocumentCommand \@@_rowcolor_tabular { O { } m }
@@ -10190,6 +10256,31 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+% \bigskip
+% When the user uses the key |color-inside|, the following command will
+% be linked to |\rowcolors| in the tabular. The last argument (an optional
+% argument between square brackets is taken by curryfication).
+% \begin{macrocode}
+\NewDocumentCommand { \@@_rowcolors_tabular } { O { } m m }
+ { \@@_rowlistcolors_tabular [ #1 ] { #2 , #3 } }
+% \end{macrocode}
+%
+% \bigskip
+% When the user uses the key |color-inside|, the following command will
+% be linked to |\rowlistcolors| in the tabular.
+% \begin{macrocode}
+\NewDocumentCommand { \@@_rowlistcolors_tabular } { O { } m O { } }
+ {
+ \peek_remove_spaces:n
+ {
+ \tl_gput_right:Nx \g__nicematrix_pre_code_before_tl
+ {
+ \@@_rowlistcolors
+ [ #1 ] { \int_use:N \c@iRow } { #2 } [ restart, #3 ]
+ }
+ }
+ }
+% \end{macrocode}
%
% \bigskip
% \begin{macrocode}
@@ -10272,7 +10363,13 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_OnlyMainNiceMatrix_i:n #1
{
\int_compare:nNnF \c@iRow = 0
- { \int_compare:nNnF \c@iRow = \l_@@_last_row_int { #1 } }
+ {
+ \int_compare:nNnF \c@iRow = \l_@@_last_row_int
+ {
+ \int_compare:nNnT \c@jCol > \c_zero_int
+ { \bool_if:NF \l_@@_in_last_col_bool { #1 } }
+ }
+ }
}
% \end{macrocode}
% Remember that |\c@iRow| is not always inferior to |\l_@@_last_row_int| because
@@ -10582,11 +10679,11 @@ version 2005/12/01 or later.
{
\int_step_inline:nnn
{
- \bool_if:nTF { \g_@@_NiceArray_bool && ! \l_@@_except_borders_bool }
+ \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
1 2
}
{
- \bool_if:nTF { \g_@@_NiceArray_bool && ! \l_@@_except_borders_bool }
+ \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
{ \int_eval:n { \c@jCol + 1 } }
\c@jCol
}
@@ -10839,7 +10936,7 @@ version 2005/12/01 or later.
\int_compare:nNnT \l_@@_local_start_int = 1
{
\dim_sub:Nn \l_@@_x_initial_dim \l_@@_left_margin_dim
- \bool_if:NT \g_@@_NiceArray_bool
+ \bool_if:NF \g_@@_delims_bool
{ \dim_sub:Nn \l_@@_x_initial_dim \arraycolsep }
% \end{macrocode}
% For reasons purely aesthetic, we do an adjustment in the case of a rounded
@@ -10854,7 +10951,7 @@ version 2005/12/01 or later.
\int_compare:nNnT \l_@@_local_end_int = \c@jCol
{
\dim_add:Nn \l_@@_x_final_dim \l_@@_right_margin_dim
- \bool_if:NT \g_@@_NiceArray_bool
+ \bool_if:NF \g_@@_delims_bool
{ \dim_add:Nn \l_@@_x_final_dim \arraycolsep }
\tl_if_eq:NnF \g_@@_right_delim_tl )
{ \dim_gsub:Nn \l_@@_x_final_dim { 0.5 \l_@@_xdots_inter_dim } }
@@ -10898,11 +10995,11 @@ version 2005/12/01 or later.
{
\int_step_inline:nnn
{
- \bool_if:nTF { \g_@@_NiceArray_bool && ! \l_@@_except_borders_bool }
+ \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
1 2
}
{
- \bool_if:nTF { \g_@@_NiceArray_bool && ! \l_@@_except_borders_bool }
+ \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
{ \int_eval:n { \c@iRow + 1 } }
\c@iRow
}
@@ -12007,8 +12104,23 @@ version 2005/12/01 or later.
% |\NewExpandableDocumentCommand| because it has an optional argument between
% |<| and |>|. It's mandatory to use an expandable command.
%
+%
% \begin{macrocode}
-\NewExpandableDocumentCommand \@@_Block: { O { } m D < > { } +m }
+\cs_new_protected:Npn \@@_block:n #1
+ {
+ \peek_meaning:NTF [
+ { \@@_block_i:n { #1 } }
+ { \@@_Block_i:[#1] }
+ }
+
+\cs_new_protected:Npn \@@_block_i:n #1[#2] { \@@_block:n {#1,#2} }
+
+\cs_new_protected:Npn \@@_Block: { \@@_block:n { } }
+% \end{macrocode}
+%
+% \bigskip
+% \begin{macrocode}
+\NewExpandableDocumentCommand \@@_Block_i: { O { } m D < > { } +m }
{
% \end{macrocode}
% If the first mandatory argument of the command (which is the size of the block
@@ -12210,8 +12322,8 @@ version 2005/12/01 or later.
% the tabular is the same as the external alignment of the tabular (that is to
% say the position of the block in its zone of merged cells).
% \begin{macrocode}
- \bool_if:NT \g_@@_rotate_bool { \str_set:Nn \l_@@_hpos_block_str c }
- \bool_if:NTF \l_@@_NiceTabular_bool
+ \bool_if:NT \g_@@_rotate_bool { \str_set:Nn \l_@@_hpos_block_str c }
+ \bool_if:NTF \l_@@_tabular_bool
{
\bool_lazy_all:nTF
{
@@ -12268,6 +12380,20 @@ version 2005/12/01 or later.
\box_grotate:cn
{ g_@@_ block _ box _ \int_use:N \g_@@_block_box_int _ box }
{ 90 }
+ \bool_if:NT \g_@@_rotate_c_bool
+ {
+ \hbox_gset:cn
+ { g_@@_ block _ box _ \int_use:N \g_@@_block_box_int _ box }
+ {
+ \c_math_toggle_token
+ \vcenter
+ {
+ \box_use:c
+ { g_@@_ block _ box _ \int_use:N \g_@@_block_box_int _ box }
+ }
+ \c_math_toggle_token
+ }
+ }
\bool_gset_false:N \g_@@_rotate_bool
}
% \end{macrocode}
@@ -12321,12 +12447,17 @@ version 2005/12/01 or later.
% alignment and that's why we put a key corresponding to the value of
% |\l_@@_hpos_block_str|, which is fixed by the type of current column.
% \begin{macrocode}
- { \exp_not:n { #3 } , \l_@@_hpos_block_str }
+ {
+ \exp_not:n { #3 } ,
+ \l_@@_hpos_block_str ,
+ \bool_if:NT \g_@@_rotate_c_bool { v-center }
+ }
{
\box_use_drop:c
{ g_@@_ block _ box _ \int_use:N \g_@@_block_box_int _ box }
}
}
+ \bool_set_false:N \g_@@_rotate_c_bool
}
% \end{macrocode}
%
@@ -12343,7 +12474,7 @@ version 2005/12/01 or later.
\l_tmpa_tl
{ \exp_not:n { #3 } }
{
- \bool_if:NTF \l_@@_NiceTabular_bool
+ \bool_if:NTF \l_@@_tabular_bool
{
\group_begin:
\bool_if:NF \l_@@_respect_arraystretch_bool
@@ -12539,6 +12670,7 @@ version 2005/12/01 or later.
%
%
% \medskip
+% The following command |\@@_Block_v:nnnnnn| will actually draw the block.
% |#1| is the first row of the block;
% |#2| is the first column of the block;
% |#3| is the last row of the block;
@@ -13061,7 +13193,8 @@ version 2005/12/01 or later.
\keys_define:nn { NiceMatrix / BlockStroke }
{
color .tl_set:N = \l_@@_draw_tl ,
- draw .tl_set:N = \l_@@_draw_tl ,
+ draw .code:n =
+ \exp_args:Nx \tl_if_empty:nF { #1 } { \tl_set:Nn \l_@@_draw_tl { #1 } } ,
draw .default:n = default ,
line-width .dim_set:N = \l_@@_line_width_dim ,
rounded-corners .dim_set:N = \l_@@_rounded_corners_dim ,
@@ -13328,6 +13461,8 @@ version 2005/12/01 or later.
delimiters / max-width .default:n = true ,
delimiters .code:n = \keys_set:nn { NiceMatrix / delimiters } { #1 } ,
delimiters .value_required:n = true ,
+ rounded-corners .dim_set:N = \l_@@_tab_rounded_corners_dim ,
+ rounded-corners .default:n = 4 pt
}
% \end{macrocode}
%
@@ -13345,20 +13480,13 @@ version 2005/12/01 or later.
% The group is for the protection of the keys.
% \begin{macrocode}
\group_begin:
- \bool_set_true:N \l_@@_Matrix_bool
- \str_if_eq:nnT { #1 } { . }
- {
- \str_if_eq:nnT { #2 } { . }
- { \bool_set_false:N \l_@@_Matrix_bool }
- }
\keys_set_known:nnN { NiceMatrix / Auto } { #6 } \l_tmpa_tl
% \end{macrocode}
-% We nullify the command |\@@_transform_preamble:| because we will provide a
+% We nullify the command |\@@_transform_preamble_i:| because we will provide a
% preamble which is yet transformed (by using |\l_@@_columns_type_tl| which is
% yet nicematrix-ready).
-%
% \begin{macrocode}
- \cs_set_eq:NN \@@_transform_preamble: \prg_do_nothing:
+ \bool_set_false:N \l_@@_preamble_bool
\use:x
{
\exp_not:N \begin { NiceArrayWithDelims } { #1 } { #2 }
@@ -13394,13 +13522,12 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-%
% \begin{macrocode}
\cs_set_protected:Npn \@@_define_com:nnn #1 #2 #3
{
\cs_set_protected:cpn { #1 AutoNiceMatrix }
{
- \bool_gset_false:N \g_@@_NiceArray_bool
+ \bool_gset_true:N \g_@@_delims_bool
\str_gset:Nx \g_@@_name_env_str { #1 AutoNiceMatrix }
\AutoNiceMatrixWithDelims { #2 } { #3 }
}
@@ -13421,8 +13548,7 @@ version 2005/12/01 or later.
\NewDocumentCommand \AutoNiceMatrix { O { } m O { } m ! O { } }
{
\group_begin:
- \bool_gset_true:N \g_@@_NiceArray_bool
- % \bool_set_true:N \l_@@_Matrix_bool
+ \bool_gset_false:N \g_@@_delims_bool
\AutoNiceMatrixWithDelims . . { #2 } { #4 } [ #1 , #3 , #5 ]
\group_end:
}
@@ -14817,7 +14943,7 @@ version 2005/12/01 or later.
% The class \cls{beamer} has its own system to extract footnotes and that's why
% we have nothing to do if \cls{beamer} is used.
% \begin{macrocode}
- \IfClassLoadeTF { beamer }
+ \IfClassLoadedTF { beamer }
{ \bool_set_false:N \c_@@_footnote_bool }
{
\IfPackageLoadedTF { footnotehyper }
@@ -15146,7 +15272,16 @@ version 2005/12/01 or later.
{
Unknown~key.\\
There~is~only~two~keys~available~here:~width~and~color.\\
- You~key~'\l_keys_key_str'~will~be~ignored.
+ Your~key~'\l_keys_key_str'~will~be~ignored.
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\@@_msg_new:nn { Unknown~key~for~rotate }
+ {
+ Unknown~key.\\
+ The~only~key~available~here~is~'c'.\\
+ Your~key~'\l_keys_key_str'~will~be~ignored.
}
% \end{macrocode}
%
@@ -15887,6 +16022,7 @@ version 2005/12/01 or later.
renew-dots,~
renew-matrix,~
respect-arraystretch,~
+ rounded-corners,~
right-margin,~
rules~(with~the~subkeys~'color'~and~'width'),~
small,~
@@ -15920,7 +16056,7 @@ version 2005/12/01 or later.
code-for-first-row,~
code-for-last-col,~
code-for-last-row,~
- colortbl-like,~
+ color-inside,~
columns-width,~
corners,~
create-extra-nodes,~
@@ -15943,6 +16079,7 @@ version 2005/12/01 or later.
renew-dots,~
respect-arraystretch,~
right-margin,~
+ rounded-corners,~
rules~(with~the~subkeys~'color'~and~'width'),~
small,~
t,~
@@ -15981,7 +16118,7 @@ version 2005/12/01 or later.
code-for-first-row,~
code-for-last-col,~
code-for-last-row,~
- colortbl-like,~
+ color-inside,~
columns-type,~
columns-width,~
corners,~
@@ -16007,6 +16144,7 @@ version 2005/12/01 or later.
renew-dots,~
respect-arraystretch,~
right-margin,~
+ rounded-corners,~
rules~(with~the~subkeys~'color'~and~'width'),~
small,~
t,~
@@ -16042,7 +16180,7 @@ version 2005/12/01 or later.
code-for-first-row,~
code-for-last-col,~
code-for-last-row,~
- colortbl-like,~
+ color-inside,~
columns-width,~
corners,~
custom-line,~
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index de3bb30332..af7f6d735e 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index 6fd43c26a6..072769dfa6 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -715,7 +715,7 @@ la consigne générale donnée dans le préambule pour cette colonne (cf.~\ref{h
|\Block| ou colorier le fond avec des bords arrondis avec les clés |fill| et
|rounded-corners|.\footnote{Pour colorier simplement le fond d'une case, il n'y a pas besoin
d'utiliser un bloc mono-case : on peut utiliser la commande |\cellcolor| si la
- clé |colortbl-like| est utilisée : voir p.~\pageref{colortbl-like}.}
+ clé |color-inside| est utilisée : voir p.~\pageref{color-inside}.}
\item On peut tracer une ou plusieurs bordures de la case avec la clé |borders|.
\end{itemize}
@@ -1806,8 +1806,6 @@ par une virgule) :
l'extension \pkg{xcolor} ;
\item \index{opacity (clé des commandes comme\newline \texttt{\textbackslash
rowcolor}, etc.)}
-\colorbox{yellow!50}{\textbf{Nouveau 6.18}}
-
une spécification d'opacité selon la forme \texttt{opacity =
\textsl{valeur}}.\footnote{Attention : cette fonctionnalité génère des instructions de
transparence dans le \textsc{pdf} résultant et certains lecteurs de
@@ -2119,7 +2117,7 @@ Stéphanie \\
On peut aussi utiliser dans la commande |\rowlistcolors| une série de couleurs
définie par la commande |\definecolorseries| de \pkg{xcolor} (et initialisée
avec |\resetcolorseries|\footnote{Pour l'initialisation, on a
- utilisé dans l'exemple qui suit le compteur |iRow| qui, quand il est utilisé
+ utilisé dans l'exemple qui suit le compteur LaTeX |iRow| qui, quand il est utilisé
dans le |\CodeBefore| (ou le |\CodeAfter|) désigne le nombre de rangées du
tableau : cf~p.~\pageref{iRow}. Cela permet un ajustement de la gradation des
couleurs à la taille du tableau.}).
@@ -2258,10 +2256,10 @@ spécial & 12 & 12 & 0.5 & 70 \\
On a utilisé le type de colonne |S| de \pkg{siunitx}.
-\subsection{Outils de coloriage avec la syntaxe de colortbl}
+\subsection{Outils de coloriage en tableau}
-\label{colortbl-like}
-\index{colortbl-like}
+\label{color-inside}
+\index{color-inside}
\index{cellcolor@\texttt{\textbackslash cellcolor}!commande en tableau}
\index{rowcolor@\texttt{\textbackslash rowcolor}!commande en tableau}
\index{columncolor@\texttt{\textbackslash columncolor}!commande dans le
@@ -2269,11 +2267,13 @@ On a utilisé le type de colonne |S| de \pkg{siunitx}.
On peut accéder aux outils de coloriage précédents avec une syntaxe proche de
celle proposée par \pkg{colortbl} (même si \pkg{colortbl} n'est pas chargé). On
-doit pour cela utiliser la clé |colortbl-like| dans l'environnement
+doit pour cela utiliser la clé |color-inside|\footnote{Il existe un alias pour
+ cette clé : \texttt{colortbl-like}.} dans l'environnement
concerné.\footnote{Pour le moment, cette clé n'est \emph{pas} disponible dans
|\NiceMatrixOptions|.}
-On a alors accès aux trois commandes suivantes :
+On a alors accès aux commandes suivantes (les trois premières sont inspirées par
+\pkg{colortbl} mais sont indépendantes de \pkg{colortbl}) :
\begin{itemize}
\item |\cellcolor| qui colorie la case courante\footnote{Néanmoins, cette
commande |\cellcolor| supprimera les espaces qui la suivent, ce que ne fait
@@ -2284,13 +2284,17 @@ On a alors accès aux trois commandes suivantes :
que la commande éponyme de \pkg{colortbl} (néanmoins, contrairement à la
commande |\columncolor| de \pkg{colortbl}, celle de \pkg{nicematrix} peut
apparaître à l'intérieur d'une autre commande, elle-même utilisée dans le
-préambule).
+préambule) ;
+\item \colorbox{yellow!50}{\textbf{Nouveau 6.21}}\enskip |\rowcolors| qui prend pour arguments deux couleurs et colorie la suite du
+tableau avec ces deux couleurs ;
+\item \colorbox{yellow!50}{\textbf{Nouveau 6.21}}\enskip |\rowlistcolors| qui prend pour argument une liste de couleurs et colorie
+la suite du tableau avec ces couleurs.
\end{itemize}
\medskip
\begin{Verbatim}
\NewDocumentCommand { \Blue } { } {~emphase#\columncolor{blue!15}@}
-\begin{NiceTabular}[colortbl-like]{>{\Blue}c>{\Blue}cc}
+\begin{NiceTabular}[color-inside]{>{\Blue}c>{\Blue}cc}
\toprule
~emphase#\rowcolor{red!15}@
Nom & Prénom & Année de naissance \\
@@ -2306,7 +2310,7 @@ Dupont & Chantal & 15 janvier 1998 \\
\begin{center}
\NewDocumentCommand { \Blue } { } {\columncolor{blue!15}}
-\begin{NiceTabular}[colortbl-like]{>{\Blue}c>{\Blue}cc}
+\begin{NiceTabular}[color-inside]{>{\Blue}c>{\Blue}cc}
\toprule
\rowcolor{red!15}
Nom & Prénom & Année de naissance \\
@@ -2350,7 +2354,7 @@ La clé |rowcolor| fixe la couleur de fond et la clé |color| fixe la
couleur du texte.\footnote{La clé |color| utilise la commande |\color| mais
insère aussi une instruction |\leavevmode| devant. Cela évite un espace
vertical parasite dans les cases qui correspondent à des colonnes de type
- |p|, |b|, |m|, |X| et |V| (qui débutent en mode vertical).}
+ |p|, |b|, |m|, |X| et |V| (qui débutent en mode vertical de LateX).}
\item \index{bold (clé de \texttt{\textbackslash RowStyle})}
La clé |bold| impose des caractères gras aux éléments de la rangée, qu'ils
@@ -4429,35 +4433,39 @@ la clé |caption| à la partie \ref{s:caption}, p.~\pageref{s:caption}).
\section{Autres fonctionnalités}
-\subsection{La clé rounded-corners de \{NiceTabular\}}
+\subsection{La clé rounded-corners}
\label{tabular-rounded-corners}
\index{rounded-corners!clé de \texttt{\{NiceTabular\}}}
\index{Coins arrondis!pour un tableau}
-\colorbox{yellow!50}{\textbf{Nouveau 6.18}}\par\nobreak
-
-\smallskip
La clé |rounded-corners| que l'on décrit maintenant n'a pas de lien direct avec
la clé |corners| (qui sert à spécifier les «coins vides») décrite à la
partie~\ref{corners}, p.~\pageref{corners}.
\smallskip
-L'environnement |{NiceTabular}| propose une clé |rounded-corners| qui spécifie
-que le tableau devra avoir des coins arrondis avec le rayon égal à la valeur
-de cette clé (la valeur par défaut est 4~pt\footnote{Cette valeur est la valeur
- par défaut des «\texttt{rounded corners}» de PGF/Tikz.}). Plus précisément,
-cette clé a deux effets que l'on décrit maintenant.
+La clé |rounded-corners| spécifie que le tableau ou la matrice devra avoir des
+coins arrondis avec un rayon égal à la valeur de cette clé (la valeur par défaut est
+4~pt\footnote{Cette valeur est la valeur par défaut des «\texttt{rounded
+ corners}» de PGF/Tikz.}). Plus précisément, cette clé a deux effets que l'on
+décrit maintenant.
\begin{itemize}
\item Toutes les commandes de coloriage de cases, colonnes et rangées (que ce
soit dans le |\CodeBefore| ou bien directement dans le tableau (quand la clé
-|colortbl-like| est utilisée) respectent ces coins arrondis pour le tableau.
+|color-inside| est utilisée) respectent ces coins arrondis pour le tableau.
\item Quand la clé |hvlines| est utilisée, les filets extérieurs sont tracés
-avec des coins arrondis.
+avec des coins arrondis.\footnote{Bien sûr, lorsqu'il s'agit d'un environnement
+ avec des délimiteurs (|{pNiceArray}|, |{pNiceMatrix}|, etc.) la clé
+ |hvlines| ne trace pas les filets extérieurs.}
\end{itemize}
\bigskip
+\colorbox{yellow!50}{\textbf{Nouveau 6.21}} Cette clé est disponible dans tous
+les environnements et commandes de \pkg{nicematrix} (comme
+|\pAutoNiceMatrix|) et également dans |\NiceMatrixOptions|.
+
+\bigskip
\begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
\begin{NiceTabular}{ccc}[hvlines,~emphase#rounded-corners@]
\CodeBefore
@@ -4644,6 +4652,19 @@ $A = \begin{pNiceMatrix}[last-row,last-col=4]
\end{pNiceMatrix}$
\end{varwidth}
+\bigskip
+\colorbox{yellow!50}{\textbf{Nouveau 6.21}}\enskip La commande |\rotate| accepte
+une option |c| entre crochets : |\rotate[c]|. Quand cette clé est utilisée, le
+contenu, après rotation, est composé dans une |\vcenter|, ce qui fait que, le
+plus souvent, on obtiendra un centrage vertical.
+
+
+\medskip
+Attention : la commande |\rotate| est prévue pour être utilisée dans un |\Block|
+ou bien dans des colonnes de type |l|, |c|, |r|, |w| ou |W|; si elle est
+utilisée dans un autre type de colonne (commme |p{...}|), les résultats ne
+seront peut-être pas ceux attendus.
+
\subsection{L'option small}
@@ -4883,9 +4904,9 @@ $\begin{NiceArrayWithDelims}
\indexcommand{OnlyMainNiceMatrix}
La commande |\OnlyMainNiceMatrix| n'exécute son argument que si on se trouve
-dans le tableau principal, c'est-à-dire que l'on n'est pas dans les rangées
-extérieures. Si elle est utilisée hors d'un environnement de \pkg{nicematrix},
-elle est sans effet.
+dans le tableau principal, c'est-à-dire que l'on est ni dans les rangées
+extérieures, ni dans les colonnes extérieures. Si elle est utilisée hors d'un
+environnement de \pkg{nicematrix}, elle est sans effet.
Pour un exemple d'utilisation, voir \url{tex.stackexchange.com/questions/488566}
@@ -6657,14 +6678,14 @@ composantes de la matrice.\footnote{Pour la commande |\cline|, voir la remarque
\vspace{1cm}
Il est possible de colorier une rangée avec |\rowcolor| dans le |\CodeBefore|
(ou avec |\rowcolor| dans une case de la rangée si on utilise la clé
-|colortbl-like| − même si \pkg{colortbl} n'est pas chargé).
+|color-inside| − même si \pkg{colortbl} n'est pas chargé).
-\index{colortbl-like|textit}
+\index{color-inside|textit}
\index{rowcolor@\texttt{\textbackslash rowcolor}!commande en tableau|textit}
\begin{Verbatim}
-\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,colortbl-like]
+\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,color-inside]
~emphase#\rowcolor{red!15}@A_{11} & A_{12} & A_{13} & A_{14} \\
A_{21} & ~emphase#\rowcolor{red!15}@A_{22} & A_{23} & A_{24} \\
A_{31} & A_{32} & ~emphase#\rowcolor{red!15}@A_{33} & A_{34} \\
@@ -6674,7 +6695,7 @@ Il est possible de colorier une rangée avec |\rowcolor| dans le |\CodeBefore|
-\[\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,colortbl-like]
+\[\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,color-inside]
\rowcolor{red!15}A_{11} & A_{12} & A_{13} & A_{14} \\
A_{21} & \rowcolor{red!15}A_{22} & A_{23} & A_{24} \\
A_{31} & A_{32} & \rowcolor{red!15}A_{33} & A_{34} \\
diff --git a/macros/latex/contrib/nicematrix/nicematrix.ins b/macros/latex/contrib/nicematrix/nicematrix.ins
index 2fff6fcb8c..838315cbb2 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.ins
+++ b/macros/latex/contrib/nicematrix/nicematrix.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2018-2022 by F. Pantigny
+%% Copyright (C) 2018-2023 by F. Pantigny
%%
%%
%% This file may be distributed and/or modified under the
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index ec37719356..7a7606184d 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex
index 9987ba819b..91758773dd 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix.tex
@@ -687,7 +687,7 @@ derogation of the type of column given in the preamble of the array.
command |\Block| and to fill the background with rounded corners with the keys
|fill| and |rounded-corners|.\footnote{If one simply wishes to color the
background of a unique cell, there is no point using the command |\Block|:
-it's possible to use the command |\cellcolor| (when the key |colortbl-like| is
+it's possible to use the command |\cellcolor| (when the key |color-inside| is
used).}
\item It's possible to draw one or several borders of the cell with the key |borders|.
@@ -1753,7 +1753,6 @@ by a comma)
\item the colorimetric space (|RGB|, |rgb|, |HTML|, etc) as specified by the
the extension \pkg{xcolor};
\item \index{opacity (key of commands such as\newline \texttt{\textbackslash rowcolor}, etc.)}
-\colorbox{yellow!50}{\textbf{New 6.18}}\par\nobreak
a specification of opacity of the form \texttt{opacity =
\textsl{value}}.\footnote{Caution : that feature creates instructions of
transparency in the \textsc{pdf} and some \textsc{pdr} don't support such instructions.}
@@ -2198,9 +2197,9 @@ special & 12 & 12 & 0.5 & 70 \\
We have used the type of column |S| of \pkg{siunitx}.
-\subsection{Color tools with the syntax of colortbl}
+\subsection{Color tools to be used inside the tabular}
-\index{colortbl-like}
+\index{color-inside}
\index{cellcolor@\texttt{\textbackslash cellcolor}!command in tabular}
\index{rowcolor@\texttt{\textbackslash rowcolor}!command in tabular}
\index{columncolor@\texttt{\textbackslash columncolor}!command in the preamble
@@ -2208,11 +2207,12 @@ We have used the type of column |S| of \pkg{siunitx}.
It's possible to access the preceding tools with a syntax close to the syntax
-of \pkg{colortbl}. For that, one must use the key |colortbl-like| in the
+of \pkg{colortbl}. For that, one must use the key |color-inside|\footnote{There
+ is an alias for that key : \texttt{colortbl-like}.} in the
current environment.\footnote{Up to now, this key is \emph{not} available in |\NiceMatrixOptions|.}
-There are three commands available (they are inspired by \pkg{colortbl} but
-are \emph{independent} of \pkg{colortbl}):
+There are several commands available (the first three ones are inspired by
+\pkg{colortbl} but are \emph{independent} of \pkg{colortbl}):
\begin{itemize}
\item |\cellcolor| which colorizes a cell;\footnote{However, this command
|\cellcolor| will delete the following spaces, which does not the command
@@ -2223,13 +2223,17 @@ the row;
with the same syntax as the corresponding command of
\pkg{colortbl} (however, unlike the command |\columncolor| of \pkg{colortbl},
this command |\columncolor| can appear within another command, itself used in the
-preamble of the array).
+preamble of the array);
+\item \colorbox{yellow!50}{\textbf{New 6.21}}\enskip |\rowcolors| which takes in as arguments two colors and color the rest of
+the tabular with those colors;
+\item \colorbox{yellow!50}{\textbf{New 6.21}}\enskip |\rowlistcolors| which takes in as argument a color and color the rest of
+the tabular with the colors of that list of colors.
\end{itemize}
\smallskip
\begin{Verbatim}
\NewDocumentCommand { \Blue } { } { ~emphase#\columncolor{blue!15}@ }
-\begin{NiceTabular}[colortbl-like]{>{\Blue}c>{\Blue}cc}
+\begin{NiceTabular}[color-inside]{>{\Blue}c>{\Blue}cc}
\toprule
~emphase#\rowcolor{red!15}@
Last name & First name & Birth day \\
@@ -2245,7 +2249,7 @@ Dupont & Chantal & 15 janvier 1998 \\
\begin{center}
\NewDocumentCommand { \Blue } { } { \columncolor{blue!15} }
-\begin{NiceTabular}[colortbl-like]{>{\Blue}c>{\Blue}cc}
+\begin{NiceTabular}[color-inside]{>{\Blue}c>{\Blue}cc}
\toprule
\rowcolor{red!15}
Last name & First name & Birth day \\
@@ -2288,7 +2292,7 @@ color of the text.\footnote{The key |color| uses the command
|\color| but inserts also an instruction |\leavevmode| before. This
instruction prevents a extra vertical space in the cells which belong to
columns of type |p|, |b|, |m|, |X| and |V| (which start in
-vertical mode).}
+vertical mode of LaTeX).}
\item \index{bold (key of \texttt{\textbackslash RowStyle})} The key |bold|
enforces bold characters for the cells of the row, both in math and text mode.
\end{itemize}
@@ -4331,34 +4335,37 @@ provided by \pkg{nicematrix} (see the key |caption| in the section
\section{Other features}
-\subsection{The key rounded-corners of \{NiceTabular\}}
+\subsection{The key rounded-corners}
\label{tabular-rounded-corners}
\index{rounded-corners!key of \texttt{\{NiceTabular\}}}
\index{Corners (rounded ---)!for a tabular}
-\colorbox{yellow!50}{\textbf{New 6.18}}\par\nobreak
-
-\smallskip
The key |rounded-corners| that we will describe now has no direct link with
the key |corners| (which is used to specify ``empty corners'') described in
the part~\ref{corners}, p.~\pageref{corners}.
\smallskip
-The environment |{NiceTabular}| provides a key |rounded-corners| which specify
-that the tabular should have rounded corners with a radius equal to the value of
-that key (the default value is 4~pt\footnote{This value is the initial value of
- the \emph{rounded corners} of Tikz.}). More precisely, that key has two
-effects that we describe now.
+The key |rounded-corners| specifies that the tabular should have rounded corners
+with a radius equal to the value of that key (the default value is
+4~pt\footnote{This value is the initial value of the \emph{rounded corners} of
+ Tikz.}). More precisely, that key has two effects that we describe now.
\begin{itemize}
\item All the commands for coloring the cells, columns and rows (in the
-|\CodeBefore| but also directly in the array when the key |colortbl-like| is
+|\CodeBefore| but also directly in the array when the key |color-inside| is
used) will respect those rounded corners.
\item When the key |hvlines| is used, the exterior rules will be drawn with
-rounded corners.
+rounded corners.\footnote{Of course, when used in an environment with delimiters
+(|{pNiceMatrix}|, |{bNiceArray}|, etc.), the key |hvlines| does not draw the
+exterior rules.}
\end{itemize}
+
+\colorbox{yellow!50}{New 6.21}\enskip That key is available in all
+the environments and commands (e.g. |\pAutoNiceMatrix|) of \pkg{nicematrix} and also
+in the command |\NiceMatrixOptions|.
+
\bigskip
\begin{BVerbatim}[baseline=c,boxwidth=9cm]
\begin{NiceTabular}
@@ -4549,6 +4556,17 @@ $A = \begin{pNiceMatrix}[last-row=4,last-col=4]
\end{pNiceMatrix}$
\end{varwidth}
+\bigskip
+\colorbox{yellow!50}{\textbf{New 6.21}}\enskip The command |\tabular| has a key
+|c|: |\tabular[c]|. When that key is used, the content is composed in a
+|\vcenter| and, therefore, in most cases, we will have a vertical alignment.
+
+
+
+\bigskip
+Caution: the command |\rotate| is designed to be used in a |\Block| or in
+columns of type |l|, |r|, |c|, |w| ou |W|; if it is used in other column types
+(such as |p{...}|), the result will maybe differ from what is expected.
\subsection{The option small}
@@ -4788,8 +4806,8 @@ $\begin{NiceArrayWithDelims}
The command |\OnlyMainNiceMatrix| executes its argument only when it is in the
main part of the array, that is to say when it is not in one of the exterior
-rows. If it is used outside an environment of \pkg{nicematrix}, that command is
-no-op.
+rows or one of the exterior columns. If it is used outside an environment of
+\pkg{nicematrix}, that command is no-op.
For an example of utilisation, see \url{tex.stackexchange.com/questions/488566}
@@ -6561,16 +6579,16 @@ see the remark p.~\pageref{remark-cline}.}
\vspace{1cm}
It's possible to color a row with |\rowcolor| in the |code-before| (or with
-|\rowcolor| in the first cell of the row if the key |colortbl-like| is
+|\rowcolor| in the first cell of the row if the key |color-inside| is
used−even when \pkg{colortbl} is not loaded).
-\index{colortbl-like|textit}
+\index{color-inside|textit}
\index{rowcolor@\texttt{\textbackslash rowcolor}!command in tabular|textit}
\medskip
\begin{Verbatim}
-\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,colortbl-like]
+\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,color-inside]
~emphase#\rowcolor{red!15}@A_{11} & A_{12} & A_{13} & A_{14} \\
A_{21} & ~emphase#\rowcolor{red!15}@A_{22} & A_{23} & A_{24} \\
A_{31} & A_{32} & ~emphase#\rowcolor{red!15}@A_{33} & A_{34} \\
@@ -6580,7 +6598,7 @@ used−even when \pkg{colortbl} is not loaded).
-\[\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,colortbl-like]
+\[\begin{pNiceArray}{>{\strut}cccc}[margin, extra-margin=2pt,color-inside]
\rowcolor{red!15}A_{11} & A_{12} & A_{13} & A_{14} \\
A_{21} & \rowcolor{red!15}A_{22} & A_{23} & A_{24} \\
A_{31} & A_{32} & \rowcolor{red!15}A_{33} & A_{34} \\
@@ -6885,6 +6903,15 @@ The successive versions of the file |nicematrix.sty| provided by TeXLive are ava
\nolinkurl{https:www.tug.org/svn/texlive/trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty}
}
+\subsection*{Changes between version 6.20a and 6.21}
+
+Key |c| for the command |\tabularnote|.
+
+New commands |\rowcolors| and |\rowlistcolors| available in the array itself
+(previously, there were only two commands |\rowcolors| and |\rowlistcolors|
+avaailable in the |\CodeBefore|.
+
+
\subsection*{Changes between version 6.20 and 6.20a}
The value of the key |name| of an environment of \pkg{nicematrix} is expanded
diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx
index 6123adab0c..baba6274a8 100644
--- a/macros/latex/contrib/projlib/ProjLib.dtx
+++ b/macros/latex/contrib/projlib/ProjLib.dtx
@@ -19,84 +19,84 @@
%<*ProjLib>
\ProvidesExplPackage
{ProjLib}
- {2023/01/05} {}
+ {2023/07/14} {}
{Collective interface of the ProjLib toolkit}
%</ProjLib>
%
%<*projlib-author>
\ProvidesExplPackage
{projlib-author}
- {2023/01/05} {}
+ {2023/07/14} {}
{Enhanced author information block}
%</projlib-author>
%
%<*projlib-datetime>
\ProvidesExplPackage
{projlib-datetime}
- {2023/01/05} {}
+ {2023/07/14} {}
{Convert numeric date-time string to natural language}
%</projlib-datetime>
%
%<*projlib-draft>
\ProvidesExplPackage
{projlib-draft}
- {2023/01/05} {}
+ {2023/07/14} {}
{Useful commands during draft stage}
%</projlib-draft>
%
%<*projlib-font>
\ProvidesExplPackage
{projlib-font}
- {2023/01/05} {}
+ {2023/07/14} {}
{Font selection and configuration}
%</projlib-font>
%
%<*projlib-language>
\ProvidesExplPackage
{projlib-language}
- {2023/01/05} {}
+ {2023/07/14} {}
{Multi-language configuration}
%</projlib-language>
%
%<*projlib-logo>
\ProvidesExplPackage
{projlib-logo}
- {2023/01/05} {}
+ {2023/07/14} {}
{The ProjLib logo}
%</projlib-logo>
%
%<*projlib-math>
\ProvidesExplPackage
{projlib-math}
- {2023/01/05} {}
+ {2023/07/14} {}
{Efficient math setup}
%</projlib-math>
%
%<*projlib-paper>
\ProvidesExplPackage
{projlib-paper}
- {2023/01/05} {}
+ {2023/07/14} {}
{Configuration of the paper style}
%</projlib-paper>
%
%<*projlib-text>
\ProvidesExplPackage
{projlib-text}
- {2023/01/05} {}
+ {2023/07/14} {}
{Text-related commands}
%</projlib-text>
%
%<*projlib-theorem>
\ProvidesExplPackage
{projlib-theorem}
- {2023/01/05} {}
+ {2023/07/14} {}
{Configuration of theorem-like environments}
%</projlib-theorem>
%
%<*projlib-titlepage>
\ProvidesExplPackage
{projlib-titlepage}
- {2023/01/05} {}
+ {2023/07/14} {}
{Commands for rendering the title page}
%</projlib-titlepage>
@@ -317,7 +317,6 @@
\NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark
- \tl_gset:Nn \footnotemark {}
\NewCommandCopy \projlib_author_backup_thanks:w \thanks
\cs_undefine:N \thanks
@@ -341,7 +340,9 @@
{
\hook_gput_code:nnn { cmd/@title/after } { projlib-author }
{
+ \tl_set:Nn \footnotemark {}
\projlib_author_pre_thanks:n { #1 }
+ \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark:
}
}
}
@@ -353,10 +354,8 @@
{
\projlib_author_backup_my_author:w
{
- \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark:
\RenewCommandCopy \thanks \projlib_author_backup_thanks:w
#1
- \tl_gset:Nn \footnotemark {}
}
}
}
@@ -443,8 +442,8 @@
\cs_undefine:N \email
\cs_undefine:N \dedicatory
\cs_undefine:N \keywords
- \cs_undefine:N \footnotemark
- \NewCommandCopy \footnotemark \projlib_author_backup_footnotemark:
+ % \cs_undefine:N \footnotemark
+ % \NewCommandCopy \footnotemark \projlib_author_backup_footnotemark:
\bool_gset_true:N \g__projlib_author_already_maketitle_bool
}
}
@@ -3236,6 +3235,11 @@
\projlib_language_use_language_locally:en { #1 } { #2 }
\group_end:
}
+\NewDocumentEnvironment { OtherLanguage } { m +b }
+ {
+ \projlib_language_use_language_locally:en { #1 } { #2 }
+ }
+ { }
\UseLanguage { \g__projlib_language_main_str }
@@ -3957,14 +3961,14 @@
\CreateTheorem { theorem } { parent counter = chapter, create starred version }
\bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool
{
- \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version }
+ \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version, quiet }
}
}
{ % without \chapter
\CreateTheorem { theorem } { parent counter = section, create starred version }
\bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool
{
- \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version }
+ \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version, quiet }
}
}
}
@@ -3974,14 +3978,14 @@
\CreateTheorem { theorem } { create starred version }
\bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool
{
- \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version }
+ \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version, quiet }
}
}
{
\CreateTheorem { theorem } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version }
\bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool
{
- \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version }
+ \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version, quiet }
}
}
}
@@ -4685,7 +4689,7 @@
}
, crefname = {
, english = {Example}{Example}
- , french = [l']{Example}[les]{Example}
+ , french = [l']{Exemple}[les]{Exemple}
, ngerman = {Beispiel}{Beispiel}
, italian = [l']{Esempio}[gli]{Esempio}
, portuguese = [o]{Exemplo}[os]{Exemplo}
@@ -4698,7 +4702,7 @@
}
, Crefname = {
, english = {Example}{Example}
- , french = [L']{Example}[Les]{Example}
+ , french = [L']{Exemple}[Les]{Exemple}
, ngerman = {Beispiel}{Beispiel}
, italian = [L']{Esempio}[Gli]{Esempio}
, portuguese = [O]{Exemplo}[Os]{Exemplo}
@@ -5436,12 +5440,12 @@
\fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
\fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
\node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left]
- at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$)
+ at ($(current~page.north~west)+(.333\paperwidth,-.17\paperheight)$)
{
\projlib_titlepage_show_logo:n { \scalebox { 2 } { \ProjLib } }
};
\node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left]
- at ($(current~page.north~west)+(.57\paperwidth,-.28\paperheight)$)
+ at ($(current~page.north~west)+(.583\paperwidth,-.28\paperheight)$)
{
\color{titlepage-back}
\sffamily
@@ -5470,12 +5474,12 @@
\fill[color=white] ($(current~page.south~west)$) rectangle ($(current~page.north~east)$);
\fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$);
\node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left]
- at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$)
+ at ($(current~page.north~west)+(.28\paperwidth,-.15\paperheight)$)
{
\projlib_titlepage_show_logo:n { \scalebox { 2 } { \ProjLib } }
};
\node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left]
- at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$)
+ at ($(current~page.north~west)+(.53\paperwidth,-.28\paperheight)$)
{
\color{white}
\sffamily
diff --git a/macros/latex/contrib/projlib/README.md b/macros/latex/contrib/projlib/README.md
index c7b786b84a..f5d45d14cb 100644
--- a/macros/latex/contrib/projlib/README.md
+++ b/macros/latex/contrib/projlib/README.md
@@ -1,12 +1,13 @@
<!-- Copyright (C) 2021-2023 by Jinwen XU -->
-![image](https://github.com/Jinwen-XU/ProjLib/raw/main/logo/ProjLib-logo.png)
+<!-- ![image](https://github.com/Jinwen-XU/ProjLib/raw/main/logo/ProjLib-logo.png) -->
+<div align=center><img height="150" src="https://github.com/Jinwen-XU/ProjLib/raw/main/logo/ProjLib-logo.png"/></div>
# The `ProjLib` Toolkit
-> **This bundle is dated 2023/01/05.**
+> **This bundle is dated 2023/07/14.**
-> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).**
+> **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).**
## Introduction
@@ -67,14 +68,14 @@ The modules include:
> Since the module `theorem` uses `cleveref`, it should be loaded after `varioref` and `hyperref` (same for the main package `ProjLib`).
-## Regarding the files and the compilation of documentations
+<!-- ## Regarding the files and the compilation of documentations -->
### How to get these files
-You can get the `.sty` files mentioned above simply by compiling `ProjLib.ins`:
+You can get the `.sty` files mentioned above by compiling `ProjLib.ins`:
```
latex ProjLib.ins
```
-
+<!--
### How to get the source of the documentation
You can get the `.tex` source files of the documentation by compiling `ProjLib-doc.ins`:
```
@@ -90,6 +91,7 @@ Here `**` should be replaced with the language identifier, such as `en`.
### Automation
All these can be done with the given script `MakeFile.sh`.
+-->
# License