From 3479a92321ed7fe7e2133d3daec2d4f5fd53fbc6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 2 Nov 2019 03:01:48 +0000 Subject: CTAN sync 201911020301 --- macros/latex/contrib/asmejour/README.md | 4 +- macros/latex/contrib/asmejour/asmejour-sample.bib | 12 +- .../latex/contrib/asmejour/asmejour-template.pdf | Bin 494919 -> 476616 bytes .../latex/contrib/asmejour/asmejour-template.tex | 112 +++-- macros/latex/contrib/asmejour/asmejour.cls | 18 +- .../biblatex-contrib/biblatex-ext/CHANGES.md | 8 + .../biblatex-ext/biblatex-ext-oa-doiapi.sty | 2 +- .../biblatex-ext/biblatex-ext-oa.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-l3draw.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-pict2e.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-tikz.sty | 2 +- .../biblatex-ext/biblatex-ext-tabular.sty | 2 +- .../biblatex-contrib/biblatex-ext/biblatex-ext.pdf | Bin 710746 -> 711899 bytes .../biblatex-contrib/biblatex-ext/biblatex-ext.tex | 8 +- .../biblatex-contrib/biblatex-ext/blxextdoiapi.lua | 4 +- .../biblatex-ext/ext-alphabetic-verb.bbx | 2 +- .../biblatex-ext/ext-alphabetic-verb.cbx | 2 +- .../biblatex-ext/ext-alphabetic.bbx | 2 +- .../biblatex-ext/ext-alphabetic.cbx | 2 +- .../biblatex-ext/ext-authortitle-common.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.cbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.bbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.cbx | 2 +- .../biblatex-ext/ext-authortitle-icomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-icomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-terse.bbx | 2 +- .../biblatex-ext/ext-authortitle-terse.cbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.cbx | 2 +- .../biblatex-ext/ext-authortitle.bbx | 2 +- .../biblatex-ext/ext-authortitle.cbx | 2 +- .../biblatex-ext/ext-authoryear-common.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.cbx | 2 +- .../biblatex-ext/ext-authoryear-ecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-ibid.bbx | 2 +- .../biblatex-ext/ext-authoryear-ibid.cbx | 2 +- .../biblatex-ext/ext-authoryear-icomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-icomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-iecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-iecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tcomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tcomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-terse.bbx | 2 +- .../biblatex-ext/ext-authoryear-terse.cbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear.bbx | 2 +- .../biblatex-ext/ext-authoryear.cbx | 2 +- .../biblatex-ext/ext-biblatex-aux.def | 2 +- .../biblatex-ext/ext-dashed-common.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.cbx | 2 +- .../biblatex-ext/ext-numeric-verb.bbx | 2 +- .../biblatex-ext/ext-numeric-verb.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-standard.bbx | 4 +- .../biblatex-ext/ext-verbose-ibid.bbx | 2 +- .../biblatex-ext/ext-verbose-ibid.cbx | 2 +- .../biblatex-ext/ext-verbose-inote.bbx | 2 +- .../biblatex-ext/ext-verbose-inote.cbx | 2 +- .../biblatex-ext/ext-verbose-note.bbx | 2 +- .../biblatex-ext/ext-verbose-note.cbx | 2 +- .../biblatex-ext/ext-verbose-trad1.bbx | 2 +- .../biblatex-ext/ext-verbose-trad1.cbx | 2 +- .../biblatex-ext/ext-verbose-trad2.bbx | 6 +- .../biblatex-ext/ext-verbose-trad2.cbx | 2 +- .../biblatex-ext/ext-verbose-trad3.bbx | 2 +- .../biblatex-ext/ext-verbose-trad3.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.cbx | 2 +- macros/latex/contrib/circledsteps/README.md | 2 +- .../contrib/circledsteps/circledsteps-manual.pdf | Bin 326130 -> 337762 bytes .../contrib/circledsteps/circledsteps-manual.tex | 23 +- macros/latex/contrib/circledsteps/circledsteps.sty | 49 ++- macros/latex/contrib/circledsteps/ctikzexample.tex | 10 +- macros/latex/contrib/cnltx/README | 4 +- macros/latex/contrib/cnltx/cnltx-base.sty | 9 +- macros/latex/contrib/cnltx/cnltx-doc.cls | 136 ++++--- macros/latex/contrib/cnltx/cnltx-example.sty | 228 +++++++---- macros/latex/contrib/cnltx/cnltx-listings.sty | 7 +- macros/latex/contrib/cnltx/cnltx-tools.sty | 2 +- macros/latex/contrib/cnltx/cnltx-translations.sty | 4 +- macros/latex/contrib/cnltx/cnltx.bbx | 97 +++-- macros/latex/contrib/cnltx/cnltx.bib | 451 +++++++++++---------- macros/latex/contrib/cnltx/cnltx.cbx | 2 +- macros/latex/contrib/cnltx/cnltx.dbx | 2 +- macros/latex/contrib/cnltx/cnltx.sty | 2 +- macros/latex/contrib/cnltx/cnltx_en.pdf | Bin 778786 -> 773057 bytes macros/latex/contrib/cnltx/cnltx_en.tex | 6 +- macros/latex/contrib/halloweenmath/00readme.txt | 4 +- macros/latex/contrib/halloweenmath/Makefile | 2 +- macros/latex/contrib/halloweenmath/README | 2 +- .../contrib/halloweenmath/halloweenmath-doc.pdf | Bin 335762 -> 336123 bytes .../contrib/halloweenmath/halloweenmath-man.pdf | Bin 540738 -> 540967 bytes .../contrib/halloweenmath/halloweenmath-man.tex | 12 +- .../latex/contrib/halloweenmath/halloweenmath.dtx | 35 +- .../latex/contrib/halloweenmath/halloweenmath.ins | 8 +- macros/latex/contrib/halloweenmath/manifest.txt | 4 +- macros/latex/contrib/l3build/CHANGELOG.md | 21 +- macros/latex/contrib/l3build/README.md | 2 +- macros/latex/contrib/l3build/l3build-check.lua | 27 +- macros/latex/contrib/l3build/l3build.1 | 2 +- macros/latex/contrib/l3build/l3build.dtx | 176 +++++--- macros/latex/contrib/l3build/l3build.lua | 10 +- macros/latex/contrib/l3build/l3build.pdf | Bin 705508 -> 704268 bytes 115 files changed, 990 insertions(+), 663 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/asmejour/README.md b/macros/latex/contrib/asmejour/README.md index 8be9aa6158..c4475e0eca 100644 --- a/macros/latex/contrib/asmejour/README.md +++ b/macros/latex/contrib/asmejour/README.md @@ -1,7 +1,7 @@ #asmejour: A template for ASME journal papers# - Version 1.06 dated 2019/10/01. + Version 1.07 dated 2019/10/31. ####Overview#### This class provides a template to format preprints submitted to ASME journals in the style that @@ -57,6 +57,8 @@ ####Change log#### +v1.07: add commands for \\toprule, \\midrule, and \\bottomrule in ASME style; add advice on landscape material; minor edits to \\entry and for language support. + v1.06: allow standard \\date, \\maketitle, and \\title commands and abstract environment; make final column balancing a package option; remove \\normalfont from AMS equation tags to allow tags to match caption font; incorporate \\subfigure in example template; allow line numbers in AMS display math; provide comma between sequential footnote marks; adjust babel options; other minor edits; revise template text. v1.05: automate list of figures/tables with option to omit; replace balance package with flushend package and automate; revise skips in nomenclature; address conflicts of lineno package with other elements; option to hyphenate typewriter font; new options for footer text; adjust \\emergencystretch and \\tolerance; additional documentation and references diff --git a/macros/latex/contrib/asmejour/asmejour-sample.bib b/macros/latex/contrib/asmejour/asmejour-sample.bib index fcbcc7a840..62255d83d9 100644 --- a/macros/latex/contrib/asmejour/asmejour-sample.bib +++ b/macros/latex/contrib/asmejour/asmejour-sample.bib @@ -1,4 +1,4 @@ -%% Revised 1 October 2019. +%% Revised 31 October 2019. @article{DKE1969, author = {D. K. Edwards}, @@ -125,6 +125,16 @@ version = {1.10}, } +@online{fairbairns, + author = {Robin Fairbairns and Sebastian Rahtz and Leonor Barroca}, + title = {A package for rotated objects in \LaTeX}, + year = {2016}, + organization = {Comprehensive \TeX\ Archive Network}, + url = {https://www.ctan.org/pkg/rotating}, + urldate = {October 2, 2019}, + version = {v2.16d}, +} + @online{GSL, title = {{GNU} Scientific Library}, URL = {https://www.gnu.org/software/gsl/}, diff --git a/macros/latex/contrib/asmejour/asmejour-template.pdf b/macros/latex/contrib/asmejour/asmejour-template.pdf index b69e52b5ac..ade917abc4 100644 Binary files a/macros/latex/contrib/asmejour/asmejour-template.pdf and b/macros/latex/contrib/asmejour/asmejour-template.pdf differ diff --git a/macros/latex/contrib/asmejour/asmejour-template.tex b/macros/latex/contrib/asmejour/asmejour-template.tex index 93ce5d67ce..2d276e0956 100644 --- a/macros/latex/contrib/asmejour/asmejour-template.tex +++ b/macros/latex/contrib/asmejour/asmejour-template.tex @@ -3,7 +3,7 @@ %% This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers %% as they are being published in 2019. %% -%% This file is version 1.06 dated 2019/10/1 +%% This file is version 1.07 dated 2019/10/31 %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -84,7 +84,6 @@ \pdfminorversion=7 % This selection is not required. - %%%%% FIELDS TO BE COMPLETED FOLLOW %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -280,10 +279,13 @@ The typewriter font loaded is \texttt{inconsolata} (which is sans serif), as sug Table \ref{tab:1} is an example of a simple table. Table captions should be placed above tables. The class loads the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Tables \ref{tab:2} and \ref{tab:3}). Table~\ref{tab:3} is designed to have exactly the width of a text column. +The \texttt{booktabs} is been loaded (and customized) to provide versions of \verb|\toprule|, \verb|\midrule|, and \verb|\bottomrule}| appropriate to ASME-style tables. + Table~\ref{tab:4} shows a table that spans both text columns. Figure~\ref{fig:2} shows a figure spanning both columns. Text in the figures should be checked for legibility at either single-column width (about 83~mm) or full-column width (about 170~mm). Figure captions should be placed below figures. +Landscape figures and tables may be produced at full-page size by putting \verb|\usepackage[figuresright]{rotating}| in your \texttt{.tex} file's preamble and using the \texttt{sidewaystable*} and \texttt{sidewaysfigure*} environments~\cite{fairbairns}. %%%%%%%%%%%%%%% begin simple table %%%%%%%%%%%%%%%%%%%%%%%%%% @@ -293,19 +295,43 @@ Text in the figures should be checked for legibility at either single-column wid \caption{A simple table\label{tab:1}} \centering{% \begin{tabular}{l l r} -\hline\hline -Experiment & $u$ [m/s] & $T$ [\textdegree C]\rule{0pt}{10pt} \\[2pt] -\hline -Run 11 & 12.5 & 103.4 \rule{0pt}{10pt} \\ -Run 12 & 24 & 68.3 \\[1pt] -\hline\hline +\toprule +Experiment & $u$ [m/s] & $T$ [\textdegree C] \\ +\midrule +Run 11 & 12.5 & 103.4 \\ +Run 12 & 24 & 68.3 \\ +\bottomrule \end{tabular} -} +}% \end{table} %%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% begin two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%% + +\begin{figure*}[t] +\begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth} +\vbox{ +\vspace*{1.7em} +\centering{ + \includegraphics{sample-figure-2a.pdf} +} +\vspace*{1.7em} +} +\subcaption{Interior region\label{fig:interior-region}} +\end{subfigure}% +%%%%%%%% don't leave a break here +\begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth} +\centering{ +\includegraphics{sample-figure-2b.pdf} +\subcaption{Exterior region\label{fig:exterior-region}} +}\end{subfigure}% +\caption{A figure with two subfigures \cite{Lienhard2019b}\label{fig:2}} +\end{figure*} + +%%%%%%%%%%%%%%%%%%% end two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Reference Formatting with \texttt{asmejour.bst}} @@ -335,45 +361,20 @@ The \verb|version={..}| field may be used with \verb|@book|, \verb|@online|, and \caption{Table with more complicated columns}\label{tab:2}% \centering{% \begin{tabular}{!{\hspace*{0.5cm}} >{\raggedright\hangindent=1em} p{3cm} d{3} @{\hspace*{1cm}} d{3} !{\hspace*{0.5cm}}} -\hline\hline -\rule{0pt}{10pt}Experiment & \multicolumn{1}{c@{\hspace*{1cm}}}{$u$ [m/s]} & \multicolumn{1}{c!{\hspace*{0.5cm}}}{$T$ [\textdegree C]} \\[1pt] -\hline -The first experiment we ran this morning & 124.3 & 68.3 \rule{0pt}{10pt} \\ -The second experiment we ran this morning & 82.50 & 103.46 \\ -Our competitor's data & 72.321 & 141.384 \\[1pt] -\hline\hline +\toprule +Experiment & \multicolumn{1}{c@{\hspace*{1cm}}}{$u$ [m/s]} & \multicolumn{1}{c!{\hspace*{0.5cm}}}{$T$ [\textdegree C]} \\ +\midrule +The first experiment we ran this morning & 124.3 & 68.3 \\ +The second experiment we ran this morning & 82.50 & 103.46 \\ +Our competitor's data & 72.321 & 141.384\\ +\bottomrule \end{tabular} -} +}% \end{table} %%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%% begin two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%% - -\begin{figure*}[t] -\begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth} -\vbox{ -\vspace*{1.7em} -\centering{ - \includegraphics{sample-figure-2a.pdf} -} -\vspace*{1.7em} -} -\subcaption{Interior region\label{fig:interior-region}} -\end{subfigure}% -%%%%%%%% don't leave a break here -\begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth} -\centering{ -\includegraphics{sample-figure-2b.pdf} -\subcaption{Exterior region\label{fig:exterior-region}} -}\end{subfigure}% -\caption{A figure with two subfigures \cite{Lienhard2019b}\label{fig:2}} -\end{figure*} - -%%%%%%%%%%%%%%%%%%% end two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Additional Options for \texttt{asmejour.cls}} The class accepts a number of options in addition to those already described. @@ -390,24 +391,21 @@ The footers are all generated with the \texttt{fancyhdr} package~\cite{oostrum}, \subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and superscripts. To enable this font, use the option \texttt{[nodefaultsups]}. The corresponding author mark in the author block will not change. - %%%%%%%%%%%%%%%%%%% begin linewidth table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{table}[t] \newcolumntype{C}{>{$}c<{$}} % math-mode version of "c" column type, from array package \caption{\label{tab:3}Table at full column width with columns in math mode} -\centering{% \begin{tabular*}{\linewidth}{@{\extracolsep{\fill}}CCCC@{\extracolsep{\fill}}} -\hline\hline -X_{z} & X_{c} & X_{c,m} & X_{c,2}\rule{0pt}{11pt}\\ +\toprule +X_{z} & X_{c} & X_{c,m} & X_{c,2}\rule{0pt}{8pt}\\ 3.92069 & 5.70943 & 6.32429 & 7.08757\\[2pt] \varepsilon (T_1) & \varepsilon^i (T_1) & \varepsilon^i (T_m) & \alpha (T_1, T_2)\\ 0.7258 & 0.6237 & 0.6807 & 0.7964 \\[2pt] q_\textrm{gray} & q_\textrm{int, $T_1$} & q_\textrm{int, $T_m$} & q_\textrm{exact}\\ -400.2 & 462.1 & 371.0 & 371.8 \\[1pt] -\hline\hline +400.2 & 462.1 & 371.0 & 371.8 \\ +\bottomrule \end{tabular*} -} \end{table} %%%%%%%%%%%%%%%%%%%% end linewidth table %%%%%%%%%%%%%%%%%%%%%%% @@ -436,14 +434,14 @@ Note that bookmarks can include simple math. Also note that \texttt{newtxmath} p \caption{A table spanning two columns}\label{tab:4}% \centering{% \begin{tabular*}{0.8\textwidth}{@{\hspace*{1.5em}}@{\extracolsep{\fill}}ccc!{\hspace*{3.em}}ccc@{\hspace*{1.5em}}} -\hline\hline -\multicolumn{1}{@{\hspace*{1.5em}}c}{$x$\rule{0pt}{11pt}} & +\toprule +\multicolumn{1}{@{\hspace*{1.5em}}c}{$x$\rule{0pt}{8pt}} & \multicolumn{1}{c}{$\textrm{erf}(x)$} & \multicolumn{1}{c!{\hspace*{3.em}}}{$\textrm{erfc}(x)$} & \multicolumn{1}{c}{$x$} & \multicolumn{1}{c}{$\textrm{erf}(x)$} & -\multicolumn{1}{c@{\hspace*{1.5em}}}{$\textrm{erfc}(x)$} \\ \hline -0.00 & 0.00000 & 1.00000 & 1.10 & 0.88021 & 0.11980\rule{0pt}{11pt} \\ +\multicolumn{1}{c@{\hspace*{1.5em}}}{$\textrm{erfc}(x)$} \\ \midrule +0.00 & 0.00000 & 1.00000 & 1.10 & 0.88021 & 0.11980 \\ 0.05 & 0.05637 & 0.94363 & 1.20 & 0.91031 & 0.08969 \\ 0.10 & 0.11246 & 0.88754 & 1.30 & 0.93401 & 0.06599 \\ 0.15 & 0.16800 & 0.83200 & 1.40 & 0.95229 & 0.04771 \\ @@ -455,10 +453,10 @@ Note that bookmarks can include simple math. Also note that \texttt{newtxmath} p 0.70 & 0.67780 & 0.32220 & 1.90 & 0.99279 & 0.00721 \\ 0.80 & 0.74210 & 0.25790 & 2.00 & 0.99532 & 0.00468 \\ 0.90 & 0.79691 & 0.20309 & 2.50 & 0.99959 & 0.00041 \\ -1.00 & 0.84270 & 0.15730 & 3.00 & 0.99998 & 0.00002 \\[2pt] -\hline\hline +1.00 & 0.84270 & 0.15730 & 3.00 & 0.99998 & 0.00002 \\ +\bottomrule \end{tabular*} -} +}% \end{table*} %%%%%%%%%%%%%%%% end two column table %%%%%%%%%%%%%%%%%%% @@ -551,7 +549,7 @@ ASME publishes in English, but the \texttt{babel} package is loaded for users who may wish to include other languages. Options are supported to load a primary language, \texttt{lang=}, as well as a secondary and tertiary language, \texttt{lang-second} and \texttt{lang-third}. The primary language must be given as the \textit{last} language option in \verb|\documentclass|. -If no language option is given, the package defaults to English. The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English. Users may additionally change ``Keywords'' and ``Nomenclature'' by renewing the commands \verb|\keywordname| and \verb|\nomname|. Changes to the page footer were described earlier. +If no language option is given, the package defaults to English. The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English. Users may additionally change ``Keywords'' and ``Nomenclature'' by renewing the commands \verb|\keywordname| and \verb|\nomname|. Changes to the page footer were described earlier. The pdf bookmark for ``Appendices'' by be changed by renewing \verb|\appendicesname|. An example of use is shown in \selectlanguage{french}\appendixname\ \ref{app:fourier}.\selectlanguage{english} diff --git a/macros/latex/contrib/asmejour/asmejour.cls b/macros/latex/contrib/asmejour/asmejour.cls index beb4364634..3f7653278c 100644 --- a/macros/latex/contrib/asmejour/asmejour.cls +++ b/macros/latex/contrib/asmejour/asmejour.cls @@ -6,7 +6,7 @@ %% The asmejour.cls file should be used with the files asmejour.bst (for citations) and asmejour-template.tex. %% %% -%% This file is version 1.06 dated 2019/10/01. +%% This file is version 1.07 dated 2019/10/31. %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -52,7 +52,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{asmejour}[2019/10/01 asmejour paper format] +\ProvidesClass{asmejour}[2019/10/31 asmejour paper format] \LoadClass[twoside,9pt,twocolumn]{extarticle} @@ -200,11 +200,15 @@ %% make \hline in tables heavier than default 0.4pt \setlength\arrayrulewidth{.5\p@} +\RequirePackage{booktabs} +\renewcommand*{\toprule}{\specialrule{0.5pt}{0pt}{\doublerulesep}\specialrule{0.5pt}{0pt}{3pt}} +\renewcommand*{\midrule}{\specialrule{0.5pt}{2pt}{3pt}} +\renewcommand*{\bottomrule}{\specialrule{0.5pt}{1pt}{\doublerulesep}\specialrule{0.5pt}{0pt}{0pt}} %%%%%%%% FONT related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{mathtools} % extends amsmath -\RequirePackage[utf8]{inputenc} +\RequirePackage[utf8]{inputenc} % backward compatibility... \RequirePackage[]{babel} \RequirePackage[]{newtxtext} \RequirePackage[varqu,varl]{inconsolata} % sans typewriter font @@ -262,6 +266,8 @@ } \providecommand{\nomname}{Nomenclature} \providecommand{\keywordname}{Keywords} + \providecommand{\appendicesname}{Appendices} + %%%%%%%%%%%%%%%%% EQUATION AND LINE NUMBERING %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -432,7 +438,7 @@ %% Special handling of the appendices %% Assumes that appendices are the last technical content in paper \RenewDocumentCommand{\appendix}{}{% - \pdfbookmark[1]{Appendices}{appendices} + \pdfbookmark[1]{\appendicesname}{appendices} \setcounter{section}{0} \renewcommand\thesection{\Alph{section}} \setcounter{equation}{0} @@ -536,8 +542,8 @@ \DeclareDocumentCommand{\entry}{m g}{% \IfNoValueTF{#2}{% \itemsep12\p@ plus 4\p@ minus 4\p@% \bigskip - \goodbreak\item[\bfseries#1\hfill]\itemsep3\p@ plus 1\p@ minus 1\p@\nopagebreak% \smallskip, ASME closer to \medskip - }{% + \goodbreak\item[\bfseries#1\hfill]\itemsep3\p@ plus 1\p@ minus 1\p@\@itempenalty=1000% + }{% \item[\hfill#1${} = {}$]#2% \setlength\itemsep\savitemsep \settowidth\@widest{#1${} = {}$}% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md index f5a42585e2..bb9ac3a006 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md @@ -1,5 +1,13 @@ # Changelog +## Version 0.8b (2019-11-01) + +See + +### Fixed + +- Call to removed option in `ext-verbose-trad2`. + ## Version 0.8a (2019-10-31) See 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 a80d535253..919ca13bc7 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} - [2019/10/31 v0.8a Obtain open access information from DOI via + [2019/11/01 v0.8b 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 346810e4cc..f5104f43a8 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} - [2019/10/31 v0.8a mark open access in biblatex bibliographies (MW)] + [2019/11/01 v0.8b mark open access in biblatex bibliographies (MW)] \protected\def\extblx@oa@error#1#2{% \PackageError{biblatex-ext-oa}{#1}{#2.}} 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 5ee5666a93..7d27819da9 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} - {2019/10/31} {0.8a} + {2019/11/01} {0.8b} {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 bf027bddc2..b01ed9c094 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} - [2019/10/31 v0.8a open access symbols with pict2e (MW)] + [2019/11/01 v0.8b 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 467b9e9ab1..61ba039f49 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} - [2019/10/31 v0.8a open access symbols with TikZ (MW)] + [2019/11/01 v0.8b 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 a3e8ac141b..b67f83fea6 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} - [2019/10/31 v0.8a tabular bibliographies for biblatex (MW)] + [2019/11/01 v0.8b 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 4a662b837d..de0918a8e9 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf 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 cb882a105b..5f2dc59e0c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex @@ -463,7 +463,7 @@ \newcommand*{\ctan}{\mkbibacro{CTAN}} \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext} -\newcommand*{\extblxversion}{0.8a} +\newcommand*{\extblxversion}{0.8b} \newcommand*{\biber}{Biber} \newcommand*{\gitissuelink}[1]{% \href{\gitbaseurl/issues/#1}{issue \##1 on github}} @@ -529,7 +529,7 @@ author = {Moritz Wemheuer}, link = {mwemheu@gmail.com},% revision = {\extblxversion}, - date = {\DTMDate{2019-10-31}}, + date = {\DTMDate{2019-11-01}}, } \hypersetup{% @@ -3177,6 +3177,10 @@ See also \filename{CHANGES.md}. The numbers on the right indicate the relevant section of the manual. \begin{changelog} +\begin{release}{0.8b}{2019-11-01} + \item Fixed bug in \blxstyle{ext-verbose-trad2}% + \see{sec:styles:standard} +\end{release} \begin{release}{0.8a}{2019-10-31} \item Fixed default value of \hypercmd{servoldelim}\see{sec:opt:punct} \item Fixed bug in \blxstyle{ext-authoryear-tiecomp}% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua index 4162323db3..5cd1f7223d 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.8a", - date = "2019/10/31", + version = "v0.8b", + date = "2019/11/01", 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 25512f8e9e..e780dfb726 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} - [2019/10/31 v0.8a extended biblatex alphabetic-verb + [2019/11/01 v0.8b 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 3697b20f03..39fe0046c8 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} - [2019/10/31 v0.8a extended biblatex alphabetic-verb citation style + [2019/11/01 v0.8b 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 7a84d4046a..576dfbc2dc 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} - [2019/10/31 v0.8a extended biblatex alphabetic bibliography style (MW)] + [2019/11/01 v0.8b 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 28a2355424..a00ef171eb 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} - [2019/10/31 v0.8a extended biblatex alphabetic citation style (MW)] + [2019/11/01 v0.8b 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 56c9699104..896a76714c 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} - [2019/10/31 v0.8a common files for extended biblatex + [2019/11/01 v0.8b 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 089545e46f..b98d0eaa7f 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} - [2019/10/31 v0.8a extended biblatex authortitle-comp + [2019/11/01 v0.8b 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 fc8c3eaff3..be3ed3f405 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} - [2019/10/31 v0.8a extended biblatex authortitle-comp + [2019/11/01 v0.8b 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 b35479b188..b13f4eb628 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} - [2019/10/31 v0.8a extended biblatex authortitle-ibid + [2019/11/01 v0.8b 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 88f6fa3dbf..54a03f99c4 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} - [2019/10/31 v0.8a extended biblatex authortitle-ibid + [2019/11/01 v0.8b 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 5cf503d9f3..394e3e6ada 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} - [2019/10/31 v0.8a extended biblatex authortitle-icomp + [2019/11/01 v0.8b 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 aafde9ca5e..f8c57afeeb 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} - [2019/10/31 v0.8a extended biblatex authortitle-icomp + [2019/11/01 v0.8b 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 1c1eeb7796..50e18491a7 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} - [2019/10/31 v0.8a extended biblatex authortitle-tcomp + [2019/11/01 v0.8b 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 1f0466fb11..b5f335a60d 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} - [2019/10/31 v0.8a extended biblatex authortitle-tcomp + [2019/11/01 v0.8b 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 f763ae2409..b21263abae 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} - [2019/10/31 v0.8a extended biblatex authortitle-terse + [2019/11/01 v0.8b 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 10520a454d..219a4ba02a 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} - [2019/10/31 v0.8a extended biblatex authortitle-terse + [2019/11/01 v0.8b 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 df92f34694..175042b3b9 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} - [2019/10/31 v0.8a extended biblatex authortitle-ticomp + [2019/11/01 v0.8b 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 9f693a0849..e86f1c3958 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} - [2019/10/31 v0.8a extended biblatex authortitle-ticomp citation style + [2019/11/01 v0.8b 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 e7c2b83076..e96389247d 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} - [2019/10/31 v0.8a extended biblatex authortitle + [2019/11/01 v0.8b 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 05aebdc575..73e937f664 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} - [2019/10/31 v0.8a extended biblatex authortitle citation style (MW)] + [2019/11/01 v0.8b 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 4ce7e4f7b8..ea8b7fd234 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} - [2019/10/31 v0.8a common files for extended biblatex + [2019/11/01 v0.8b 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 bfdf8ce2d7..d76e361106 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} - [2019/10/31 v0.8a extended biblatex authoryear-comp + [2019/11/01 v0.8b 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 36350c71e5..d9a048610e 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} - [2019/10/31 v0.8a extended biblatex authoryear-comp + [2019/11/01 v0.8b 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 2c2d1ec3d6..cb80aade93 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} - [2019/10/31 v0.8a biblatex authoryear-ecomp + [2019/11/01 v0.8b 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 2aec3a302e..9a18ff4aaa 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} - [2019/10/31 v0.8a biblatex authoryear-ecomp + [2019/11/01 v0.8b 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 40b695debb..bd12ffd63e 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} - [2019/10/31 v0.8a extended biblatex authoryear-ibid + [2019/11/01 v0.8b 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 a66d3f9e48..f069d84266 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} - [2019/10/31 v0.8a extended biblatex authoryear-ibid + [2019/11/01 v0.8b 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 34f5a8ec07..8f4c96c228 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} - [2019/10/31 v0.8a extended biblatex authoryear-icomp + [2019/11/01 v0.8b 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 d0f2fb339c..4565888182 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} - [2019/10/31 v0.8a extended biblatex authoryear-icomp + [2019/11/01 v0.8b 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 a1f152b0f5..0661392738 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} - [2019/10/31 v0.8a biblatex authoryear-iecomp + [2019/11/01 v0.8b 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 352302aa72..7344711272 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} - [2019/10/31 v0.8a biblatex authoryear-iecomp + [2019/11/01 v0.8b 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 d5fd08577b..2856eaa812 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} - [2019/10/31 v0.8a extended biblatex authoryear-tcomp + [2019/11/01 v0.8b 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 f0cb6b455e..af28a2fb72 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} - [2019/10/31 v0.8a extended biblatex authoryear-tcomp + [2019/11/01 v0.8b 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 5a32feef67..5fbad208f9 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} - [2019/10/31 v0.8a extended biblatex authoryear-tecomp + [2019/11/01 v0.8b 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 670161944b..6d2a5684ad 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} - [2019/10/31 v0.8a extended biblatex authoryear-tecomp + [2019/11/01 v0.8b 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 63a772cce3..efd1ed9bde 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} - [2019/10/31 v0.8a extended biblatex authoryear-terse + [2019/11/01 v0.8b 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 a4ca634f10..b61bb15d52 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} - [2019/10/31 v0.8a extended biblatex authoryear-terse + [2019/11/01 v0.8b 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 b92aa1d67d..8e9a120c97 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} - [2019/10/31 v0.8a extended biblatex authoryear-ticomp + [2019/11/01 v0.8b 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 e8fa9f03fe..5750cf0912 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} - [2019/10/31 v0.8a extended biblatex authoryear-ticomp citation style + [2019/11/01 v0.8b 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 9f500c9272..afcdb7ddb8 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} - [2019/10/31 v0.8a extended biblatex authoryear-tiecomp + [2019/11/01 v0.8b 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 6fe1cfc3d6..b5cfbea925 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} - [2019/10/31 v0.8a extended biblatex authoryear-tiecomp citation style + [2019/11/01 v0.8b 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 96651c4a3c..84c056b435 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} - [2019/10/31 v0.8a extended biblatex authoryear bibliography style (MW)] + [2019/11/01 v0.8b 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 947ce8ee3f..ed12262ffb 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} - [2019/10/31 v0.8a extended biblatex authoryear citation style (MW)] + [2019/11/01 v0.8b 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 9e73d9e93b..406c4208d3 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} - [2019/10/31 v0.8a auxiliaries for extended biblatex citation style + [2019/11/01 v0.8b auxiliaries for extended biblatex citation style (MW)] \def\extblx@requiredbiblatexversion{3.13a} 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 314a62bbe3..5684ce02e0 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} - [2019/10/31 v0.8a common files for extended biblatex + [2019/11/01 v0.8b 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 bedb51962f..7790baab3e 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} - [2019/10/31 v0.8a extended biblatex numeric-comp + [2019/11/01 v0.8b 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 3c8bd92f0b..fce37f6a15 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} - [2019/10/31 v0.8a extended biblatex numeric-comp citation style (MW)] + [2019/11/01 v0.8b 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 c3e0d604ff..a7ae5e2992 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} - [2019/10/31 v0.8a extended biblatex numeric-verb + [2019/11/01 v0.8b 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 8e9ccdea43..e0da7df8a5 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} - [2019/10/31 v0.8a extended biblatex numeric-verb citation style (MW)] + [2019/11/01 v0.8b 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 596f8158d6..6ce7d77a13 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} - [2019/10/31 v0.8a extended biblatex numeric bibliography style (MW)] + [2019/11/01 v0.8b 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 b01a2a4b4f..cad27257c7 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} - [2019/10/31 v0.8a extended biblatex numeric citation style (MW)] + [2019/11/01 v0.8b 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 9261dc5358..7bae59e7c9 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.8a (2019-10-31) +% biblatex-ext v0.8b (2019-11-01) % Maintainer: Moritz Wemheuer % Licence: LaTeX Project Public License v1.3c or later % \ProvidesFile{ext-standard.bbx} - [2019/10/31 v0.8a extended biblatex standard style (MW)] + [2019/11/01 v0.8b 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-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx index 50dd95ab6d..a11cd6522b 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} - [2019/10/31 v0.8a extended biblatex verbose-ibid + [2019/11/01 v0.8b 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 af422e088d..cf8126bd16 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} - [2019/10/31 v0.8a extended biblatex verbose-ibid citation style (MW)] + [2019/11/01 v0.8b 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 188e934f2f..c1f475f89b 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} - [2019/10/31 v0.8a extended biblatex verbose-inote + [2019/11/01 v0.8b 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 cc73a75d86..2c0b675904 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} - [2019/10/31 v0.8a extended biblatex verbose-inote citation style (MW)] + [2019/11/01 v0.8b 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.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx index 961dfd2657..d1fb391a7d 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} - [2019/10/31 v0.8a extended biblatex verbose-note + [2019/11/01 v0.8b 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 d190b1239e..fe47c02544 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} - [2019/10/31 v0.8a extended biblatex verbose-note citation style (MW)] + [2019/11/01 v0.8b 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 07c3ea5ee4..86b6b74deb 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} - [2019/10/31 v0.8a extended biblatex verbose-trad1 + [2019/11/01 v0.8b 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 579c1d174a..c6899f41f4 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} - [2019/10/31 v0.8a extended biblatex verbose-trad1 citation style (MW)] + [2019/11/01 v0.8b 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 ad6c0126e6..d550c6ea58 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,14 +1,10 @@ \ProvidesFile{ext-verbose-trad2.bbx} - [2019/10/31 v0.8a extended biblatex verbose-trad2 + [2019/11/01 v0.8b extended biblatex verbose-trad2 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{verbose-trad2} -\ExecuteBibliographyOptions{ - inxref=false, -} - \endinput % % This file is part of the biblatex-ext bundle. 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 2fbccd925d..0e6ad983d0 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} - [2019/10/31 v0.8a extended biblatex verbose-trad2 citation style (MW)] + [2019/11/01 v0.8b 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 37ab51f746..5d808dc741 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} - [2019/10/31 v0.8a extended biblatex verbose-trad3 + [2019/11/01 v0.8b 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 2f08f90582..366dba0e84 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} - [2019/10/31 v0.8a extended biblatex verbose-trad3 citation style (MW)] + [2019/11/01 v0.8b 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 a06f52cb02..4cd21a9fae 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} - [2019/10/31 v0.8a extended biblatex verbose + [2019/11/01 v0.8b 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 b2db78d2b9..e0cf427550 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} - [2019/10/31 v0.8a extended biblatex verbose citation style (MW)] + [2019/11/01 v0.8b extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/circledsteps/README.md b/macros/latex/contrib/circledsteps/README.md index f901562015..299da24975 100644 --- a/macros/latex/contrib/circledsteps/README.md +++ b/macros/latex/contrib/circledsteps/README.md @@ -6,7 +6,7 @@ See [this question on tex.stackexchange.com](https://tex.stackexchange.com/quest ### DOCUMENTATION -See the included file `circledsteps-manual.tex`; you can compile it running (twice) `pdflatex` on it. If you want to have a look before buying, you can find a compiled copy on the [release page](https://github.com/Rmano/circledsteps/releases). +See the included file `circledsteps-manual.tex`; you can compile it running (twice) `pdflatex` on it. If you want to have a look before buying, you can find a compiled copy on the [release page](https://github.com/Rmano/circledsteps/releases) or on [CTAN](https://ctan.org/pkg/circledsteps). If you have already installed the package in your TeX distribution, use `texdoc circledsteps`; it should show you the manual of the installed version of the package. diff --git a/macros/latex/contrib/circledsteps/circledsteps-manual.pdf b/macros/latex/contrib/circledsteps/circledsteps-manual.pdf index 624d6009fd..ae0581a644 100644 Binary files a/macros/latex/contrib/circledsteps/circledsteps-manual.pdf and b/macros/latex/contrib/circledsteps/circledsteps-manual.pdf differ diff --git a/macros/latex/contrib/circledsteps/circledsteps-manual.tex b/macros/latex/contrib/circledsteps/circledsteps-manual.tex index 5ebebc77dc..c98ab46e4c 100644 --- a/macros/latex/contrib/circledsteps/circledsteps-manual.tex +++ b/macros/latex/contrib/circledsteps/circledsteps-manual.tex @@ -44,12 +44,13 @@ The basic commands are: \toprule Circled\{\} & circled text using the package colors, text on the baseline\\ CircledTop\{\} & circled text using the package colors, circle on the baseline\\ - CircledText\{\} & circled text using the current color (may fail\footnotemark{} in moving arguments)\\ + CircledText\{\} & circled text using the current color (may fail\footnotemark{} across pages break in header or footers)\\ \bottomrule \end{tabular} \footnotetext{in the sense it can select the wrong color.} The parameters for the output are controlled using \texttt{pgfkeys}; you can change them with \verb|\tikzset|; you can obviously limit the effect of change using normal \LaTeX{} scoping rules. +The pseudo-color \texttt{none} means that the current color is used for both the text and the circle. \begin{tabular}{>{\ttfamily}lll} \toprule @@ -57,8 +58,8 @@ The parameters for the output are controlled using \texttt{pgfkeys}; you can cha \midrule /csteps/inner ysep & vertical spacing & 4pt\\ /csteps/inner xsep & horizontal spacing & 4pt\\ - /csteps/inner color & color of the text & red\\ - /csteps/outer color & color of the circle & blue\\ + /csteps/inner color & color of the text & none\\ + /csteps/outer color & color of the circle & none\\ \bottomrule \end{tabular} @@ -102,19 +103,23 @@ If you want to change colors it's easy: \par\bigskip \end{LTXexample} +If you use the package option \texttt{redblue} or \texttt{legacy} you will have the same effect than + +\begin{lstlisting}[] + \tikzset{/csteps/inner color=red, /csteps/outer color=blue} +\end{lstlisting} + \begin{LTXexample} Or even you can have inline numbers like \CircledText{1} or exponents\textsuperscript{\CircledText{2}} and so on. \textcolor{red}{They follow the current color: \CircledText{1} and \CircledText{2} automatically,} as you can see: \CircledText{$1+1\approx3$}. In-text circled numbers look better when a bit smaller, though, as you can see in {\small\CircledText{1}} for example. \end{LTXexample} -Notice that \verb|\CircledText{}| uses the special ``\texttt{.}'' color defined by \texttt{xcolor}; when page breaks occurs it can get the wrong color. - No, you can't fill the circle/oval. Pull requests in that sense are welcome. \section{Automatically generated numbers} -The command \verb|\cstep| will generate a circled number, starting from \texttt{1}, that can be referenced with the normal \verb|\label| mechanism. You can reset the numbering with +The command \verb|\cstep| will generate a circled number, starting from \texttt{1}, that can be referenced with the normal \verb|\label| mechanism. You can reset the numbering with \verb|\startcstep|. For example: \input{ctikzexample.tex} @@ -125,12 +130,12 @@ The command \verb|\cstep| will generate a circled number, starting from \texttt{ \section{Personalize it!} -The definition of \verb|CircledTexT| is simply the following one; you can get idea and define your own easily (beware of spaces at the end of the lines, though!): +The definition of \verb|CircledTexT| is simply the following one; you can get idea and define your own easily (beware of spaces at the end of the lines, though!): \begin{lstlisting} \newcommand{\CircledText}[1]{% \begingroup - \tikzset{/csteps/inner color=., /csteps/outer color=.}% + \tikzset{/csteps/inner color=none, /csteps/outer color=none,} \Circled{#1}% \endgroup } @@ -147,7 +152,7 @@ Also the implementation of the \verb|\cstep| command and relatives is quite simp \refstepcounter{cstepcnt}% \Circled{\scriptsize\arabic{cstepcnt}}% } -\renewcommand{\thecstepcnt}{\textbf{\arabic{cstepcnt}:}} +\renewcommand{\thecstepcnt}{\arabic{cstepcnt}} \end{lstlisting} diff --git a/macros/latex/contrib/circledsteps/circledsteps.sty b/macros/latex/contrib/circledsteps/circledsteps.sty index f70e179cdf..8949ec71cb 100644 --- a/macros/latex/contrib/circledsteps/circledsteps.sty +++ b/macros/latex/contrib/circledsteps/circledsteps.sty @@ -1,6 +1,6 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1996/06/01] -\ProvidesPackage{circledsteps}[2019/06/19 v1.0 Circled steps that you can reference] +\ProvidesPackage{circledsteps}[2019/11/01 v1.1 Circled steps that you can reference] % \end{macrocode} % % Copyright (c) 2019 Romano Giannetti @@ -14,12 +14,25 @@ \RequirePackage{pgfkeys} % for the pgfkeys \pgfkeys{/csteps/inner ysep/.initial=4pt, /csteps/inner xsep/.initial=4pt, - /csteps/inner color/.initial=red, - /csteps/outer color/.initial=blue, + /csteps/inner color/.initial=none, + /csteps/outer color/.initial=none, } +\DeclareOption{redblue}{ + \tikzset{/csteps/inner color=red, /csteps/outer color=blue}% +} +\DeclareOption{legacy}{ + \tikzset{/csteps/inner color=red, /csteps/outer color=blue}% +} + +% end of options definitions +\ProcessOptions\relax + \newsavebox\csteps@CBox \newlength\csteps@XLength \newlength\csteps@YLength \newlength\csteps@YDepth \newlength\csteps@tmplen \def\csteps@CircledParam#1#2{\sbox\csteps@CBox{#2}% + \edef\csteps@none{none}% + \edef\csteps@outercolor{\pgfkeysvalueof{/csteps/outer color}}% + \edef\csteps@innercolor{\pgfkeysvalueof{/csteps/inner color}}% \csteps@XLength=\wd\csteps@CBox\advance\csteps@XLength by\pgfkeysvalueof{/csteps/inner xsep}\relax \csteps@tmplen=\pgfkeysvalueof{/csteps/inner ysep}\relax \csteps@YDepth=\dp\csteps@CBox\advance\csteps@YDepth by 0.5\csteps@tmplen\relax @@ -29,18 +42,36 @@ \ifdim\csteps@XLength>\csteps@YLength \makebox[\csteps@XLength]{% X bigger than Y \makebox(0,\csteps@YLength){% - \color{\pgfkeysvalueof{/csteps/outer color}}\put(0,0){\oval(\csteps@XLength,\csteps@YLength)}% + \ifx\csteps@outercolor\csteps@none\else + \color{\csteps@outercolor}% + \fi + \put(0,0){\oval(\csteps@XLength,\csteps@YLength)}% }% \makebox(0,\csteps@YLength){% - \put(-.5\wd\csteps@CBox,0){\textcolor{\pgfkeysvalueof{/csteps/inner color}}{#2}}% + \put(-.5\wd\csteps@CBox,0){% + \ifx\csteps@outercolor\csteps@none + #2\relax% + \else + \textcolor{\csteps@innercolor}{#2}% + \fi + }% }}% \else \makebox[\csteps@YLength]{% \makebox(0,\csteps@YLength){% - \color{\pgfkeysvalueof{/csteps/outer color}}\put(0,0){\circle{\csteps@YLength}}% + \ifx\csteps@outercolor\csteps@none\else + \color{\csteps@outercolor}% + \fi + \put(0,0){\circle{\csteps@YLength}}% }% \makebox(0,\csteps@YLength){% - \put(-.5\wd\csteps@CBox,0){\textcolor{\pgfkeysvalueof{/csteps/inner color}}{#2}}% + \put(-.5\wd\csteps@CBox,0){% + \ifx\csteps@outercolor\csteps@none + #2\relax% + \else + \textcolor{\csteps@innercolor}{#2}% + \fi + }% }}% \fi }% @@ -52,7 +83,7 @@ \def\CircledTop#1{\csteps@CircledParam{0}{#1}} \newcommand{\CircledText}[1]{% \begingroup - \tikzset{/csteps/inner color=., /csteps/outer color=.}% + \tikzset{/csteps/inner color=none, /csteps/outer color=none}% \Circled{#1}% \endgroup } @@ -66,7 +97,7 @@ \refstepcounter{cstepcnt}% \Circled{\scriptsize\arabic{cstepcnt}}% } -\renewcommand{\thecstepcnt}{\textbf{\arabic{cstepcnt}:}} +\renewcommand{\thecstepcnt}{\arabic{cstepcnt}} % \end{macrocode} % % diff --git a/macros/latex/contrib/circledsteps/ctikzexample.tex b/macros/latex/contrib/circledsteps/ctikzexample.tex index 100a4fb988..88664349c3 100644 --- a/macros/latex/contrib/circledsteps/ctikzexample.tex +++ b/macros/latex/contrib/circledsteps/ctikzexample.tex @@ -1,3 +1,5 @@ +\tikzset{/csteps/inner color=red, /csteps/outer color=blue} +\newcommand{\circref}[1]{\CircledText{\small\textbf{\ref{#1}}}:} \begin{circuitikz}[scale=0.9, baseline=(VCC), transform shape] \draw (0,0) node[ground](GND){} to[V=$v_s$] ++(0,2) to[R, l2^=$R_1$ and \SI{1}{k\ohm}, l2 valign=b] ++(2,0) coordinate(firstb); @@ -19,9 +21,9 @@ \begin{minipage}[t]{0.5\linewidth} %% minipage reset these.. \parindent=0pt\parskip=6pt plus 6pt minus 2pt\relax - \ref{c:b1} let's neglect (to be confirmed!) $I_B$, $V_B\approx\SI{0}{V}$;\par - \ref{c:ie1} $I_{E1_Q}=(V_{E1_Q}-V_{EE})/R_3$;\par - \ref{c:ic1} $I_{C1_Q} \approx\SI{0.93}{mA}$;\par - \ref{c:g1} $V_{CC}-R_2I_{C2_Q}= \SI{5.35}{V}$; $V_{CE1_Q}=\SI{6.05}{V}$;\par + \circref{c:b1} let's neglect (to be confirmed!) $I_B$, $V_B\approx\SI{0}{V}$;\par + \circref{c:ie1} $I_{E1_Q}=(V_{E1_Q}-V_{EE})/R_3$;\par + \circref{c:ic1} $I_{C1_Q} \approx\SI{0.93}{mA}$;\par + \circref{c:g1} $V_{CC}-R_2I_{C2_Q}= \SI{5.35}{V}$; $V_{CE1_Q}=\SI{6.05}{V}$;\par \end{minipage} diff --git a/macros/latex/contrib/cnltx/README b/macros/latex/contrib/cnltx/README index aa4361964a..caf1d9810f 100644 --- a/macros/latex/contrib/cnltx/README +++ b/macros/latex/contrib/cnltx/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the CNLTX bundle v0.13 2015/08/17 +the CNLTX bundle v0.15 2019/11/01 LaTeX tools and documenting facilities @@ -8,7 +8,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/cnltx/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2013-2015 Clemens Niederberger +Copyright 2013--2019 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/cnltx/cnltx-base.sty b/macros/latex/contrib/cnltx/cnltx-base.sty index d8c63223fd..ca2f861446 100644 --- a/macros/latex/contrib/cnltx/cnltx-base.sty +++ b/macros/latex/contrib/cnltx/cnltx-base.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,8 +25,8 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\def\cnltx@@date{2015/08/17} -\def\cnltx@@version{v0.13} +\def\cnltx@@date{2019/11/01} +\def\cnltx@@version{v0.15} \def\cnltx@@info{LaTeX tools and documenting facilities (CN)} \ProvidesPackage{cnltx-base}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info] \RequirePackage{pgfopts,etoolbox,ltxcmds,pdftexcmds} @@ -891,4 +891,5 @@ HISTORY: 2015/01/11 v0.12 - updating the bundle to CTAN - more security for \cnltx@ifisnum 2015/08/17 v0.13 - resolve long overdue issues with cnltx-doc - +2015/08/29 v0.13a - small changes in cnltx-example +2016/03/16 v0.13b - adapt bib style to biblatex v3.3 diff --git a/macros/latex/contrib/cnltx/cnltx-doc.cls b/macros/latex/contrib/cnltx/cnltx-doc.cls index 4d7339db32..8c3fa83861 100644 --- a/macros/latex/contrib/cnltx/cnltx-doc.cls +++ b/macros/latex/contrib/cnltx/cnltx-doc.cls @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -107,7 +107,7 @@ \pgfkeys{ cnltx/.cd, caption-font/.code = \def\cnltx@caption@font{#1} , - caption-label-font/.code = \def\cnltx@captionlabel@font{#1} + caption-label-font/.code = \def\cnltx@captionlabel@font{\cnltx@caption@font#1} } \ifbool{cnltx@load@preamble}{ @@ -119,12 +119,13 @@ {\RequirePackage{fontspec}} \RequirePackage[oldstyle]{libertine} \RequirePackage{libertinehologopatch} - \RequirePackage[supstfm=libertinesups]{superiors} + % \RequirePackage{superiors} + % \setkeys{superiors}{supstfm=libertinesups} % libertine does not have superior letters: \def\@makefnmark{% \hbox{% \cnltx@ifisnum{\@thefnmark} - {\textsu{\hspace*{\superiors@spaced}\@thefnmark}} + {\textsu{\hspace*{.04em}\@thefnmark}} {\@textsuperscript{\normalfont\@thefnmark}}% }% } @@ -191,7 +192,6 @@ {} \RequirePackage{fnpct} \expandafter\RequirePackage\expandafter[\cnltx@babel@options]{babel} - % \RequirePackage{babel} }{} \ifbool{cnltx@layout}{ @@ -429,35 +429,36 @@ } % -------------------------------------------------------------------------- % command descriptions: -\newcommand*\cnltx@command{% - \@ifstar - {\cnltx@command@star} - {\cnltx@command@nostar}% -} - -\newrobustcmd*\cnltx@command@star[1]{% - \@ifnextchar[ - {\cnltx@command@star@opt{#1}} - {\cnltx@command@star@opt{#1}[]}% -} - -\newrobustcmd*\cnltx@command@nostar[1]{% - \@ifnextchar[ - {\cnltx@command@nostar@opt{#1}} - {\cnltx@command@nostar@opt{#1}[]}% -} - -\def\cnltx@command@star@opt#1[#2]{% - \ifblank{#2} - {\item\cs*{#1}} - {\item\cs*{#1}#2}% - \cnltx@checkdefault{\hfill\newline}% -} -\def\cnltx@command@nostar@opt#1[#2]{% - \ifblank{#2} - {\item\cs{#1}} - {\item\cs{#1}#2}% - \cnltx@checkdefault{\hfill\newline}% +% #1: command in the list which places the item +% #2: formatting command taking one mandatory argument and a star form +\newrobustcmd*\cnltx@deflistitem[2]{% + \protected\csdef{\cnltx@stripbs#1}{% + \@ifstar + {\csuse{\cnltx@stripbs#1@star}} + {\csuse{\cnltx@stripbs#1@nostar}}% + }% + \protected\csdef{\cnltx@stripbs#1@star}##1{% + \@ifnextchar[%] + {\csuse{\cnltx@stripbs#1@star@opt}{##1}} + {\csuse{\cnltx@stripbs#1@star@opt}{##1}[]}% + }% + \protected\csdef{\cnltx@stripbs#1@nostar}##1{% + \@ifnextchar[%] + {\csuse{\cnltx@stripbs#1@nostar@opt}{##1}} + {\csuse{\cnltx@stripbs#1@nostar@opt}{##1}[]}% + }% + \protected\csdef{\cnltx@stripbs#1@star@opt}##1[##2]{% + \ifblank{##2} + {\item#2*{##1}} + {\item#2*{##1}##2}% + \cnltx@checkdefault{\hfill\newline}% + }% + \protected\csdef{\cnltx@stripbs#1@nostar@opt}##1[##2]{% + \ifblank{##2} + {\item#2{##1}} + {\item#2{##1}##2}% + \cnltx@checkdefault{\hfill\newline}% + }% } \newcommand\cnltx@checkdefault[1]{% @@ -490,6 +491,8 @@ {\list{}{\cmltx@list@setup}} {\endlist} +\cnltx@deflistitem{\cnltx@command}{\cs} + \newenvironment{commands} {% \let\command\cnltx@command @@ -726,11 +729,12 @@ \newrobustcmd*\cnltx@tableofcontents{% \begingroup \let\tocbasic@listhead\@gobble + \RaggedRight \tableofcontents \endgroup }% - \RequirePackage{multicol} - \AtBeginDocument{% + \RequirePackage{multicol,ragged2e} + \AfterEndPreamble{% \ifbool{cnltx@build@title}{% \ifbool{cnltx@package@name} {\cnltx@title@information} @@ -751,11 +755,14 @@ {\renewcommand\thefootnote{\@fnsymbol\c@footnote}}% \Huge \scalebox{1.5}{% - \color{cnltx}% - \cnltx@title@format - \ifbool{cnltx@package@title} - {\cnltx@package@title} - {\cnltx@package@name}% + \begin{minipage}{.6\linewidth} + \centering + \color{cnltx}% + \cnltx@title@format + \ifbool{cnltx@package@title} + {\cnltx@package@title} + {\cnltx@package@name}% + \end{minipage} }% \par\vskip.5cm\relax \large @@ -867,27 +874,29 @@ \cls{#2}\footnote{\CTANurl[#1]{#2}}% } -\AtEndPreamble{% - \RequirePackage{hyperref}% - \pdfstringdefDisableCommands{% - \def\cnltx@name[#1]#2{#1 #2, }% - \def\cnltxpackagenameformat#1{#1}% - }% - \hypersetup - { - colorlinks = true, - allcolors = link , - plainpages = false, - bookmarksopen = true, - bookmarksopenlevel = 1, - bookmarksnumbered = true, - pdfauthor = {\forlistloop{}\cnltx@package@author@pdflist}, - pdftitle = - {\cnltx@package@name\space\cnltx@package@version\space Manual}, - pdfsubject = {\cnltx@package@info}, - pdfstartview = FitH +\ifbool{cnltx@load@preamble}{% + \AtEndPreamble{% + \RequirePackage{hyperref}% + \pdfstringdefDisableCommands{% + \def\cnltx@name[#1]#2{#1 #2, }% + \def\cnltxpackagenameformat#1{#1}% }% -} + \hypersetup + { + colorlinks = true, + allcolors = link , + plainpages = false, + bookmarksopen = true, + bookmarksopenlevel = 1, + bookmarksnumbered = true, + pdfauthor = {\forlistloop{}\cnltx@package@author@pdflist}, + pdftitle = + {\cnltx@package@name\space\cnltx@package@version\space Manual}, + pdfsubject = {\cnltx@package@info}, + pdfstartview = FitH + }% + }% +}{}% \endinput @@ -945,7 +954,10 @@ HISTORY: - use \cnltx@load@modules - new commands \email, \website, \securewebsite - \expandablesymbol, \unexpandablesymbol - +2015/08/17 v0.13 - resolve long overdue issues with cnltx-doc +2015/03/11 v0.13a - wrap title in minipage in order to enable linebreaks +2016/03/17 v0.13b - ragged right toc +2017/02/04 v0.14 - load `hyperref' only with `load-preample = true' % -------------------------------------------------------------------------- TODO: diff --git a/macros/latex/contrib/cnltx/cnltx-example.sty b/macros/latex/contrib/cnltx/cnltx-example.sty index 39d066602f..c7b39b03c7 100644 --- a/macros/latex/contrib/cnltx/cnltx-example.sty +++ b/macros/latex/contrib/cnltx/cnltx-example.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -101,10 +101,15 @@ {\cnltx@key@aux{#1}\Marg}% } - +\newlength\cnltx@choice@sep@stretch +\setlength\cnltx@choice@sep@stretch{\z@\@plus.5em} % \DeclareListParser*\cnltx@choices{|} \newrobustcmd*\choices[1]{% - \def\cnltx@choice@sep{\def\cnltx@choice@sep{|\hskip\z@}}% + \def\cnltx@choice@sep{% + \def\cnltx@choice@sep{% + \hskip\cnltx@choice@sep@stretch|\hskip\cnltx@choice@sep@stretch + }% + }% \forcsvlist{\cnltx@choice@sep\code}{#1}% } @@ -229,9 +234,8 @@ {Ä}{{\"A}}{1} {Ö}{{\"O}}{1} {Ü}{{\"U}}{1} - {ß}{{\ss}}{1} - {`}{\`{}}{1} - {'}{\textquotesingle}{1} , + {ß}{{\ss}}{1} , + upquote = true, breaklines = true, keepspaces = true, breakindent = 1em, @@ -260,9 +264,11 @@ equation,eqnarray, figure,flushleft,flushright, itemize,list, + math, otherlanguage, table,tabu,tabular }, + texcs = , keywords = , % \begin, \end: texcsstyle = [2]\color{beginend}, index = [2][texcs2], @@ -277,12 +283,12 @@ index = [4][texcs4], indexstyle = [4]\@gobble, % added environments that'll be indexed: - texcsstyle = [5]\color{env}, - index = [5][texcs5], + keywordstyle = [5]\color{env}, + index = [5][keyword5], indexstyle = [5]\indexenv, % environments that won't be indexed: - texcsstyle = [6]\color{env}, - index = [6][texcs6], + keywordstyle = [6]\color{env}, + index = [6][keyword6], indexstyle = [6]\@gobble, moredelim = *[s][\color{math}]{$}{$} } @@ -304,6 +310,7 @@ {Ö}{{\"O}}1 {Ü}{{\"U}}1 {ß}{{\ss}}1 , + upquote = true, breaklines = true, keepspaces = true, breakindent = 1em, @@ -311,6 +318,9 @@ keywordstyle = \color{bibentry} , keywordstyle = [2]\color{bibentryfield}\itshape , showstringspaces = false , + deleteindex = [3][texcs3] , + deleteindex = [5][keyword5] , + deleteindex = [6][keyword6] } \def\cnltx@makeindex@listings@style{ @@ -337,8 +347,49 @@ keywordstyle = \color{makeidxkey}\bfseries , stringstyle = \color{makeidxstring} , showstringspaces = false , + deleteindex = [3][texcs3] , + deleteindex = [5][keyword5] , + deleteindex = [6][keyword6] +} + +\def\cnltx@bash@listings@style{ + language = bash, + basicstyle = {\sourceformat\color{black}}, + % numbers = left, + % numberstyle = \tiny, + xleftmargin = 1em, + numbersep = .75em, + gobble = \cnltx@gobble , + columns = fullflexible, + literate = + {ä}{{\"a}}1 + {ö}{{\"o}}1 + {ü}{{\"u}}1 + {Ä}{{\"A}}1 + {Ö}{{\"O}}1 + {Ü}{{\"U}}1 + {ß}{{\ss}}1 , + upquote = true, + breaklines = true, + keepspaces = true, + breakindent = 1em, + commentstyle = \color{comment}, + keywordstyle = \color{black}\bfseries , + stringstyle = \color{black} , + showstringspaces = false , + morekeywords = texdoc , + deleteindex = [3][texcs3] , + deleteindex = [5][keyword5] , + deleteindex = [6][keyword6] } +\newcommand*\cnltx@prompt{} +\patchcmd\lst@NewLine + {\hbox{}} + {\hbox{}\cnltx@prompt} + {} + {} + \cnltx@expandargs(nx)\lstdefinestyle {cnltx} {\expandonce\cnltx@listings@style} @@ -351,6 +402,10 @@ {cnltx-makeindex} {\expandonce\cnltx@makeindex@listings@style} +\cnltx@expandargs(nx)\lstdefinestyle + {bash} + {\expandonce\cnltx@bash@listings@style} + \lstdefinestyle {cnltx-inline} { @@ -381,18 +436,18 @@ \def\cnltx@addenvs#1{% \cnltx@expandargs(nx)\lstdefinestyle {cnltx} - {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}}% + {\expandonce\cnltx@listings@style,\unexpanded{morekeywords={[5]#1}}}% \edef\cnltx@listings@style{% - \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}% + \expandonce\cnltx@listings@style,\unexpanded{morekeywords={[5]#1}}% }% } \def\cnltx@addsilentenvs#1{% \cnltx@expandargs(nx)\lstdefinestyle {cnltx} - {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}}% + {\expandonce\cnltx@listings@style,\unexpanded{morekeywords={[6]#1}}}% \edef\cnltx@listings@style{% - \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}% + \expandonce\cnltx@listings@style,\unexpanded{morekeywords={[6]#1}}% }% } @@ -512,7 +567,7 @@ \cnltx@get@page@list{#1} \booltrue{cnltx@pagelist} , runs/.code = \setcounter{cnltx@runs}{#1} , - program/.code = \def\cnltx@compilation@method{#1} , + program/.code = \def\cnltx@compilation@methods{#1} , file-ext/.code = \def\cnltx@example@fileext{#1} , exe-with/.code = \def\cnltx@compilation@options{#1} , graphics/.code = \def\cnltx@image@options{#1} , @@ -596,10 +651,17 @@ } \newcommand*\cnltx@exe{\immediate\write18} -\newcommand*\cnltx@program@pdflatex{pdflatex} -\newcommand*\cnltx@program@lualatex{lualatex} -\newcommand*\cnltx@program@xelatex {xelatex} -\newcommand*\cnltx@program@arara {arara} +\newrobustcmd*\cnltx@add@program[1]{% + \expandafter\newcommand + \expandafter*\csname cnltx@program@#1\endcsname{#1}% +} +\cnltx@add@program{pdflatex} +\cnltx@add@program{lualatex} +\cnltx@add@program{xelatex} +\cnltx@add@program{arara} +\cnltx@add@program{biber} +\cnltx@add@program{bibtex} + \newcommand*\cnltx@compile[3]{% \ifcsdef{cnltx@program@#1} {% @@ -613,9 +675,16 @@ } {\cnltx@example@error{Unknown compilation method `#1'}}% } -\newcommand*\cnltx@compilation@method{pdflatex} +\newcommand*\cnltx@compilation@methods{pdflatex} \newcommand*\cnltx@compilation@options{} +\newrobustcmd*\cnltx@compilation@process[2]{ + \cnltx@expandargs(oo)\cnltx@compile + {#2} + {\cnltx@compilation@options} + {#1}% +} + \newrobustcmd*\cnltx@get@pdfpages[1]{% \begingroup \ifxetex @@ -657,8 +726,7 @@ {% \cnltx@expandargs(x)\lstset{ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } - {linewidth=\cnltx@sidebysidewidth,}{}% - moretexcs=[3], moretexcs=[5], + {linewidth=\cnltx@sidebysidewidth,}{}% \expandonce\cnltx@local@listings@options }% } @@ -668,8 +736,6 @@ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } {linewidth=\cnltx@sidebysidewidth,}{}% \expandonce\cnltx@local@listings@options - % no idea why this is necessary: - % \ifcsdef{lst@gtexcs3}{}{,moretexcs=[3]}% }% }% \ifbool{cnltx@local@frame@overwrite} @@ -819,12 +885,11 @@ {% Compiling example `#1.tex' \arabic{cnltx@runs} time\ifnum\value{cnltx@runs}>1s\fi\space with - \cnltx@compilation@method + \cnltx@compilation@methods }% - \cnltx@expandargs(oo)\cnltx@compile - {\cnltx@compilation@method} - {\cnltx@compilation@options} - {#1.tex}% + \cnltx@expandargs(no)\forcsvlist + {\cnltx@compilation@process{#1}} + {\cnltx@compilation@methods}% } {% \cnltx@example@warning @@ -926,6 +991,7 @@ \vskip\cnltx@after@skip }% } + \newrobustcmd\newsourcecodeenv[2][]{% \cnltx@new@sourcecode@env{#1}{#2}% } @@ -950,6 +1016,12 @@ \newsourcecodeenv[side-by-side]{sidebyside} \newsourcecodeenv[code-only]{sourcecode} +\newsourcecodeenv[ + code-only, + sourcecode-options={style=bash}, + pre-code=\def\cnltx@prompt{\textasciitilde\space\$\space} +]{bash} + \newinputsourcefilecmd\inputexample \newinputsourcefilecmd[side-by-side]\inputsidebyside \newinputsourcefilecmd[code-only]\inputsourcecode @@ -958,7 +1030,6 @@ \lstinputlisting[style=cnltx,#1]{#2}% } - % -------------------------------------------------------------------------- % packages and classes: \newcommand*\packageformat{\sffamily} @@ -995,50 +1066,59 @@ % -------------------------------------------------------------------------- HISTORY: -2013/09/08 v0.1 - first working version -2013/09/10 v0.2 - added \keyis - - lot's of improvements on the source code example - environments - - disable indexing commands in PDF strings - - added hooks to the source example environments - - added possibility for internationalization - - new macro \verbcode - - added optional argument to \newarg - - new macros \Marg, \Oarg, \Darg - - option for formatting the \default command -2013/09/12 v0.3 - added \module - - added \newsourcecodeenv and \newinputsourcefilecmd - - added \inputexample, \inputsidebyside and \inputsourcecode - - renamed `example*' into `sidebyside' -2013/09/15 v0.4 - new listings style `cnltx-bibtex' -2013/09/20 v0.5 - new command \implementation - - fixed wrong indexing behaviour: keywords in the silent lists - are now correctly indexed if added with `add-cmds' or - `add-envs' -2013/09/30 v0.7 - added listings style `cnltx-makeindex' -2013/10/04 v0.7a - new command \cnltx@treat@lst@index - - changed \envidx in listings into \indexenv - - added \bnd for package bundles -2013/11/22 v0.9 - new option `compile' that allows to compile source code - examples (which need to be complete, of course) with - pdflatex and include the documents afterwards - - new options `max-pages' that determines the maximum number - of pages before a line break if documents are included with - `compile' - - new option `graphics' - - new option `runs' that specifies the number of compilation - runs of the included example - - new options `program' and `exe-with' - - new option `float', `float-pos' and `caption' -2014/01/05 v0.10 - sometimes there is a spurious `undefined control sequence - \lst@gtexcs3' error: added hack to fix this => find out - where this comes from! - - new option `add-frame' for `compile'd examples - - new command \parg for an optional + argument - - new option `outside' for non-`compiled' examples - - new option `float-env' -2014/03/11 v0.11 - \cnltx@load@modules -2014/04/09 v0.12 - improvements on the sidebyside examples +2013/09/08 v0.1 - first working version +2013/09/10 v0.2 - added \keyis + - lot's of improvements on the source code example + environments + - disable indexing commands in PDF strings + - added hooks to the source example environments + - added possibility for internationalization + - new macro \verbcode + - added optional argument to \newarg + - new macros \Marg, \Oarg, \Darg + - option for formatting the \default command +2013/09/12 v0.3 - added \module + - added \newsourcecodeenv and \newinputsourcefilecmd + - added \inputexample, \inputsidebyside and \inputsourcecode + - renamed `example*' into `sidebyside' +2013/09/15 v0.4 - new listings style `cnltx-bibtex' +2013/09/20 v0.5 - new command \implementation + - fixed wrong indexing behaviour: keywords in the silent + lists are now correctly indexed if added with `add-cmds' + or `add-envs' +2013/09/30 v0.7 - added listings style `cnltx-makeindex' +2013/10/04 v0.7a - new command \cnltx@treat@lst@index + - changed \envidx in listings into \indexenv + - added \bnd for package bundles +2013/11/22 v0.9 - new option `compile' that allows to compile source code + examples (which need to be complete, of course) with + pdflatex and include the documents afterwards + - new options `max-pages' that determines the maximum number + of pages before a line break if documents are included + with `compile' + - new option `graphics' + - new option `runs' that specifies the number of compilation + runs of the included example + - new options `program' and `exe-with' + - new option `float', `float-pos' and `caption' +2014/01/05 v0.10 - sometimes there is a spurious `undefined control sequence + \lst@gtexcs3' error: added hack to fix this => find out + where this comes from! + - new option `add-frame' for `compile'd examples + - new command \parg for an optional + argument + - new option `outside' for non-`compiled' examples + - new option `float-env' +2014/03/11 v0.11 - \cnltx@load@modules +2014/04/09 v0.12 - improvements on the sidebyside examples +2015/08/29 v0.13a - enable \choices list to stretch +2016/03/16 v0.13b - `program' may now be a csv list of programs to be + executed +2017/02/04 v0.14 - exchange literate={`}{\`{}}{1}{'}{\textquotesingle}{1} for + listings' upquote option + - new sourcecode environment `bash' +2019/11/01 v0.15 - fix `undefined control sequence \lst@gtexcs3' error + - fix `undefined control sequence \lst@gkeyword3' error + - fix `undefined control sequence \lst@gkeyword3' error TODO: diff --git a/macros/latex/contrib/cnltx/cnltx-listings.sty b/macros/latex/contrib/cnltx/cnltx-listings.sty index 7db538a102..3661e09701 100644 --- a/macros/latex/contrib/cnltx/cnltx-listings.sty +++ b/macros/latex/contrib/cnltx/cnltx-listings.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -1635,15 +1635,18 @@ th,TH, thanks, the, + thechapter, theendnotes, theenumi,theenumii,theenumiii,theenumiv, thefootnote, thefootnotemark, thempfn, - thempfn, thempfootnote, thepage, thepart, + thesection, + thesubsection, + thesubsubsection, theta, Theta, thicklines, diff --git a/macros/latex/contrib/cnltx/cnltx-tools.sty b/macros/latex/contrib/cnltx/cnltx-tools.sty index 3b53ee0ec4..a4cc5f1e3e 100644 --- a/macros/latex/contrib/cnltx/cnltx-tools.sty +++ b/macros/latex/contrib/cnltx/cnltx-tools.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/cnltx/cnltx-translations.sty b/macros/latex/contrib/cnltx/cnltx-translations.sty index 53dc2d4ed4..9f742a861f 100644 --- a/macros/latex/contrib/cnltx/cnltx-translations.sty +++ b/macros/latex/contrib/cnltx/cnltx-translations.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -125,4 +125,4 @@ \endinput 2014/03/11 v0.11 - first published version -2014/??/?? v0.?? - {cnltx-vs.} +2015/01/11 v0.12 - {cnltx-vs.} diff --git a/macros/latex/contrib/cnltx/cnltx.bbx b/macros/latex/contrib/cnltx/cnltx.bbx index 1fd4dc2b1b..c5409b04e7 100644 --- a/macros/latex/contrib/cnltx/cnltx.bbx +++ b/macros/latex/contrib/cnltx/cnltx.bbx @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -28,8 +28,9 @@ \RequirePackage{cnltx-base} \ProvidesFile{cnltx.bbx}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info] -\cnltx@load@modules{example,tools,translations} +\cnltx@load@modules{example,tools,translations,names} +\RequireBiber \RequireBibliographyStyle{alphabetic} \ExecuteBibliographyOptions{block=ragged,useprefix=true} @@ -40,9 +41,7 @@ \usebibmacro{maintainer}% \setunit{\labelnamepunct}\newblock \usebibmacro{title+subtitle}% - \printfield{version}% - \setunit{\addcomma\addspace}% - \usebibmacro{date}% + \usebibmacro{version+date}% \newunit\newblock \usebibmacro{url+urldate}% \newunit\newblock @@ -52,7 +51,7 @@ \DeclareBibliographyAlias{class}{latex} \DeclareBibliographyAlias{bundle}{latex} -\newbibmacro{title+subtitle}{% +\newbibmacro*{title+subtitle}{% \iffieldundef{title}{}{% \printfield{title}% \ifbibindex{\indexfield{title}}{}% @@ -64,6 +63,31 @@ }% } +\NewBibliographyString{version} +\NewBibliographyString{or-newer} +\DefineBibliographyStrings{english}{ + version = {version} , + or-newer = {or newer} +} + +\DefineBibliographyStrings{german}{ + version = {Version} , + or-newer = {oder neuer} +} + +\newbibmacro*{version+date}{% + \iffieldundef{version}{}{% + \bibstring{version}% + \addspace + \printfield{version}% + \addcomma\addspace + }% + \usebibmacro{date}% + \addspace + \bibstring[\mkbibparens]{or-newer}% + \setunit{\adddot\addspace}% +} + \newbibmacro*{maintainer}{% \printtext{% \ifnameundef{maintainer} @@ -79,9 +103,9 @@ }% } -\renewcommand*{\mkbibnamelast}[1]{\cnltx@write@lastname{#1}} -\renewcommand*{\mkbibnamefirst}[1]{\cnltx@write@firstname{#1}} -\renewcommand*{\mkbibnameprefix}[1]{\cnltx@write@lastname{#1}} +\renewcommand*\mkbibnamefamily[1]{\cnltx@write@lastname{#1}} +\renewcommand*\mkbibnamegiven[1]{\cnltx@write@firstname{#1}} +\renewcommand*\mkbibnameprefix[1]{\cnltx@write@lastname{#1}} \DeclareNameAlias[package]{maintainer}{default} \DeclareNameAlias[class]{maintainer}{default} @@ -100,6 +124,10 @@ \DeclareFieldFormat[class]{title}{\cls*{#1}} \DeclareFieldFormat[bundle]{title}{\bnd*{#1}} +\DeclareFieldFormat[package]{version}{#1} +\DeclareFieldFormat[class]{version}{#1} +\DeclareFieldFormat[bundle]{version}{#1} + \DeclareIndexFieldFormat[package]{title}{% \ifstrequal{#1}{\KOMAScript} {\pkgidx[KOMA-Script]{\KOMAScript}} @@ -132,34 +160,28 @@ {\bndidx{#1}}% } -\def\cnltx@onlyonefirstname#1\bibnamedelima#2\q@stop{#1} - \DeclareIndexNameFormat{cnltx}{% - \cnltx@if@in{#3}{\bibnamedelima} - {% - \usebibmacro{index:entry}{\index}{% - \ifblank{#5}{}{#5 }% - \@firstofone#1% - \ifblank{#3}{}{, \cnltx@onlyonefirstname#3\q@stop}% - \actualoperator - \ifblank{#5} - {\cnltx@write@lastname{#1}} - {\cnltx@write@lastname{#5 #1}}% - \ifblank{#3}{}{, \cnltx@write@firstname{\cnltx@onlyonefirstname#3\q@stop}}% - }% - } - {% - \usebibmacro{index:entry}{\index}{% - \ifblank{#5}{}{#5 }% - \@firstofone#1% - \ifblank{#3}{}{, #3}% - \actualoperator - \ifblank{#5} - {\cnltx@write@lastname{#1}} - {\cnltx@write@lastname{#5 #1}}% - \ifblank{#3}{}{, \cnltx@write@firstname{#3}}% - }% + \nameparts{#1}% + \expandafter\notblank\expandafter{\namepartgiven}{% + \usebibmacro{index:entry}{\index}{% + \namepartfamily, \namepartgiven + \actualoperator + \expandafter\notblank\expandafter{\namepartprefix} + {\cnltx@write@lastname\namepartprefix\space} + {}% + \cnltx@write@lastname\namepartfamily, + \cnltx@write@firstname\namepartgiven + }% + }{% + \usebibmacro{index:entry}{\index}{% + \namepartfamily + \actualoperator + \expandafter\notblank\expandafter{\namepartprefix} + {\cnltx@write@lastname\namepartprefix\space} + {}% + \cnltx@write@lastname\namepartfamily }% + }% } \DeclareIndexNameAlias{labelname}{cnltx} @@ -202,4 +224,7 @@ HISTORY: module; this is going to need tests if it really is consistent for different types of name formats (prefixes, affixes...) - +2016/03/11 v0.13b - adapt bib style to biblatex v3.3 +2017/02/04 v0.14 - new bibmacro `version+date', use said macro in the `latex' + driver +2019/11/01 v0.15 - fix problems with name format diff --git a/macros/latex/contrib/cnltx/cnltx.bib b/macros/latex/contrib/cnltx/cnltx.bib index d38858ab3d..c1284a6adb 100644 --- a/macros/latex/contrib/cnltx/cnltx.bib +++ b/macros/latex/contrib/cnltx/cnltx.bib @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -35,15 +35,15 @@ @package{pkg:accsupp, title = {accsupp} , author = {Heiko Oberdiek} , - date = {2010-01-16} , - version = {0.3} , + date = {2018-03-28} , + version = {0.5} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:acro, title = {acro} , author = {Clemens Niederberger} , - date = {2013-09-24} , - version = {1.4b} , + date = {2019-09-23} , + version = {2.10} , url = {http://mirror.ctan.org/macros/latex/contrib/acro/} } @package{pkg:acromake, @@ -57,8 +57,8 @@ title = {acronym}, subtitle = {An Acronym Environment for \LaTeXe}, author = {Tobias Oetiker}, - date = {2012-10-29}, - version = {1.38}, + date = {2015-03-21}, + version = {1.41}, url = {http://mirror.ctan.org/macros/latex/contrib/acronym/} } @package{pkg:acroterm, @@ -71,8 +71,8 @@ @package{pkg:adjustbox, title = {adjustbox}, author = {Martin Scharrer}, - date = {2012-05-21}, - version = {1.0}, + date = {2019-01-04}, + version = {1.2}, url = {http://mirror.ctan.org/macros/latex/contrib/adjustbox/} } @package{pkg:amsmath, @@ -80,8 +80,8 @@ author = {{American Mathematical Society}} , sortname = {American Mathematical Society} , shorthand = {AMS} , - date = {2002-02-25} , - version = {2.0} , + date = {2018-04-05} , + version = {2.1} , url = {http://mirror.ctan.org/macros/latex/required/amsmath/} } @package{pkg:amstext, @@ -95,80 +95,87 @@ title = {answers}, author = {Mike Piff}, maintainer = {Joseph Wright}, - date = {2010-10-11}, - version = {2.13}, + date = {2014-08-24}, + version = {2.16}, url = {http://mirror.ctan.org/macros/latex/contrib/answers/} } @package{pkg:array, title = {array}, author = {Frank Mittelbach and David Carlisle}, - date = {2008-09-09}, - version = {2.4c}, + date = {2019-09-13}, + version = {2.4l}, url = {http://mirror.ctan.org/macros/latex/required/tools/} } @package{pkg:asymptote, title = {asymptote}, author = {Andy Hammerlindl and John Bowman and Tom Price}, - date = {2013}, - version = {2.23}, + date = {2019}, + version = {2.49}, url = {http://mirror.ctan.org/graphics/asymptote/} } +@package{pkg:auto-pst-pdf, + title = {auto-pst-pdf}, + author = {Will Robertson and Johannes Große}, + date = {2009-04-26}, + version = {0.6}, + url = {http://mirror.ctan.org/macros/latex/contrib/auto-pst-pdf/} +} @package{pkg:babel, title = {babel} , author = {Johannes Braams} , maintainer = {Javier Bezos} , - date = {2013-05-16} , - version = {3.9f} , + date = {2019-07-19} , + version = {3.33} , url = {http://mirror.ctan.org/macros/latex/required/babel/} } @package{pkg:bm, title = {bm} , author = {David Carlisle and Frank Mittelbach} , - date = {2004-02-26} , - version = {1.1c} , + date = {2019-07-24} , + version = {1.2d} , url = {http://mirror.ctan.org/macros/latex/required/bm/} } @package{pkg:biblatex, title = {biblatex} , author = {Philipp Lehman} , maintainer = {Joseph Wright and Audrey Boruvka and Philip Kime} , - date = {2013-07-14} , - version = {2.7a} , + date = {2019-08-07} , + version = {3.13} , url = {http://mirror.ctan.org/macros/latex/contrib/biblatex/} } @package{pkg:bigfoot, title = {bigfoot}, author = {David Kastrup}, - date = {2006-07-15}, - version = {1.25}, + date = {2015-08-30}, + version = {2.1}, url = {http://mirror.ctan.org/macros/latex/contrib/bigfoot/} } @package{pkg:bohr, title = {bohr} , author = {Clemens Niederberger} , - date = {2015-06-16} , + date = {2015-06-24} , version = {1.0} , url = {http://mirror.ctan.org/macros/latex/contrib/bohr/} } @package{pkg:booktabs, title = {booktabs} , author = {Simon Fear} , - date = {2005-04-14} , - version = {1.61803} , + date = {2016-04-29} , + version = {1.618033} , url = {http://mirror.ctan.org/macros/latex/contrib/booktabs/} } @package{pkg:bpchem, title = {bpchem} , author = {Bj\o{}rn Pedersen} , - date = {2004-11-25} , - version = {1.06} , + date = {2017-08-23} , + version = {1.1} , url = {http://mirror.ctan.org/macros/latex/contrib/bpchem/} } @package{pkg:catchfile, title = {catchfile} , author = {Heiko Oberdiek} , - date = {2011-03-01} , - version = {1.6} , + date = {2016-05-16} , + version = {1.7} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:chemcompounds, @@ -188,36 +195,36 @@ @package{pkg:chemfig, title = {chemfig} , author = {Christian Tellechea} , - date = {2013-11-28} , - version = {1.0h} , + date = {2019-05-21} , + version = {1.41} , url = {http://mirror.ctan.org/macros/generic/chemfig/} } @package{pkg:chemformula, title = {chemformula} , author = {Clemens Niederberger} , - date = {2015-06-30} , - version = {4.11} , + date = {2019-09-23} , + version = {4.15f} , url = {http://mirror.ctan.org/macros/latex/contrib/chemformula/} } @package{pkg:chemgreek, title = {chemgreek} , author = {Clemens Niederberger} , - date = {2015-07-01} , - version = {1.0a} , + date = {2016-12-20} , + version = {1.1} , url = {http://mirror.ctan.org/macros/latex/contrib/chemgreek/} } @package{pkg:chemmacros, title = {chemmacros} , author = {Clemens Niederberger} , - date = {2015-02-08} , - version = {4.7} , + date = {2019-09-24} , + version = {5.8d} , url = {http://mirror.ctan.org/macros/latex/contrib/chemmacros/} } @package{pkg:chemnum, title = {chemnum} , author = {Clemens Niederberger} , - date = {2015-05-13} , - version = {1.1a} , + date = {2016-04-14} , + version = {1.2} , url = {http://mirror.ctan.org/macros/latex/contrib/chemnum/} } @package{pkg:chemstyle, @@ -231,15 +238,15 @@ title = {chngcntr} , author = {Peter Wilson} , maintainer = {Will Robertson} , - date = {2009-09-02} , - version = {1.0a} , + date = {2018-04-09} , + version = {1.1a} , url = {http://mirror.ctan.org/macros/latex/contrib/chngcntr/} } @bundle{bnd:cnltx, title = {cnltx} , author = {Clemens Niederberger} , - date = {2014-01-23} , - version = {0.10a} , + date = {2019-09-25} , + version = {0.15} , url = {http://mirror.ctan.org/macros/latex/contrib/cnltx/} } @class{cls:cnpkgdoc, @@ -281,21 +288,21 @@ @package{pkg:enotez, title = {enotez}, author = {Clemens Niederberger}, - version = {0.7b}, - date = {2013-10-31}, + version = {0.9a}, + date = {2017-04-24}, url = {http://mirror.ctan.org/macros/latex/contrib/enotez/} } @package{pkg:enumitem, title = {enumitem}, author = {Javier Bezos}, - date = {2011-09-28}, - version = {3.5.2}, + date = {2019-06-20}, + version = {3.9}, url = {http://mirror.ctan.org/macros/latex/contrib/enumitem/} } @package{pkg:environ, title = {environ}, author = {Will Robertson}, - date = {2013-04-01}, + date = {2014-05-04}, version = {0.3}, url = {http://mirror.ctan.org/macros/latex/contrib/environ/} } @@ -309,30 +316,30 @@ @package{pkg:eqexam, title = {eqexam}, author = {D. P. Story}, - date = {2011-09-01}, - version = {3.0k}, + date = {2019-01-31}, + version = {5.1.4}, url = {http://mirror.ctan.org/macros/latex/contrib/eqexam/} } @package{pkg:esami, title = {esami}, author = {Grazia Messineo and Salvatore Vassallo}, - date = {2013-03-08}, - version = {1.0}, + date = {2018-05-06}, + version = {2.5}, url = {http://mirror.ctan.org/macros/latex/contrib/esami/} } @package{pkg:etoolbox, title = {etoolbox} , author = {Philipp Lehman} , maintainer = {Joseph Wright} , - date = {2015-04-04} , - version = {2.2} , + date = {2019-09-21} , + version = {2.5h} , url = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/} } @class{cls:exam, title = {exam}, author = {Philip Hirschhorn}, - date = {2015-05-07}, - version = {2.5}, + date = {2017-11-05}, + version = {2.6}, url = {http://mirror.ctan.org/macros/latex/contrib/exam/} } @package{pkg:examdesign, @@ -345,51 +352,51 @@ @package{pkg:exercise, title = {exercise}, author = {Paul Pichaureau}, - date = {2012-05-08}, - version = {1.58}, + date = {2014-10-21}, + version = {1.6}, url = {http://mirror.ctan.org/macros/latex/contrib/exercise/} } -@bundle{bnd:exsheets, +@package{pkg:exsheets, title = {exsheets} , author = {Clemens Niederberger} , - date = {2014-06-27} , - version = {0.14} , + date = {2017-02-08} , + version = {0.21i} , url = {http://mirror.ctan.org/macros/latex/contrib/exsheets/} } @package{pkg:exsol, title = {exsol}, author = {Walter Daems}, - date = {2013-05-12}, - version = {0.6}, + date = {2018-10-23}, + version = {1.4}, url = {http://mirror.ctan.org/macros/latex/contrib/exsol/} } @package{pkg:fixfoot, title = {fixfoot}, author = {Robin Fairbairns}, - date = {2007-12-12}, + date = {2010-02-19}, version = {0.3a} , url = {http://mirror.ctan.org/macros/latex/contrib/fixfoot/} } @package{pkg:fnpct, title = {fnpct} , author = {Clemens Niederberger} , - date = {2013-02-28} , - version = {0.2j} , + date = {2019-02-17} , + version = {0.4f} , url = {http://mirror.ctan.org/macros/latex/contrib/fnpct/} } @package{pkg:fontenc, - title = {fontenc} , - author = {{The \LaTeX\ team}} , - sortname = {LaTeX team} , - version = {1.99g} , - date = {2005-09-27} , - url = {http://mirror.ctan.org/macros/latex/unpacked/} + title = {fontenc} , + author = {{The \LaTeX\ team}} , + sortname = {LaTeX team} , + shorthand = {L3P} , + date = {2016-02-18} , + url = {http://mirror.ctan.org/macros/latex/base/} } @package{pkg:fontspec, title = {fontspec} , author = {Will Robertson and Khaled Hosny} , - version = {2.3c} , - date = {2013-05-20} , + version = {2.7c} , + date = {2019-03-15} , url = {http://mirror.ctan.org/macros/latex/contrib/fontspec/} } @package{pkg:footmisc, @@ -416,78 +423,77 @@ @package{pkg:geometry, title = {geometry} , author = {Hideo Umeki} , - date = {2010-09-12} , - version = {5.6} , + date = {2018-04-16} , + version = {5.8} , url = {http://mirror.ctan.org/macros/latex/contrib/geometry/} } @package{pkg:ghsystem, title = {ghsystem} , author = {Clemens Niederberger} , - date = {2014-08-08} , - version = {4.6} , + date = {2016-07-16} , + version = {4.8} , url = {http://mirror.ctan.org/macros/latex/contrib/ghsystem/} } @package{pkg:glossaries, title = {glossaries}, - author = {Nicola L.C. Talbot}, - date = {2013-04-21}, - version = {3.05}, + author = {Nicola L. C. Talbot}, + date = {2019-01-06}, + version = {4.42}, url = {http://mirror.ctan.org/macros/latex/contrib/glossaries/} } @package{pkg:graphicx, title = {graphicx} , author = {David Carlisle} , - date = {2005-11-14} , - version = {1.0f} , + date = {2017-06-01} , url = {http://mirror.ctan.org/macros/latex/required/graphics/} } @bundle{bnd:greek-fontenc, title = {greek-fontenc} , author = {G\"unter Milde} , - date = {2013-12-01} , - version = {0.11.1} , + date = {2019-07-11} , + version = {0.13.4} , url = {http://mirror.ctan.org/language/greek/greek-fontenc/} } @package{pkg:hologo, title = {hologo} , author = {Heiko Oberdiek} , - date = {2012-04-26} , - version = {1.10} , + date = {2017-05-01} , + version = {1.13} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:hyperref, title = {hyperref} , author = {Heiko Oberdiek and Sebastian Rahtz} , - date = {2012-11-06} , - version = {6.83m} , + date = {2019-09-12} , + version = {6.88i} , url = {http://mirror.ctan.org/macros/latex/contrib/hyperref/} } @package{pkg:idxcmds, title = {idxcmds} , author = {Clemens Niederberger} , - date = {2013-08-31} , - version = {0.2b} , + date = {2015-08-13} , + version = {0.2c} , url = {http://mirror.ctan.org/macros/latex/contrib/idxcmds/} } @package{pkg:ifluatex, title = {ifluatex} , author = {Heiko Oberdiek} , - date = {2010-03-01} , - version = {1.3} , + date = {2016-05-16} , + version = {1.4} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:ifpdf, title = {ifpdf} , - author = {Heiko Oberdiek} , - date = {2011-01-30} , - version = {2.3} , + author = {L3P} , + date = {2018-09-07} , + version = {3.3} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:ifplatform, title = {ifplatform} , author = {Johannes Gro\ss e and Will Robertson} , - date = {2010-10-22} , - version = {0.4} , + date = {2017-10-13} , + version = {0.4a} , url = {http://mirror.ctan.org/macros/latex/contrib/ifplatform/} } @package{pkg:ifxetex, @@ -500,15 +506,15 @@ @package{pkg:imakeidx, title = {imakeidx} , author = {Enrico Gregorio} , - date = {2013-07-11} , - version = {1.3a} , + date = {2016-10-15} , + version = {1.3e} , url = {http://mirror.ctan.org/macros/latex/contrib/imakeidx/} } @package{pkg:inputenc, title = {inputenc} , author = {Alan Jeffrey and Frank Mittelbach} , - date = {2008-03-30} , - version = {1.1d} , + date = {2018-08-11} , + version = {1.3c} , url = {http://mirror.ctan.org/macros/latex/base/} } @bundle{bnd:koma-script, @@ -517,16 +523,16 @@ indextitle = {\KOMAScript} , indexsorttitle = {KOMA-Script} , author = {Markus Kohm}, - date = {2015-07-02} , - version = {3.18} , + date = {2019-01-14} , + version = {3.25} , url = {http://mirror.ctan.org/macros/latex/contrib/koma-script/} } @package{pkg:kpfonts, title = {kpfonts} , author = {Christophe Caignaert} , aubtitle = {The Johannes Kepler Project} , - date = {2010-08-20} , - version = {3.31} , + date = {2018-08-22} , + version = {3.33} , url = {http://mirror.ctan.org/fonts/kpfonts} } @bundle{bnd:l3experimental, @@ -534,8 +540,7 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - version = {SVN 5630} , - date = {2015-07-15} , + date = {2019-09-19} , url = {http://mirror.ctan.org/macros/latex/contrib/l3experimental/} } @bundle{bnd:l3kernel, @@ -543,8 +548,7 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - version = {SVN 5630} , - date = {2015-07-15} , + date = {2019-09-19} , url = {http://mirror.ctan.org/macros/latex/contrib/l3kernel/} } @bundle{bnd:l3packages, @@ -552,29 +556,28 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - version = {SVN 5530} , - date = {2015-07-15} , + date = {2019-09-19} , url = {http://mirror.ctan.org/macros/latex/contrib/l3packages/} } @package{pkg:libertine, title = {libertine} , author = {Bob Tennent} , - date = {2013-09-02} , + date = {2018-10-01} , url = {http://mirror.ctan.org/fonts/libertine/} } @package{pkg:listings, title = {listings} , author = {Carsten Heinz and Brooks Moses} , maintainer = {Jobst Hoffmann} , - date = {2013-08-26} , - version = {1.5b} , + date = {2019-09-10} , + version = {1.8c} , url = {http://mirror.ctan.org/macros/latex/contrib/listings/} } @package{pkg:longtable, title = {longtable} , author = {David Carlisle} , - date = {2004-02-01} , - version = {4.11} , + date = {2019-02-06} , + version = {4.12} , url = {http://mirror.ctan.org/macros/latex/required/tools/} } @package{pkg:lscape, @@ -587,8 +590,8 @@ @package{pkg:ltxcmds, title = {ltxcmds}, author = {Heiko Oberdiek}, - date = {2011-11-09}, - version = {1.22}, + date = {2016-05-16}, + version = {1.23}, url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:manyfoot, @@ -601,8 +604,8 @@ @package{pkg:marginnote, title = {marginnote} , author = {Markus Kohm} , - date = {2012-03-29} , - version = {1.1i} , + date = {2018-08-09} , + version = {1.4b} , url = {http://mirror.ctan.org/macros/latex/contrib/marginnote/} } @package{pkg:mathdesign, @@ -615,13 +618,13 @@ @package{pkg:mathtools, title = {mathtools} , author = {Lars Madsen and Will Robertson and Joseph Wright} , - version = {1.13} , - date = {2013-02-12} , + version = {1.22} , + date = {2019-07-31} , url = {http://mirror.ctan.org/macros/latex/contrib/mh/} } @package{pkg:mdframed, title = {mdframed} , - author = {Marco Daniel} , + author = {Marco Daniel and Elke Schubert} , date = {2013-07-01} , version = {1.9b} , url = {http://mirror.ctan.org/macros/latex/contrib/mdframed/} @@ -629,29 +632,36 @@ @class{cls:memoir, title = {memoir} , author = {Peter Wilson and Lars Madsen} , - date = {2011-03-06} , - version = {3.6j} , + date = {2018-12-12} , + version = {3.7h} , url = {http://mirror.ctan.org/macros/latex/contrib/memoir/} } @package{pkg:mfirstuc, title = {mfirstuc}, author = {Nicola L.C. Talbot}, - date = {2012-05-21}, - version = {1.05}, + date = {2017-11-14}, + version = {2.06}, url = {http://mirror.ctan.org/macros/latex/contrib/glossaries/} } +@package{pkg:mhchem, + title = {mhchem} , + author = {Martin Hensel} , + date = {2018-06-22}, + version = {4.08}, + url = {http://mirror.ctan.org/macros/latex/contrib/mhchem/} +} @package{pkg:microtype, title = {microtype} , author = {Robert Schlicht} , - date = {2013-05-23} , - version = {2.5a} , + date = {2019-02-28} , + version = {2.7b} , url = {http://mirror.ctan.org/macros/latex/contrib/microtype/} } @package{pkg:multicol, title = {multicol} , author = {Frank Mittelbach} , - date = {2011-06-27} , - version = {1.7a} , + date = {2019-03-01} , + version = {1.8w} , url = {http://mirror.ctan.org/macros/latex/required/tools/multicol/} } @package{pkg:multienum, @@ -664,15 +674,15 @@ @package{pkg:musixtex, title = {musixtex}, author = {Daniel Taupin and Ross Mitchell and Andreas Egler}, - version = {1.15}, - date = {2011-04-01}, + version = {1.29}, + date = {2018-08-04}, url = {http://mirror.ctan.org/macros/musixtex/} } @package{pkg:newtx, title = {newtx} , author = {Michael Sharpe} , - date = {2013-10-17} , - version = {1.151} , + date = {2018-05-11} , + version = {1.55} , url = {http://mirror.ctan.org/fonts/newtx/} } @package{pkg:nicefrac, @@ -686,15 +696,15 @@ title = {nomencl}, subtitle = {A Package to Create a Nomenclature}, author = {Boris Veytsman and Bernd Schandl and Lee Netherton and C.V. Radhakrishnan}, - date = {2005-09-22}, - version = {4.2}, + date = {2019-05-05}, + version = {5.2}, url = {http://mirror.ctan.org/macros/latex/contrib/nomencl/} } @package{pkg:parnotes, title = {parnotes}, author = {Micheal Hughes}, - date = {2012-03-01}, - version = {1}, + date = {2019-07-23}, + version = {3b}, url = {http://mirror.ctan.org/macros/latex/contrib/parnotes/} } @package{pkg:pagenote, @@ -705,40 +715,47 @@ version = {1.1a}, url = {http://mirror.ctan.org/macros/latex/contrib/pagenote/} } +@package{pkg:pdfcomment, + title = {pdfcomment} , + author = {Josef Kleber} , + date = {2018-11-01} , + version = {2.4a} , + url = {http://mirror.ctan.org/macros/latex/contrib/pdfcomment/} +} @package{pkg:pdftexcmds, title = {pdftexcmds} , author = {Heiko Oberdiek} , - date = {2011-11-29} , - version = {0.20} , + date = {2019-07-25} , + version = {0.30} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:perpage, title = {perpage}, author = {David Kastrup}, - date = {2006-07-15}, - version = {1.12}, + date = {2014-10-25}, + version = {2.0}, url = {http://mirror.ctan.org/macros/latex/contrib/perpage/} } @package{pkg:pgf, title = {TikZ/pgf} , author = {Till Tantau} , - version = {3.0.0} , - date = {2013-12-13} , + version = {3.1.4b} , + date = {2019-08-03} , url = {http://mirror.ctan.org/graphics/pgf/} } @package{pkg:pgfopts, title = {pgfopts} , author = {Joseph Wright} , - date = {2011-06-02} , - version = {2.1} , + date = {2014-07-10} , + version = {2.1a} , url = {http://mirror.ctan.org/macros/latex/contrib/pgfopts/} } @package{pkg:pgfplots, title = {pgfplots} , author = {Christian Feuers\"anger} , sortname = {Christian Feuersaenger} , - date = {2013-10-04} , - version = {1.9} , + date = {2018-03-28} , + version = {1.16} , url = {http://mirror.ctan.org/graphics/pgf/contrib/pgfplots/} } @package{pkg:polyglossia, @@ -746,15 +763,15 @@ author = {Fran\c{c}ois Charette} , sortname = {Francois Charette} , maintainer = {Arthur Reutenauer} , - date = {2013-06-27} , - version = {1.33.4} , + date = {2019-04-04} , + version = {1.44} , url = {http://mirror.ctan.org/macros/latex/contrib/polyglossia/} } @package{pkg:probsoln, title = {probsoln}, author = {Nicola L. C. Talbot}, - date = {2012-08-23}, - version = {3.04}, + date = {2017-07-10}, + version = {3.05}, url = {http://mirror.ctan.org/macros/latex/contrib/probsoln/} } @package{pkg:psfrag, @@ -767,23 +784,30 @@ @package{pkg:pstricks, title = {pstricks}, author = {Timothy van Zandt and Dennis Girou and Herbert Vo\ss}, - date = {2013}, - version = {2.46}, + date = {2019-05-11}, + version = {2.97}, url = {http://mirror.ctan.org/graphics/pstricks/} } +@package{pkg:pxgreeks, + title = {pxgreeks}, + author = {Jean-Fran\c{c}ois Burnol}, + date = {2011-03-16}, + version = {1.0}, + url = {http://mirror.ctan.org/macros/latex/contrib/pxgreeks/} +} @package{pkg:ragged2e, title = {ragged2e} , author = {Martin Schr\"oder} , sortname = {Martin Schroeder} , - date = {2009-05-21} , - version = {2.1} , + date = {2019-07-28} , + version = {2.2} , url = {http://mirror.ctan.org/macros/latex/contrib/ms/ragged2e/} } @package{pkg:realbookchords, title = {realbookchords}, author = {Clemens Niederberger}, - date = {2013-04-29}, - version = {0.1}, + date = {2017-03-04}, + version = {0.1b}, url = {https://bitbucket.org/cgnieder/guitarchordschemes/} } @package{pkg:relsize, @@ -796,36 +820,36 @@ @package{pkg:scrlfile, title = {scrlfile} , author = {Markus Kohm} , - date = {2012-06-15} , - version = {3.12} , + date = {2019-01-14} , + version = {3.25} , url = {http://mirror.ctan.org/macros/latex/contrib/koma-script/} } @package{pkg:sepfootnotes, title = {sepfootnotes} , author = {Eduardo C. Louren\c{c}o de Lima} , - date = {2013-01-17} , - version = {0.2} , + date = {2016-07-18} , + version = {0.3c} , url = {http://mirror.ctan.org/macros/latex/contrib/sepfootnotes/} } @package{pkg:sidenotes, title = {sidenotes}, author = {Andy Thomas and Oliver Schebaum}, - date = {2012-11-09}, - version = {0.92}, + date = {2016-04-21}, + version = {1.00}, url = {http://mirror.ctan.org/macros/latex/contrib/sidenotes/} } @package{pkg:siunitx, title = {siunitx} , author = {Joseph Wright} , - version = {2.6h} , - date = {2015-07-17} , + version = {2.7s} , + date = {2018-05-17} , url = {http://mirror.ctan.org/macros/latex/contrib/siunitx/} } @package{pkg:snotez, title = {snotez}, author = {Clemens Niederberger}, - version = {0.2}, - date = {2013-04-04}, + version = {0.3}, + date = {2013-04-21}, url = {http://mirror.ctan.org/macros/latex/contrib/snotez/} } @package{pkg:songbook, @@ -838,43 +862,50 @@ @package{pkg:songs, title = {songs}, author = {Kevin W. Hamlen}, - version = {2.14}, - date = {2012-03-17}, + version = {3.1}, + date = {2018-09-21}, url = {http://mirror.ctan.org/macros/latex/contrib/songs/} } @package{pkg:splitidx, title = {splitidx}, author = {Markus Kohm}, - date = {2013-04-09}, - version = {1.2a}, + date = {2016-02-18}, + version = {1.2c}, url = {http://mirror.ctan.org/macros/latex/contrib/splitidx/} } @package{pkg:superiors, title = {superiors}, author = {Michael Sharpe}, - date = {2012-08-13}, - version = {1.02}, + date = {2019-08-18}, + version = {1.06}, url = {http://mirror.ctan.org/macros/latex/contrib/superiors/} } -@package{pkg:tasks, - title = {tasks}, - author = {Clemens Niederberger}, - date = {2014-07-03}, - version = {0.10}, - url = {http://mirror.ctan.org/macros/latex/contrib/tasks/} -} @package{pkg:tablefootnote, title = {tablefootnote}, author = {H.-Martin M\"unch}, - date = {2012-01-14}, - version = {1.0g}, + sortname = {H.-Martin Muench}, + date = {2014-01-26}, + version = {1.1c}, url = {http://mirror.ctan.org/macros/latex/contrib/tablefootnote/} } +@package{pkg:tabu, + title = {tabu}, + author = {Florent Chervet}, + date = {2019-01-12}, + version = {2.8+}, + url = {http://mirror.ctan.org/macros/latex/contrib/tabu/} +} +@package{pkg:tasks, + title = {tasks}, + author = {Clemens Niederberger}, + date = {2016-08-13}, + version = {0.12}, + url = {http://mirror.ctan.org/macros/latex/contrib/tasks/} +} @package{pkg:textcomp, title = {textcomp} , author = {Sebastian Rahtz} , - date = {1995-12-11} , - version = {1.4} , + date = {2016-02-18} , url = {http://mirrors.ctan.org/obsolete/fonts/psfonts/ts1} } @package{pkg:textgreek, @@ -887,8 +918,8 @@ @package{pkg:tkz-base, title = {tkz-base}, author = {Alain Matthes}, - date = {2011-06-02}, - version = {1.16}, + date = {2011-06-03}, + version = {1.16c}, url = {http://mirror.ctan.org/macros/latex/contrib/tkz/} } @package{pkg:tkz-euclide, @@ -901,22 +932,22 @@ @package{pkg:tkz-fct, title = {tkz-fct}, author = {Alain Matthes}, - date = {2011-06-02}, + date = {2011-06-03}, version = {1.16c}, url = {http://mirror.ctan.org/macros/latex/contrib/tkz/} } @package{pkg:translations, title = {translations} , author = {Clemens Niederberger} , - date = {2013-09-30} , - version = {1.1a} , + date = {2017-08-31} , + version = {1.7a} , url = {http://mirror.ctan.org/macros/latex/contrib/translations/} } @package{pkg:translator, title = {translator} , - author = {Till Tantau} , - date = {2010-06-12} , - version = {1.0} , + author = {Till Tantau and Joseph Wright} , + date = {2019-05-31} , + version = {1.12a} , url = {http://mirror.ctan.org/macros/contrib/beamer/base/translator/} } @package{pkg:trimspaces, @@ -929,8 +960,8 @@ @class{cls:tufte, title = {tufte-latex}, author = {Kevin Godby and Bil Kleb and Bill Wood}, - date = {2009-12-11}, - version = {3.5.0}, + date = {2010}, + version = {3.5.2}, url = {http://mirror.ctan.org/macros/latex/contrib/tufte-latex/} } @package{pkg:ulem, @@ -949,8 +980,8 @@ @package{pkg:xcolor, title = {xcolor} , author = {Uwe Kern} , - date = {2007-01-21} , - version = {2.11} , + date = {2016-05-11} , + version = {2.12} , url = {http://mirror.ctan.org/macros/latex/contrib/xcolor/} } @package{pkg:xfrac, @@ -958,8 +989,7 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - date = {2014-05-04} , - version = {4728} , + date = {2019-05-28} , url = {http://mirror.ctan.org/macros/latex/contrib/l3packages/} } @package{pkg:xpatch, @@ -973,15 +1003,22 @@ title = {xspace} , author = {David Carlisle and Morten H\o{}gholm} , sortname = {David Carlisle and Morten Hoegholm} , - date = {2009-10-20} , + date = {2014-10-28} , version = {1.13} , url = {http://mirror.ctan.org/macros/latex/required/tools/} } +@package{pkg:xymtex, + title = {\XyMTeX} , + author = {Shinsaku Fujita} , + date = {2013} , + version = {5.06} , + url = {http://mirror.ctan.org/macros/latex/contrib/xymtex/} +} @bundle{bnd:yafoot, title = {yafoot}, author = {Hiroshi Nakashima}, - date = {1999-07-14}, - version = {1.0}, + date = {2018-09-03}, + version = {1.1}, url = {http://mirror.ctan.org/macros/latex/contrib/yafoot/} } diff --git a/macros/latex/contrib/cnltx/cnltx.cbx b/macros/latex/contrib/cnltx/cnltx.cbx index 1fd3158685..8c7d7fbfd0 100644 --- a/macros/latex/contrib/cnltx/cnltx.cbx +++ b/macros/latex/contrib/cnltx/cnltx.cbx @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/cnltx/cnltx.dbx b/macros/latex/contrib/cnltx/cnltx.dbx index dacca354db..aa1af1464c 100644 --- a/macros/latex/contrib/cnltx/cnltx.dbx +++ b/macros/latex/contrib/cnltx/cnltx.dbx @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/cnltx/cnltx.sty b/macros/latex/contrib/cnltx/cnltx.sty index 298ba37b74..8b9a9ffe03 100644 --- a/macros/latex/contrib/cnltx/cnltx.sty +++ b/macros/latex/contrib/cnltx/cnltx.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/cnltx/cnltx_en.pdf b/macros/latex/contrib/cnltx/cnltx_en.pdf index d25b68094a..f6981af695 100644 Binary files a/macros/latex/contrib/cnltx/cnltx_en.pdf and b/macros/latex/contrib/cnltx/cnltx_en.pdf differ diff --git a/macros/latex/contrib/cnltx/cnltx_en.tex b/macros/latex/contrib/cnltx/cnltx_en.tex index 867a808b61..a19b36a68f 100644 --- a/macros/latex/contrib/cnltx/cnltx_en.tex +++ b/macros/latex/contrib/cnltx/cnltx_en.tex @@ -13,7 +13,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -131,6 +131,7 @@ } } +\usepackage{csquotes} \defbibheading{bibliography}[\bibname]{\section{#1}} \makeatletter @@ -352,8 +353,7 @@ The intended use of this bundle is three-fold: and actually loads most if not all of the bundle. \item The module \cnltxbase\ is also intended as a programming tools package that will be used in other packages eventually. For example it is used by - the \pkg{cntformats} package from the \bnd{exsheets} - bundle~\cite{bnd:exsheets}. + the \pkg{cntformats} package. \item In case parts of this bundle prove useful to be used in a document the recommended way is to add \begin{sourcecode}[gobble=6] diff --git a/macros/latex/contrib/halloweenmath/00readme.txt b/macros/latex/contrib/halloweenmath/00readme.txt index 9062c54982..d529f19be2 100644 --- a/macros/latex/contrib/halloweenmath/00readme.txt +++ b/macros/latex/contrib/halloweenmath/00readme.txt @@ -4,7 +4,7 @@ This is file `00readme.txt'. This file is part of a work named "halloweenmath package". -Copyright (C) 2017 by Gustavo MEZZETTI. +Copyright (C) 2019 by Gustavo MEZZETTI. The halloweenmath package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -26,7 +26,7 @@ This file, after giving a brief description of the halloweenmath package, explains how to install it and how to generate its--alas, still incomplete!--documentation. -April 25, 2017 (vers. 0.10a) +November 1, 2019 (vers. 0.11) diff --git a/macros/latex/contrib/halloweenmath/Makefile b/macros/latex/contrib/halloweenmath/Makefile index 14862e19a6..aeb4b56152 100644 --- a/macros/latex/contrib/halloweenmath/Makefile +++ b/macros/latex/contrib/halloweenmath/Makefile @@ -1,6 +1,6 @@ # makefile # -# 2017 Apr 25 +# 2019 Nov 01 # # Macro definitions # diff --git a/macros/latex/contrib/halloweenmath/README b/macros/latex/contrib/halloweenmath/README index f8ae0c7905..84522e550d 100644 --- a/macros/latex/contrib/halloweenmath/README +++ b/macros/latex/contrib/halloweenmath/README @@ -1,4 +1,4 @@ -(Version indicator: 2017 Apr 25) +(Version indicator: 2019 Nov 01) The halloweenmath package originated from a question asked for enjoyment on TeX-LaTeX Stack Exchange by the user diff --git a/macros/latex/contrib/halloweenmath/halloweenmath-doc.pdf b/macros/latex/contrib/halloweenmath/halloweenmath-doc.pdf index 94debdafad..8a88d4ee19 100644 Binary files a/macros/latex/contrib/halloweenmath/halloweenmath-doc.pdf and b/macros/latex/contrib/halloweenmath/halloweenmath-doc.pdf differ diff --git a/macros/latex/contrib/halloweenmath/halloweenmath-man.pdf b/macros/latex/contrib/halloweenmath/halloweenmath-man.pdf index 5b86c5fa77..97de2309fb 100644 Binary files a/macros/latex/contrib/halloweenmath/halloweenmath-man.pdf and b/macros/latex/contrib/halloweenmath/halloweenmath-man.pdf differ diff --git a/macros/latex/contrib/halloweenmath/halloweenmath-man.tex b/macros/latex/contrib/halloweenmath/halloweenmath-man.tex index 7776ee16bd..a8062cddf3 100644 --- a/macros/latex/contrib/halloweenmath/halloweenmath-man.tex +++ b/macros/latex/contrib/halloweenmath/halloweenmath-man.tex @@ -1,21 +1,21 @@ \documentclass[a4paper]{article} \usepackage[T1]{fontenc} \usepackage{amsmath,amsfonts} -\usepackage{halloweenmath}[2017/04/16] +\usepackage{halloweenmath}[2019/11/01] \usepackage{array} \usepackage[bookmarksnumbered]{hyperref} \title{User's manual\\for the \halloweenmath\ package} \author{G. Mezzetti} -\date{April~25, 2017} +\date{November~1, 2019} \hypersetup{ pdftitle = {User's manual for the halloweenmath package}, pdfauthor = {G. Mezzetti}, pdfsubject = {The halloweenmath LaTeX package}, pdfkeywords = {TeX,LaTeX,Halloween,math,math symbold}, - pdfcreationdate = {D:20170425120000}, - pdfmoddate = {D:20170425120000} + pdfcreationdate = {D:20191101120000}, + pdfmoddate = {D:20191101120000} } \DeclareTextFontCommand{\packlass}{\normalfont\sffamily} @@ -31,7 +31,7 @@ \newcolumntype{H}[3]{>{\hb@xt@ #3\bgroup#1}c<{#2\egroup}} \newcolumntype{U}[2]{H{\hss$#1}{$\hss}{#2}@{\hspace{.5em}}} \newcolumntype{V}[1]{H{\ttfamily}{\hss}{#1}} -\newcolumntype{W}[1]{H{}{\hss}{#1}} +\newcolumntype{Q}[1]{H{}{\hss}{#1}} \newcolumntype{O}{U{}{15\p@}} \newcolumntype{D}{U{\displaystyle}{30\p@}} \newcolumntype{L}{OD} @@ -60,7 +60,7 @@ } \newenvironment{xasymtable}[1][\tw@]{% \def\arraystretch{\tw@}% - \@symtable{AW{200\p@}}{#1}% + \@symtable{AQ{200\p@}}{#1}% }{% \end@symtable } diff --git a/macros/latex/contrib/halloweenmath/halloweenmath.dtx b/macros/latex/contrib/halloweenmath/halloweenmath.dtx index 83e0f21fb0..44739dc2ee 100644 --- a/macros/latex/contrib/halloweenmath/halloweenmath.dtx +++ b/macros/latex/contrib/halloweenmath/halloweenmath.dtx @@ -5,7 +5,7 @@ % % This file is part of a work named "halloweenmath package". % -% Copyright (C) 2017 by Gustavo MEZZETTI. +% Copyright (C) 2019 by Gustavo MEZZETTI. % % This file may be distributed and/or modified under the conditions % of the LaTeX Project Public License, either version 1.3 of this @@ -32,12 +32,12 @@ % \fi % % \def\filename{halloweenmath.dtx} -% \def\fileversion{0.10a} -% \def\filedate{2017/04/25} -% \def\docdate {2017/04/25} -% \def\doclongdate{April~25, 2017} +% \def\fileversion{0.11} +% \def\filedate{2019/11/01} +% \def\docdate {2019/11/01} +% \def\doclongdate{November~1, 2019} % -% \CheckSum{2259} +% \CheckSum{2262} % % \changes{0.01}{2017 Jan 06}{First writing of the code} % \changes{0.10}{2017 Apr 16}{Changed the look of the broom in the extensible @@ -197,7 +197,7 @@ % integration\thanks{This file has % version~\fileversion, release date \filedate; % last documentation update: \docdate. -% Copyright \copyright~2017 by G.~Mezzetti +% Copyright \copyright~2019 by G.~Mezzetti % (see page~\pageref{S:Copy}).} % } % \author{G. Mezzetti} @@ -210,8 +210,8 @@ % pdfauthor = {G. Mezzetti}, % pdfsubject = {Documentation of the halloweenmath package}, % pdfkeywords = {Halloween, math, scary mathematical symbols}, -% pdfcreationdate = {D:20170425120000}, -% pdfmoddate = {D:20170425120000}, +% pdfcreationdate = {D:20191101120000}, +% pdfmoddate = {D:20191101120000}, % bookmarksopen, % bookmarksopenlevel = 1 % } @@ -300,7 +300,7 @@ % \label{S:Copy} % \vspace{-\parskip} % -% Copyright \copyright~2017 by Gustavo \textsc{Mezzetti}. +% Copyright \copyright~2019 by Gustavo \textsc{Mezzetti}. % All rights are reserved, except as noted below. % % This document has been produced by feeding to a \LaTeX\ typesetting engine @@ -347,7 +347,7 @@ % % \begin{list}{\setlength{\topsep}{0pt}}\item\relax % Gustavo \textsc{Mezzetti}\\ -% L.~S.~U. ``A.~di Savoia Duca degli Abruzzi''\\ +% L.~S.~U. ``A.~di Savoia Duca d'Aosta''\\ % Via del Santo, 57\\ % I--35123\quad PADOVA\quad PD\\ % Italy @@ -1219,7 +1219,7 @@ % The usual identification: % \begin{macrocode} \ProvidesPackage{halloweenmath} - [2017/04/25 v0.10a (development)] + [2019/11/01 v0.11 (development)] % \end{macrocode} % % \subsection{Initial code} @@ -1338,11 +1338,16 @@ % \end{macro} % % \begin{macro}{\@HwM@right@or@left} +% \changes{0.11}{2019 Nov 01}{Corrected bug: \cs{@HwM@right@or@left} +% now defaults to \cs{@gobbletwo}} % Used to pass information about the orientation of left\slash right -% symmetric figures. Here we just check that the name can be used, at the -% same time reserving it. +% symmetric figures. More precisely, it is a switch that selects +% between two branches according to the current orientation. Here we +% set the global default (no current orientation defined) so that it +% ignores \emph{both} branches, thus correcting a bug in versions +% prior to 0.11. % \begin{macrocode} -\@ifdefinable\@HwM@right@or@left{} +\@ifdefinable\@HwM@right@or@left{\let \@HwM@right@or@left=\@gobbletwo} % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/halloweenmath/halloweenmath.ins b/macros/latex/contrib/halloweenmath/halloweenmath.ins index 6a40a55226..1aced78b5b 100644 --- a/macros/latex/contrib/halloweenmath/halloweenmath.ins +++ b/macros/latex/contrib/halloweenmath/halloweenmath.ins @@ -3,7 +3,7 @@ % % This file is part of a work named "halloweenmath package". % -% Copyright (C) 2017 by Gustavo MEZZETTI. +% Copyright (C) 2019 by Gustavo MEZZETTI. % % The halloweenmath package may be distributed and/or modified under % the conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ % only part of the Work" in the sense of the LaTeX Project Public % License, and should be avoided. % -% April 25, 2017 (vers. 0.10a) +% November 1, 2019 (vers. 0.11) % \input docstrip @@ -119,7 +119,7 @@ This is a generated file. It is part of a work named "halloweenmath package". -Copyright (C) 2017 by Gustavo MEZZETTI. +Copyright (C) 2019 by Gustavo MEZZETTI. The halloweenmath package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -141,7 +141,7 @@ Note that the distribution of this file alone is "distribution of only part of the Work" in the sense of the LaTeX Project Public License, and should be avoided. -April 25, 2017 (vers. 0.10a) +November 1, 2019 (vers. 0.11) \endpreamble diff --git a/macros/latex/contrib/halloweenmath/manifest.txt b/macros/latex/contrib/halloweenmath/manifest.txt index 16e4a978ad..76dcbcf956 100644 --- a/macros/latex/contrib/halloweenmath/manifest.txt +++ b/macros/latex/contrib/halloweenmath/manifest.txt @@ -3,7 +3,7 @@ This is file `manifest.txt'. This file is part of a work named "halloweenmath package". -Copyright (C) 2017 by Gustavo MEZZETTI. +Copyright (C) 2019 by Gustavo MEZZETTI. The halloweenmath package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -21,7 +21,7 @@ precisely, it explains how the locutions "Work" and "Compiled Work", used in the LaTeX Project Public License, are to be interpreted in the case of this work. -April 25, 2017 (vers. 0.10a) +November 1, 2019 (vers. 0.11) diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index ec89a3f58a..b74e628687 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,24 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2019-11-01] + +### Added + +- New `\ASSERT` and `\ASSERTSTR` functions (issue #102) + +### Changed + +- Avoid normalisation of (u)pTeX data when this is standard engine + (fixes #103) +- Normalise Lua data references (#107) +- Extend `runtest_task()` to pass run number +- Allow `regression-test` to load when e-TeX is unavailable (fixes #105) + +### Fixed + +- Location of `testsuppdir` when multiple configurations are used + ## [2019-10-02] ### Added @@ -370,7 +388,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2019-10-02...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2019-11-01...HEAD +[2019-11-01]: https://github.com/latex3/l3build/compare/2019-10-02...2019-11-01 [2019-10-02]: https://github.com/latex3/l3build/compare/2019-09-30...2019-10-02 [2019-09-30]: https://github.com/latex3/l3build/compare/2019-09-29...2019-09-30 [2019-09-29]: https://github.com/latex3/l3build/compare/2019-09-28...2019-09-29 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 04fb613e32..d781a521d0 100644 --- a/macros/latex/contrib/l3build/README.md +++ b/macros/latex/contrib/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2019-10-02 +Release 2019-11-01 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index e2cdd655bf..ea550327eb 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -215,12 +215,14 @@ local function normalize_log(content,engine,errlevels) if match(line, "^> \\box%d+=$") or match(line, "^> \\box%d+=(void)$") then line = gsub(line, "%d+=", "...=") end - -- Remove 'normal' direction information on boxes with (u)pTeX - line = gsub(line, ",? yoko direction,?", "") - line = gsub(line, ",? yoko%(math%) direction,?", "") - -- Remove '\displace 0.0' lines in (u)pTeX - if match(line,"^%.*\\displace 0%.0$") then - return "" + if not match(stdengine,"^e?u?ptex$") then + -- Remove 'normal' direction information on boxes with (u)pTeX + line = gsub(line, ",? yoko direction,?", "") + line = gsub(line, ",? yoko%(math%) direction,?", "") + -- Remove '\displace 0.0' lines in (u)pTeX + if match(line,"^%.*\\displace 0%.0$") then + return "" + end end -- Remove the \special line that in DVI mode keeps PDFs comparable if match(line, "^%.*\\special%{pdf: docinfo << /Creator") then @@ -249,6 +251,9 @@ local function normalize_log(content,engine,errlevels) line = gsub(line, "save cache:", "load cache:") -- A tidy-up to keep LuaTeX and other engines in sync line = gsub(line, utf8_char(127), "^^?") + -- Remove lua data reference ids + line = gsub(line, "", + "") -- Unicode engines display chars in the upper half of the 8-bit range: -- tidy up to match pdfTeX if an ASCII engine is in use if next(asciiengines) then @@ -749,7 +754,7 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) .. setup(lvtfile) .. (hide and (" > " .. os_null) or "") .. os_concat .. - runtest_tasks(jobname(lvtfile)) + runtest_tasks(jobname(lvtfile),i) ) -- Break the loop if the result is stable if breakout and i < checkruns then @@ -796,7 +801,7 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) end -- A hook to allow additional tasks to run for the tests -runtest_tasks = runtest_tasks or function(name) +runtest_tasks = runtest_tasks or function(name,run) return "" end @@ -958,6 +963,10 @@ end function save(names) checkinit() local engines = options["engine"] or {stdengine} + if names == nil then + print("Arguments are required for the save command") + return 1 + end for _,name in pairs(names) do if testexists(name) then for _,engine in pairs(engines) do @@ -989,7 +998,7 @@ function save(names) .. lveext .. " file of the same name") return 1 else - print('Test "'.. name .. '"not found') + print('Test "' .. name .. '" not found') return 1 end end diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index 91374cd0fa..aa583fe599 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2019-10-02" +.TH l3build 1 "2019-11-01" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx index e48fd8b195..2f55c5173d 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -231,7 +231,7 @@ % }^^A % } % -% \date{Released 2019-10-02} +% \date{Released 2019-11-01} % % \maketitle % \tableofcontents @@ -845,6 +845,9 @@ % \texttt{\cs{\meta{type}}\meta{...}} % \item Conversion of box numbers in |\show| lines % \texttt{>~\cs{box}\meta{number}=} to \texttt{>~\cs{box}...=} +% \item Conversion of Lua data reference ids +% \texttt{} to +% \texttt{} % \item Removal of some (u)p\TeX{} data where it is equivalent to % \pdfTeX{} (|yoko direction|, |\displace 0.0|) % \end{itemize} @@ -893,16 +896,6 @@ % % Any commands that write content to the |.log| file that should be ignored can be surrounded by |\OMIT| \dots\ |\TIMO|. % At the appropriate location in the document where the |.log| comparisons should start (say, after |\begin{document}|), the test suite must contain the |\START| macro. -% The test should then include \cs{AUTHOR}\marg{authors details} in case a test file fails in the future and needs to be re-analysed. -% -% Some additional diagnostic information can then be included as metadata for the conditions of the test. -% The desired format can be indicated with \cs{FORMAT}\marg{format name}, and any packages or classes loaded can be indicated with -% -% \noindent\hspace*{2\parindent} \cs{CLASS}\oarg{options}\marg{class name, version}\par -% \noindent\hspace*{2\parindent} \cs{PACKAGE}\oarg{options}\marg{package name, version} -% -% \noindent These do not provide information that is useful for automated checking; after all, packages change their version numbers frequently. -% Rather, including this information in a test indicates the conditions under which the test was definitely known to pass at a certain time in the past. % % The |\END| command signals the end of the test (but read on). % Some additional diagnostic information is printed at this time to debug if the test did not complete `properly' in terms of mismatched brace groups or \cs{if}\dots\cs{fi} groups. @@ -913,9 +906,6 @@ % % \subsection{Commands to help write tests} % -% A simple command \cs{CHECKCOMMAND}\cs{\meta{macro}} is provided to check whether a particular \cs{\meta{macro}} is defined, undefined, or equivalent to \cs{relax}. -% This is useful to flag either that internal macros are remaining local to their definitions, or that defined commands definitely are defined, or even as a reminder that commands you intend to define in a future package need to be tested once they appear. -% % \cs{TYPE} is used to write material to the \texttt{.log} file, like \LaTeX's \cs{typeout}, but it allows `long' input. % The following commands are defined to use \cs{TYPE} to output strings to the \texttt{.log} file. % \begin{itemize} @@ -936,6 +926,13 @@ % \item % \cs{BEGINTEST}\marg{title} \dots \cs{ENDTEST} is an environment form of % \cs{TEST}, allowing verbatim material, \emph{etc.} to appear. +% \item +% \cs{SHOWFILE} (\eTeX{} only) Shows the content of the file given as an +% argument. +% \item +% \cs{ASSERT} and \cs{ASSERTSTR} (\eTeX{} only) Asserts if the full expansion +% of the two required arguments are the same: the \cs{ASSERT} function is +% token-based, the \cs{ASSERTSTR} works on a string basis. % \end{itemize} % An example of some of these commands is shown following. % \begin{Verbatim} @@ -1105,19 +1102,23 @@ % or more engines, but will not carry out any additional processing. For % some tests, for example bibliography generation, it may be desirable to % call one or more tools in addition to the engine. This can be arranged -% by defining |runtest_tasks|, a function taking one argument, the name +% by defining |runtest_tasks|, a function taking two arguments, the name % of the current test (this is equivalent to \TeX{}'s \cs{jobname}, -% \emph{i.e.}~it lacks an extension). The function |runtest_tasks| -% is is into a call to the system to run the engine. As such, it -% should take return a string with the appropriate command(s) -% and option(s). If more than one task is required, these should be separated +% \emph{i.e.}~it lacks an extension) and the current run number. +% The function |runtest_tasks| is run after the main call to the +% engine for a test cycle. It should return an errorlevel value. +% If more than one task is required, these should be separated % by use of |os_concat|, a string variable defined by \pkg{l3build} as the % correct concatenation marker for the system. An example of |runtest_tasks| % suitable for calling Biber is shown in Listing~\ref{fig:test-tasks}. % \begin{figure} % \begin{lstlisting}[frame=single,language={[5.2]Lua},gobble = 6] -% function runtest_tasks(name) -% return "biber " .. name +% function runtest_tasks(name,run) +% if run == 1 then +% return "biber " .. name +% else +% return 0 +% end % end % \end{lstlisting} % \caption{Example \texttt{runtest_tasks} function.} @@ -2028,12 +2029,11 @@ % % \subsection{Preliminaries} % -% We require \eTeX{}. +% We require \eTeX{} for some features. % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname eTeXversion\endcsname\relax - \errmessage{e-TeX is required to use regression-test.tex}% - \expandafter\endinput + \message{e-TeX is required by some regression-test.tex features}% \fi % \end{macrocode} % @@ -2058,7 +2058,11 @@ % Put \TeX{} into scroll mode, and stop it showing the % implementation details of macros in error messages. % \begin{macrocode} -\ifnum\interactionmode>1 \scrollmode\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname interactionmode\endcsname\relax +\else + \ifnum\interactionmode>1 \scrollmode\fi +\fi \errorcontextlines=-1 % % \end{macrocode} % @@ -2140,6 +2144,13 @@ \LONGTYPEOUT{^^JEND-TEST-LOG^^J}% \@@@end } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname currentgrouplevel\endcsname\relax + \def\END{% + \LONGTYPEOUT{^^JEND-TEST-LOG^^J}% + \@@@end + } +\fi \ifx\@@end\@undefined \let\end\END \else @@ -2157,8 +2168,6 @@ % \end{macrocode} % \end{macro} % -% - % \begin{macro}{\SHOWFILE} % Load a file (e.g.,| \jobname.toc|) into the .log file with the usual special % characters rendered harmless. Use as |\SHOWFILE{\jobname.aux}|. @@ -2180,6 +2189,10 @@ \typeout{-------- #1 (end) -----------}% }% \endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname everyeof\endcsname\relax + \def\SHOWFILE#1{\TYPE{FEATURE UNAVAILABLE}} +\fi % \end{macrocode} % \end{macro} % @@ -2224,7 +2237,9 @@ % \FALSE, % \YES, % \NO, -% \NEWLINE +% \NEWLINE, +% \ASSERT, +% \ASSERTSTR % } % We are not starved for space in the log file output, so let's make it as % verbose as is useful when reading the |.diff|'s. @@ -2234,7 +2249,7 @@ ============================================================% }% } -\protected\long\def\BEGINTEST#1{% +\csname protected\endcsname\long\def\BEGINTEST#1{% \global\advance\gTESTint by 1 % \SEPARATOR \LONGTYPEOUT{TEST \the\gTESTint: \detokenize{#1}}% @@ -2242,7 +2257,21 @@ \begingroup \let\TYPE\LONGTYPEOUT } -\protected\long\def\ENDTEST{% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \long\def\BEGINTEST#1{% + \global\advance\gTESTint by 1 % + \SEPARATOR + \begingroup + \toks0={#1}% + \LONGTYPEOUT{TEST \the\gTESTint: \the\toks0 }% + \endgroup + \SEPARATOR + \begingroup + \let\TYPE\LONGTYPEOUT + } +\fi +\csname protected\endcsname\long\def\ENDTEST{% \endgroup \SEPARATOR \LONGTYPEOUT{}% @@ -2262,11 +2291,74 @@ \def \YES {\TYPE{YES}} \def \NO {\TYPE{NO}} \def \NEWLINE {\TYPE{^^J}} +\csname protected\endcsname\long\def\ASSERT#1#2{% + \begingroup + \edef\@tempa{#1}% + \edef\@tempb{#2}% + \ifx\@tempa\@tempb + \TYPE{PASSED}% + \else + \TYPE{FAILED}% + \fi + \endgroup +} +\csname protected\endcsname\long\def\ASSERTSTR#1#2{% + \begingroup + \edef\@tempa{#1}% + \edef\@tempb{#2}% + \edef\@tempa{\detokenize\expandafter{\@tempa}}% + \edef\@tempb{\detokenize\expandafter{\@tempb}}% + \ifx\@tempa\@tempb + \TYPE{PASSED}% + \else + \TYPE{FAILED}% + \fi + \endgroup +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \long\def\ASSERTSTR#1#2{% + \TYPE{FEATURE UNAVAILABLE}% + } +\fi % \end{macrocode} % \end{macro} % % \subsection{Suppressing variable data in output} % +% Disable compression in PDF output. +% \begin{macrocode} +\ifnum 0% + \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi + \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi + >0 % + \ifx\pdfvariable\@undefined + \pdfcompresslevel=0 % + \pdfobjcompresslevel=0 % + \else + \pdfvariable compresslevel=0 % + \pdfvariable objcompresslevel=0 % + \fi +\else + \ifnum 0% + \ifx\XeTeXversion\@undefined\else 1\fi + \ifx\kanjiskip\@undefined\else 1\fi + >0 % + \special{dvipdfmx:config z 0}% Compress level + \special{dvipdfmx:config C 0x40}% Object compression + \fi +\fi +% \end{macrocode} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax + \reset@catcodes + \let\protected\undefined + \expandafter\endinput +\fi +% \end{macrocode} +% % Load the map file early so it does not appear in the log. % \begin{macrocode} \ifx\pdfoutput\@undefined @@ -2335,30 +2427,6 @@ \fi % \end{macrocode} % -% Disable compression in PDF output. -% \begin{macrocode} -\ifnum 0% - \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>0 1\fi\fi - \ifx\outputmode\@undefined\else\ifnum\outputmode>0 1\fi\fi - >0 % - \ifx\pdfvariable\@undefined - \pdfcompresslevel=0 % - \pdfobjcompresslevel=0 % - \else - \pdfvariable compresslevel=0 % - \pdfvariable objcompresslevel=0 % - \fi -\else - \ifnum 0% - \ifx\XeTeXversion\@undefined\else 1\fi - \ifx\kanjiskip\@undefined\else 1\fi - >0 % - \special{dvipdfmx:config z 0}% Compress level - \special{dvipdfmx:config C 0x40}% Object compression - \fi -\fi -% \end{macrocode} -% % Finish up. % \begin{macrocode} \reset@catcodes diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index d9f4fe23f8..48f3ab99d4 100755 --- a/macros/latex/contrib/l3build/l3build.lua +++ b/macros/latex/contrib/l3build/l3build.lua @@ -2,7 +2,7 @@ --[[ -File l3build.lua Copyright (C) 2014-2018 The LaTeX3 Project +File l3build.lua Copyright (C) 2014-2019 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2019-10-02" +release_date = "2019-11-01" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -177,8 +177,14 @@ if #checkconfigs == 1 and (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua" if fileexists(config) then + local savedtestfiledir = testfiledir dofile(config) testdir = testdir .. "-" .. checkconfigs[1] + -- Reset testsuppdir if required + if savedtestfiledir ~= testfiledir and + testsuppdir == savedtestfiledir .. "/support" then + testsuppdir = testfiledir .. "/support" + end else print("Error: Cannot find configuration " .. checkconfigs[1]) exit(1) diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf index 8a7d3fc1de..27c6e3c918 100644 Binary files a/macros/latex/contrib/l3build/l3build.pdf and b/macros/latex/contrib/l3build/l3build.pdf differ -- cgit v1.2.3