summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-02-28 03:01:24 +0000
committerNorbert Preining <norbert@preining.info>2021-02-28 03:01:24 +0000
commit189140b53960215eec1626503040fb38360ab4ed (patch)
treee7551ffd51e263ef259dcd95668d5b35377590cd /macros
parent4e6fb7c03bc033485887a99d2ffeca70ef8c0644 (diff)
CTAN sync 202102280301
Diffstat (limited to 'macros')
-rw-r--r--macros/generic/chemfig/README4
-rw-r--r--macros/generic/chemfig/chemfig-en.pdfbin1092263 -> 1090751 bytes
-rw-r--r--macros/generic/chemfig/chemfig-en.tex83
-rw-r--r--macros/generic/chemfig/chemfig-fr.pdfbin1120059 -> 1118323 bytes
-rw-r--r--macros/generic/chemfig/chemfig-fr.tex81
-rw-r--r--macros/generic/chemfig/chemfig.tex196
-rw-r--r--macros/generic/chemfig/lewis.tex129
-rw-r--r--macros/generic/schemata/README.md13
-rw-r--r--macros/generic/schemata/schemata.dtx30
-rw-r--r--macros/generic/schemata/schemata.pdfbin705502 -> 705866 bytes
-rw-r--r--macros/latex-dev/required/firstaid/README.md9
-rw-r--r--macros/latex-dev/required/firstaid/changes.txt51
-rw-r--r--macros/latex-dev/required/firstaid/firstaid.ins78
-rw-r--r--macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx521
-rw-r--r--macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdfbin0 -> 224897 bytes
-rw-r--r--macros/latex/contrib/babel-contrib/german/README2
-rw-r--r--macros/latex/contrib/babel-contrib/german/german.ins6
-rw-r--r--macros/latex/contrib/babel-contrib/german/germanb.dtx46
-rw-r--r--macros/latex/contrib/babel-contrib/german/germanb.pdfbin395190 -> 396377 bytes
-rw-r--r--macros/latex/contrib/babel-contrib/german/ngermanb.dtx36
-rw-r--r--macros/latex/contrib/babel-contrib/german/ngermanb.pdfbin371703 -> 372481 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md23
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib5
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdfbin824330 -> 832745 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex349
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def10
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx2
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.pdfbin290207 -> 290203 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.tex28
-rw-r--r--macros/latex/contrib/easybook/doc/easybook.pdfbin232847 -> 233035 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook.tex20
-rw-r--r--macros/latex/contrib/easybook/doc/pages/chapter3.tex2
-rw-r--r--macros/latex/contrib/easybook/easybook.cls35
-rw-r--r--macros/latex/contrib/nameauth/Makefile20
-rw-r--r--macros/latex/contrib/nameauth/README.md71
-rw-r--r--macros/latex/contrib/nameauth/examples.tex8
-rw-r--r--macros/latex/contrib/nameauth/nameauth.dtx88
-rw-r--r--macros/latex/contrib/nameauth/nameauth.pdfbin1144403 -> 1144677 bytes
110 files changed, 1551 insertions, 543 deletions
diff --git a/macros/generic/chemfig/README b/macros/generic/chemfig/README
index de87a14c9b..894be61c10 100644
--- a/macros/generic/chemfig/README
+++ b/macros/generic/chemfig/README
@@ -2,9 +2,9 @@ ___________________________________
The
Chemfig package
- v1.56
+ v1.6
- 2020/07/13
+ 2021/02/26
___________________________________
Maintainer: Christian Tellechea
diff --git a/macros/generic/chemfig/chemfig-en.pdf b/macros/generic/chemfig/chemfig-en.pdf
index 990c8454ba..bd50f2d2a7 100644
--- a/macros/generic/chemfig/chemfig-en.pdf
+++ b/macros/generic/chemfig/chemfig-en.pdf
Binary files differ
diff --git a/macros/generic/chemfig/chemfig-en.tex b/macros/generic/chemfig/chemfig-en.tex
index 281530c1cd..d0cf711b11 100644
--- a/macros/generic/chemfig/chemfig-en.tex
+++ b/macros/generic/chemfig/chemfig-en.tex
@@ -216,47 +216,22 @@
\setitemize{leftmargin=3em,topsep=0pt,parsep=0pt,itemsep=0pt}
\part{Introduction}
-\section{New in v1.5}
-\subsection{The primitive \texttt{\protect\textbackslash expanded}}
-As of version 1.54, \CF requires a \TeX{} engine that provides the \verb|\expanded| primitive and becomes incompatible with con\TeX t. If \verb|\expanded| is not available or is not a primitive, \CF will not be loaded. It is strongly recommended that you update your \LaTeX{} distribution in order to take advantage of the newer engine that provide for the use of this new primitive.
-
-\subsection{The macro \texttt{\protect\textbackslash charge}}
-Version 1.5 implements the macros \verb|\charge| and \verb|\Charge| (see page~\pageref{charge}) whose purpose is to place arbitrary elements around an atom that can be placed with great precision. These macros will replace the \verb|\lewis| and \verb|\Lewis| macros because they are much more powerful and configurable, even if more verbose. It is therefore important to note that the macros \verb|\lewis| and \verb|\Lewis| \textcolor{red}{\bfseries are no longer documented and will be removed from the \CF package}.
-
-\exemple{La macro \string\charge}/Simple charges around A :
-\Charge{0=\:,
- 0:3pt[anchor=180]=$\color{red}\scriptstyle\delta^+$,
- 120={\"["width=2pt,"style={draw=green,fill=gray}]},
- 210=\|
- }{A}
-\par
-Complex charges aroud "B" :
-\Charge{%
- 30:10pt={\chemfig[atom sep=6pt,double bond sep=1.5pt]{[:20]*6(=-=-=-)}},
- 120:5pt[scale=0.4,rotate=30,anchor=center]=\chemfig{CH_2=CH_2},
- -45[anchor=west,rotate=\chargeangle]={%
- \begin{tikzpicture}
- \node[anchor=mid west](a){$\oplus$};\draw[-stealth](a)--(-.5,0);
- \end{tikzpicture}}%
- }{B}/
-
-\subsection{Consecutive bonds}
-As of version 1.5, two bonds are joined if the atom between them has all its dimensions equal to zero (i.e. width, height and depth in the sense of \TeX). Previously, two bonds were joined if the atom was \emph{empty}, which was more restrictive.
-
-Together with the use of the macro \verb|\charge|, this new feature makes it possible to place charges in a chain without using invisible bonds.
-\exemple{Consecutive bonds}/\chemfig{[:30]-\charge{90=\:}{}
--[:-30]\charge{-90=\"}{}-\charge{90:2pt=$\delta^+$}{}-[:-30]}/
+\section{New in v1.6}
+\subsection{Lewis decorations}
+As announced since version 1.5 of 5/3/2020, the deprecated macros \verb|lewis| and \verb|Lewis| are no longer available in the \CF package. The recommended method for drawing Lewis formulas is to use \verb|\charge| and \verb|\Charge|, see page~\pageref{charge}.
-\subsection{Center of rings}
-The center of each ring is reachable with a \TIKZ node. See page~\pageref{centre_cycle}.
+If the use of the macros \verb|lewis| and \verb|Lewis| is indispensable, their code is in the file \verb|lewis.tex| which it is possible to load using \verb|input|, after having loaded the package \CF.
-\subsection{Manual Update}
-More detailed explanations are given on:
-\begin{itemize}
- \item the role played by the first atom encountered in the placement of the whole molecule (page~\pageref{premieratome1} and \pageref{premieratome});
- \item how \CF places the atoms in a group of atoms (page~\pageref{placementatomes});
- \item how a bond joins two atoms (page~\pageref{liaisonatomes}).
-\end{itemize}
+\subsection{Key debug}
+A new boolean key \CFkey{debug}, false by default, is available. When set to \verb|true|, the (rectangular) outline of each group of atoms is drawn in red and the outline of each atom is drawn in gray. The number of the group of atoms is shown above the red rectangle, and similarly for the number of each atom (the atoms are numbered from left to right, starting from 1). These numbers allow to know the name of the node of each atom whose syntax is \verb|n<a>-<b>| where \verb|<a>| is the number of the atom group and \verb|<b>| is the number of the atom.
+
+In this example, a blue arrow starts at atom \verb|n1-3|, which is "C2", and goes to atom \verb|n2-4|, which is "Gz".
+\exemple{Name of nodes}/\setchemfig{debug=true}
+\chemfig{A1BC2-[:30]DxEyFGz-H3I}
+\chemmove{\draw[blue](n1-3)to[out=75,in=90](n2-4);}/
+
+\subsection{Token \texttt\# in schemes}
+In a scheme, the \verb|#| token is now allowed when in the argument of the \verb|\chemfig| macro. See page~\pageref{modif.retrait}.
\section{Presenting \protect\CF}
To use this package, start by adding the following code to the preamble:
@@ -312,13 +287,7 @@ Here is the complete list of parameters as well as their default values\label{li
\CFparam{angle increment}
\CFparam{node style}
\CFparam{bond style}
- \CFparam{lewis | width}
- \CFparam{lewis sep}
- \CFparam{lewis length}
- \CFparam{lewis style}
- \CFparam{lewis dist}
- \CFparam{lewis radius}
- \CFparam{lewis diag coeff}
+ \CFparam{debug}
\CFparam{cycle radius coeff}
\CFparam{stack sep}
\CFparam{show cntcycle}
@@ -1296,7 +1265,7 @@ The \chevrons{keys}${}={}$\chevrons{values} available in the \chevrons{general p
\Chargeparam{extra sep} & node size increment of the \chevrons{atom} to put the \chevrons{charges}: it is the value passed to the \CFkey{inner sep} of \TIKZ.\\
\Chargeparam{overlay} & boolean which, when \CFval{true}, draws the \chevrons{charges} "overlay", i.e. outside the final bounding box.\\
\Chargeparam{shortcuts}&boolean which, when \CFval{true}, activates the shortcuts"\verb-\.-," "\verb-\:-," "\verb-\|- and "\verb-\"-" to draw Lewis formuas.\\
- \Chargeparam{lewisautorot}&booleann which, when \CFval{true}, automatically rotates "\verb-\:-," "\verb-\|- and "\verb-\"-".\\
+ \Chargeparam{lewisautorot}&boolean which, when \CFval{true}, automatically rotates "\verb-\:-," "\verb-\|- and "\verb-\"-".\\
\Chargeparam{.radius}&radius of the point used to plot "\verb|\.|" and "\verb|\:|".\\
\Chargeparam{:sep} & separation between the two dots of "\verb|\:|".\\
\Chargeparam{.style}&\TIKZ style used to draw the "\verb|\.|" and "\verb|\:|" dots.\\
@@ -1350,12 +1319,6 @@ The key \CFkey{lewisautorot}, which is \CFval{true} by default, acts on {\setcha
\exemple{Autorot}/\Charge{60=\:,150=\"}{A} et
\Charge{[lewisautorot=false]60=\:,150=\"}{A}/
-The \verb|lewis| and \verb|Lewis| macros are still functional, but are no longer maintained or documented, and \textcolor{red}{\bfseries will be removed in a future version}, so it is advisable to prefer the \verb|\charge| and \verb|\Charge| macros, which give comparable results as shown below, while being much more powerful and configurable:
-
-\exemple{Comparison with \string\Lewis}/\Lewis{1:3.5|,X}\quad\Lewis{0:2.3|,X}\qquad(avec \string\Lewis)\par
-\Charge{45=\:,135=\.,225=\"}{X}\quad\Charge{0=\:,90=\.,135=\"}{X}%
-\qquad(avec \string\Charge)/
-
The customization of Lewis' formulas is done via the macro \verb|\setcharge| or via the optional argument of \verb|\charge| by acting on the keys \CFkey{.radius}, \CFkey{:sep}, \CFkey{.style}, \CFkey{|style}, \CFkey{"length}, \CFkey{"width} and \CFkey{"style}. It is also possible to modify these keys for each formula with their optional argument which receives a list of \CFkey{keys}${}={}$\chevrons{values}.
\exemple{Ccustomization}/\Charge{[.radius=1.5pt,.style={draw=gray}]
@@ -1368,11 +1331,9 @@ The customization of Lewis' formulas is done via the macro \verb|\setcharge| or
135=\"[{"width=3pt,"style={line width=.8pt,draw=blue,fill=cyan}}]}{A}/
\subsection{Integration in \CF}
-A macro \verb|\charge| can take the place of an atom, just like it did with \verb|\lewis|.
+A macro \verb|\charge| can take the place of an atom.
-\exemple{Charge in \CF}*\chemfig{H-\chemabove{\lewis{5|7,O}}{\quad\scriptstyle+}(-[2]H)-H}
-\qquad
-\chemfig{H-\charge{45:1.5pt=$\scriptstyle+$,-45=\|,-135=\"}{O}(-[2]H)-H}*
+\exemple{Charge in \CF}*\chemfig{H-\charge{45:1.5pt=$\scriptstyle+$,-45=\|,-135=\"}{O}(-[2]H)-H}*
However, \CF has been modified so that the bonds are \emph{joined} when the dimensions of an atom is zero, that is, if its width, height and depth are all \verb|0pt|. This was previously only the case if the atom was empty. This new feature makes it easy to place charges in carbon chains.
@@ -2468,16 +2429,10 @@ The commands created by \CF are:
\item \CFkv{angle increment} {45}: increment of the angle of bonds
\item \CFkv{node style} {{}}: style of atoms
\item \CFkv{bond style} {{}}: style of bonds
- \item \CFkv{lewis | width} {0.3ex}: width of the rectangle Lewis "|"
- \item \CFkv{lewis sep} {0.4ex}: space between atom and Lewis formulas
- \item \CFkv{lewis length} {1.5ex}: length of Lewis formulas
- \item \CFkv{lewis style} {{}}: style of Lewis formulas
- \item \CFkv{lewis dist} {0.3em}: space between discs of the ":" Lewis formulas
- \item \CFkv{lewis radius} {0.15ex}: radius of discs for Lewis formulas
- \item \CFkv{lewis diag coeff} {1}: factor that multiplies the distance to Lewis formulas in odd directions
\item \CFkv{cycle radius coeff} {0.75}: shrinkage ratio of the circle or arc inside cycles
\item \CFkv{stack sep} {1.5pt}: vertical gap between arguments of \verb-\chemabove- and \verb-\chembelow- macros
\item \CFkv{show cntcycle} {false}: show rings numbers
+ \item \CFkv{debug} {false}: show atoms ans groups of atoms
\item \CFkv{autoreset cntcycle} {true}: reset ring counter at \verb|\chemfig| execution
\item \CFkv{compound style} {{}}: style of compounds
\item \CFkv{compound sep} {5em}: space between compounds
diff --git a/macros/generic/chemfig/chemfig-fr.pdf b/macros/generic/chemfig/chemfig-fr.pdf
index 1777f6d5b9..12e29fa135 100644
--- a/macros/generic/chemfig/chemfig-fr.pdf
+++ b/macros/generic/chemfig/chemfig-fr.pdf
Binary files differ
diff --git a/macros/generic/chemfig/chemfig-fr.tex b/macros/generic/chemfig/chemfig-fr.tex
index d52bb1259e..5076a2437e 100644
--- a/macros/generic/chemfig/chemfig-fr.tex
+++ b/macros/generic/chemfig/chemfig-fr.tex
@@ -216,47 +216,22 @@
\setitemize{leftmargin=3em,topsep=0pt,parsep=0pt,itemsep=0pt,label=--}
\part{Introduction}
-\section{Nouveau dans la v1.5}
-\subsection{Primitive \texttt{\protect\textbackslash expanded}}
-À partir de la version 1.54, \CF nécessite un moteur \TeX{} fournissant la primitive \texttt{\string\expanded} et devient incompatible avec con\TeX t. Si \verb|\expanded| n'est pas disponible ou n'est pas une primitive, \CF ne sera pas chargé : il est donc vivement conseillé de mettre à jour sa distribution \LaTeX{} afin de profiter d'un moteur récent permettant l'utilisation de cette nouvelle primitive.
-
-\subsection{La macro \texttt{\protect\textbackslash charge}}
-La version 1.5 met en place les macros \verb|\charge| et \verb|\Charge| (voir page~\pageref{charge}) dont le but est de placer atour d'un atome des éléments arbitraires avec une grande précision. Ces macros remplaceront, à terme, les macros \verb|\lewis| et \verb|\Lewis| car elles sont bien plus puissantes et configurables, même si plus verbeuses quant à leur emploi. Il est donc important de noter que les macros \verb|\lewis| et \verb|\Lewis| \textcolor{red}{\bfseries ne sont plus documentées et seront supprimées de l'extension \CF}.
-
-\exemple{La macro \string\charge}/Charges simples autour de A :
-\Charge{0=\:,
- 0:3pt[anchor=180]=$\color{red}\scriptstyle\delta^+$,
- 120={\"["width=2pt,"style={draw=green,fill=gray}]},
- 210=\|
- }{A}
-\par
-Charges complexes autour de "B" :
-\Charge{%
- 30:10pt={\chemfig[atom sep=6pt,double bond sep=1.5pt]{[:20]*6(=-=-=-)}},
- 120:5pt[scale=0.4,rotate=30,anchor=center]=\chemfig{CH_2=CH_2},
- -45[anchor=west,rotate=\chargeangle]={%
- \begin{tikzpicture}
- \node[anchor=mid west](a){$\oplus$};\draw[-stealth](a)--(-.5,0);
- \end{tikzpicture}}%
- }{B}/
-
-\subsection{Liaisons jointives}
-À partir de la version 1.5, deux liaisons sont jointives si l'atome qui se trouve entre-elles a toutes ses dimensions nulles (c'est-à-dire sa largeur, sa hauteur et sa profondeur au sens de \TeX). Auparavant, deux liaisons étaient jointives si l'atome était \emph{vide}, ce qui était plus restrictif.
-
-Conjointement à l'utilisation de la macro \verb|\charge|, cette nouvelle fonctionnalité rend possible de placer des charges dans une chaine sans avoir recours à des liaisons invisibles.
-\exemple{Liaisons jointives}/\chemfig{[:30]-\charge{90=\:}{}
--[:-30]\charge{-90=\"}{}-\charge{90:2pt=$\delta^+$}{}-[:-30]}/
+\section{Nouveau dans la v1.6}
+\subsection{Formules de Lewis}
+Comme annoncé depuis la version 1.5 du 5/3/2020, les macros dépréciées \verb|\lewis| et \verb|Lewis| ne sont plus disponibles dans le package \CF. La méthode recommandée pour tracer des formules de Lewis passe désormais par les macros \verb|\charge| et \verb|\Charge|, voir pages~\pageref{charge} et suivantes.
-\subsection{Centre des cycles}
-Le centre de chaque cycle est désormais accessible via un nœud de \TIKZ. Voir page~\pageref{centre_cycle}.
+Si l'utilisation des macros \verb|\lewis| et \verb|Lewis| est indispensable, leur code a été placé dans le fichier \verb|lewis.tex| qu'il est possible de charger à l'aide de \verb|\input|, après avoir chargé le package \CF.
-\subsection{Mise à jour du manuel}
-Des explications plus détaillées sont données sur:
-\begin{itemize}
- \item le rôle que joue le premier atome rencontré dans le placement de la molécule dans son ensemble (page~\pageref{premieratome1} et \pageref{premieratome});
- \item la façon dont \CF place les atomes dans un groupe d'atome (page~\pageref{placementatomes});
- \item comment une liaison joint deux atomes (page~\pageref{liaisonentreatomes}).
-\end{itemize}
+\subsection{Clé debug}
+Une nouvelle clé booléenne \CFkey{debug} est disponible; elle est fausse par défaut. Lorsque sa valeur est \verb|true|, le contour (rectangulaire) de chaque groupe d'atomes est tracé en rouge et le contour de chaque atome est tracé en gris. Au-dessus du rectangle rouge se trouve le numéro du groupe d'atomes et de même, au-dessous de chaque atome figure son numéro (les atomes sont numérotés de gauche à droite, en partant de 1). Ces numéros permettent de connaitre le nom du nœud de chaque atome dont la syntaxe est \verb|n<a>-<b>| où \verb|<a>| est le numéro du groupe d'atome et \verb|<b>| celui de l'atome.
+
+Sur cet exemple, l'atome \verb|n1-3| qui est «C2» est relié par une flèche bleue à l'atome \verb|n2-4| qui est «Gz».
+\exemple{Nom des nœuds}/\setchemfig{debug=true}
+\chemfig{A1BC2-[:30]DxEyFGz-H3I}
+\chemmove{\draw[blue](n1-3)to[out=75,in=90](n2-4);}/
+
+\subsection{Token \texttt\# dans les schémas}
+Dans un schéma réactionnel, le token \verb|#| est désormais permis lorsqu'il se trouve dans l'argument de la commande \verb|\chemfig|. Voir page~\pageref{modif.retrait}.
\section{Présentation}
Pour charger \CF, il faut écrire :
@@ -312,13 +287,7 @@ Voici la liste exhaustive des paramètres ainsi que leurs valeurs par défaut\la
\CFparam{angle increment}
\CFparam{node style}
\CFparam{bond style}
- \CFparam{lewis | width}
- \CFparam{lewis sep}
- \CFparam{lewis length}
- \CFparam{lewis style}
- \CFparam{lewis dist}
- \CFparam{lewis radius}
- \CFparam{lewis diag coeff}
+ \CFparam{debug}
\CFparam{cycle radius coeff}
\CFparam{stack sep}
\CFparam{show cntcycle}
@@ -1350,12 +1319,6 @@ La clé \CFkey{lewisautorot}, qui est \CFval{true} par défaut agit sur {\setcha
\exemple{Autorot}/\Charge{60=\:,150=\"}{A} et
\Charge{[lewisautorot=false]60=\:,150=\"}{A}/
-Les macros \verb|\lewis| et \verb|\Lewis| sont encore fonctionnelles, mais ne sont plus maintenues ni documentées et \textcolor{red}{\bfseries seront retirées dans une future version}; il est donc conseillé de leur préférer les macros \verb|\charge| et \verb|\Charge| qui donnent des résultats comparables comme on le voit ci-dessous, tout en étant bien plus puissantes et configurables:
-
-\exemple{Comparaison avec \string\Lewis}/\Lewis{1:3.5|,X}\quad\Lewis{0:2.3|,X}\qquad(avec \string\Lewis)\par
-\Charge{45=\:,135=\.,225=\"}{X}\quad\Charge{0=\:,90=\.,135=\"}{X}%
-\qquad(avec \string\Charge)/
-
La personnalisation des formules de Lewis s'effectue via la macro \verb|\setcharge| ou par l'intermédiaire de l'argument optionnel de \verb|\charge| en agissant sur les clés \CFkey{.radius}, \CFkey{:sep}, \CFkey{.style}, \CFkey{|style}, \CFkey{"length}, \CFkey{"width} et \CFkey{"style}. Il est également possible de modifier ces clés pour chaque formule avec leur argument optionnel qui reçoit une liste de \chevrons{clés}${}={}$\chevrons{valeurs}.
\exemple{Personnalisation}/\Charge{[.radius=1.5pt,.style={draw=gray}]
@@ -1368,11 +1331,9 @@ La personnalisation des formules de Lewis s'effectue via la macro \verb|\setchar
135=\"[{"width=3pt,"style={line width=.8pt,draw=blue,fill=cyan}}]}{A}/
\subsection{Intégration dans \CF}
-Une macro \verb|\charge| peut tenir lieu d'atome, tout comme c'était le cas avec \verb|\lewis|.
+Une macro \verb|\charge| peut tenir lieu d'atome.
-\exemple{Charge dans \CF}*\chemfig{H-\chemabove{\lewis{5|7,O}}{\quad\scriptstyle+}(-[2]H)-H}
-\qquad
-\chemfig{H-\charge{45:1.5pt=$\scriptstyle+$,-45=\|,-135=\"}{O}(-[2]H)-H}*
+\exemple{Charge dans \CF}*\chemfig{H-\charge{45:1.5pt=$\scriptstyle+$,-45=\|,-135=\"}{O}(-[2]H)-H}*
Cependant, \CF a été modifié pour que les liaisons soient \emph{jointives} lorsque l'encombrement d'un atome est nul, c'est-à-dire si sa largeur, hauteur et profondeur sont toutes nulles. Ce n'était le cas auparavant que si l'atome était vide. Cette nouvelle fonctionnalité permet de placer facilement des charges dans des chaines.
@@ -2468,16 +2429,10 @@ Les commandes créées par \CF sont :
\item \CFkv{angle increment} {45}: incrément de l'angle des liaisons
\item \CFkv{node style} {{}}: style des atomes
\item \CFkv{bond style} {{}}: style des liaisons
- \item \CFkv{lewis | width} {0.3ex}: largeur du rectangle pour la formules | de Lewis
- \item \CFkv{lewis sep} {0.4ex}: espacement entre l'atome et les formule de Lewis
- \item \CFkv{lewis length} {1.5ex}: longueur des formule de Lewis
- \item \CFkv{lewis style} {{}}: style des formules de Lewis
- \item \CFkv{lewis dist} {0.3em}: espacement entre les disques pour la formule «\string:»
- \item \CFkv{lewis radius} {0.15ex}: rayon des disques des formules de Lewis
- \item \CFkv{lewis diag coeff} {1}: coefficient multiplicatif de la distance dans les directions impaires
\item \CFkv{cycle radius coeff} {0.75}: coefficient du cercle ou de l'arc de cercle tracé dans les cycles
\item \CFkv{stack sep} {1.5pt}: espacement vertical pour les arguments des macros \verb-\chemabove- et \verb-\chembelow-
\item \CFkv{show cntcycle} {false}: affichage des numéros des cycles
+ \item \CFkv{debug} {false}: affichage des atomes et des groupes d'atomes
\item \CFkv{autoreset cntcycle} {true}: remise à 0 du compteur de cycles à chaque exécution de \verb|\chemfig|
\item \CFkv{compound style} {{}}: style des composés
\item \CFkv{compound sep} {5em}: espacement entre 2 composés
diff --git a/macros/generic/chemfig/chemfig.tex b/macros/generic/chemfig/chemfig.tex
index 6c743b24e3..76761ab317 100644
--- a/macros/generic/chemfig/chemfig.tex
+++ b/macros/generic/chemfig/chemfig.tex
@@ -4,9 +4,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\CFname {chemfig} %
-\def\CFver {1.56} %
+\def\CFver {1.6} %
% %
-\def\CFdate {2020/07/13} %
+\def\CFdate {2021/02/26} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -17,17 +17,17 @@
% Package URL: https://www.ctan.org/pkg/chemfig |
% Bug tracker: https://framagit.org/unbonpetit/chemfig/issues |
% Repository : https://framagit.org/unbonpetit/chemfig/tree/master |
-% Copyright : Christian Tellechea 2010-2020 |
+% Copyright : Christian Tellechea 2010-2021 |
% Licence : Released under the LaTeX Project Public License v1.3c |
% or later, see http://www.latex-project.org/lppl.txt |
% Files : 1) chemfig.tex |
% 2) chemfig.sty |
-% 3) t-chemfig.tex |
-% 4) README |
-% 5) chemfig_doc_fr.tex |
-% 6) chemfig_doc_fr.pdf |
-% 7) chemfig_doc_en.tex |
-% 8) chemfig_doc_fr.pdf |
+% 3) README |
+% 4) chemfig_doc_fr.tex |
+% 5) chemfig_doc_fr.pdf |
+% 6) chemfig_doc_en.tex |
+% 7) chemfig_doc_fr.pdf |
+% 8) lewis.tex |
%--------------------------------------------------------------------
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -92,13 +92,12 @@
\newif\ifCF_definesubmol
\newif\ifCF_adjustnamedp
\newif\ifCF_macrofixedbondlength
-\newif\ifCF_lewisoverlay
+\newif\ifCF_compound_is_chemfig
\newdimen\CF_dim
\newdimen\CF_arrowsize
\newdimen\CF_zero \CF_zero=0pt
-\newbox\CF_boxlewis
\newbox\CF_box
\newbox\CF_boxstuff
\newbox\CF_testbox
@@ -277,9 +276,11 @@
\let\CF_substnogroups\CF_substnogrouponly
\CF_ifnum{#1>0 }
{\let\CF_testifx\empty
- \foreach\CF_x in {1,...,#1}{\xdef\CF_testifx{\unexpanded\expandafter{\CF_testifx}\unexpanded\expandafter{\expandafter\ifx\CF_x\CF_nexttok1\fi}}}%
+ \foreach\CF_x in {1,...,#1}
+ {\xdef\CF_testifx{\unexpanded\expandafter{\CF_testifx}\unexpanded\expandafter{\expandafter\ifx\CF_x\CF_nexttok1\fi}}}%
\let\CF_testif\empty
- \foreach\CF_x in {1,...,#1}{\xdef\CF_testif{\unexpanded\expandafter{\CF_testif}\unexpanded\expandafter{\expandafter\if\CF_x\CF_nexttok1\fi}}}%
+ \foreach\CF_x in {1,...,#1}
+ {\xdef\CF_testif{\unexpanded\expandafter{\CF_testif}\unexpanded\expandafter{\expandafter\if\CF_x\CF_nexttok1\fi}}}%
\CF_expsecond\CF_substi#2%
}
{\CF_substall#2%
@@ -368,13 +369,6 @@
angle increment = \CF_defifempty\CF_angleincrement {#1}{45},
node style = \def\CF_nodestyle {#1},
bond style = \def\CF_bondstyle {#1},
- lewis | width = \CF_defifempty\CF_lewiswidthdouble {#1}{0.3ex},
- lewis sep = \CF_defifempty\CF_lewisoffset {#1}{0.4ex},
- lewis length = \CF_defifempty\CF_lewislength {#1}{1.5ex},
- lewis style = \def\CF_lewisstyle {#1},
- lewis dist = \CF_defifempty\CF_lewisdist {#1}{0.3em},
- lewis radius = \CF_defifempty\CF_lewisradius {#1}{0.15ex},
- lewis diag coeff = \CF_defifempty\CF_lewisdiagcoeff {#1}{1},
cycle radius coeff = \CF_defifempty\CF_cycleradiuscoeff {#1}{0.75},
stack sep = \CF_defifempty\CF_stacksep {#1}{1.5pt},
compound style = \def\CF_defaultcompoundstyle {#1},
@@ -408,15 +402,11 @@
angle increment = 45,
node style = {},
bond style = {},
- lewis | width = 0.3ex,
- lewis sep = 0.4ex,
- lewis length = 1.5ex,
- lewis style = {},
- lewis dist = 0.3em,
- lewis radius = 0.15ex,
- lewis diag coeff = 1,
cycle radius coeff = 0.75,
stack sep = 1.5pt,
+ autoreset cntcycle = true,
+ show cntcycle = false,
+ debug =false,
scheme debug = false,
compound style = {},
compound sep = 5em,
@@ -432,8 +422,6 @@
+ sep left = 0.5em,
+ sep right = 0.5em,
+ vshift = 0pt,
- autoreset cntcycle = true,
- show cntcycle = false,
}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1365,7 +1353,7 @@
\global\advance\CF_cntgroup1
\let\CF_currentatom\empty
\global\let\CF_hookdrawlist\empty
- \CF_cntatomgroup0
+ \CF_cntatomgroup0 % est le nombre d'atome dans le groupe que va calculer \CF_drawatomgroupa
\CF_iffirsttokmatch{#3}?
{\CF_drawatomgroupa{{}#3}}
{\CF_drawatomgroupa{#3}}%
@@ -1422,7 +1410,12 @@
\let\CF_moveatomname\empty
}
{}%
- \CF_expafter{\node[}\CF_optstring](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
+ \ifboolKV[chemfig]{debug}
+ {\CF_expafter{\node[}\CF_optstring,draw=gray](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
+ \CF_show_debug_atom
+ }
+ {\CF_expafter{\node[}\CF_optstring](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
+ }%
\let\CF_nodestrut\empty
\advance\CF_cntatom1
\edef\CF_optstring{anchor=base \ifnum\CF_flipstate=1 east\else west\fi,at=(n\number\CF_cntgroup-\number\numexpr\CF_cntatom-1.base \ifnum\CF_flipstate=1 west\else east\fi),\CF_nodestyle}%
@@ -1446,13 +1439,31 @@
\let\CF_moveatomname\empty
}
{}%
- \CF_expafter{\node[}\CF_optstring](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
+ \ifboolKV[chemfig]{debug}
+ {\CF_expafter{\node[}\CF_optstring,draw=gray](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
+ \CF_show_debug_atom
+ }
+ {\CF_expafter{\node[}\CF_optstring](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
+ }%
\repeat
+ \ifboolKV[chemfig]{debug}
+ \CF_show_debug_atomgroup
+ {}%
\CF_hookdrawall
\edef\CF_lastgroupnumber{\number\CF_cntgroup}%
\let\CF_previousatomgroup\CF_currentatomgroup
}
+\def\CF_show_debug_atom{%
+ \node[at=(n\number\CF_cntgroup-\number\CF_cntatom.south),anchor=north,outer sep=1pt,overlay]{$\scriptscriptstyle\color{gray}\number\CF_cntatom$};%
+}
+
+\def\CF_show_debug_atomgroup{%
+ \draw[red,overlay] ([xshift=-.5pt,yshift=.5pt]n\number\CF_cntgroup-1.north west) rectangle ([xshift=.5pt,yshift=-.5pt]n\number\CF_cntgroup-\number\CF_cntatomgroup.south east);%
+ \path (n\number\CF_cntgroup-1.north west) -- (n\number\CF_cntgroup-\number\CF_cntatomgroup.north east)
+ node [midway,yshift=1pt,overlay] {$\scriptscriptstyle\color{red}\number\CF_cntgroup$};
+}
+
\def\CF_keepmovearg @#1#2\_nil{\def\CF_currentatom{@{#1}}}
\def\CF_drawatomgroupa#1{% transforme #1 en un groupe d'atomes
@@ -1785,95 +1796,6 @@
\charge_d
}
-\def\Lewis{%
- \CF_warning{\string\Lewis\space is unmaintained and is likely to be removed in a near future. Please, use \string\Charge.}%
- \CF_lewisoverlayfalse
- \CF_testopt\CF_lewisa{}%
-}
-
-\def\lewis{%
- \CF_warning{\string\lewis\space is unmaintained and is likely to be removed in a near future. Please, use \string\charge.}%
- \CF_lewisoverlaytrue
- \CF_testopt\CF_lewisa{}%
-}
-
-\def\CF_lewisa[#1]{%
- \begingroup
- \CF_doifnotempty{#1}{\setchemfig{#1}}%
- \ifCF_lewisoverlay
- \CF_addtomacro\CF_lewisstyle{,overlay}%
- \fi
- \CF_lewisb
-}
-
-\def\CF_lewisb#1{%
- \CF_lewisc#1\_nil
- \endgroup
-}
-
-\def\CF_lewisc#1,#2\_nil{%
- \setbox\CF_boxlewis\hbox{\printatom{#2}}% mettre en dehors de tikzpicture (si \printatom ne passe pas en mode math)
- \CF_ifinsidetikz
- {\pgfinterruptpicture
- \let\CF_atendoflewis\endpgfinterruptpicture
- }
- {\let\CF_atendoflewis\relax
- }%
- \tikzpicture[every node/.style={anchor=base,inner sep=0pt,outer sep=0pt,minimum size=0pt},baseline]%
- \CF_makeother;\CF_makeother:%
- \node(CF_lewis@anchor){};
- \def\CF_lewisremainpos{#1}%
- \let\CF_lewispreviouspos\empty
- \loop
- \unless\ifx\CF_lewisremainpos\empty
- \edef\CF_lewiscurrentpos{\expandafter\CF_firsttonil\CF_lewisremainpos\_nil}%
- \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
- \pgfmathsetmacro\CF_lewisx{\wd\CF_boxlewis/2+\ifcase\CF_lewiscurrentpos\space1\or1\or0\or-1\or-1\or-1\or0\or1\fi*(\wd\CF_boxlewis/2)}%
- \pgfmathsetmacro\CF_lewisy{\ht\CF_boxlewis/2+\ifcase\CF_lewiscurrentpos\space0\or1\or1\or1\or0\or-1\or-1\or-1\fi*(\ht\CF_boxlewis/2\ifnum\CF_lewiscurrentpos>4 +\dp\CF_boxlewis\fi)}%
- \edef\CF_lewisxoffset{\ifcase\CF_lewiscurrentpos\space1\or0.70711\or0\or-0.70711\or-1\or-0.70711\or0\or0.70711\fi}%
- \edef\CF_lewisyoffset{\ifcase\CF_lewiscurrentpos\space0\or0.70711\or1\or0.70711\or0\or-0.70711\or-1\or-0.70711\fi}%
- \ifodd\CF_lewiscurrentpos\relax
- \pgfmathsetmacro\CF_lewiscurrentoffset{\CF_lewisoffset*\CF_lewisdiagcoeff}%%
- \else
- \let\CF_lewiscurrentoffset\CF_lewisoffset
- \fi
- \if.\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
- \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
- \CF_expafter{\draw[fill,black,}{\CF_lewisstyle]}%
- (\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset,\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset)circle(\CF_lewisradius);%
- \else
- \if|\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
- \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
- \pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
- \pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
- \CF_expafter{\draw[}\CF_lewisstyle]%
- (\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt)--
- (\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt+\CF_lewisxoffset*\CF_lewiswidthdouble,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt+\CF_lewisyoffset*\CF_lewiswidthdouble)--
- (\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt+\CF_lewisxoffset*\CF_lewiswidthdouble,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt+\CF_lewisyoffset*\CF_lewiswidthdouble)--
- (\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt)--cycle;%
- \else
- \if:\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
- \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
- \pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
- \pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
- \CF_expafter{\draw[fill,black,}{\CF_lewisstyle]}%
- (\CF_lewisx pt+\CF_lewisdist*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewisdist*\CF_lewisxoffset/2 pt)circle(\CF_lewisradius)%
- (\CF_lewisx pt-\CF_lewisdist*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewisdist*\CF_lewisxoffset/2 pt)circle(\CF_lewisradius);%
- \else
- \pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
- \pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
- \CF_expafter{\draw[}\CF_lewisstyle]%
- (\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt)--%
- (\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt);%
- \fi
- \fi
- \fi
- \repeat
- \node[anchor=base west]at(CF_lewis@anchor){\box\CF_boxlewis};%
- \endtikzpicture
- \CF_atendoflewis
-}
-
\def\Chembelow{\begingroup\let\CF_temp\CF_gobarg\CF_chembelowa}
\def\chembelow{\begingroup\let\CF_temp\CF_id\CF_chembelowa}
@@ -2074,20 +1996,34 @@
\CF_iffirsttokina{\arrow\schemestop\merge}%
{}
{\CF_ifx\CF_toksa\bgroup
- {\CF_addnextarg
+ {\ifCF_compound_is_chemfig% bugfix 1.6
+ \edef\CF_restore_hashcatcode{\catcode\number`\#=\number\catcode`\# \relax}%
+ \catcode`\#12 % TODO ou carrment mettre # 12 dans tout l'environnement ?
+ \fi
+ \CF_addnextarg
}
{\CF_ifx\CF_toksa\CF_sptoken
{\CF_addtomacro\CF_compound{ }%
\CF_schemestartd
}
- {\afterassignment\CF_schemestartc
+ {\CF_ifx\CF_toksa\chemfig
+ \CF_compound_is_chemfigtrue% mettre le flag vrai
+ {}%
+ \afterassignment\CF_schemestartc
\CF_addtomacro\CF_compound
}%
}%
}%
}
-\def\CF_addnextarg#1{\CF_addtomacro\CF_compound{{#1}}\CF_schemestartc}
+\def\CF_addnextarg#1{%
+ \CF_addtomacro\CF_compound{{#1}}%
+ \ifCF_compound_is_chemfig% bugfix 1.6
+ \CF_restore_hashcatcode
+ \CF_compound_is_chemfigfalse% mettre le flag faux
+ \fi
+ \CF_schemestartc
+}
\def\CF_displaycompound#1#2{% #1 = nom et #2 = style
\CF_doifnotempty\CF_compound
@@ -3088,7 +3024,7 @@ v1.53 2020/04/27
v1.54 2020/05/21
- chemfig ne peut plus fonctionner sans \expanded
- bug : un signe "=" laiss par erreur dans le flux
- ----------------------------------------------------------------------
+----------------------------------------------------------------------
v1.55 2020/06/15
- chemfig est incompatible avec conTeXt, vu que ce moteur redfinit
des primitives telles que \expanded, \unexpanded et peut tre
@@ -3096,4 +3032,12 @@ v1.55 2020/06/15
----------------------------------------------------------------------
v1.56 2020/07/13
- le centre des cycles est dsormais accessible via un noeud
- spcifique pour chacun d'eux. \ No newline at end of file
+ spcifique pour chacun d'eux.
+----------------------------------------------------------------------
+v1.6 2021/02/26
+ - les macros des formules de Lewis sont retires et places dans
+ le fichier spar "lewis.tex" que l'utilisateur peut charger
+ s'il le souhaite
+ - ajout d'une cl <debug> pour le trousseau [chemfig]
+ - l'intrieur d'un schma, le token '#' est permis dans
+ l'argument de \chemfig
diff --git a/macros/generic/chemfig/lewis.tex b/macros/generic/chemfig/lewis.tex
new file mode 100644
index 0000000000..d713eecf68
--- /dev/null
+++ b/macros/generic/chemfig/lewis.tex
@@ -0,0 +1,129 @@
+\ifdefined\CFname\else
+ \errmessage{Chemfig is not loaded, lewis cannot work}%
+ \expandafter\endinput
+\fi
+
+\csname lewisloadonce\endcsname
+\let\lewisloadonce\endinput
+
+\begingroup
+ \def\X#1{\catcode\number`#1=\number\catcode`#1\relax}
+ \xdef\CFrestorecatcode{\X\[\X\]\X\:\X\(\X\)\X\,\X\-\X\=\X\~\X\!\X\?\X\<\X\>\X\;\X\*\X\|\X\@\X\ \X\_}%
+\endgroup
+
+\catcode`\[12 \catcode`\]12 \catcode`\:12 \catcode`\(12
+\catcode`\)12 \catcode`\,12 \catcode`\-12 \catcode`\=12
+\catcode`\~12 \catcode`\!12 \catcode`\?12 \catcode`\<12
+\catcode`\>12 \catcode`\;12 \catcode`\*12 \catcode`\|12
+\catcode`\@12 \catcode`\#6 \catcode`\ 10 \catcode`\_11
+
+\newif\ifCF_lewisoverlay
+\newbox\CF_boxlewis
+
+\defKV[chemfig]{%
+ lewis | width = \CF_defifempty\CF_lewiswidthdouble {#1}{0.3ex},
+ lewis sep = \CF_defifempty\CF_lewisoffset {#1}{0.4ex},
+ lewis length = \CF_defifempty\CF_lewislength {#1}{1.5ex},
+ lewis style = \def\CF_lewisstyle {#1},
+ lewis dist = \CF_defifempty\CF_lewisdist {#1}{0.3em},
+ lewis radius = \CF_defifempty\CF_lewisradius {#1}{0.15ex},
+ lewis diag coeff = \CF_defifempty\CF_lewisdiagcoeff {#1}{1}
+ }
+\setKVdefault[chemfig]{%
+ lewis | width = 0.3ex,
+ lewis sep = 0.4ex,
+ lewis length = 1.5ex,
+ lewis style = {},
+ lewis dist = 0.3em,
+ lewis radius = 0.15ex,
+ lewis diag coeff = 1
+ }
+
+\def\Lewis{%
+ \CF_lewisoverlayfalse
+ \CF_testopt\CF_lewisa{}%
+}
+
+\def\lewis{%
+ \CF_lewisoverlaytrue
+ \CF_testopt\CF_lewisa{}%
+}
+
+\def\CF_lewisa[#1]{%
+ \begingroup
+ \CF_doifnotempty{#1}{\setchemfig{#1}}%
+ \ifCF_lewisoverlay
+ \CF_addtomacro\CF_lewisstyle{,overlay}%
+ \fi
+ \CF_lewisb
+}
+
+\def\CF_lewisb#1{%
+ \CF_lewisc#1\_nil
+ \endgroup
+}
+
+\def\CF_lewisc#1,#2\_nil{%
+ \setbox\CF_boxlewis\hbox{\printatom{#2}}% mettre en dehors de tikzpicture (si \printatom ne passe pas en mode math)
+ \CF_ifinsidetikz
+ {\pgfinterruptpicture
+ \let\CF_atendoflewis\endpgfinterruptpicture
+ }
+ {\let\CF_atendoflewis\relax
+ }%
+ \tikzpicture[every node/.style={anchor=base,inner sep=0pt,outer sep=0pt,minimum size=0pt},baseline]%
+ \CF_makeother;\CF_makeother:%
+ \node(CF_lewis@anchor){};
+ \def\CF_lewisremainpos{#1}%
+ \let\CF_lewispreviouspos\empty
+ \loop
+ \unless\ifx\CF_lewisremainpos\empty
+ \edef\CF_lewiscurrentpos{\expandafter\CF_firsttonil\CF_lewisremainpos\_nil}%
+ \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
+ \pgfmathsetmacro\CF_lewisx{\wd\CF_boxlewis/2+\ifcase\CF_lewiscurrentpos\space1\or1\or0\or-1\or-1\or-1\or0\or1\fi*(\wd\CF_boxlewis/2)}%
+ \pgfmathsetmacro\CF_lewisy{\ht\CF_boxlewis/2+\ifcase\CF_lewiscurrentpos\space0\or1\or1\or1\or0\or-1\or-1\or-1\fi*(\ht\CF_boxlewis/2\ifnum\CF_lewiscurrentpos>4 +\dp\CF_boxlewis\fi)}%
+ \edef\CF_lewisxoffset{\ifcase\CF_lewiscurrentpos\space1\or0.70711\or0\or-0.70711\or-1\or-0.70711\or0\or0.70711\fi}%
+ \edef\CF_lewisyoffset{\ifcase\CF_lewiscurrentpos\space0\or0.70711\or1\or0.70711\or0\or-0.70711\or-1\or-0.70711\fi}%
+ \ifodd\CF_lewiscurrentpos\relax
+ \pgfmathsetmacro\CF_lewiscurrentoffset{\CF_lewisoffset*\CF_lewisdiagcoeff}%%
+ \else
+ \let\CF_lewiscurrentoffset\CF_lewisoffset
+ \fi
+ \if.\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
+ \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
+ \CF_expafter{\draw[fill,black,}{\CF_lewisstyle]}%
+ (\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset,\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset)circle(\CF_lewisradius);%
+ \else
+ \if|\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
+ \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
+ \pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
+ \pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
+ \CF_expafter{\draw[}\CF_lewisstyle]%
+ (\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt)--
+ (\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt+\CF_lewisxoffset*\CF_lewiswidthdouble,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt+\CF_lewisyoffset*\CF_lewiswidthdouble)--
+ (\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt+\CF_lewisxoffset*\CF_lewiswidthdouble,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt+\CF_lewisyoffset*\CF_lewiswidthdouble)--
+ (\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt)--cycle;%
+ \else
+ \if:\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
+ \edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
+ \pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
+ \pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
+ \CF_expafter{\draw[fill,black,}{\CF_lewisstyle]}%
+ (\CF_lewisx pt+\CF_lewisdist*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewisdist*\CF_lewisxoffset/2 pt)circle(\CF_lewisradius)%
+ (\CF_lewisx pt-\CF_lewisdist*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewisdist*\CF_lewisxoffset/2 pt)circle(\CF_lewisradius);%
+ \else
+ \pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
+ \pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
+ \CF_expafter{\draw[}\CF_lewisstyle]%
+ (\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt)--%
+ (\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt);%
+ \fi
+ \fi
+ \fi
+ \repeat
+ \node[anchor=base west]at(CF_lewis@anchor){\box\CF_boxlewis};%
+ \endtikzpicture
+ \CF_atendoflewis
+}
+\CFrestorecatcode
+\endinput \ No newline at end of file
diff --git a/macros/generic/schemata/README.md b/macros/generic/schemata/README.md
index ecf34f9142..4483796340 100644
--- a/macros/generic/schemata/README.md
+++ b/macros/generic/schemata/README.md
@@ -1,6 +1,5 @@
# Short Description
-Short description:
The schemata package helps the creation of topical outlines that illustrate the breakdown of concepts and categories in academic texts from the late medieval to early modern periods.
# Files
@@ -10,6 +9,7 @@ The schemata package helps the creation of topical outlines that illustrate the
|`schemata.dtx` |commented style file; source file |
|`Makefile` |For use with GNU make; with source file|
|`schemata.ins` |installation driver (generated file) |
+|`schemata.sty` |style file (generated file) |
|`schemata.pdf` |Documentation (generated file) |
|`README.md` |This file (generated file) |
|`schematest.tex`|Test file (generated file) |
@@ -19,7 +19,7 @@ The schemata package helps the creation of topical outlines that illustrate the
1. Packaged in your current TeX distrbution: See the appropriate documentation.
-2. Otherwise, download `schemata.zip` from [CTAN](www.ctan.org/tex-archive/macros/generic/schemata).
+2. Otherwise, download `schemata.zip` from [CTAN](http://mirrors.ctan.org/macros/generic/schemata.zip).
3. Unpack `schemata.zip` in an appropriate directory.
@@ -37,7 +37,7 @@ This method requires GNU `make` on a POSIX-compliant environment, such as GNU/Li
* We now use an Encapsulated PostScript graphics file instead of a Portable Network Graphics file to permit all LaTeX variants to build the package.
-We use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
+ * We use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
1. Type `make` to generate the release files using `pdflatex`.
@@ -52,6 +52,8 @@ We use the LaTeX installation on the host machine to build the package. When usi
4. Type `sudo make install` to install the files in the system-wide, local TDS-compliant directory tree.
+5. One can include multiple make targets on the command line, but that goes beyond the scope of this document and is intended for experienced users.
+
## Manual Compilation
Otherwise, the following steps are used for manual installation. See the general information at the [TeX FAQ](https://www.texfaq.org/FAQ-installthings).
@@ -63,6 +65,7 @@ Otherwise, the following steps are used for manual installation. See the general
2. This will generate the following files:
schemata.ins (complete)
+ schemata.sty (complete)
schemata.pdf (incomplete; do steps 3 through 5)
README.md (complete)
schematest.tex (complete)
@@ -176,7 +179,7 @@ The manual is also a test suite.
# Copyright
-Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
-------------------------------------------------------
This file may be distributed and/or modified under the
@@ -184,7 +187,7 @@ 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](http://www.latex-project.org/lppl.txt)
+ [https://www.latex-project.org/lppl.txt](https://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.
diff --git a/macros/generic/schemata/schemata.dtx b/macros/generic/schemata/schemata.dtx
index 49a9aabc5f..4e9a6333ef 100644
--- a/macros/generic/schemata/schemata.dtx
+++ b/macros/generic/schemata/schemata.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+% Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
% -------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -8,7 +8,7 @@
% 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
+% https://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.
@@ -20,7 +20,6 @@
%<<readmevb
# Short Description
-Short description:
The schemata package helps the creation of topical outlines that illustrate the breakdown of concepts and categories in academic texts from the late medieval to early modern periods.
# Files
@@ -30,6 +29,7 @@ The schemata package helps the creation of topical outlines that illustrate the
|`schemata.dtx` |commented style file; source file |
|`Makefile` |For use with GNU make; with source file|
|`schemata.ins` |installation driver (generated file) |
+|`schemata.sty` |style file (generated file) |
|`schemata.pdf` |Documentation (generated file) |
|`README.md` |This file (generated file) |
|`schematest.tex`|Test file (generated file) |
@@ -39,7 +39,7 @@ The schemata package helps the creation of topical outlines that illustrate the
1. Packaged in your current TeX distrbution: See the appropriate documentation.
-2. Otherwise, download `schemata.zip` from [CTAN](www.ctan.org/tex-archive/macros/generic/schemata).
+2. Otherwise, download `schemata.zip` from [CTAN](http://mirrors.ctan.org/macros/generic/schemata.zip).
3. Unpack `schemata.zip` in an appropriate directory.
@@ -57,7 +57,7 @@ This method requires GNU `make` on a POSIX-compliant environment, such as GNU/Li
* We now use an Encapsulated PostScript graphics file instead of a Portable Network Graphics file to permit all LaTeX variants to build the package.
-We use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
+ * We use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
1. Type `make` to generate the release files using `pdflatex`.
@@ -72,6 +72,8 @@ We use the LaTeX installation on the host machine to build the package. When usi
4. Type `sudo make install` to install the files in the system-wide, local TDS-compliant directory tree.
+5. One can include multiple make targets on the command line, but that goes beyond the scope of this document and is intended for experienced users.
+
## Manual Compilation
Otherwise, the following steps are used for manual installation. See the general information at the [TeX FAQ](https://www.texfaq.org/FAQ-installthings).
@@ -83,6 +85,7 @@ Otherwise, the following steps are used for manual installation. See the general
2. This will generate the following files:
schemata.ins (complete)
+ schemata.sty (complete)
schemata.pdf (incomplete; do steps 3 through 5)
README.md (complete)
schematest.tex (complete)
@@ -196,7 +199,7 @@ The manual is also a test suite.
# Copyright
-Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
-------------------------------------------------------
This file may be distributed and/or modified under the
@@ -204,7 +207,7 @@ 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](http://www.latex-project.org/lppl.txt)
+ [https://www.latex-project.org/lppl.txt](https://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.
@@ -226,14 +229,14 @@ version 2005/12/01 or later.
This is a generated file.
-Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
This file 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
+ https://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.
@@ -279,7 +282,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
%<package>\expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}[2005/12/01]
%<package>\ProvidesPackage{schemata}
%<*package>
- [2020/12/02 1.3 generic package to aid construction of topical categories]
+ [2021/02/27 1.4 generic package to aid construction of topical categories]
%</package>
%<package>\else
%<package>\catcode`@=11\relax
@@ -354,7 +357,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
\usepackage{mflogo}
\usepackage[toc]{multitoc}
\usepackage{paracol}
-\usepackage{\jobname}[2020/12/02]
+\usepackage{\jobname}[2021/02/27]
\usepackage{verbatim}
\usepackage[numbered]{hypdoc}
@@ -423,6 +426,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
% \changes{1.0}{2020/03/13}{Ensure better multi-format operation}
% \changes{1.1}{2020/03/14}{Fix issue with \texttt{dtx} guards}
% \changes{1.2}{2020/11/23}{Updates to \texttt{Readme.md}, \texttt{Makefile}, \texttt{schematest.tex}, combine \texttt{Readme.md} and \texttt{schematest.tex} files in \texttt{dtx}}
+% \changes{1.4}{2021/02/27}{Updates to \texttt{Readme.md}}
%
% \GetFileInfo{\jobname.dtx}
% \DoNotIndex{\bgroup, \csname, \DeclareOption, \def, \dimen, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \expandafter, \fi, \futurelet, \gdef, \hbox, \hfil, \if, \ifcsname, \ifdim, \ifmmode, \ifx, \ignorespaces, \index, \let, \newbox, \newcommand, \newdimen, \newif, \next, \PackageWarning, \ProcessOptions, \relax, \RequirePackage, \setbox, \space, \vbox, \vcenter, \vfil, \vskip}
@@ -2215,7 +2219,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 4}\ \ }\verb+%<package>\expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}[2005/12/01]+
% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 5}\ \ }\verb+%<package>\ProvidesPackage{schemata}+
% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 6}\ \ }\verb+%<*package>+
-% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 7}\ \ }\verb+ [2020/12/02 1.3 generic package to aid construction of topical categories]+
+% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 7}\ \ }\verb+ [2021/02/27 1.4 generic package to aid construction of topical categories]+
% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 8}\ \ }\verb+%</package>+
% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 9}\ \ }\verb+%<package>\else+
% \leavevmode\llap{\hbox to 1em{\hfill\scriptsize 10}\ \ }\verb+%<package>\catcode`@=11\relax+
@@ -2731,7 +2735,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
%
% Using the default option is a secondary test for mode detection.
%
- \usepackage[braces]{schemata}[2020/12/02]
+ \usepackage[braces]{schemata}[2021/02/27]
\begin{document}
\else
\ifx\fmtname\nameoflollipop
diff --git a/macros/generic/schemata/schemata.pdf b/macros/generic/schemata/schemata.pdf
index c3d85cbc2d..a5aac814d4 100644
--- a/macros/generic/schemata/schemata.pdf
+++ b/macros/generic/schemata/schemata.pdf
Binary files differ
diff --git a/macros/latex-dev/required/firstaid/README.md b/macros/latex-dev/required/firstaid/README.md
new file mode 100644
index 0000000000..a9a762e4a2
--- /dev/null
+++ b/macros/latex-dev/required/firstaid/README.md
@@ -0,0 +1,9 @@
+# LaTeX2e temporary first aid for external packages and classes during transition periods
+
+LaTeX2e kernel code that temporarily adjusts packages that are not yet
+updated and therefore fail if a new LaTeX release updates internal
+commands (which have been used in the external packages)
+
+This is stored in a separate file external to the base bundle, so that
+it can be easily updated when fixes become available without the need
+to upload a full new LaTeX2e release to CTAN.
diff --git a/macros/latex-dev/required/firstaid/changes.txt b/macros/latex-dev/required/firstaid/changes.txt
new file mode 100644
index 0000000000..24b6eae4f6
--- /dev/null
+++ b/macros/latex-dev/required/firstaid/changes.txt
@@ -0,0 +1,51 @@
+2021-01-06 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ Add replacement code for everysel package.
+ Add first aid for CJK (as it overwrite \selectfont with an
+ old definition).
+
+2020-12-14 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ bandage for pgfmorepages got detached, so need to adjust the first
+ aid (gh/455)
+
+2020-10-29 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ Add temporary aid for pgfpages and pfgmorepages.
+ To be replaced when LaTeX offers configuration point interfaces.
+
+2020-10-25 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx
+ Fix for gh408 taken out as now in the kernel.
+
+2020-10-13 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ Fix for gh408 to be taken out later when it moves to the kernel.
+
+2020-10-04 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ Fix for gh400 taken out and moved into the kernel instead for PL1.
+
+2020-10-03 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ Added a fix for gh400. This will soon move into the kernel.
+
+2020-09-29 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ filehook doesn't need first aid any longer.
+
+2020-09-27 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ Initial version for 2020-10-01 release containing first aid
+ for packages bidi, filehook and class dinbrief.
+
+
diff --git a/macros/latex-dev/required/firstaid/firstaid.ins b/macros/latex-dev/required/firstaid/firstaid.ins
new file mode 100644
index 0000000000..6a1dbaa853
--- /dev/null
+++ b/macros/latex-dev/required/firstaid/firstaid.ins
@@ -0,0 +1,78 @@
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright (C) 2020,2021
+%% The LaTeX Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file is part of the Standard LaTeX `First Aid Bundle'.
+%% -------------------------------------------------------
+%%
+%% It 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
+%% https://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.
+%%
+%% As this file contains legal notices, it is NOT PERMITTED to modify
+%% this file in any way that the legal information placed into
+%% generated files is changed (i.e., the files generated when the
+%% original file is executed). This restriction does not apply if
+%% (parts of) the content is reused in a different WORK producing its
+%% own generated files.
+%%
+%% The list of all files belonging to the `First Aid Bundle' is
+%% given in the file `manifest.txt'.
+%%
+%%
+%% --------------- start of docstrip commands ------------------
+%%
+\input docstrip
+
+\keepsilent
+
+\usedir{tex/latex/firstaid}
+
+\preamble
+
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at https://latex-project.org/bugs/
+(but please observe conditions on bug reports sent to that address!)
+
+
+Copyright (C) 2020-2021
+The LaTeX Project and any individual authors listed elsewhere
+in this file.
+
+This file was generated from file(s) of the Standard LaTeX `First Aid Bundle'.
+------------------------------------------------------------------------------
+
+It 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
+ https://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 only be distributed together with a copy of the LaTeX
+`First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle'
+without such generated files.
+
+\endpreamble
+
+
+\generate{\file{latex2e-first-aid-for-external-files.ltx}
+ {\from{latex2e-first-aid-for-external-files.dtx}{kernel}}}
+
+\generate{\file{filehook-ltx.sty}
+ {\from{latex2e-first-aid-for-external-files.dtx}{filehook-ltx}}}
+
+\generate{\file{everysel-ltx.sty}
+ {\from{latex2e-first-aid-for-external-files.dtx}{everysel-ltx}}}
+
+\endbatchfile
diff --git a/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
new file mode 100644
index 0000000000..a74cb79a78
--- /dev/null
+++ b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -0,0 +1,521 @@
+% \iffalse meta-comment
+%
+%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020,2021
+%% The LaTeX Project and any individual authors listed elsewhere
+%% in this file.
+%
+% It 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
+% https://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% This file has the LPPL maintenance status "maintained".
+%
+%
+%
+%<*driver>
+\documentclass{ltxdoc}
+\EnableCrossrefs
+\CodelineIndex
+\begin{document}
+ \DocInput{latex2e-first-aid-for-external-files.dtx}
+\end{document}
+%</driver>
+%
+% \fi
+%
+%
+% \providecommand\pkg[1]{\texttt{#1}}
+%
+% \title{First aid for external files and packages that need updating}
+% \author{Frank Mittelbach, \LaTeX{} Project}
+%
+% \maketitle
+%
+%
+% \begin{abstract}
+% This file contains some first aid for packages or classes that
+% require updates because of internal changes to \LaTeX{} but that
+% aren't yet reflected in the package/class code.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Introduction}
+%
+% Over the years package writers have hooked into
+% various parts of internal \LaTeX{} commands (largely because
+% proper interfaces were missing in important places) and if
+% we are now gradually adding such interfaces these internal
+% commands do change and as a result patching into them stops
+% working.
+%
+% As part of making such internal changes the \LaTeX{} Project team
+% attempts to check for such usage in packages, alert the package
+% maintainers and ensures that the packages get updated alongside
+% the core \LaTeX{} system. However it is not always possible to
+% get packages that will fail with a new kernel updated in time and
+% if that is the case we try to provide a temporary fix in this
+% file for them.
+% Once the package gets updated the fix will then be removed again.
+%
+% For that reason, it is put into a separate bundle so that we can
+% update it easily without requiring the CTAN maintainers to
+% install a new full LaTeX system just because we take out (or add)
+% a fix for a package here.
+%
+% In the best case scenario the file documented here should be
+% empty. In practice it will probably always contain one or the
+% other fix while we are waiting for the package to get updated.
+%
+% \begin{quote} \textbf{Important notice:} The fixes provided here
+% are not meant to be a permanent solution, but are only provided
+% to support the transition period. They are (usually) neither
+% complete nor necessarily the best solution! Furthermore, as they
+% are done from the ``outside'', they usually add some burden and
+% slow down \LaTeX{} processing, even if the package/class is not
+% used in the document.
+%
+% We will therefore remove such code as soon as possible
+% again. In practice this means that if some package never gets
+% updated/corrected, then it will eventually fail to work, because
+% after one or at most two \LaTeX{} releases we will take out the
+% transition code to ensure that this ``first aid patching''
+% doesn't get out of bounds.
+% \end{quote}
+%
+% \subsection{Minor kernel fixes}
+%
+% If we encounter issues with the kernel code that should get fixed
+% before the next main release we normally generate a patch release
+% for \LaTeX{}. However, depending on the complexity of the fix we
+% might first add the fix here and generate a full patch release
+% only when a number of such issues have accumulated. This way we
+% lessen the impact on CTAN maintainers because for each tach
+% release we have to make and distribute also a matching
+% development release.
+%
+% \StopEventually{\setlength\IndexMin{200pt} \PrintIndex }
+%
+%
+% \section{The Implementation}
+%
+% This file is meant to be loaded during format generation which is
+% why we give it the extension \texttt{.ltx}.
+% \begin{macrocode}
+%<*kernel>
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\LaTeXFirstAidDate{2021/02/24}
+\def\LaTeXFirstAidVersion{v1.0k}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ProvidesFile{latex2e-first-aid-for-external-files.ltx}
+ [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space
+ LaTeX kernel fixes to external files and packages]
+% \end{macrocode}
+ %
+
+% \begin{macro}{\FirstAidNeededT}
+% This is a very simple help to ensure that we only apply first aid
+% to an unmodified package or class. It only works in the case the
+% file has already been loaded and the csname \cs{ver@\#1.\#2} got
+% defined (holding the current date, version, and short description
+% info). We then compare its content to a frozen string and make
+% the modification \verb=#3= only if both agree. If they differ we
+% assume that the package/class in question got updated by its
+% maintainer.
+% \begin{macrocode}
+\ExplSyntaxOn
+\cs_new:Npn\FirstAidNeededT#1#2#3{
+ \exp_args:Nc\str_if_eq:onT{ver@#1.#2}{#3}
+}
+\ExplSyntaxOff
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+%</kernel>
+% \end{macrocode}
+%
+%
+% \subsection{The \pkg{filehook} package first aid}
+%
+% The \pkg{filehook} package implements hooks into file loading
+% commands. These days this is already provided by the kernel
+% albeit not with the same user interface. Until that package gets
+% updated (to use the kernel interfaces) we provide a
+% substitution. This does not offer all hooks from \pkg{filehook}
+% but all that have been used in packages available in \TeX{} Live.
+%
+% Note that this doesn't fix \pkg{currfile} because that package
+% uses \pkg{filehook} but relies on the internals of the old
+% implementation.
+%
+% The package has now got an update so we aren't activating the
+% first aid. However, at the moment it basically bypasses the new
+% hook mechanism and puts the old hooks in thereby disabling, for
+% example, the possibility to re-order code through rules.
+%
+% We therefore keep \texttt{filehook-ltx.sty} around as a guideline
+% for further updates.
+%
+% Replacing \pkg{filehook} with a leaner version would then work
+% like this:
+% \begin{macrocode}
+%<*kernel>
+%\declare@file@substitution{filehook.sty}{filehook-ltx.sty}
+%</kernel>
+% \end{macrocode}
+%
+% What follows is a simplified (partial) implementation of the \pkg{filehook}
+% interfaces.
+% Not implemented are:
+%\begin{verbatim}
+% \AtBeginOfFiles \AtEndOfFiles
+% \AtBeginOfInputs \AtEndOfInputs
+% \AtBeginOfInputFile \AtEndOfInputFile
+%\end{verbatim}
+%
+% \begin{macrocode}
+%<*filehook-ltx>
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\AtBeginOfEveryFile [1]
+ {\AddToHook{file/before}{#1}}
+\newcommand\AtEndOfEveryFile [1]
+ {\AddToHook{file/after}{#1}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\AtBeginOfIncludes [1]
+ {\AddToHook{include/before}{#1}}
+\newcommand\AtEndOfIncludes [1]
+ {\AddToHook{include/end}{#1}}
+\newcommand\AfterIncludes [1]
+ {\AddToHook{include/after}{#1}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\AtBeginOfPackages [1]
+ {\AddToHook{package/before}{#1}}
+\newcommand\AtEndOfPackages [1]
+ {\AddToHook{package/after}{#1}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\AtBeginOfClasses [1]
+ {\AddToHook{class/before}{#1}}
+\newcommand\AtEndOfClasses [1]
+ {\AddToHook{class/after}{#1}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\AtBeginOfFile [2]
+ {\AddToHook{file/before/#1}{#2}}
+\newcommand\AtEndOfFile [2]
+ {\AddToHook{file/after/#1}{#2}}
+% \end{macrocode}
+%
+% Some commands offered a starred form
+% \begin{macrocode}
+\DeclareDocumentCommand \AtBeginOfPackageFile {smm}
+ {\IfBooleanTF{#1}%
+ {\@ifpackageloaded{#2}%
+ {#3}%
+ {\AddToHook{package/before/#2}{#3}}}%
+ {\AddToHook{package/before/#2}{#3}}%
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareDocumentCommand \AtEndOfPackageFile {smm}
+ {\IfBooleanTF{#1}%
+ {\@ifpackageloaded{#2}%
+ {#3}%
+ {\AddToHook{package/after/#2}{#3}}}%
+ {\AddToHook{package/after/#2}{#3}}%
+ }
+% \end{macrocode}
+%
+% Are the * forms here of any use? I know they are use 3--4 times
+% on CTAN but I wonder if those are real or mistaken usages.
+% \begin{macrocode}
+\DeclareDocumentCommand \AtBeginOfClassFile {smm}
+ {\IfBooleanTF{#1}%
+ {\@ifclassloaded{#2}%
+ {#3}%
+ {\AddToHook{class/before/#2}{#3}}}%
+ {\AddToHook{class/before/#2}{#3}}%
+ }
+\DeclareDocumentCommand \AtEndOfClassFile {smm}
+ {\IfBooleanTF{#1}%
+ {\@ifclassloaded{#2}%
+ {#3}%
+ {\AddToHook{class/after/#2}{#3}}}%
+ {\AddToHook{class/after/#2}{#3}}%
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\AtBeginOfIncludeFile [2]
+ {\AddToHook{include/before/#1}{#2}}
+\newcommand\AtEndOfIncludeFile [2]
+ {\AddToHook{include/end/#1}{#2}}
+\newcommand\AfterIncludeFile [2]
+ {\AddToHook{include/after/#1}{#2}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</filehook-ltx>
+% \end{macrocode}
+%
+%
+%
+%
+% \subsection{The \pkg{bidi} package first aid}
+%
+% The \pkg{bidi} package adds a lot of hooks in various places and
+% those added to \cs{document} and \cs{enddocument} are now no
+% longer necessary as the kernel already provides the right hooks
+% there.
+%
+% However, we aren't trying to change that but instead only make
+% sure that the existing patches still work by adding some first
+% aid after \pkg{biditools} has been loaded.
+%
+% If the package gets updated one can easily take that out simply
+% through
+%\begin{verbatim}
+% \RemoveFromHook{file/after/biditools.sty}[firstaid]
+%\end{verbatim}
+% This makes it easy to test new bidi code while the first aid code
+% is still in the kernel.
+%
+% \begin{macrocode}
+%<*kernel>
+% \end{macrocode}
+%
+% \begin{macrocode}
+\AddToHook{file/after/biditools.sty}[firstaid]{%
+ \FirstAidNeededT{biditools}{sty}%
+ {2020/05/13 v2 Programming tools for bidi package}%
+ {%
+% \end{macrocode}
+% \pkg{bidi} adds some code to the beginning of \cs{document} which
+% contains \cs{endgroup} and \cs{begingroup} which is no longer
+% correct.
+%
+% Patching \cs{document} using \cs{bidi@patchcmd} doesn't work so
+% we take the extra groups out by hand:
+% \begin{macrocode}
+ \def\firstaid@bidi@document@patch
+ \endgroup#1\begingroup#2\firstaid@bidi@document@patch
+ {\unexpanded{#1#2}}%
+ \edef\document{\expandafter\firstaid@bidi@document@patch\document
+ \firstaid@bidi@document@patch}%
+% \end{macrocode}
+% There are also some patches into \cs{enddocument}, some continue
+% to go in but one fails, so we add that now into the right place.
+% \begin{macrocode}
+ \AddToHook{enddocument/info}%
+ {\let\bidi@AfterEndDocumentCheckLabelsRerun\@firstofone
+ \bidi@afterenddocumentchecklabelsrerunhook}%
+ }%
+}
+% \end{macrocode}
+%
+%
+%
+% \subsection{The \pkg{dinbrief} class first aid}
+%
+% Again a case of a no longer correct \cs{endgroup} in document.
+% Here the fix is simply though.
+% \begin{macrocode}
+\AddToHook{file/after/dinbrief.cls}[firstaid]{%
+ \FirstAidNeededT{dinbrief}{cls}{2000/03/02 LaTeX2e class}%
+ {\AddToHook{env/document/begin}{\begingroup}}%
+}
+% \end{macrocode}
+%
+%
+%
+%
+% \subsection{The \pkg{pgfpages} and \pkg{pgfmorepages} first aid}
+%
+% \pkg{pgfpages} alters the \cs{shipout} primitive to support
+% multiple page up scenarios. If used together with \pkg{atbegshi}
+% that worked because the alterations done by \pkg{atbegshi} came
+% later and so used the new definition provide by
+% \pkg{pgfpages}. Now that the code from \pkg{atbegshi} is already
+% in the kernel this further redefinition doesn't happen with the
+% result that the change to \cs{shipout} comes to late and
+% breaks the kernel processes.
+%
+% \begin{macrocode}
+\ExplSyntaxOn
+\AddToHook{file/after/pgfpages.sty}[firstaid]{%
+% \end{macrocode}
+% Undo overwriting \cs{shipout}:
+% \begin{macrocode}
+ \cs_gset_eq:NN \shipout \pgfpages@originalshipout
+% \end{macrocode}
+% Instead overwrite the L3 programming layer name of the
+% primitive. This is really an absolute no-go, but for now the
+% simplest solution to keep the original code running.
+%
+% It will be replaced when the ``configuration points'' interface
+% for \LaTeX{} becomes available. At that point the package will be
+% able to set up a different strategy for doing shipouts and
+% without the need to overrite a primitive (which it did in the
+% past and which we do below) and then this code here can be taken
+% out again.
+% \begin{macrocode}
+ \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
+ \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
+}
+\ExplSyntaxOff
+% \end{macrocode}
+%
+% Same issue with \pkg{pgfmorepages} but slightly different implementation (sigh).
+%
+% \begin{macrocode}
+\ExplSyntaxOn
+\AddToHook{file/after/pgfmorepages.sty}[firstaid]{
+ \cs_set_nopar:Npn \pgfhookintoshipout {
+ \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
+ \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
+ }
+}
+\ExplSyntaxOff
+% \end{macrocode}
+%
+%
+% \begin{macrocode}
+%</kernel>
+% \end{macrocode}
+%
+%
+%
+%
+%
+% \subsection{The \pkg{everysel} package first aid}
+%
+%
+% The \cs{selectfont} command got a hook (with the 2021/05 release) which
+% was originally provided by the \pkg{everysel}
+% package. Now that it is in the kernel this package is no longer
+% needed (or only in a simplified manner).
+%
+% If it is requested we replace it with a simplified package
+% (until) it gets updated at which point this line can be removed.
+% \changes{v2.2k}{2020/12/04}{Emulate everysel package}
+% \begin{macrocode}
+%<*kernel>
+% this has been updated
+%\declare@file@substitution{everysel.sty}{everysel-ltx.sty}
+%</kernel>
+% \end{macrocode}
+%
+%
+%
+% \begin{macrocode}
+%<*everysel-ltx>
+\ProvidesPackage{everysel-ltx}
+ [2020/12/04 v1.0a
+ Emulation of the original everysel^^Jpackage with kernel methods]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\EverySelectfont}[1]
+ {\AddToHook{selectfont}{#1}}
+\newcommand*{\AtNextSelectfont}[1]
+ {\AddToHookNext{selectfont}{#1}}
+% \end{macrocode}
+%
+%
+% \begin{macrocode}
+%</everysel-ltx>
+% \end{macrocode}
+%
+%
+%
+%
+%
+% \subsection{The \pkg{CJK} package first aid}
+%
+% \begin{macrocode}
+%<*kernel>
+% \end{macrocode}
+%
+% The package redefines \cs{selectfont} to add some code but
+% otherwise uses the old definition. So we make a copy of the
+% newer kernel definition and restore it after the package got
+% loaded. The extra code that the package needs can go into the
+% newly provided hook instead.
+%
+% \begin{macrocode}
+\DeclareCommandCopy\CJK@selectfont\selectfont
+% \end{macrocode}
+%
+% \begin{macrocode}
+\AddToHook{file/after/CJK.sty}[firstaid]{%
+ \FirstAidNeededT{CJK}{sty}%
+ {2015/04/18 4.8.4}%
+ {%
+ \DeclareCommandCopy\selectfont\CJK@selectfont
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \AddToHook{selectfont}[CJK]{%
+ \expandafter\ifx\csname CJK@\curr@fontshape\endcsname \relax
+ \else
+ \CJK@bold@false
+ \csname CJK@\curr@fontshape\endcsname
+ \fi
+ }%
+ }%
+}
+% \end{macrocode}
+%
+%
+%
+% \subsection{\cs{footref} first aid}
+%
+% A few classes unconditionally define \cs{footref}. Until that has
+% changed we provide some first aid to let them do this.
+%
+% \begin{macrocode}
+\AddToHook{file/after/scrkbase.sty}[firstaid]{%
+ \FirstAidNeededT{scrkbase}{sty}%
+ {2020/09/21 v3.32 KOMA-Script package (KOMA-Script-dependent basics and keyval usage)}%
+ {\let\footref\@undefined}
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\AddToHook{class/before/memoir}[firstaid]{%
+ % for version {2020/10/04 v3.7n configurable book, report, article document class}%
+ \let\footref\@undefined
+}
+% \end{macrocode}
+%
+%
+% \subsection[Temporary fixes for the kernel (until the next
+% patch-level release)]
+% {Temporary fixes for the kernel \\
+% (until the next patch-level release)}
+%
+%
+% \begin{macrocode}
+%</kernel>
+% \end{macrocode}
+%
+% \Finale
+%
diff --git a/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
new file mode 100644
index 0000000000..eecccbc8f6
--- /dev/null
+++ b/macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
Binary files differ
diff --git a/macros/latex/contrib/babel-contrib/german/README b/macros/latex/contrib/babel-contrib/german/README
index d929351078..6ac552b7cc 100644
--- a/macros/latex/contrib/babel-contrib/german/README
+++ b/macros/latex/contrib/babel-contrib/german/README
@@ -3,7 +3,7 @@ The babel-german bundle
German language support for the babel multilingual package
-Copyright 1989--2018 Johannes L. Braams
+Copyright 1989--2021 Johannes L. Braams
Bernd Raichle
Walter Schmidt,
Jürgen Spitzmüller
diff --git a/macros/latex/contrib/babel-contrib/german/german.ins b/macros/latex/contrib/babel-contrib/german/german.ins
index 92f2142bdf..3afe75f32f 100644
--- a/macros/latex/contrib/babel-contrib/german/german.ins
+++ b/macros/latex/contrib/babel-contrib/german/german.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989--2018
+%% Copyright 1989--2021
%% Johannes L. Braams
%% Bernd Raichle
%% Walter Schmidt
@@ -28,7 +28,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2018/12/08}
+\def\filedate{2021/02/27}
\input docstrip.tex
@@ -50,7 +50,7 @@
\preamble
This is a generated file.
-Copyright 1989--2018
+Copyright 1989--2021
Johannes L. Braams
Bernd Raichle
Walter Schmidt
diff --git a/macros/latex/contrib/babel-contrib/german/germanb.dtx b/macros/latex/contrib/babel-contrib/german/germanb.dtx
index 21e0c78802..35a837bf70 100644
--- a/macros/latex/contrib/babel-contrib/german/germanb.dtx
+++ b/macros/latex/contrib/babel-contrib/german/germanb.dtx
@@ -2,7 +2,7 @@
%
% File `germanb.dtx'
%
-% Copyright 1989--2020
+% Copyright 1989--2021
% Johannes L. Braams
% Bernd Raichle
% Walter Schmidt
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Juergen Spitzmueller.
% \fi
-% \CheckSum{513}
+% \CheckSum{522}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -39,7 +39,7 @@
%<germanb>\ProvidesLanguage{germanb}
%\fi
%\ProvidesFile{germanb.dtx}
- [2020/07/21 v2.12 German support for babel (pre-1996 orthography)]
+ [2021/02/27 v2.13 German support for babel (pre-1996 orthography)]
%\iffalse
%
%<*filedriver>
@@ -358,9 +358,31 @@
%
% \subsection{General settings}
%
-% First, we define some helper macros that help us to identify later on
+%
+% If \file{germanb.ldf} is read via the deprecated \babel\ option
+% \Lopt{germanb}, we make it behave as if \Lopt{german} was specified.
+% \changes{Version 2.6m}{2008/06/01}{Corrected a typo}
+% \begin{macrocode}
+\def\tmpa{germanb}
+\let\SaveCurrentOption\CurrentOption
+\ifx\CurrentOption\tmpa
+ \def\CurrentOption{german}
+\fi
+% \end{macrocode}
+%
+% The macro |\LdfInit| takes care of preventing that this file is
+% loaded more than once with the same option, checking the category
+% code of the \texttt{@} sign, etc.
+% \changes{Version 2.6d}{1996/11/02}{Now use \cs{LdfInit} to perform
+% initial checks}
+% \begin{macrocode}
+\LdfInit\CurrentOption{captions\CurrentOption}
+% \end{macrocode}
+%
+% We define some helper macros that help us to identify later on
% which variety of German we are currently dealing with.
% \changes{Version 2.9a=Version 2.10}{2016/11/03}{Add helper macros to identify the current option.}
+% \changes{Version 2.9d=Version 2.13}{2021/02/27}{Move option helper macros after \cs{LdfInit} to fix plain tex usage.}
% \iffalse
%<*germanb>
% \fi
@@ -371,14 +393,11 @@
\def\bbl@opt@swissgerman{swissgerman}
% \end{macrocode}
%
-% If \file{germanb.ldf} is read via the deprecated \babel\ option
-% \Lopt{germanb}, we make it behave as if \Lopt{german} was specified.
+% Some more work to make germanb behave like german.
% \changes{Version 2.6l}{2008/03/17}{Making germanb behave like german
% needs some more work besides defining \cs{CurrentOption}}
-% \changes{Version 2.6m}{2008/06/01}{Corrected a typo}
% \begin{macrocode}
-\ifx\CurrentOption\bbl@opt@germanb
- \def\CurrentOption{german}
+\ifx\SaveCurrentOption\bbl@opt@germanb
\ifx\l@german\@undefined
\@nopatterns{German (trad. orthography)}
\adddialect\l@german0
@@ -393,15 +412,6 @@
\fi
% \end{macrocode}
%
-% The macro |\LdfInit| takes care of preventing that this file is
-% loaded more than once with the same option, checking the category
-% code of the \texttt{@} sign, etc.
-% \changes{Version 2.6d}{1996/11/02}{Now use \cs{LdfInit} to perform
-% initial checks}
-% \begin{macrocode}
-\LdfInit\CurrentOption{captions\CurrentOption}
-% \end{macrocode}
-%
% If \file{germanb.ldf} is read as an option, i.e. via |\usepackage|
% command, \Lopt{german} could be an `unknown' language, so we
% have to make it known. We check for the existence of
diff --git a/macros/latex/contrib/babel-contrib/german/germanb.pdf b/macros/latex/contrib/babel-contrib/german/germanb.pdf
index 90180b1e1e..972952ed63 100644
--- a/macros/latex/contrib/babel-contrib/german/germanb.pdf
+++ b/macros/latex/contrib/babel-contrib/german/germanb.pdf
Binary files differ
diff --git a/macros/latex/contrib/babel-contrib/german/ngermanb.dtx b/macros/latex/contrib/babel-contrib/german/ngermanb.dtx
index 5d8d045eb3..d0b638457f 100644
--- a/macros/latex/contrib/babel-contrib/german/ngermanb.dtx
+++ b/macros/latex/contrib/babel-contrib/german/ngermanb.dtx
@@ -2,7 +2,7 @@
%
% File `ngermanb.dtx'
%
-% Copyright 1989--2020
+% Copyright 1989--2021
% Johannes L. Braams
% Bernd Raichle
% Walter Schmidt
@@ -29,7 +29,7 @@
% by Bernd Raichle, Hubert Partl et.al.
%
% \fi
-% \CheckSum{407}
+% \CheckSum{409}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -43,7 +43,7 @@
%<ngermanb>\ProvidesLanguage{ngermanb}
%\fi
%\ProvidesFile{ngermanb.dtx}
- [2020/07/21 v2.12 German support for babel (post-1996 orthography)]
+ [2021/02/27 v2.13 German support for babel (post-1996 orthography)]
%\iffalse
%
%<*filedriver>
@@ -299,23 +299,11 @@
%
% \subsection{General settings}
%
-% First, we define some helper macros that help us to identify later on
-% which variety of German we are currently dealing with.
-% \changes{Version 2.9a=Version 2.10}{2016/11/03}{Add helper macros to identify the current option.}
-% \iffalse
-%<*ngermanb>
-% \fi
-% \begin{macrocode}
-\def\bbl@opt@ngerman{ngerman}
-\def\bbl@opt@ngermanb{ngermanb}
-\def\bbl@opt@naustrian{naustrian}
-\def\bbl@opt@nswissgerman{nswissgerman}
-% \end{macrocode}
-%
% If \file{ngermanb.ldf} is read via the deprecated \babel\ option
% \Lopt{ngermanb}, we make it behave as if \Lopt{ngerman} was specified.
% \begin{macrocode}
-\ifx\CurrentOption\bbl@opt@ngermanb
+\def\tmpa{ngermanb}
+\ifx\CurrentOption\tmpa
\def\CurrentOption{ngerman}
\fi
% \end{macrocode}
@@ -327,6 +315,20 @@
\LdfInit\CurrentOption{captions\CurrentOption}
% \end{macrocode}
%
+% We define some helper macros that help us to identify later on
+% which variety of German we are currently dealing with.
+% \changes{Version 2.9a=Version 2.10}{2016/11/03}{Add helper macros to identify the current option.}
+% \changes{Version 2.9d=Version 2.13}{2021/02/27}{Move option helper macros after \cs{LdfInit} to fix plain tex usage.}
+% \iffalse
+%<*ngermanb>
+% \fi
+% \begin{macrocode}
+\def\bbl@opt@ngerman{ngerman}
+\def\bbl@opt@ngermanb{ngermanb}
+\def\bbl@opt@naustrian{naustrian}
+\def\bbl@opt@nswissgerman{nswissgerman}
+% \end{macrocode}
+%
% If \file{ngermanb.ldf} is read as an option, i.e., by the |\usepackage|
% command, \Lopt{ngerman} could be an `unknown' language, so we
% have to make it known. We check for the existence of
diff --git a/macros/latex/contrib/babel-contrib/german/ngermanb.pdf b/macros/latex/contrib/babel-contrib/german/ngermanb.pdf
index 4b02945872..a663794b0e 100644
--- a/macros/latex/contrib/babel-contrib/german/ngermanb.pdf
+++ b/macros/latex/contrib/babel-contrib/german/ngermanb.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
index 52341a9677..15974d4efd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
@@ -1,8 +1,21 @@
# Changelog
-## Unreleased
+## Version 0.12 (2021-02-27)
-See <https://github.com/moewew/biblatex-ext/compare/v0.10...HEAD>
+See <https://github.com/moewew/biblatex-ext/compare/v0.11...v0.12>
+
+### Added
+- `\UndeclareCiteDelims{<cite command>}` to delete inner and outer
+ delimiters at the same time.
+
+### Fixed
+- Clarified in the documentation that `innamebeforetitle` does not apply
+ to `@inbook` entries
+ (cf. also <https://github.com/moewew/biblatex-ext/issues/20>).
+
+## Version 0.11 (2021-02-19)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.10...v0.11>
### Changed
- Synced with 2021-02-18 changes in `l3draw`/`l3color`.
@@ -40,7 +53,7 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.8e...v0.8f>
### Fixed
- Fixed inner cite delimiters for `\footcitetext` in `authoryear`
and `authortitle` (not `comp`) styles
- (https://github.com/moewew/biblatex-ext/issues/19).
+ (<https://github.com/moewew/biblatex-ext/issues/19>).
## Version 0.8e (2020-05-05)
@@ -50,7 +63,7 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.8d...v0.8e>
### Fixed
- Fixed `bbx:introcite` definition for `ext-numeric-comp`.
- Fixed issue with `labelprefix` in `\printbibtabular`
- (https://github.com/moewew/biblatex-ext/pull/18).
+ (<https://github.com/moewew/biblatex-ext/pull/18>).
### Changed
- `biblatex-ext-tabular` now checks for the recommended `biblatex`
@@ -96,7 +109,7 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.8...v0.8a>
### Fixed
- The default value of `\servoldelim` was documented as
- and should be `\jourvoldelim`.
+ and should be `\jourvoldelim`.
Previous versions had `\addspace` (the default value of
`\jourvoldelim`) instead.
- Reenabled visible space in documentation.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib
index dfda83ff67..033334c23f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib
@@ -3,27 +3,23 @@
title = {On the Importance of the Civil Service},
date = {1980},
}
-
@book{appleby:abl,
author = {Humphrey Appleby},
title = {On the Ablative in Greek},
date = {1982},
}
-
@book{elk:bronto,
author = {Elk, Anne and Hacker, James and Rumpo, Syd},
title = {On the Theory of Brontosauruses},
date = {1972},
options = {maxnames=1, uniquelist=false},
}
-
@book{elk:einio,
author = {Elk, Anne and Hacker, James and Pode, Eric},
title = {On the Theory of Einiosauruses},
date = {1973},
options = {maxnames=1, uniquelist=false},
}
-
@article{cipriani,
author = {Cipriani, Alessandra and Hazra, Rajat Subhra
and Ruszel, Wioletta M.},
@@ -36,7 +32,6 @@
doi = {10.1007/s00440-017-0821-x},
doi+an = {=openaccess},
}
-
@online{meckes,
author = {Elizabeth Meckes and Kathryn Stewart},
title = {On the eigenvalues of truncations
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
index 59fd9ec6c6..253862dc67 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa-doiapi}
- [2021/02/19 v0.11 Obtain open access information from DOI via
+ [2021/02/27 v0.12 Obtain open access information from DOI via
unpaywall.org and doi.org (MW)]
\RequirePackage{etoolbox}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
index fad259f268..1354ee2bd3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa}
- [2021/02/19 v0.11 mark open access in biblatex bibliographies (MW)]
+ [2021/02/27 v0.12 mark open access in biblatex bibliographies (MW)]
\RequirePackage{etoolbox}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
index bf02f64580..2b2d07b901 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
@@ -1,7 +1,7 @@
\RequirePackage{expl3}
\ProvidesExplPackage {biblatex-ext-oasymb-l3draw}
- {2021/02/19} {0.11}
+ {2021/02/27} {0.12}
{open access symbols with l3draw (MW)}
\RequirePackage{xparse}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
index 7888c7d282..74bf30cd83 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-pict2e}
- [2021/02/19 v0.11 open access symbols with pict2e (MW)]
+ [2021/02/27 v0.12 open access symbols with pict2e (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
index ddff6b8f6a..f96b1d4f13 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-tikz}
- [2021/02/19 v0.11 open access symbols with TikZ (MW)]
+ [2021/02/27 v0.12 open access symbols with TikZ (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
index eac2ae2ce3..37bb08b981 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-tabular}
- [2021/02/19 v0.11 tabular bibliographies for biblatex (MW)]
+ [2021/02/27 v0.12 tabular bibliographies for biblatex (MW)]
% Code based on Audrey's
% (https://tex.stackexchange.com/users/4483/audrey)
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
index 22c6eb5946..ede8481ae2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
index 05161f93f8..521bc7bbd5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
@@ -49,7 +49,7 @@
\usetikzlibrary{shapes.geometric}
\usetikzlibrary{fit}
\usetikzlibrary{positioning}
-\usepackage[style=ext-authoryear-iecomp, backend=biber]{biblatex}
+\usepackage[style=ext-authoryear-iecomp, backend=biber, labelnumber]{biblatex}
\addbibresource{biblatex-examples.bib}
\addbibresource{biblatex-ext-examples.bib}
\usepackage{biblatex-ext-tabular}
@@ -67,24 +67,68 @@
\undef\DefineOASymbol
\usepackage{biblatex-ext-oasymb-pict2e}
+\DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}}
+\DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}}
+\DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}}
+
+\defbibenvironment{bibliographyNUM}
+ {\list
+ {\printtext[labelnumberwidth]{%
+ \printfield{labelprefix}%
+ \printfield{labelnumber}}}
+ {\setlength{\labelwidth}{\labelnumberwidth}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}}%
+ \renewcommand*{\makelabel}[1]{\hss##1}}
+ {\endlist}
+ {\item}
+
+\newcounter{extblxdoc@examplebib}
+
\makeatletter
\defbibcheck{examplebib}{%
\xifinlist{\thefield{entrykey}}{\extblxdoc@examplebib@list}
{}
{\skipentry}}
-\newcommand*{\exampleprintbib}[1]{%
- \nocite{#1}%
+\newcommand*{\extblxdoc@fixexamplelinks}{%
+ \protected\def\blx@anchor{%
+ \xifinlist{\the\c@refsection @\the\c@extblxdoc@examplebib
+ @\abx@field@entrykey}{\blx@anchors}
+ {}
+ {\listxadd\blx@anchors{\the\c@refsection @\the\c@extblxdoc@examplebib
+ @\abx@field@entrykey}%
+ \hyper@natanchorstart{\the\c@refsection @\the\c@extblxdoc@examplebib
+ @\abx@field@entrykey}%
+ \hyper@natanchorend}}%
+ \long\def\blx@bibhyperref[##1]##2{%
+ \blx@sfsave\hyper@natlinkstart{\the\c@refsection
+ @\the\c@extblxdoc@examplebib @##1}\blx@sfrest
+ ##2%
+ \blx@sfsave\hyper@natlinkend\blx@sfrest}%
+}
+
+\newcommand*{\exampleprintbib}[2][]{%
+ \nocite{#2}%
\let\extblxdoc@examplebib@list\empty
\def\do##1{\listeadd\extblxdoc@examplebib@list{\detokenize{##1}}}%
- \docsvlist{#1}%
- \printbibliography[check=examplebib, heading=none]}
+ \docsvlist{#2}%
+ \AtNextBibliography{%
+ \stepcounter{extblxdoc@examplebib}%
+ \extblxdoc@fixexamplelinks}%
+ \printbibliography[check=examplebib, heading=none, #1]}
\newcommand*{\exampleprintbibtab}[1]{%
\nocite{#1}%
\let\extblxdoc@examplebib@list\empty
\def\do##1{\listeadd\extblxdoc@examplebib@list{\detokenize{##1}}}%
\docsvlist{#1}%
+ \AtNextBibliography{%
+ \stepcounter{extblxdoc@examplebib}%
+ \extblxdoc@fixexamplelinks}%
\printbibtabular[check=examplebib, heading=none]}
@@ -152,9 +196,11 @@
defbibtabular,defbibtabulartwocolumn,defbibenvironment,
printbibliography,printbibtabular,
autocite,
- DeclareFieldFormat,DeclareDelimFormat,DeclareDelimcontextAlias,
+ DeclareFieldFormat,DeclareDelimFormat,
+ DeclareDelimcontextAlias,UndeclareDelimcontextAlias,
DeclareInnerCiteDelims,UndeclareInnerCiteDelims,DeclareInnerCiteDelimsAlias,
DeclareOuterCiteDelims,UndeclareOuterCiteDelims,DeclareOuterCiteDelimsAlias,
+ UndeclareCiteDelims,
introcitepunct,volnumdelim,maintitletitledelim,voltitledelim,sernumdelim,
jourvoldelim,
volnumdatedelim,locdatedelim,locpubdelim,publocdelim,pubdatedelim,
@@ -540,7 +586,7 @@
\newcommand*{\ctan}{\mkbibacro{CTAN}}
\newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.11}
+\newcommand*{\extblxversion}{0.12}
\newcommand*{\biber}{Biber}
\newcommand*{\gitissuelink}[1]{%
\href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -613,7 +659,7 @@
author = {Moritz Wemheuer},
link = {mwemheu@posteo.de},%
revision = {\extblxversion},
- date = {\DTMDate{2021-02-19}},
+ date = {\DTMDate{2021-02-27}},
}
\hypersetup{%
@@ -817,7 +863,7 @@ Of the many introductory texts and tutorials available on the internet%
\fnurl{https://tex.stackexchange.com/q/13509/35864}
the author particularly likes
Knut Hegna and Dag Langmyhr's \emph{Local Guide to \sty{biblatex}}%
-\fnurl{http://dag.at.ifi.uio.no/public/doc/biblatex-guide.pdf}
+\fnurl{https://www.mn.uio.no/ifi/tjenester/it/hjelp/latex/biblatex-guide.pdf}
and Paul Stanley's \emph{\sty{biblatex}~-- An Easier Read}%
\fnurl{https://github.com/PaulStanley/biblatex-tutorial/releases}.
French speakers may want to consider Maïeul Rouquette's
@@ -1217,8 +1263,8 @@ necessary to modify the bibmacro~\bibmacro{in:}.
\boolitem[false]{citexref}
This option controls if \bibtype{inbook}, \bibtype{incollection} and
\bibtype{inproceedings} entries that are tied to a parent entry with
-\bibfield{xref} or \bibfield{crossref} should show all data of their
-parent entry inline as usual or if they should cite their parent entry
+\bibfield{xref} or \bibfield{crossref} show all data of their
+parent entry inline as usual or if they cite their parent entry
instead \emph{if} the parent is listed in the bibliography as a
separate entry.
With the default setting \kvopt{citexref}{false} the parent is not
@@ -1271,10 +1317,255 @@ or implicitly via the \opt{minxrefs} or \opt{mincrossrefs} option.
\exampleprintbib{westfahl:space,westfahl:frontier}
\end{bibexample}
+The citation produced by this option is implemented via
+\cmd{bbx@xrefcite},
+which is set up to inherit most styling from \cmd{cite}.
+\cmd{bbx@xrefcite} can be modified as usual
+(and independent of \cmd{cite})
+if the delimiter context alias is removed.
+\begin{bibexample}[enhanced,
+ title={Example customisation of \cmd{bbx@xrefcite}}]
+\begin{lstlisting}[style=extblxstylelatex]
+\UndeclareDelimcontextAlias{bbx@xrefcite}
+\DeclareInnerCiteDelims{bbx@xrefcite}{\bibopenparen}{\bibcloseparen}
+\end{lstlisting}
+\tcblower
+\makeatletter
+\renewbibmacro*{crosscite}[1]{%
+ \printtext[highlight1]{%
+ \iftoggle{bbx:citexref}
+ {\iffieldundef{crossref}
+ {\iffieldundef{xref}
+ {\usebibmacro{#1}}
+ {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
+ {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+ {\usebibmacro{#1}}}}
+\makeatother
+\UndeclareDelimcontextAlias{bbx@xrefcite}
+\DeclareInnerCiteDelims{bbx@xrefcite}{\bibopenparen}{\bibcloseparen}
+\toggletrue{bbx:citexref}
+\exampleprintbib{westfahl:space,westfahl:frontier}
+\end{bibexample}
+
+The bibliography macro that prints the citation in \cmd{bbx@xrefcite}
+is called \bibmacro{bbx:inxrefcite}.
+By default this bibliography macro just expands to the bibliography
+macro \bibmacro{cite}.
+In some cases it might be easier to obtain the desired result by
+redefining this bibliography macro than by redefining the complete
+citation command \cmd{bbx@xrefcite} with \cmd{DeclareCiteCommand}.
+\begin{remindbox}
+For general citation commands
+this strategy of only changing the bibliography macro and not
+the complete citation command will not always result in
+the expected output, but in the context of \opt{citexref},
+where we have control over how exactly the citation command is going
+to be used, we can sometimes use this shortcut.
+\end{remindbox}
+
+The following example shows the standard behaviour of \opt{citexref}
+with a numeric style and a customisation involving
+\bibmacro{bbx:inxrefcite} that emulates the output of \cmd{textcite}.
+
+\begin{bibexample}[enhanced,
+ title={Standard behaviour of \cmd{bbx@xrefcite}
+ with \blxstyle{ext-numeric}}]
+\begin{lstlisting}[style=extblxstylelatex]
+%\usepackage[style=ext-numeric, citexref=true]{biblatex}
+\end{lstlisting}
+\tcblower
+\makeatletter
+\renewbibmacro*{crosscite}[1]{%
+ \printtext[highlight1]{%
+ \iftoggle{bbx:citexref}
+ {\iffieldundef{crossref}
+ {\iffieldundef{xref}
+ {\usebibmacro{#1}}
+ {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
+ {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+ {\usebibmacro{#1}}}}
+\makeatother
+\UndeclareDelimcontextAlias{bbx@xrefcite}
+\DeclareOuterCiteDelims{bbx@xrefcite}{\bibopenbracket}{\bibclosebracket}
+\toggletrue{bbx:citexref}
+% emulate all the 'numeric'/default behaviour
+\DeclareNameAlias{sortname}{given-family}
+\renewbibmacro*{author}{%
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }
+ {\printnames{author}%
+ \iffieldundef{authortype}
+ {}
+ {\setunit{\printdelim{authortypedelim}}%
+ \usebibmacro{authorstrg}}}
+ {}}
+\renewbibmacro*{editor}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \setunit{\printdelim{editortypedelim}}%
+ \usebibmacro{editorstrg}%
+ \clearname{editor}}
+ {}}
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \setunit{\printdelim{editortypedelim}}%
+ \usebibmacro{editor+othersstrg}%
+ \clearname{editor}}
+ {}}
+\renewbibmacro*{date}{\printdate}%
+\renewbibmacro*{cite}{%
+ \printtext[bibhyperref]{%
+ \printfield{labelprefix}%
+ \printfield{labelnumber}}}
+\exampleprintbib[env=bibliographyNUM]{westfahl:space,westfahl:frontier}
+\end{bibexample}
+
+\begin{bibexample}[enhanced,
+ title={\cmd{textcite}-like behaviour of \cmd{bbx@xrefcite}
+ with \blxstyle{ext-numeric}}]
+\begin{lstlisting}[style=extblxstylelatex]
+%\usepackage[style=ext-numeric, citexref=true]{biblatex}
+
+\UndeclareCiteDelims{bbx@xrefcite}
+\DeclareDelimcontextAlias{bbx@xrefcite}{textcite}
+
+\renewbibmacro*{bbx:inxrefcite}{%
+ \usebibmacro{textcite:init}%
+ \usebibmacro{textcite}%
+ \usebibmacro{textcite:postnote}}
+\end{lstlisting}
+\tcblower
+\makeatletter
+\renewbibmacro*{crosscite}[1]{%
+ \printtext[highlight1]{%
+ \iftoggle{bbx:citexref}
+ {\iffieldundef{crossref}
+ {\iffieldundef{xref}
+ {\usebibmacro{#1}}
+ {\printtext{\bbx@xrefcite{\thefield{xref}}}}}
+ {\printtext{\bbx@xrefcite{\thefield{crossref}}}}}
+ {\usebibmacro{#1}}}}
+% emulate all the 'numeric'/default behaviour
+\DeclareNameAlias{sortname}{given-family}
+\renewbibmacro*{author}{%
+ \ifboolexpr{
+ test \ifuseauthor
+ and
+ not test {\ifnameundef{author}}
+ }
+ {\printnames{author}%
+ \iffieldundef{authortype}
+ {}
+ {\setunit{\printdelim{authortypedelim}}%
+ \usebibmacro{authorstrg}}}
+ {}}
+\renewbibmacro*{editor}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \setunit{\printdelim{editortypedelim}}%
+ \usebibmacro{editorstrg}%
+ \clearname{editor}}
+ {}}
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \setunit{\printdelim{editortypedelim}}%
+ \usebibmacro{editor+othersstrg}%
+ \clearname{editor}}
+ {}}
+\renewbibmacro*{date}{\printdate}%
+\renewbibmacro*{cite}{%
+ \printtext[bibhyperref]{%
+ \printfield{labelprefix}%
+ \printfield{labelnumber}}}
+\renewbibmacro*{textcite}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+ {\setunit{\multicitedelim}}
+ {\ifnameundef{labelname}
+ {\printfield[citetitle]{labeltitle}}
+ {\printnames{labelname}}%
+ \setunit*{\printdelim{namelabeldelim}}%
+ \printtext{\bibopenbracket}\global\booltrue{cbx:parens}%
+ \stepcounter{textcitecount}%
+ \savefield{namehash}{\cbx@lasthash}}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite}%
+ \setunit{%
+ \ifbool{cbx:parens}
+ {\bibclosebracket\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}
+\newbibmacro*{textcite:init}{%
+ \ifnumless{\value{multicitecount}}{2}
+ {\global\boolfalse{cbx:parens}%
+ \global\undef\cbx@lasthash}
+ {\global\undef\cbx@lasthash}}
+\renewbibmacro*{textcite:postnote}{%
+ \usebibmacro{postnote}%
+ \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+ {\setunit{}%
+ \printtext{%
+ \ifbool{cbx:parens}
+ {\bibclosebracket\global\boolfalse{cbx:parens}}
+ {}}}
+ {\setunit{%
+ \ifbool{cbx:parens}
+ {\bibclosebracket\global\boolfalse{cbx:parens}}
+ {}%
+ \textcitedelim}}}
+\makeatother
+\UndeclareCiteDelims{bbx@xrefcite}
+\DeclareDelimcontextAlias{bbx@xrefcite}{textcite}
+\renewbibmacro*{bbx:inxrefcite}{%
+ \usebibmacro{textcite:init}%
+ \usebibmacro{textcite}%
+ \usebibmacro{textcite:postnote}}
+\toggletrue{bbx:citexref}
+\exampleprintbib[env=bibliographyNUM]{westfahl:space,westfahl:frontier}
+\end{bibexample}
+
+
\boolitem[false]{innamebeforetitle}
-Whether or not the \bibfield{editor} should be moved before the
-\bibfield{booktitle} field for \bibtype{inbook}, \bibtype{incollection} and
-\bibtype{inproceedings} entries.
+Whether or not the \bibfield{editor} is moved before the
+\bibfield{booktitle} field for \bibtype{incollection}
+and \bibtype{inproceedings} entries.
+
+\begin{remindbox}[breakable]
+ This option does \emph{not} influence the position of the
+ \bibfield{editor} field for \bibtype{inbook} entries.
+
+ The primary name connected to a \bibtype{book} entry is its
+ \bibfield{author}, which for \bibtype{inbook} entries normally
+ corresponds to the \bibfield{bookauthor}
+ (usually \bibfield{author} and \bibfield{bookauthor} will be the
+ same for \bibfield{inbook} entries) and that is the name one
+ would normally expect to see before the title.
+ In most cases where one wants the \bibfield{editor} to appear before
+ the \bibfield{booktitle}, the entry in question is
+ an~\bibtype{incollection} or~\bibtype{inproceedings}.
+\end{remindbox}
\begin{bibexample}[title={\kvopt{innamebeforetitle}{true}}]
\makeatletter
@@ -1467,7 +1758,7 @@ they determine if a list of authors/editors is the same as the previous.
\makeatletter
Assuming \kvopt{maxnames}{1} and no name list disambiguation
(\kvopt{uniquelist}{false}), the four entries
-\inputexamplebibfile[listing options={linerange={1-16,18-23,25-25},
+\inputexamplebibfile[listing options={linerange={1-14,16-20,22-22},
style = extblxstylebibtex}]
{biblatex-ext-examples.bib}
give
@@ -1665,8 +1956,8 @@ overlay={%
\end{bibexample}
\endgroup
-\begin{bibexample}[enhanced, title={\kvopt{introcite}{label} with empty
- \cs{introcitebreak}}]
+\begin{bibexample}[enhanced, breakable,
+ title={\kvopt{introcite}{label} with empty \cs{introcitebreak}}]
\begin{lstlisting}[style=extblxstylelatex]
%\usepackage[..., introcite=label]{biblatex}
\renewcommand*{\introcitebreak}{}
@@ -1679,9 +1970,9 @@ overlay={%
\exampleprintbib{coleridge,geer}
\end{bibexample}
-\begin{bibexample}[enhanced, title={\kvopt{introcite}{label} with
- \len{introcitewidth} set to zero and \len{introcitesep} equal to
- \len{bibhang}}]
+\begin{bibexample}[enhanced, breakable,
+ title={\kvopt{introcite}{label} with \len{introcitewidth} set to zero
+ and \len{introcitesep} equal to \len{bibhang}}]
\begin{lstlisting}[style=extblxstylelatex]
%\usepackage[..., introcite=label]{biblatex}
\setlength{\introcitewidth}{0pt}
@@ -1776,9 +2067,6 @@ The default settings for \cmd{bbx@introcite} emulate the output of \cmd{cite}.
\csletcs{extblx@introcite}{extblx@opt@introcite@label}
\exampleprintbib{coleridge,geer}
\end{bibexample}
-\csgundef{blx@delimcontextalias@bbx@introcite}
-% because \DeclareDelimcontextAlias is global ... at the moment, this can go
-% with biblatex >= 3.12
If you are using an author-year citation style together with
\kvopt{introcite}{label} or \kvopt{introcite}{label}, you may be interested in
@@ -2422,6 +2710,12 @@ delimiters whenever the citation command is called.
Completely remove the definitions of the inner delimiters for
\cmd{\prm{cite command}}.
+\cmditem{UndeclareCiteDelims}{cite command}
+
+Remove inner and outer delimiters for \cmd{\prm{cite command}}
+by calling \cmd{UndeclareOuterCiteDelims}
+and \cmd{UndeclareInnerCiteDelims}.
+
\cmditem{RegisterCiteDelims}{modifier}{cite command}
Register a pair of \prm{modifier} citation delimiters for
@@ -3344,13 +3638,13 @@ For \optval{auto}-detection, an open access article with DOI would
ideally use the field annotation \texttt{openaccess}
(\lstinline[style=extblxstylebibtex]|{doi+an = {=openaccess},|).
% cipriani
-\inputexamplebibfile[listing options={linerange={27-38},
+\inputexamplebibfile[listing options={linerange={23-34},
style = extblxstylebibtex}]
{biblatex-ext-examples.bib}
Preprints on the arXiv, on the other hand, need no field annotation, because
they are always open access.
% meckes
-\inputexamplebibfile[listing options={linerange={40-48},
+\inputexamplebibfile[listing options={linerange={35-43},
style = extblxstylebibtex}]
{biblatex-ext-examples.bib}
\makeatletter
@@ -3629,6 +3923,11 @@ See also \filename{CHANGES.md}.
The numbers on the right indicate the relevant section of the manual.
\begin{changelog}
+\begin{release}{0.12}{2021-02-27}
+ \item Added \hypercmd{UndeclareCiteDelims}\see{sec:opt:citedelims}
+ \item Clarified \hyperopt{innamebeforetitle} documentation%
+ \see{sec:opt:gen}
+\end{release}
\begin{release}{0.11}{2021-02-19}
\item Synced with \sty{l3draw} changes.
\end{release}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
index 9a8305d5d6..d17dbb4edf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
@@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {}
local blxextdoiapi_module = {
name = "blxextdoiapi",
- version = "v0.11",
- date = "2021/02/19",
+ version = "v0.12",
+ date = "2021/02/27",
description = "Obtain open access information from DOI via unpaywall.org",
author = "Moritz Wemheuer",
license = "LPPL v1.3c",
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
index 7816d360b5..0777b02ed3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.bbx}
- [2021/02/19 v0.11 extended biblatex alphabetic-verb
+ [2021/02/27 v0.12 extended biblatex alphabetic-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
index 4c819b4a6b..a48ab4f020 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.cbx}
- [2021/02/19 v0.11 extended biblatex alphabetic-verb citation style
+ [2021/02/27 v0.12 extended biblatex alphabetic-verb citation style
(MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
index aa90994c20..638256b441 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.bbx}
- [2021/02/19 v0.11 extended biblatex alphabetic bibliography style (MW)]
+ [2021/02/27 v0.12 extended biblatex alphabetic bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{alphabetic}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
index 8ff01b82dc..c1dc96f6f1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.cbx}
- [2021/02/19 v0.11 extended biblatex alphabetic citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex alphabetic citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
index 00279b4501..27782b5310 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-common.bbx}
- [2021/02/19 v0.11 common files for extended biblatex
+ [2021/02/27 v0.12 common files for extended biblatex
authortitle bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
index 79594ef801..0e2dac632b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.bbx}
- [2021/02/19 v0.11 extended biblatex authortitle-comp
+ [2021/02/27 v0.12 extended biblatex authortitle-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
index 65b5cf5324..4983317e92 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.cbx}
- [2021/02/19 v0.11 extended biblatex authortitle-comp
+ [2021/02/27 v0.12 extended biblatex authortitle-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
index cf57954dc1..1c4d3a3178 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.bbx}
- [2021/02/19 v0.11 extended biblatex authortitle-ibid
+ [2021/02/27 v0.12 extended biblatex authortitle-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
index 7ce17b2b39..88e1aed18f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.cbx}
- [2021/02/19 v0.11 extended biblatex authortitle-ibid
+ [2021/02/27 v0.12 extended biblatex authortitle-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
index 7a320a6c5c..ed1b62d285 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.bbx}
- [2021/02/19 v0.11 extended biblatex authortitle-icomp
+ [2021/02/27 v0.12 extended biblatex authortitle-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
index ee4e4b2783..c913901958 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.cbx}
- [2021/02/19 v0.11 extended biblatex authortitle-icomp
+ [2021/02/27 v0.12 extended biblatex authortitle-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
index 03930ac954..09b0fe72a3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.bbx}
- [2021/02/19 v0.11 extended biblatex authortitle-tcomp
+ [2021/02/27 v0.12 extended biblatex authortitle-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
index 874af94882..abdcdfd1f2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.cbx}
- [2021/02/19 v0.11 extended biblatex authortitle-tcomp
+ [2021/02/27 v0.12 extended biblatex authortitle-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authortitle-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
index 002e1e1056..e581ebc1c5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.bbx}
- [2021/02/19 v0.11 extended biblatex authortitle-terse
+ [2021/02/27 v0.12 extended biblatex authortitle-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
index 4538124e8d..05bcc6c10b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.cbx}
- [2021/02/19 v0.11 extended biblatex authortitle-terse
+ [2021/02/27 v0.12 extended biblatex authortitle-terse
citation style (MW)]
\RequireCitationStyle{ext-authortitle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
index e73a5fb2b9..c95fd795e4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.bbx}
- [2021/02/19 v0.11 extended biblatex authortitle-ticomp
+ [2021/02/27 v0.12 extended biblatex authortitle-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
index 3aa9a0d085..7f392b98da 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.cbx}
- [2021/02/19 v0.11 extended biblatex authortitle-ticomp citation style
+ [2021/02/27 v0.12 extended biblatex authortitle-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authortitle-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
index 81dc8487ef..52ceb4920c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.bbx}
- [2021/02/19 v0.11 extended biblatex authortitle
+ [2021/02/27 v0.12 extended biblatex authortitle
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
index c233ae3921..c96a762d56 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.cbx}
- [2021/02/19 v0.11 extended biblatex authortitle citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex authortitle citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
index 3edb6c9487..9fa5746066 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-common.bbx}
- [2021/02/19 v0.11 common files for extended biblatex
+ [2021/02/27 v0.12 common files for extended biblatex
authoryear bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
index 2d08a3b4a9..3b42062a75 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-comp
+ [2021/02/27 v0.12 extended biblatex authoryear-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
index f2d2a4d1d9..884ecda4f9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-comp
+ [2021/02/27 v0.12 extended biblatex authoryear-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
index c18c590b5a..bb90b43edd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.bbx}
- [2021/02/19 v0.11 biblatex authoryear-ecomp
+ [2021/02/27 v0.12 biblatex authoryear-ecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
index c40eeccd9e..1a69aafeaf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.cbx}
- [2021/02/19 v0.11 biblatex authoryear-ecomp
+ [2021/02/27 v0.12 biblatex authoryear-ecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
index 74be9bd9e3..219fe9951a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-ibid
+ [2021/02/27 v0.12 extended biblatex authoryear-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
index f6b7bfe4a4..a504e24c1d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-ibid
+ [2021/02/27 v0.12 extended biblatex authoryear-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
index 520c0e58a0..2029128c59 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-icomp
+ [2021/02/27 v0.12 extended biblatex authoryear-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
index be25d09875..117c05d395 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-icomp
+ [2021/02/27 v0.12 extended biblatex authoryear-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
index eb5442d3f3..12168678ae 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.bbx}
- [2021/02/19 v0.11 biblatex authoryear-iecomp
+ [2021/02/27 v0.12 biblatex authoryear-iecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
index 21c6cf3c18..1cb523a6ed 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.cbx}
- [2021/02/19 v0.11 biblatex authoryear-iecomp
+ [2021/02/27 v0.12 biblatex authoryear-iecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
index ce47fd9b26..d4cb4bfaca 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-tcomp
+ [2021/02/27 v0.12 extended biblatex authoryear-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
index 98838f818b..64da140423 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-tcomp
+ [2021/02/27 v0.12 extended biblatex authoryear-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
index a85a7dc564..3b145c4541 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-tecomp
+ [2021/02/27 v0.12 extended biblatex authoryear-tecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
index 15b0dafe0c..f4ec3d0dce 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-tecomp
+ [2021/02/27 v0.12 extended biblatex authoryear-tecomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-ecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
index a3b68efe93..af22c7f118 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-terse
+ [2021/02/27 v0.12 extended biblatex authoryear-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
index 6776434788..13d2c94a6e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-terse
+ [2021/02/27 v0.12 extended biblatex authoryear-terse
citation style (MW)]
\RequireCitationStyle{ext-authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
index d8fadcefe1..8b64621050 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-ticomp
+ [2021/02/27 v0.12 extended biblatex authoryear-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
index 4a88db4b20..cf0b4c55bd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-ticomp citation style
+ [2021/02/27 v0.12 extended biblatex authoryear-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
index c6c9ce9241..7b99cd0c90 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear-tiecomp
+ [2021/02/27 v0.12 extended biblatex authoryear-tiecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
index 9ac36f418f..558491a501 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear-tiecomp citation style
+ [2021/02/27 v0.12 extended biblatex authoryear-tiecomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-iecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
index f4f13014d6..34e264b02d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.bbx}
- [2021/02/19 v0.11 extended biblatex authoryear bibliography style (MW)]
+ [2021/02/27 v0.12 extended biblatex authoryear bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
index 2348d26494..bd7948920f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.cbx}
- [2021/02/19 v0.11 extended biblatex authoryear citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex authoryear citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
index 50f86a8430..44da301117 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
@@ -1,5 +1,5 @@
\ProvidesFile{ext-biblatex-aux.def}
- [2021/02/19 v0.11 auxiliaries for extended biblatex citation style
+ [2021/02/27 v0.12 auxiliaries for extended biblatex citation style
(MW)]
\def\extblx@requiredbiblatexversion{3.16}
@@ -38,6 +38,10 @@
\newrobustcmd*{\UndeclareInnerCiteDelims}{%
\extblx@undeclareciteddelims{inner}}
+\newrobustcmd*{\UndeclareCiteDelims}[1]{%
+ \UndeclareOuterCiteDelims{#1}%
+ \UndeclareInnerCiteDelims{#1}}
+
%{<inner/outer>}{<cite context>}
\def\extblx@undeclareciteddelims#1#2{%
\csundef{extblx@citedelim@#2@#1@open}%
@@ -290,6 +294,10 @@
% and needs two groups for correct local effects
\providecommand*{\mkrelatedstringtext}[1]{{{\mainlang #1}}}
+% biblatex 3.17
+\providecommand*{\UndeclareDelimcontextAlias}[1]{%
+ \csundef{blx@delimcontextalias@#1}}
+
\endinput
%
% This file is part of the biblatex-ext bundle.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
index c6085e7a36..acfad016f6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-dashed-common.bbx}
- [2021/02/19 v0.11 common files for extended biblatex
+ [2021/02/27 v0.12 common files for extended biblatex
dashed bibliography styles (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
index 2311056fe9..cde4eff163 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.bbx}
- [2021/02/19 v0.11 extended biblatex numeric-comp
+ [2021/02/27 v0.12 extended biblatex numeric-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
index ace6642ffe..208b801070 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.cbx}
- [2021/02/19 v0.11 extended biblatex numeric-comp citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex numeric-comp citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
index 5301adeeba..0b649761f9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.bbx}
- [2021/02/19 v0.11 extended biblatex numeric-verb
+ [2021/02/27 v0.12 extended biblatex numeric-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
index 5e127960d0..165ff6a063 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.cbx}
- [2021/02/19 v0.11 extended biblatex numeric-verb citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex numeric-verb citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
index 7dd47af203..c4bad814ab 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.bbx}
- [2021/02/19 v0.11 extended biblatex numeric bibliography style (MW)]
+ [2021/02/27 v0.12 extended biblatex numeric bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{numeric}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
index ded0ad77d5..8a17edc63c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.cbx}
- [2021/02/19 v0.11 extended biblatex numeric citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex numeric citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
index d480825242..3bfa3a5797 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
@@ -1,9 +1,9 @@
-% biblatex-ext v0.11 (2021-02-19)
+% biblatex-ext v0.12 (2021-02-27)
% Maintainer: Moritz Wemheuer
% Licence: LaTeX Project Public License v1.3c or later
%
\ProvidesFile{ext-standard.bbx}
- [2021/02/19 v0.11 extended biblatex standard style (MW)]
+ [2021/02/27 v0.12 extended biblatex standard style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
index 90a2fca62b..b175e6b66b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-common.cbx}
- [2021/02/19 v0.11 extended biblatex verbose citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
index cfd01245ea..1f104c5eb3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.bbx}
- [2021/02/19 v0.11 extended biblatex verbose-ibid
+ [2021/02/27 v0.12 extended biblatex verbose-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
index eaa7a23b04..eea8ff8df0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.cbx}
- [2021/02/19 v0.11 extended biblatex verbose-ibid citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose-ibid citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
index 9e2ec2c6e1..001aae2745 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.bbx}
- [2021/02/19 v0.11 extended biblatex verbose-inote
+ [2021/02/27 v0.12 extended biblatex verbose-inote
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
index a550c91a7d..d23e70ce91 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.cbx}
- [2021/02/19 v0.11 extended biblatex verbose-inote citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose-inote citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
index b7ca5da5be..6d68af712e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note-common.cbx}
- [2021/02/19 v0.11 extended biblatex verbose citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
index dfea6cd68d..a15b98b7e2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.bbx}
- [2021/02/19 v0.11 extended biblatex verbose-note
+ [2021/02/27 v0.12 extended biblatex verbose-note
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
index c392914cc8..5549e5ae41 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.cbx}
- [2021/02/19 v0.11 extended biblatex verbose-note citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose-note citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
index 0846c6a203..c1b969a7e3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.bbx}
- [2021/02/19 v0.11 extended biblatex verbose-trad1
+ [2021/02/27 v0.12 extended biblatex verbose-trad1
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
index 40d4b63642..8d8d1a0e80 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.cbx}
- [2021/02/19 v0.11 extended biblatex verbose-trad1 citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose-trad1 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
index 8b8c213c67..8ec4bf59c0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.bbx}
- [2021/02/19 v0.11 extended biblatex verbose-trad2
+ [2021/02/27 v0.12 extended biblatex verbose-trad2
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
index 868595e59e..355c16bab0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.cbx}
- [2021/02/19 v0.11 extended biblatex verbose-trad2 citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose-trad2 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
index c70a61de1a..65cfc90359 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.bbx}
- [2021/02/19 v0.11 extended biblatex verbose-trad3
+ [2021/02/27 v0.12 extended biblatex verbose-trad3
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
index d706b8cc9d..bcdb13e904 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.cbx}
- [2021/02/19 v0.11 extended biblatex verbose-trad3 citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose-trad3 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
index 4f2dfb3bee..b69cba7b45 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.bbx}
- [2021/02/19 v0.11 extended biblatex verbose
+ [2021/02/27 v0.12 extended biblatex verbose
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
index 1fb80dd7c1..cbf701035f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.cbx}
- [2021/02/19 v0.11 extended biblatex verbose citation style (MW)]
+ [2021/02/27 v0.12 extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index b5aa905abf..67992f6a26 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index fae23008c3..9c59b2c7a4 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -16,7 +16,8 @@
% perpart = true,
perpage = true,
% notomath = false,
- rulewidth = 0.75pt
+ rulewidth = 0.75pt,
+ % uppercase = false
},
link =
{
@@ -57,9 +58,9 @@
},
hdrset =
{
- \easyhead[EC]{\color{DarkViolet}\kaishu\leftmark}
- \easyhead[OC]{\color{DarkViolet}\kaishu\rightmark}
- \easyhead[EL,OR]{\color{DarkViolet}\thepage}
+ \easyhead[EC]{\color{SeaGreen}\kaishu\leftmark}
+ \easyhead[OC]{\color{SeaGreen}\kaishu\rightmark}
+ \easyhead[EL,OR]{\color{SeaGreen}\thepage}
},
tocset =
{
@@ -85,20 +86,17 @@
% tocdepth = 2
}
-\AfterPreamble
+\begin{document}
+\title{\sffamily easybook书籍文档类}
+\author
{
- \title{\sffamily easybook书籍文档类}
- \author
- {
- 瞿毅\thanks{texeasybook@foxmail.com.} \\
- \git~\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} \\
- \github~\url{https://github.com/texl3/easybook} \\
- \edge~\url{https://latexstudio.net}
- }
- \date{2021/02/23\hskip\ccwd\relax v1.23g}
+ 瞿毅\thanks{texeasybook@foxmail.com.} \\
+ \git~\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} \\
+ \github~\url{https://github.com/texl3/easybook} \\
+ \edge~\url{https://latexstudio.net}
}
+\date{2021/02/27\hskip\ccwd\relax v1.23h}
-\begin{document}
\frontmatter[roman]
\maketitle
\tableofcontents
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index 411175f913..6a7da0e2f3 100644
--- a/macros/latex/contrib/easybook/doc/easybook.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex
index f01e75319e..3cc05243f7 100644
--- a/macros/latex/contrib/easybook/doc/easybook.tex
+++ b/macros/latex/contrib/easybook/doc/easybook.tex
@@ -3,7 +3,7 @@
\title{\sffamily easybook书籍文档类}
\author{瞿毅}
-\date{2021/02/23\hskip\ccwd\relax v1.23g\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/27\hskip\ccwd\relax v1.23h\thanks{\url{https://gitee.com/texl3/easybook}}}
\begin{document}
\maketitle
@@ -98,7 +98,7 @@
\tn{frontmatter}\oarg{编号格式|(Roman)}
\tn{printindex}\oarg{索引名}
\end{syntax}
-\changes{v1.23g}{2021/02/20}{重新定义文档结构划分命令。}
+\changes{v1.23h}{2021/02/20}{重新定义文档结构划分命令。}
\tn{frontmatter} 为前言区命令,章标题不编号,页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令,章标题正常编号且页码为从1开始计数的阿拉伯数字,\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令,页码格式与编号保持不变,章标题不编号。\tn{listoffigures} 命令输出图片目录,\tn{listoftables} 命令输出表格目录,\tn{listoflistings} 命令输出代码目录。
\end{function}
@@ -119,7 +119,7 @@
\end{function}
\subsection{风格}
-\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-09]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath,style/rulewidth}
+\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-27]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath,style/rulewidth,style/uppercase}
\begin{syntax}
color = <(none)|seaside|energy|cyberpunk>
capdash = <true|(false)>
@@ -129,10 +129,11 @@
perpage = <true|(false)>
notomath = <(true)|false>
rulewidth = <(0.75pt)>
+ uppercase = <(true)|false>
\end{syntax}
\changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。}
-\changes{v1.23g}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。}
-\changes{v1.23g}{2021/02/09}{增加控制页面横线粗细的选项。}
+\changes{v1.23h}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。}
+\changes{v1.23h}{2021/02/09}{增加控制页面横线粗细的选项。}
\opt{style} 选项控制文章的风格。
\end{function}
@@ -152,6 +153,7 @@
\item[perpage] 使脚注跟随每一页编号,默认不跟随。
\item[notomath] 使用 \opt{noto} 风格的数学字体,将会加载 \pkg{newtxmath} 宏包。
\item[rulewidth] 调整页眉、定理盒子以及代码框线条的粗细。
+ \item[uppercase] 使用 \tn{rightmark} 及 \tn{leftmark} 获取标题内容设置页眉页脚时英文是否大小写。
\end{optdesc}
\subsection{超链接}
@@ -188,7 +190,7 @@
footnote = <(1)>
\end{syntax}
\changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。}
-\changes{v1.23g}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
+\changes{v1.23h}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
行距因子用于设置各种行距倍数,只能是浮点数,不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效,行距的意义为
\end{function}
@@ -210,7 +212,7 @@
marginpart = <\tn{rmfamily}\tn{footnotesize}>
\end{syntax}
\changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。}
-\changes{v1.23g}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
+\changes{v1.23h}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
\end{function}
\begin{optdesc}
@@ -231,7 +233,7 @@
\tn{printbibliography}\oarg{选项列表}
\end{syntax}
\changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
-\changes{v1.23g}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
+\changes{v1.23h}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
\end{function}
\begin{optdesc}
@@ -430,7 +432,7 @@
\tn{item} <习题内容>
\tn{end}\marg{exercise}
\end{syntax}
-\changes{v1.23g}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
+\changes{v1.23h}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉,当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称,正文编号格式与小节 \ref{sort list} 排序列表相同,标题名默认为摘要,参数只能\textbf{从右往左}省略。
\begin{ctexexam}
\begin{exercise}[LightYellow][1.][习题]
diff --git a/macros/latex/contrib/easybook/doc/pages/chapter3.tex b/macros/latex/contrib/easybook/doc/pages/chapter3.tex
index 0dd968f26d..3d0a88bb1f 100644
--- a/macros/latex/contrib/easybook/doc/pages/chapter3.tex
+++ b/macros/latex/contrib/easybook/doc/pages/chapter3.tex
@@ -33,7 +33,7 @@ HN-[::+60]CH_3)=-(-HO)=)}\]
\clearpage
\section{引用}
\index{y@引用}
-\zhlipsum[8][name = aspirin]
+
\subsection{索引}
\index{y@引用!s@索引}
\zhlipsum[8][name = aspirin]
diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls
index 470d7ae495..47a3778ff1 100644
--- a/macros/latex/contrib/easybook/easybook.cls
+++ b/macros/latex/contrib/easybook/easybook.cls
@@ -9,7 +9,7 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/23}{1.23g}{}
+\ProvidesExplClass{easybook}{2021/02/27}{1.23h}{}
\cs_generate_variant:Nn \keys_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -91,6 +91,7 @@
\bool_new:N \l__foot_perpart_bool
\bool_new:N \l__foot_perpage_bool
\bool_new:N \l__notomath_bool
+\bool_new:N \l__uppercase_bool
\tl_new:N \g__config_tl
\ctex_define:n
@@ -128,7 +129,10 @@
notomath .default:n = true,
notomath .initial:n = true,
rulewidth .dim_set:N = \l__rule_width_dim,
- rulewidth .initial:n = 0.75pt
+ rulewidth .initial:n = 0.75pt,
+ uppercase .bool_set:N = \l__uppercase_bool,
+ uppercase .default:n = true,
+ uppercase .initial:n = true
}
\clist_map_inline:nn
@@ -338,7 +342,7 @@
{
\markboth
{
- \MakeUppercase
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
{
\ifnum\c@secnumdepth>\m@ne
\if@mainmatter
@@ -349,7 +353,7 @@
\fi#1
}
}{
- \MakeUppercase
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
{
\ifnum\c@secnumdepth>\m@ne
\if@mainmatter
@@ -368,7 +372,7 @@
{
\markboth
{
- \MakeUppercase
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
{
\ifnum\c@secnumdepth>\m@ne
\if@mainmatter
@@ -387,11 +391,14 @@
{
\markright
{
- \ifnum\c@secnumdepth>\z@
- \ifodd\CTEX@section@numbering
- \CTEXthesection\hspace{0.5\ccwd}
- \fi
- \fi#1
+ \bool_if:NT \l__uppercase_bool{\MakeUppercase}
+ {
+ \ifnum\c@secnumdepth>\z@
+ \ifodd\CTEX@section@numbering
+ \CTEXthesection\hspace{0.5\ccwd}
+ \fi
+ \fi#1
+ }
}
}
\cs_gset:Npn \headrule
@@ -989,7 +996,7 @@
\refstepcounter{section}
\markright{\CTEXthesection\hspace{0.5\ccwd}#4}
\CTEX@addtocline{section}{#4}
- },
+ }
]{\IfBooleanF{#1}{\CTEXthesection\hspace{0.5\ccwd}}#4}
}{
\sffamily\Large
@@ -1167,7 +1174,7 @@
{
language = [LaTeX]TeX,
texcsstyle =
- *\lst@ifdisplaystyle\bfseries\color{ctex@emph}\else\color{ctex@verb}\fi,
+ *\lst@ifdisplaystyle\bfseries\color{ctex@verb}\else\color{ctex@verb}\fi,
basicstyle =
\ttfamily\lst@ifdisplaystyle\small\else\color{ctex@verb}\fi,
framexleftmargin = 0pt,
@@ -1182,7 +1189,7 @@
emphstyle = \color{ctex@emph},
emph = {caption,makecell,subcaption,tabularx},
keywordstyle =
- \lst@ifdisplaystyle\bfseries\color{ctex@emph}\else\color{ctex@verb}\fi,
+ \lst@ifdisplaystyle\bfseries\color{ctex@verb}\else\color{ctex@verb}\fi,
morekeywords =
{
includegraphics,setmainfont,setsansfont,setmonofont,setCJKmainfont,setCJKsansfont,setCJKmonofont,setCJKfamilyfont,RequirePackage
@@ -1284,7 +1291,7 @@
\clist_map_function:nN
{
{none, 000000,000000,000000},
- {seaside, 1381b2,004986,a40000},
+ {seaside, 4682B4,004986,a40000},
{energy, f39800,00a0e9,893895},
{cyberpunk, 601986,eb6877,a4005b}
}
diff --git a/macros/latex/contrib/nameauth/Makefile b/macros/latex/contrib/nameauth/Makefile
index d2a47efb83..ffd7d76e94 100644
--- a/macros/latex/contrib/nameauth/Makefile
+++ b/macros/latex/contrib/nameauth/Makefile
@@ -46,7 +46,7 @@ examples.pdf : examples.tex
if [ -f examples.out.ps ]; then rm examples.out.ps; fi
#
# This is the recipe for the package docs. It will work also for dvi output.
-$(NAME).pdf : $(NAME).dtx
+$(NAME).pdf : $(NAME).dtx nameauth.sty nameauth.ins
$(ENGINE) -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
$(ENGINE) --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
@@ -55,6 +55,24 @@ $(NAME).pdf : $(NAME).dtx
$(ENGINE) --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
if [ -f $(NAME).dvi ]; then dvipdf $(NAME); fi
#
+# These are the recipes for all the files that need to be extracted
+# from the dtx file. Any one of them simply extracts the following:
+# README.md, nameauth.ins, nameauth.sty, examples.tex
+#
+# Once any one of these recipes is run, the rest will be satisfied.
+# But they need to be there for dependencies to work best.
+README.md : $(NAME).dtx
+ pdftex $(NAME).dtx
+
+nameauth.ins : $(NAME).dtx
+ pdftex $(NAME).dtx
+
+nameauth.sty : $(NAME).dtx
+ pdftex $(NAME).dtx
+
+examples.tex : $(NAME).dtx
+ pdftex $(NAME).dtx
+#
# Using this recipe deletes the auxiliary and log files
clean:
rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out,toc}
diff --git a/macros/latex/contrib/nameauth/README.md b/macros/latex/contrib/nameauth/README.md
index 2ea1c5952b..0ae72377ac 100644
--- a/macros/latex/contrib/nameauth/README.md
+++ b/macros/latex/contrib/nameauth/README.md
@@ -11,15 +11,16 @@ editing process without needing to retype name references.
|`nameauth.dtx`|commented style file; source file |
|`Makefile` |For use with GNU make; with source file|
|`nameauth.ins`|installation driver (generated file) |
-|`nameauth.pdf`|Documentation (generated file) |
-|`README.md` |This file (generated file) |
-|`examples.tex`|example macros (generated file) |
+|`nameauth.sty`|style file (generated file) |
+|`nameauth.pdf`|Documentation (generated file) |
+|`README.md` |This file (generated file) |
+|`examples.tex`|example macros (generated file) |
# Obtaining the Package
1. Packaged in your current TeX distrbution: See the appropriate documentation.
-2. Otherwise, download `nameauth.zip` from [CTAN](www.ctan.org/tex-archive/macros/latex/contrib/nameauth).
+2. Otherwise, download `nameauth.zip` from [CTAN](http://mirrors.ctan.org/macros/latex/contrib/nameauth.zip).
3. Unpack `nameauth.zip` in an appropriate directory.
@@ -31,54 +32,56 @@ editing process without needing to retype name references.
This method requires GNU `make` on a POSIX-compliant environment, such as GNU/Linux, various BSD flavors, perhaps MacOS (e.g., with various porting systems), and even Cygwin on Windows.
-0. A quick install in one's home directory using some of the included files from the `zip` archive just requires the following steps:
+ * We use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
- tex nameauth.dtx
- make inst
+1. Type `make` to generate the release files using `pdflatex`.
-Otherwise we use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
+2. To use another LaTeX engine, type one of the following:
-1. Type `make distclean release` to generate the release files using `pdflatex`.
-
-2. To use another TeX engine, type one of the following:
- make ENGINE=latex
+ make ENGINE=xelatex
make ENGINE=lualatex
make ENGINE=dvilualatex
- make ENGINE=xelatex
+ make ENGINE=latex
3. Type `make inst` to install the files in the user's personal TDS-compliant directory tree.
4. Type `sudo make install` to install the files in the system-wide, local TDS-compliant directory tree.
+5. One can include multiple make targets on the command line, but that goes beyond the scope of this document and is intended for experienced users.
+
## Manual Compilation
Otherwise, the following steps are used for manual installation. See the general information at the [TeX FAQ](https://www.texfaq.org/FAQ-installthings).
-0. To use some of the included files from the `zip` archive and only extract files from the `dtx` file, just do the following step and proceed to installation:
-
- tex nameauth.dtx
-
1. To build the package on the host system, generate the installation files and a copy of the documentation without the table of contents and cross-references. We use `pdflatex` by default:
pdflatex --shell-escape --recorder --interaction=batchmode nameauth.dtx
-2. Generate the TOC and cross-references for the documentation:
+2. This will generate the following files:
+
+ nameauth.ins (complete)
+ nameauth.sty (complete)
+ nameauth.pdf (incomplete; do steps 3 through 5)
+ README.md (complete)
+ examples.tex (complete)
+
+3. Generate the TOC and cross-references for the documentation:
pdflatex --recorder --interaction=nonstopmode nameauth.dtx
-3. Generate the index files using `makeindex`:
+4. Generate the index files using `makeindex`:
makeindex -q -s gglo.ist -o nameauth.gls nameauth.glo
makeindex -q -s gind.ist -o nameauth.ind nameauth.idx
-4. Integrate the glossary (changes) and index into the documentation. The second run updates the TOC:
+5. Integrate the glossary (changes) and index into the documentation. The second run updates the TOC:
pdflatex --recorder --interaction=nonstopmode nameauth.dtx
pdflatex --recorder --interaction=nonstopmode nameauth.dtx
-One can substitute, e.g., `latex`, `xelatex`, `lualatex`, and `dvilualatex` for `pdflatex`, but the documentation may look different in some cases.
+One can substitute, e.g., `xelatex`, `lualatex`, `dvilualatex`, and `latex`, for `pdflatex`, but the documentation may look different in some cases.
-## File Installation
+## Manual File Installation
Different TeX distributions have somewhat different ways to store TDS-compliant configuration and package data. See, for example, [MikTeX](https://miktex.org/kb/texmf-roots) and the [TeX FAQ](https://www.texfaq.org/FAQ-privinst). Two approaches below conform generally to a Unix-based system:
@@ -86,11 +89,11 @@ Different TeX distributions have somewhat different ways to store TDS-compliant
`TEXMFHOME` is a variable that points to the root of a TDS-compliant directory tree available to a user. Use `kpsewhich --var-value TEXMFHOME` to obtain its value. Quite often it is equivalent to `$HOME/texmf`. The dollar sign in front of the variable denotes the value of the variable instead of its name. So if `$HOME` is `/home/bob`, then `$TEXMFHOME` would be `/home/bob/texmf`, and we can understand the following paths to be under that directory:
-|Path |Description |
-|----------------------------------|---------------------------------------|
-|`$TEXMFHOME/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
-|`$TEXMFHOME/tex/latex/nameauth` |`sty` file |
-|`$TEXMFHOME/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex`|
+|Path |Description |
+|----------------------------------|----------------------------------------|
+|`$TEXMFHOME/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
+|`$TEXMFHOME/tex/latex/nameauth` |`sty` file |
+|`$TEXMFHOME/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex` |
On older TeX distributions, run `mktexlsr` on $TEXMFHOME to complete the install process.
@@ -98,11 +101,11 @@ On older TeX distributions, run `mktexlsr` on $TEXMFHOME to complete the install
`TEXMFLOCAL` is a variable that points to the root of a TDS-compliant directory tree available to all users on a local site, system-wide installation. Use `kpsewhich --var-value TEXMFLOCAL` to obtain its value. See the [TeX FAQ](https://www.texfaq.org/FAQ-what-TDS). We can understand the following paths to be under that directory:
-|Path |Description |
-|-----------------------------------|---------------------------------------|
-|`$TEXMFLOCAL/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
-|`$TEXMFLOCAL/tex/latex/nameauth` |`sty` file |
-|`$TEXMFLOCAL/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex`|
+|Path |Description |
+|-----------------------------------|----------------------------------------|
+|`$TEXMFLOCAL/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
+|`$TEXMFLOCAL/tex/latex/nameauth` |`sty` file |
+|`$TEXMFLOCAL/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex` |
Run `mktexlsr` with the appropriate permissions on `$TEXMFLOCAL` to complete the install process.
@@ -141,7 +144,7 @@ The manual is also a test suite.
# Copyright
-Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
-------------------------------------------------------
This file may be distributed and/or modified under the
@@ -149,7 +152,7 @@ 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](http://www.latex-project.org/lppl.txt)
+ [http://www.latex-project.org/lppl.txt](https://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.
diff --git a/macros/latex/contrib/nameauth/examples.tex b/macros/latex/contrib/nameauth/examples.tex
index c9e41e6eab..c7c6fabb86 100644
--- a/macros/latex/contrib/nameauth/examples.tex
+++ b/macros/latex/contrib/nameauth/examples.tex
@@ -8,14 +8,14 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+%% Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
%%
%% This file 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
+%% https://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.
@@ -74,7 +74,7 @@
\usepackage{booktabs}
\usepackage{colortbl}
\usepackage{index}
-\usepackage{nameauth}[2020/11/23]
+\usepackage{nameauth}[2021/02/27]
\usepackage{verbatim}
\usepackage{xcolor}
\colorlet{grey}{black!7!white}
@@ -236,7 +236,7 @@
\ClearNum
\title{\bfseries Longer Examples}
\author{Charles P. Schaum}
-\date{2020/11/23}
+\date{2021/02/27}
\begin{document}
\maketitle
diff --git a/macros/latex/contrib/nameauth/nameauth.dtx b/macros/latex/contrib/nameauth/nameauth.dtx
index 5a9d1ad126..f755e23dd3 100644
--- a/macros/latex/contrib/nameauth/nameauth.dtx
+++ b/macros/latex/contrib/nameauth/nameauth.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+% Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
% -------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -8,7 +8,7 @@
% 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
+% https://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.
@@ -31,15 +31,16 @@ editing process without needing to retype name references.
|`nameauth.dtx`|commented style file; source file |
|`Makefile` |For use with GNU make; with source file|
|`nameauth.ins`|installation driver (generated file) |
-|`nameauth.pdf`|Documentation (generated file) |
-|`README.md` |This file (generated file) |
-|`examples.tex`|example macros (generated file) |
+|`nameauth.sty`|style file (generated file) |
+|`nameauth.pdf`|Documentation (generated file) |
+|`README.md` |This file (generated file) |
+|`examples.tex`|example macros (generated file) |
# Obtaining the Package
1. Packaged in your current TeX distrbution: See the appropriate documentation.
-2. Otherwise, download `nameauth.zip` from [CTAN](www.ctan.org/tex-archive/macros/latex/contrib/nameauth).
+2. Otherwise, download `nameauth.zip` from [CTAN](http://mirrors.ctan.org/macros/latex/contrib/nameauth.zip).
3. Unpack `nameauth.zip` in an appropriate directory.
@@ -51,54 +52,56 @@ editing process without needing to retype name references.
This method requires GNU `make` on a POSIX-compliant environment, such as GNU/Linux, various BSD flavors, perhaps MacOS (e.g., with various porting systems), and even Cygwin on Windows.
-0. A quick install in one's home directory using some of the included files from the `zip` archive just requires the following steps:
+ * We use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
- tex nameauth.dtx
- make inst
+1. Type `make` to generate the release files using `pdflatex`.
-Otherwise we use the LaTeX installation on the host machine to build the package. When using `make`, any `dvi` files that are created will also be converted to `pdf` format.
+2. To use another LaTeX engine, type one of the following:
-1. Type `make distclean release` to generate the release files using `pdflatex`.
-
-2. To use another TeX engine, type one of the following:
- make ENGINE=latex
+ make ENGINE=xelatex
make ENGINE=lualatex
make ENGINE=dvilualatex
- make ENGINE=xelatex
+ make ENGINE=latex
3. Type `make inst` to install the files in the user's personal TDS-compliant directory tree.
4. Type `sudo make install` to install the files in the system-wide, local TDS-compliant directory tree.
+5. One can include multiple make targets on the command line, but that goes beyond the scope of this document and is intended for experienced users.
+
## Manual Compilation
Otherwise, the following steps are used for manual installation. See the general information at the [TeX FAQ](https://www.texfaq.org/FAQ-installthings).
-0. To use some of the included files from the `zip` archive and only extract files from the `dtx` file, just do the following step and proceed to installation:
-
- tex nameauth.dtx
-
1. To build the package on the host system, generate the installation files and a copy of the documentation without the table of contents and cross-references. We use `pdflatex` by default:
pdflatex --shell-escape --recorder --interaction=batchmode nameauth.dtx
-2. Generate the TOC and cross-references for the documentation:
+2. This will generate the following files:
+
+ nameauth.ins (complete)
+ nameauth.sty (complete)
+ nameauth.pdf (incomplete; do steps 3 through 5)
+ README.md (complete)
+ examples.tex (complete)
+
+3. Generate the TOC and cross-references for the documentation:
pdflatex --recorder --interaction=nonstopmode nameauth.dtx
-3. Generate the index files using `makeindex`:
+4. Generate the index files using `makeindex`:
makeindex -q -s gglo.ist -o nameauth.gls nameauth.glo
makeindex -q -s gind.ist -o nameauth.ind nameauth.idx
-4. Integrate the glossary (changes) and index into the documentation. The second run updates the TOC:
+5. Integrate the glossary (changes) and index into the documentation. The second run updates the TOC:
pdflatex --recorder --interaction=nonstopmode nameauth.dtx
pdflatex --recorder --interaction=nonstopmode nameauth.dtx
-One can substitute, e.g., `latex`, `xelatex`, `lualatex`, and `dvilualatex` for `pdflatex`, but the documentation may look different in some cases.
+One can substitute, e.g., `xelatex`, `lualatex`, `dvilualatex`, and `latex`, for `pdflatex`, but the documentation may look different in some cases.
-## File Installation
+## Manual File Installation
Different TeX distributions have somewhat different ways to store TDS-compliant configuration and package data. See, for example, [MikTeX](https://miktex.org/kb/texmf-roots) and the [TeX FAQ](https://www.texfaq.org/FAQ-privinst). Two approaches below conform generally to a Unix-based system:
@@ -106,11 +109,11 @@ Different TeX distributions have somewhat different ways to store TDS-compliant
`TEXMFHOME` is a variable that points to the root of a TDS-compliant directory tree available to a user. Use `kpsewhich --var-value TEXMFHOME` to obtain its value. Quite often it is equivalent to `$HOME/texmf`. The dollar sign in front of the variable denotes the value of the variable instead of its name. So if `$HOME` is `/home/bob`, then `$TEXMFHOME` would be `/home/bob/texmf`, and we can understand the following paths to be under that directory:
-|Path |Description |
-|----------------------------------|---------------------------------------|
-|`$TEXMFHOME/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
-|`$TEXMFHOME/tex/latex/nameauth` |`sty` file |
-|`$TEXMFHOME/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex`|
+|Path |Description |
+|----------------------------------|----------------------------------------|
+|`$TEXMFHOME/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
+|`$TEXMFHOME/tex/latex/nameauth` |`sty` file |
+|`$TEXMFHOME/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex` |
On older TeX distributions, run `mktexlsr` on $TEXMFHOME to complete the install process.
@@ -118,11 +121,11 @@ On older TeX distributions, run `mktexlsr` on $TEXMFHOME to complete the install
`TEXMFLOCAL` is a variable that points to the root of a TDS-compliant directory tree available to all users on a local site, system-wide installation. Use `kpsewhich --var-value TEXMFLOCAL` to obtain its value. See the [TeX FAQ](https://www.texfaq.org/FAQ-what-TDS). We can understand the following paths to be under that directory:
-|Path |Description |
-|-----------------------------------|---------------------------------------|
-|`$TEXMFLOCAL/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
-|`$TEXMFLOCAL/tex/latex/nameauth` |`sty` file |
-|`$TEXMFLOCAL/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex`|
+|Path |Description |
+|-----------------------------------|----------------------------------------|
+|`$TEXMFLOCAL/source/latex/nameauth`|`ins` and `dtx` files, Makefile |
+|`$TEXMFLOCAL/tex/latex/nameauth` |`sty` file |
+|`$TEXMFLOCAL/doc/latex/nameauth` |`pdf` file, `README.md`, `examples.tex` |
Run `mktexlsr` with the appropriate permissions on `$TEXMFLOCAL` to complete the install process.
@@ -161,7 +164,7 @@ The manual is also a test suite.
# Copyright
-Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
-------------------------------------------------------
This file may be distributed and/or modified under the
@@ -169,7 +172,7 @@ 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](http://www.latex-project.org/lppl.txt)
+ [http://www.latex-project.org/lppl.txt](https://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.
@@ -191,14 +194,14 @@ version 2005/12/01 or later.
This is a generated file.
-Copyright (C) 2020 by Charles P. Schaum <charles[dot]schaum@comcast.net>
+Copyright (C) 2021 by Charles P. Schaum <charles[dot]schaum@comcast.net>
This file 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
+ https://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.
@@ -240,7 +243,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{nameauth}
%<*package>
- [2020/11/23 3.5 Name authority mechanism for consistency in text and index]
+ [2021/02/27 3.6 Name authority mechanism for consistency in text and index]
%</package>
%
%<*driver>
@@ -310,7 +313,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
right=25mm,marginparwidth=39mm,nohead]{geometry}
%^^A Include specifically the current version of the package.
-\usepackage{\jobname}[2020/11/23]
+\usepackage{\jobname}[2021/02/27]
%^^A Set up all tabular packages. Booktabs makes them pretty,
%^^A colortabl shades rows, and tabularx allows some fiddly
@@ -653,6 +656,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
% \changes{3.2}{2017/03/22}{Root, suffix macros renamed, redesigned}
% \changes{3.4}{2020/02/26}{Update manual, \texttt{examples.tex}}
% \changes{3.5}{2020/11/23}{Updates to manual, \texttt{Readme.md}, \texttt{Makefile}, \texttt{examples.tex}, combine \texttt{Readme.md} and \texttt{examples.tex} files in \texttt{dtx}}
+% \changes{3.6}{2021/02/27}{Updates to \texttt{Readme.md}, \texttt{Makefile}}
%
% \GetFileInfo{\jobname.dtx}
%
@@ -9414,7 +9418,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
\usepackage{booktabs}
\usepackage{colortbl}
\usepackage{index}
-\usepackage{nameauth}[2020/11/23]
+\usepackage{nameauth}[2021/02/27]
\usepackage{verbatim}
\usepackage{xcolor}
\colorlet{grey}{black!7!white}
@@ -9576,7 +9580,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
\ClearNum
\title{\bfseries Longer Examples}
\author{Charles P. Schaum}
-\date{2020/11/23}
+\date{2021/02/27}
\begin{document}
\maketitle
diff --git a/macros/latex/contrib/nameauth/nameauth.pdf b/macros/latex/contrib/nameauth/nameauth.pdf
index 63ce4add2a..2f290222c7 100644
--- a/macros/latex/contrib/nameauth/nameauth.pdf
+++ b/macros/latex/contrib/nameauth/nameauth.pdf
Binary files differ