summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/fmtcount/CHANGES13
-rw-r--r--macros/latex/contrib/fmtcount/README4
-rw-r--r--macros/latex/contrib/fmtcount/fc-typeout-languages.tex20
-rw-r--r--macros/latex/contrib/fmtcount/fmtcount.dtx243
-rw-r--r--macros/latex/contrib/fmtcount/fmtcount.ins4
-rw-r--r--macros/latex/contrib/fmtcount/fmtcount.pdfbin553518 -> 562977 bytes
-rw-r--r--macros/latex/contrib/hycolor/hycolor.dtx150
-rw-r--r--macros/latex/contrib/hycolor/hycolor.pdfbin364587 -> 379542 bytes
-rw-r--r--macros/latex/contrib/nwejm/README.md2
-rw-r--r--macros/latex/contrib/nwejm/doc/examples/article-in-dutch.pdfbin188075 -> 188077 bytes
-rw-r--r--macros/latex/contrib/nwejm/doc/examples/article-in-english.pdfbin183751 -> 183735 bytes
-rw-r--r--macros/latex/contrib/nwejm/doc/examples/article-in-french.pdfbin239260 -> 238982 bytes
-rw-r--r--macros/latex/contrib/nwejm/doc/examples/article-in-german.pdfbin189437 -> 189448 bytes
-rw-r--r--macros/latex/contrib/nwejm/doc/examples/issue.pdfbin382128 -> 382101 bytes
-rw-r--r--macros/latex/contrib/nwejm/doc/examples/sample.pdfbin182364 -> 182347 bytes
-rw-r--r--macros/latex/contrib/nwejm/doc/nwejm-fr.pdfbin568729 -> 579239 bytes
-rw-r--r--macros/latex/contrib/nwejm/source/nwejm.dtx302
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.dtx96
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.pdfbin293116 -> 292531 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/README.md11
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdfbin576177 -> 574099 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdfbin622092 -> 618259 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdfbin570001 -> 567645 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdfbin590862 -> 589081 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdfbin826876 -> 822920 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdfbin562162 -> 558957 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdfbin852539 -> 847954 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdfbin551838 -> 550780 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdfbin590728 -> 586723 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdfbin820383 -> 815860 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex10
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex20
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex4
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty9
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudabeamer.cls20
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.def6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.sty10
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaexercise.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudafonts.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaletter.cls20
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaposter.cls24
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudapub.cls20
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudarules.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasciposter.cls20
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudathesis.cfg45
67 files changed, 709 insertions, 462 deletions
diff --git a/macros/latex/contrib/fmtcount/CHANGES b/macros/latex/contrib/fmtcount/CHANGES
index f49307cceb..b36551c14b 100644
--- a/macros/latex/contrib/fmtcount/CHANGES
+++ b/macros/latex/contrib/fmtcount/CHANGES
@@ -1,5 +1,18 @@
fmtcount package versions:
+Version 3.06:
+
+* Fix French documentation « mille » → « mil » where applicable.
+
+* Rename \Hexadecimal to \HEXADecimal, and document why. Same for
+ \Hexadecimalnum renamed to \HEXADecimalnum. Keep support for old
+ macro name with deprecation warning.
+
+* Fix issue #34 (documentation concerning no more trailing space
+ gobbling when the optional gender argument is omitted).
+
+* Fix issue #33 (fix ordinalstringnum in German)
+
Version 3.05:
* Fix issue #28 (works now with lualatex: actually from 3.05 fmtcount
diff --git a/macros/latex/contrib/fmtcount/README b/macros/latex/contrib/fmtcount/README
index c41070fe18..c287533f4a 100644
--- a/macros/latex/contrib/fmtcount/README
+++ b/macros/latex/contrib/fmtcount/README
@@ -1,6 +1,6 @@
-LaTeX Package : fmtcount v3.05
+LaTeX Package : fmtcount v3.06
-Last Modified : 2017-12-26
+Last Modified : 2020-01-30
Author : Nicola Talbot and Vincent Belaïche
diff --git a/macros/latex/contrib/fmtcount/fc-typeout-languages.tex b/macros/latex/contrib/fmtcount/fc-typeout-languages.tex
deleted file mode 100644
index 1759593d13..0000000000
--- a/macros/latex/contrib/fmtcount/fc-typeout-languages.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\documentclass{article}
-\usepackage{fmtcount}
-\usepackage{lipsum}
-\newwrite\styfiles
-\openout\styfiles=fc-styfiles.txt
-\begin{document}
-\immediate\write\styfiles{STYFILES=\string\^^J}
-\makeatletter
-{%
- \def\@tempb#1{%
- \immediate\write\styfiles{fc-#1.def\string\^^J}%
- }%
- \fc@iterate@on@languages\@tempb
-}
-\makeatother
-\immediate\write\styfiles{fmtcount.sty fcnumparser.sty fcprefix.sty}
-\closeout\styfiles
-\lipsum
-\clearpage
-\end{document}
diff --git a/macros/latex/contrib/fmtcount/fmtcount.dtx b/macros/latex/contrib/fmtcount/fmtcount.dtx
index 20d2f75195..910ff33571 100644
--- a/macros/latex/contrib/fmtcount/fmtcount.dtx
+++ b/macros/latex/contrib/fmtcount/fmtcount.dtx
@@ -1,11 +1,11 @@
%\iffalse
% fmtcount.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
-% -author "Nicola Talbot and Vincent Belaïche"
% -doc "fmtcount-manual.tex"
+% -author "Nicola Talbot and Vincent Belaïche"
% -src "(.+)\.(sty|def)$=>\1.\2"
% fmtcount
-% Created on 2017/12/26 22:09
+% Created on 2020/1/28 8:17
%\fi
%\iffalse
%<*package>
@@ -28,7 +28,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2017 Nicola Talbot and Vincent Belaïche, all rights reserved.
+% Copyright (C) 2020 Nicola Talbot and Vincent Belaïche, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -77,7 +77,7 @@
pdftitle={fmtcount.sty: Displaying the Values of LaTeX Counters},
pdfkeywords={LaTeX,counter}]{hyperref}
-\CheckSum{10334}
+\CheckSum{10311}
\doxitem{Option}{option}{options}
@@ -104,7 +104,7 @@
% \url{www.dickimaw-books.com}
% \and
% Vincent Bela\"iche}
-% \date{2017-12-26 (version 3.05)\relax
+% \date{2020-01-30 (version 3.06)\relax
%}
% \maketitle
% \tableofcontents
@@ -135,8 +135,8 @@
%is used to format the st, nd, rd, th bit. By default the ordinal is
%formatted as a superscript, if the package option \pkgopt{level} is
%used, it is level with the text. For example, if the current section
-%is 3, then \verb"\ordinal{section}" will produce the output:
-%3\textsuperscript{rd}. Note that the optional argument \meta{gender}
+%is \arabic{section}, then \verb"\ordinal{section}" will produce the output:
+%\ordinal{section}. Note that the optional argument \meta{gender}
%occurs \emph{at the end}. This argument may only take one of
%the following values: \texttt{m} (masculine), \texttt{f}
%(feminine) or \texttt{n} (neuter.) If \meta{gender} is omitted,
@@ -155,24 +155,20 @@
%\end{definition}
%to access \styfmt{fmtcount}'s version of \cs{ordinal}, and use
%\cs{ordinal} to use \cls{memoir}'s version of that command.
-%
-%\item As with all commands which have an optional argument as the
-%last argument, if the optional argument is omitted, any spaces
-%following the final argument will be ignored. Whereas, if the
-%optional argument is present, any spaces following the optional
-%argument won't be ignored. so \verb"\ordinal{section} !"
-%will produce: 3\textsuperscript{rd}! whereas
-% \verb"\ordinal{section}[m] !" will produce:
-%3\textsuperscript{rd} !
+%\item When the \oarg{gender} optional argument is omitted, no ignoring of spaces
+% following the final argument occurs. So both
+% \verb"\ordinal{section}"\textvisiblespace\verb"!" and
+% \verb"\ordinal{section}[m]"\textvisiblespace\verb"!" will produce:
+% \ordinal{section}\textvisiblespace!, where \textvisiblespace\ denotes a space. See
+% \S~\ref{sec:tailing-oarg}.
%\end{enumerate}
%
%The commands below only work for numbers in the range 0~to~99999.
%\begin{definition}[\DescribeMacro{\ordinalnum}]
%\cs{ordinalnum}\marg{n}\oarg{gender}
%\end{definition}
-%This is like \cs{ordinal} but takes an actual number rather than a
-%counter as the argument. For example: \verb"\ordinalnum{3}" will
-%produce: 3\textsuperscript{rd}.
+%This is like \cs{ordinal} but takes an actual number rather than a counter as the argument. For example:
+%\verb"\ordinalnum{"\texttt{\arabic{section}}\verb"}" will produce: \ordinal{section}.
%
%\begin{definition}[\DescribeMacro{\numberstring}]
%\cs{numberstring}\marg{counter}\oarg{gender}
@@ -186,7 +182,7 @@
%\end{definition}
%This does the same as \cs{numberstring}, but with initial letters in
%uppercase. For example, \verb"\Numberstring{section}" will produce:
-%Three.
+%\Numberstring{section}.
%
%\begin{definition}[\DescribeMacro{\NUMBERstring}]
%\cs{NUMBERstring}\marg{counter}\oarg{gender}
@@ -225,7 +221,7 @@
%\end{definition}
%This does the same as \cs{ordinalstring}, but with initial letters in
%uppercase. For example, \verb"\Ordinalstring{section}" will produce:
-%Third.
+%\Ordinalstring{section}.
%
%\begin{definition}[\DescribeMacro{\ORDINALstring}]
%\cs{ORDINALstring}\marg{counter}\oarg{gender}
@@ -243,9 +239,10 @@
%\cs{ORDINALstringnum}\marg{n}\oarg{gender}
%\end{definition}
%These macros work like \cs{ordinalstring}, \cs{Ordinalstring} and
-%\cs{ORDINALstring}, respectively, but take an actual number rather
-%than a counter as the argument. For example,
-%\verb"\ordinalstringnum{3}" will produce: third.
+%\cs{ORDINALstring}, respectively, but take an actual number rather than a
+%counter as the argument. For example,
+%\verb"\ordinalstringnum{"\texttt{\arabic{section}}\verb"}" will produce:
+%\ordinalstring{section}.
%
%\changes{v.1.09}{21 Apr 2007}{store facility added}
%As from version 1.09, textual representations can be stored for
@@ -328,14 +325,15 @@
%\begin{definition}[\DescribeMacro{\binary}]
%\cs{binary}\marg{counter}
%\end{definition}
-%This will print the value of \meta{counter} as a binary number.
-%E.g.\ \verb"\binary{section}" will produce: 11. The declaration
+%This will print the value of \meta{counter} as a binary number. E.g.\
+%\verb"\binary{section}" will produce: \binary{section}. The declaration
%\begin{definition}[\DescribeMacro{\padzeroes}]
%\cs{padzeroes}\oarg{n}
%\end{definition}
-%will ensure numbers are written to \meta{n} digits, padding with
-%zeroes if necessary. E.g.\ \verb"\padzeroes[8]\binary{section}" will
-%produce: 00000011. The default value for \meta{n} is 17.
+%will ensure numbers are written to \meta{n} digits, padding with zeroes if
+%necessary. E.g.\ \verb"\padzeroes"\discretionary{}{}{}\verb"[8]\binary{section}"
+%will produce: \padzeroes[8]\binary{section}. The default value for \meta{n} is
+%17.
%
%\begin{definition}[\DescribeMacro{\binarynum}]
%\cs{binary}\marg{n}
@@ -370,32 +368,43 @@
%will be padded with zeroes if necessary, depending on whether
%\cs{padzeroes} has been used.
%
-%\begin{definition}[\DescribeMacro{\Hexadecimal}]
-%\cs{Hexadecimal}\marg{counter}
+%\begin{definition}[\DescribeMacro{\HEXADecimal}]
+%\cs{HEXADecimal}\marg{counter}
%\end{definition}
%This does the same thing, but uses uppercase characters, e.g.\
-%\verb"\Hexadecimal{mycounter}" will produce: 7D.
+%\verb"\HEXADecimal{mycounter}" will produce: 7D.
+%
+%\DescribeMacro{\Hexadecimal}The macro \cs{Hexadecimal} is a deprecated alias of
+%\cs{HEXADecimal}. Its name was confusing so it was
+%changed. See~\ref{sec:macro-naming}.
+%
%
%\begin{definition}[\DescribeMacro{\hexadecimalnum}]
%\cs{hexadecimalnum}\marg{n}
%\end{definition}
%
-%\begin{definition}[\DescribeMacro{\Hexadecimalnum}]
-%\cs{Hexadecimalnum}\marg{n}
+%\begin{definition}[\DescribeMacro{\HEXADecimalnum}]
+%\cs{HEXADecimalnum}\marg{n}
%\end{definition}
%These are like \cs{hexadecimal} and \cs{Hexadecimal}
%but take an actual number rather than a counter as the
%argument. For example: \verb"\hexadecimalnum{125}" will
-%produce: 7d, and \verb"\Hexadecimalnum{125}" will
+%produce: 7d, and \verb"\HEXADecimalnum{125}" will
%produce: 7D.
%
+%\DescribeMacro{\Hexadecimalnum}The macro \cs{Hexadecimalnum} is a deprecated
+%alias of \cs{HEXADecimalnum}. Its name was confusing so it was changed.
+%See~\ref{sec:macro-naming}.
+%
+%
%\begin{definition}[\DescribeMacro{\decimal}]
%\cs{decimal}\marg{counter}
%\end{definition}
-%This is similar to \cs{arabic} but the number can be padded with
-%zeroes depending on whether \cs{padzeroes} has been used. For
-%example: \verb"\padzeroes[8]\decimal{section}" will produce:
-%00000005.
+%This is similar to \cs{arabic} but the number can be padded with zeroes
+%depending on whether \cs{padzeroes} has been used. For example:
+%\verb"\padzeroes[8]\decimal{section}" will produce:
+%\padzeroes[8]\decimal{section} still assuming current section is
+%section~\arabic{section}.
%
%\begin{definition}[\DescribeMacro{\decimalnum}]
%\cs{decimalnum}\marg{n}
@@ -407,8 +416,8 @@
%\begin{definition}[\DescribeMacro{\aaalph}]
%\cs{aaalph}\marg{counter}
%\end{definition}
-%This will print the value of \meta{counter} as: a b \ldots\ z aa bb
-%\ldots\ zz etc. For example, \verb"\aaalpha{mycounter}" will
+%This will print the value of \meta{counter} as: a b \ldots\ z aa bb \ldots\ zz
+%etc. For example, \verb"\aaalpha"\discretionary{}{}{}\verb"{mycounter}" will
%produce: uuuuu if \texttt{mycounter} is set to 125.
%
%\begin{definition}[\DescribeMacro{\AAAlph}]
@@ -819,7 +828,7 @@
%La valeur par défaut de cette option est \og\texttt{le}\fg. Il s'agit de la terminaison ajoutée à \og
%mil\fg\ pour former le pluriel, c'est à dire \og mille\fg, cette option ne sert pas à grand chose sauf dans
%l'éventualité où ce pluriel serait francisé un jour --- à dire vrai si cela se produisait une alternance
-%mille/milles est plus vraisemblable, car \og mille\fg\ est plus fréquent que \og mille\fg\ et que les
+%mille/milles est plus vraisemblable, car \og mille\fg\ est plus fréquent que \og mil\fg\ et que les
%pluriels francisés sont formés en ajoutant \og s\fg\ à la forme la plus fréquente, par exemple \og
%blini/blinis\fg, alors que \og blini\fg\ veut dire \og crêpes\fg\ (au pluriel).
%
@@ -880,9 +889,56 @@
%
%\end{itemize}
%
+%\section{Miscellaneous}
+%\label{sec:misc}
+%
+%\subsection{Handling of spaces with tailing optional argument}
+%\label{sec:tailing-oarg}
+%
+%Quite some of the commands in \styfmt{fmtcount} have a tailing optional argument, notably a \oarg{gender}
+%argument, which is due to historical reasons, and is a little unfortunate.
+%
+%When the tailing optional argument is omitted, then any subsequent space will:
+%\begin{itemize}
+%\item \texttt{not} be gobbled if the command make some typset output, like \cs{ordinal} or \cs{numbestring}, and
+%\item be gobbled if the command stores a number into a label like \cs{storeordinalnum} or
+% \cs{storenumberstring}, or make some other border effect like \cs{padzeroes} without any typeset output.
+%\end{itemize}
+%
+%So (where we use visible spaces ``\verb*! !'' to demonstrate the point):
+%\begin{itemize}
+%\item ``x\cs{odinalnum\{2\}}\verb*! !\texttt{x}'' will be typeset to ``x\ordinalnum{2}\textvisiblespace x'', while
+%\item ``x\cs{storeodinalnum\{mylabel\}\{2\}}\verb*! !\texttt{x}'' will be typeset to ``xx''.
+%\end{itemize}
+%
+%The reason for this design choice is that the commands like like \cs{ordinal} or \cs{numbestring} are usually
+%inserted in the flow of text, and one usually does not want subsequent spaces gobbled, while the commands like
+%\cs{storeordinalnum} or \cs{storenumberstring} usually stands on their own line, and one usually does not want
+%the tailing end-of-line to produce an extra-space.
+%
+%\subsection{Macro naming conventions}
+%\label{sec:macro-naming}
+%
+%Macros that refer to upper-casing have upper case only in the main part of their name. That is to say the
+%words ``store'', ``string'' or ``num'' are not upper-cased for instance in \cs{storeORDINALstringnum},
+%\cs{storeOrdinalstringnum} or in \cs{NUMBERstringnum}.
+%
+%Furthermore, when upper-casing all the number letters is considered, the main part of the name is:
+%\begin{itemize}
+%\item all in upper-case when it consist of a single word that is not composed of a prefix+radix, for instance
+% ``ORDINAL'' or ``NUMBER'', and
+%\item with the prefix all in upper-case, and only the first letter of the radix in upper-case for words that
+% consist of a prefix+radix, for instance ``HEXADecimal'' or ``AAAlph'' because they can be considered as a
+% prefix+radix construct ``hexa+decimal'' or ``aa+alph''.
+%\end{itemize}
+%
+%Observance of this rule is the reason why macros \cs{Hexadecimal} and \cs{Hexadecimalnum} were respectively
+%renamed as \cs{HEXADecimal} and \cs{HEXADecimalnum} from v3.06.
+%
+%
%\section{Acknowledgements}
%
-%I would like to thank all the people who have provided translations.
+%I would like to thank all the people who have provided translations and made bug reports.
%
%\section{Troubleshooting}
%
@@ -895,6 +951,7 @@
%
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
%
%\StopEventually{}
@@ -3558,7 +3615,7 @@ z\'ero%
% German definitions (thank you to K. H. Fricke for supplying
% this information)
% \begin{macrocode}
-\ProvidesFCLanguage{german}[2016/01/12]%
+\ProvidesFCLanguage{german}[2018/06/17]%
% \end{macrocode}
% Define macro that converts a number or count register (first
% argument) to an ordinal, and stores the result in the
@@ -4043,13 +4100,16 @@ z\'ero%
}%
\global\let\@@numberunderhundredthgerman\@@numberunderhundredthgerman
% \end{macrocode}
+%\changes{3.06}{2018/06/17}{Use \cs{@orgargctr} counter in order to fix bug
+%\href{https://github.com/nlct/fmtcount/issues/33}{\#33}.}
% \begin{macrocode}
\newcommand*\@@ordinalstringgerman[2]{%
-\ifnum#1>99999\relax
+\@orgargctr=#1\relax
+\ifnum\@orgargctr>99999\relax
\PackageError{fmtcount}{Out of range}%
{This macro only works for values less than 100000}%
\else
- \ifnum#1<0\relax
+ \ifnum\@orgargctr<0\relax
\PackageError{fmtcount}{Negative numbers not permitted}%
{This macro does not work for negative numbers, however
you can try typing "minus" first, and then pass the modulus of
@@ -4057,7 +4117,7 @@ z\'ero%
\fi
\fi
\def#2{}%
-\@strctr=#1\relax \divide\@strctr by 1000\relax
+\@strctr=\@orgargctr\divide\@strctr by 1000\relax
\ifnum\@strctr>1\relax
% \end{macrocode}
% \#1 is $\geq 2000$, \cs{@strctr} now contains the number of thousands
@@ -4066,7 +4126,7 @@ z\'ero%
% \end{macrocode}
% is that it, or is there more?
% \begin{macrocode}
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{1000}%
+ \@tmpstrctr=\@orgargctr\@FCmodulo{\@tmpstrctr}{1000}%
\ifnum\@tmpstrctr=0\relax
\eappto#2{\@thousandth}%
\else
@@ -4077,14 +4137,14 @@ z\'ero%
% \#1 lies in range [1000,1999]
% \begin{macrocode}
\ifnum\@strctr=1\relax
- \ifnum#1=1000\relax
+ \ifnum\@orgargctr=1000\relax
\eappto#2{\@thousandth}%
\else
\eappto#2{\eintausend}%
\fi
\fi
\fi
-\@strctr=#1\relax
+\@strctr=\@orgargctr
\@FCmodulo{\@strctr}{1000}%
\divide\@strctr by 100\relax
\ifnum\@strctr>1\relax
@@ -4092,7 +4152,7 @@ z\'ero%
% now dealing with number in range [200,999]
% is that it, or is there more?
% \begin{macrocode}
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}%
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
\ifnum\@tmpstrctr=0\relax
\ifnum\@strctr=1\relax
\eappto#2{\@hundredth}%
@@ -4108,11 +4168,11 @@ z\'ero%
% dealing with number in range [100,199]
% is that it, or is there more?
% \begin{macrocode}
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}%
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
\ifnum\@tmpstrctr=0\relax
\eappto#2{\@hundredth}%
\else
- \ifnum#1>1000\relax
+ \ifnum\@orgargctr>1000\relax
\appto#2{einhundert}%
\else
\eappto#2{\einhundert}%
@@ -4120,9 +4180,9 @@ z\'ero%
\fi
\fi
\fi
-\@strctr=#1\relax
+\@strctr=\@orgargctr
\@FCmodulo{\@strctr}{100}%
-\ifthenelse{\@strctr=0 \and #1>0}{}{%
+\ifthenelse{\@strctr=0 \and \@orgargctr>0 }{}{%
\@@numberunderhundredthgerman{\@strctr}{#2}%
}%
}%
@@ -7420,7 +7480,7 @@ this number}%
% This section deals with the code for |fmtcount.sty|
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2017/12/24 v3.05]
+\ProvidesPackage{fmtcount}[2020/01/30 v3.06]
\RequirePackage{ifthen}
% \end{macrocode}
% \changes{3.01}{2014/12/03}{Use \styfmt{xkeyval} instead of \styfmt{keyval}, so that we do not get in trouble
@@ -7975,7 +8035,7 @@ italian}
\let\octalnum=\@octal
% \end{macrocode}
%\end{macro}
-%\begin{macro}{\@@hexadecimalnum}
+%\begin{macro}{\@@hexadecimal}
% Converts number from 0 to 15 into lowercase hexadecimal notation.
% \begin{macrocode}
\newcommand*{\@@hexadecimal}[1]{%
@@ -7988,34 +8048,13 @@ italian}
% Converts a decimal number to a lowercase hexadecimal number,
% and displays it.
%\changes{3.02}{2016/01/08}{Made robust using \texttt{etoolbox} \cs{newrobustcmd}}
+%\changes{3.06}{2018/06/27}{Rename \cs{Hexadecimalnum} to \cs{HEXADecimalnum} and \cs{Hexadecimal} to
+% \cs{HEXADecimal} and factorize the code between \cs{HEXADecimalnum} and \cs{hexadecimalnum}.}
% \begin{macrocode}
-\newrobustcmd*{\@hexadecimal}[1]{%
- \@DT@padzeroestrue
- \@DT@loopN=\@vpt
- \@strctr=\@DT@loopN
- \whiledo{\@strctr<\c@padzeroesN}{0\advance\@strctr by \@ne}%
- \@strctr=65536\relax
- \@DT@X=#1\relax
- \loop
- \@DT@modctr=\@DT@X
- \divide\@DT@modctr by \@strctr
- \ifthenelse{\boolean{@DT@padzeroes}
- \and \(\@DT@modctr=0\)
- \and \(\@DT@loopN>\c@padzeroesN\)}
- {}{\@@hexadecimal\@DT@modctr}%
- \ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi
- \multiply\@DT@modctr by \@strctr
- \advance\@DT@X by -\@DT@modctr
- \divide\@strctr by 16\relax
- \advance\@DT@loopN by \m@ne
- \ifnum\@strctr>\@ne
- \repeat
- \@@hexadecimal\@DT@X
-}
-\let\hexadecimalnum=\@hexadecimal
+\newrobustcmd*{\hexadecimalnum}{\@hexadecimalengine\@@hexadecimal}
% \end{macrocode}
%\end{macro}
-%\begin{macro}{\@@Hexadecimalnum}
+%\begin{macro}{\@@Hexadecimal}
% Converts number from 0 to 15 into uppercase hexadecimal notation.
% \begin{macrocode}
\newcommand*{\@@Hexadecimal}[1]{%
@@ -8024,24 +8063,27 @@ italian}
}
% \end{macrocode}
%\end{macro}
-%\begin{macro}{\Hexadecimalnum}
+%\begin{macro}{\HEXADecimalnum}
% Uppercase hexadecimal
%\changes{3.02}{2016/01/08}{Made robust using \texttt{etoolbox} \cs{newrobustcmd}}
+%\changes{3.06}{2018/06/27}{Rename \cs{Hexadecimalnum} to \cs{HEXADecimalnum} and \cs{Hexadecimal} to
+% \cs{HEXADecimal} and factorize the code between \cs{HEXADecimalnum} and \cs{hexadecimalnum}.}
% \begin{macrocode}
-\newrobustcmd*{\@Hexadecimal}[1]{%
+\newrobustcmd*{\HEXADecimalnum}{\@hexadecimalengine\@@Hexadecimal}
+\newcommand*{\@hexadecimalengine}[2]{%
\@DT@padzeroestrue
- \@DT@loopN=5\relax
+ \@DT@loopN=\@vpt
\@strctr=\@DT@loopN
\whiledo{\@strctr<\c@padzeroesN}{0\advance\@strctr by \@ne}%
\@strctr=65536\relax
- \@DT@X=#1\relax
+ \@DT@X=#2\relax
\loop
\@DT@modctr=\@DT@X
\divide\@DT@modctr by \@strctr
\ifthenelse{\boolean{@DT@padzeroes}
\and \(\@DT@modctr=0\)
- \and \(\@DT@loopN>\c@padzeroesN\)}%
- {}{\@@Hexadecimal\@DT@modctr}%
+ \and \(\@DT@loopN>\c@padzeroesN\)}
+ {}{#1\@DT@modctr}%
\ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi
\multiply\@DT@modctr by \@strctr
\advance\@DT@X by -\@DT@modctr
@@ -8049,10 +8091,13 @@ italian}
\advance\@DT@loopN by \m@ne
\ifnum\@strctr>\@ne
\repeat
- \@@Hexadecimal\@DT@X
+ #1\@DT@X
}
-
-\let\Hexadecimalnum=\@Hexadecimal
+\def\Hexadecimalnum{%
+ \PackageWarning{fmtcount}{\string\Hexadecimalnum\space is deprecated, use \string\HEXADecimalnum\space
+ instead. The \string\Hexadecimalnum\space control sequence name is confusing as it can mislead in thinking
+ that only the 1st letter is upper-cased.}%
+ \HEXADecimalnum}
% \end{macrocode}
%\end{macro}
%\begin{macro}{\aaalphnum}
@@ -9155,12 +9200,12 @@ italian}
% compatibily with \texttt{glossaries}.}
% \begin{macrocode}
\providecommand*{\hexadecimal}[1]{%
- \@hexadecimal{\expandafter\expandafter\expandafter
+ \hexadecimalnum{\expandafter\expandafter\expandafter
\the\value{#1}}%
}
% \end{macrocode}
%\end{macro}
-%\begin{macro}{\Hexadecimal}
+%\begin{macro}{\HEXADecimal}
% As above, but in upper case.
% \changes{3.02}{2016/01/08}{Suppress useless \cs{expandafter}'s and
% and use \cs{value} instead tweaking with \cs{csname}. Do not use any
@@ -9171,10 +9216,18 @@ italian}
% supposed to fully expand its argument, and place 3 \cs{expandafter}'s before \cs{the}\cs{value} for
% compatibily with \texttt{glossaries}.}
% \begin{macrocode}
-\providecommand*{\Hexadecimal}[1]{%
- \@Hexadecimal{\expandafter\expandafter\expandafter
+\providecommand*{\HEXADecimal}[1]{%
+ \HEXADecimalnum{\expandafter\expandafter\expandafter
\the\value{#1}}%
}
+\newrobustcmd*\FC@Hexadecimal@warning{%
+ \PackageWarning{fmtcount}{\string\Hexadecimal\space is deprecated, use \string\HEXADecimal\space
+ instead. The \string\Hexadecimal\space control sequence name is confusing as it can mislead in thinking
+ that only the 1st letter is upper-cased.}%
+}
+\def\Hexadecimal{%
+ \FC@Hexadecimal@warning
+ \HEXADecimal}
% \end{macrocode}
%\end{macro}
%\begin{macro}{\octal}
diff --git a/macros/latex/contrib/fmtcount/fmtcount.ins b/macros/latex/contrib/fmtcount/fmtcount.ins
index 0c6535c3e7..7c4395ef39 100644
--- a/macros/latex/contrib/fmtcount/fmtcount.ins
+++ b/macros/latex/contrib/fmtcount/fmtcount.ins
@@ -1,10 +1,10 @@
-% fmtcount.ins generated using makedtx version 1.2 2017/12/26 22:09
+% fmtcount.ins generated using makedtx version 1.2 2020/1/28 8:17
\input docstrip
\preamble
fmtcount.dtx
- Copyright 2017 Nicola Talbot and Vincent Belaïche
+ Copyright 2020 Nicola Talbot and Vincent Belaïche
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/fmtcount/fmtcount.pdf b/macros/latex/contrib/fmtcount/fmtcount.pdf
index e5e1950401..e5eaf4d23e 100644
--- a/macros/latex/contrib/fmtcount/fmtcount.pdf
+++ b/macros/latex/contrib/fmtcount/fmtcount.pdf
Binary files differ
diff --git a/macros/latex/contrib/hycolor/hycolor.dtx b/macros/latex/contrib/hycolor/hycolor.dtx
index 8282fb0547..8e211c02a0 100644
--- a/macros/latex/contrib/hycolor/hycolor.dtx
+++ b/macros/latex/contrib/hycolor/hycolor.dtx
@@ -1,12 +1,12 @@
% \iffalse meta-comment
%
% File: hycolor.dtx
-% Version: 2019/12/15 v1.9
+% Version: 2020-01-27 v1.10
% Info: Color options for hyperref/bookmark
%
% Copyright (C)
% 2007-2011 Heiko Oberdiek
-% 2016-2019 Oberdiek Package Support Group
+% 2016-2020 Oberdiek Package Support Group
% https://github.com/ho-tex/hycolor/issues
%
% This work may be distributed and/or modified under the
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex hycolor.dtx
% makeindex -s gind.ist hycolor.idx
% pdflatex hycolor.dtx
@@ -81,7 +81,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hycolor 2019/12/15 v1.9 Color options for hyperref/bookmark (HO)}
+\Msg{* Package: hycolor 2020-01-27 v1.10 Color options for hyperref/bookmark (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -93,11 +93,11 @@
This is a generated file.
Project: hycolor
-Version: 2019/12/15 v1.9
+Version: 2020-01-27 v1.10
Copyright (C)
2007-2011 Heiko Oberdiek
- 2016-2019 Oberdiek Package Support Group
+ 2016-2020 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -156,7 +156,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hycolor.drv}%
- [2019/12/15 v1.9 Color options for hyperref/bookmark (HO)]%
+ [2020-01-27 v1.10 Color options for hyperref/bookmark (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage[ruled]{algorithm2e}
@@ -205,7 +205,7 @@ and the derived files
% \GetFileInfo{hycolor.drv}
%
% \title{The \xpackage{hycolor} package}
-% \date{2019/12/15 v1.9}
+% \date{2020-01-27 v1.10}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/hycolor/issues}}}
%
@@ -232,7 +232,7 @@ and the derived files
% \begin{quote}
% |\hypersetup{linkbordercolor=red}%| needs \xpackage{xcolor}\\
% |\hypersetup{linkbordercolor=[named]{red}}%| needs \xpackage{xcolor}\\
-% |\hypersetup{linkbordercolor=[rgb]{1,0,0}}|\\
+% |\hypersetup{linkbordercolor=[rgb]{1,0,0}}|
% \end{quote}
%
% Without package \xpackage{xcolor} some of the options only
@@ -270,7 +270,6 @@ and the derived files
%
% \subsection{Summary}
%
-% \begin{quote}
% \begin{tabular}{@{}llll@{}}
% Color option & Models without \xpackage{xcolor}
% & RGB color & Model empty\\
@@ -281,12 +280,12 @@ and the derived files
% |Field.*color| & |gray|, |rgb|, |cmyk| & yes & yes\\
% |AtFi.color| & |gray|, |rgb| & yes & no\\
% \end{tabular}
-% \end{quote}
+%
% ``RGB color'' means that the color value can be given as
% space separated RGB numbers (real numbers in the range
% from 0 to 1).
% Explanation of the color option prefixes:
-% \begin{quote}
+%
% \begin{tabular}{@{}ll@{}}
% Prefix & Explanation\\
% \hline
@@ -297,7 +296,7 @@ and the derived files
% Form field options\\
% |AtFi| & Package \xpackage{attachfile2}: option \xoption{color}\\
% \end{tabular}
-% \end{quote}
+%
%
% \StopEventually{
% }
@@ -308,11 +307,99 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hycolor}%
- [2019/12/15 v1.9 Color options for hyperref/bookmark (HO)]%
+ [2020-01-27 v1.10 Color options for hyperref/bookmark (HO)]%
% \end{macrocode}
%
+% Should not be needed after \textsf{xcolor} updates,
+% Avoid loading \xpackage{xcolor-patch} but fix Gray color model.
% \begin{macrocode}
-\RequirePackage{xcolor-patch}[2019/12/15]
+% \RequirePackage{xcolor-patch}[2019/12/15]
+\AtBeginDocument{%
+\def\@tempa#1,{%
+ \XC@ifxcase\tm{%
+ \XC@mod@rgb{%
+ \XC@calcN{#1}\@@tmp
+ \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}%
+ }%
+ \XC@mod@cmy{%
+ \XC@calcC{#1}\@@tmp
+ \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}%
+ }%
+ \XC@mod@cmyk{%
+ \XC@calcC{#1}\@@tmp
+ \edef\@@tmp{0,0,0,\@@tmp}%
+ }%
+ \XC@mod@RGB{%
+ \edef\@@scl{\rangeRGB}%
+ \XC@calcM{#1}\@@tmp
+ \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}%
+ }%
+ \XC@mod@HTML{%
+ \edef\@@scl{\@cclv}%
+ \XC@calcM{#1}\@@tmp
+ \XC@calcH\@@tmp\@@tmp
+ \edef\@@tmp{\@@tmp\@@tmp\@@tmp}%
+ }%
+ \XC@mod@HSB{%
+ \edef\@@scl{\rangeHSB}%
+ \XC@calcM{#1}\@@tmp
+ \edef\@@tmp{0,0,\@@tmp}%
+ }%
+ \XC@mod@Gray{%
+ \edef\@@scl{\rangeGray}%
+ \XC@calcM{#1}\@@tmp
+ }%
+ }%
+ {%
+ \XC@calcN{#1}\@@tmp
+ \edef\@@tmp{0,0,\@@tmp}%
+ }%
+ }%
+\ifx\XC@cnv@gray\@tempa
+ \def\XC@cnv@gray#1,{%
+ \XC@ifxcase\tm{%
+ \XC@mod@rgb{%
+ \XC@calcN{#1}\@@tmp
+ \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}%
+ }%
+ \XC@mod@gray{}%
+ \XC@mod@cmy{%
+ \XC@calcC{#1}\@@tmp
+ \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}%
+ }%
+ \XC@mod@cmyk{%
+ \XC@calcC{#1}\@@tmp
+ \edef\@@tmp{0,0,0,\@@tmp}%
+ }%
+ \XC@mod@RGB{%
+ \edef\@@scl{\rangeRGB}%
+ \XC@calcM{#1}\@@tmp
+ \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}%
+ }%
+ \XC@mod@HTML{%
+ \edef\@@scl{\@cclv}%
+ \XC@calcM{#1}\@@tmp
+ \XC@calcH\@@tmp\@@tmp
+ \edef\@@tmp{\@@tmp\@@tmp\@@tmp}%
+ }%
+ \XC@mod@HSB{%
+ \edef\@@scl{\rangeHSB}%
+ \XC@calcM{#1}\@@tmp
+ \edef\@@tmp{0,0,\@@tmp}%
+ }%
+ \XC@mod@Gray{%
+ \edef\@@scl{\rangeGray}%
+ \XC@calcM{#1}\@@tmp
+ }%
+ }%
+ {%
+ \XC@calcN{#1}\@@tmp
+ \edef\@@tmp{0,0,\@@tmp}%
+ }%
+ }%
+\fi
+\let\@tempa\relax
+}
% \end{macrocode}
%
% \subsection{Normalization}
@@ -653,11 +740,11 @@ and the derived files
%
% \begin{macrocode}
\def\HyColor@UseColor#1{%
- \ifx#1\relax
+ \ifx\relax#1\@empty
\else
- \ifx#1\@empty
+ \ifx\@empty#1\@empty
\else
- \expandafter\HyColor@@UseColor#1\@nil
+ \expandafter\expandafter\expandafter\HyColor@@UseColor#1\@nil
\fi
\fi
}
@@ -706,7 +793,7 @@ and the derived files
% \subsubsection{Generic algorithm}
%
% \begin{procedure}
-% \small
+% \footnotesize
% \Param{value}{value of the option}
% \Param{cmd}{macro for result}
% \Param{package}{package name for error message}
@@ -1218,7 +1305,7 @@ and the derived files
% \begin{macrocode}
%<*xcolor>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xcolor-patch}[2019/12/15 xcolor patch]
+\ProvidesPackage{xcolor-patch}[2020/01/27 v1.10 xcolor patch]
% \end{macrocode}
% \begin{macrocode}
\RequirePackage{hopatch}
@@ -1415,25 +1502,6 @@ and the derived files
% \end{description}
%
%
-% \paragraph{Bundle.} All the packages of the bundle `hycolor'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/hycolor.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTANpkg{tds}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{hycolor.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-% |unzip hycolor.tds.zip -d ~/texmf|
-% \end{quote}
%
% \subsection{Package installation}
%
@@ -1608,6 +1676,10 @@ and the derived files
% \item
% Do not load \xpackage{xcolor-patch} by default.
% \end{Version}
+% \begin{Version}{2020-01-27 v1.10}
+% \item extra expansion step to avoid \verb|! LaTeX Error: Undefined color `[{rgb}]| errors in hyperref.
+% \item add fix to Gray model from \xpackage{xcolor-patch}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/macros/latex/contrib/hycolor/hycolor.pdf b/macros/latex/contrib/hycolor/hycolor.pdf
index f2c73d016f..7721c58658 100644
--- a/macros/latex/contrib/hycolor/hycolor.pdf
+++ b/macros/latex/contrib/hycolor/hycolor.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/README.md b/macros/latex/contrib/nwejm/README.md
index 9898194051..c7148fff8b 100644
--- a/macros/latex/contrib/nwejm/README.md
+++ b/macros/latex/contrib/nwejm/README.md
@@ -8,7 +8,7 @@ new journal "North-Western European Journal of Mathematics".
Release
-------
-2019/03/18 v0.98f
+2020-01-28 v1.0.0
Development
-----------
diff --git a/macros/latex/contrib/nwejm/doc/examples/article-in-dutch.pdf b/macros/latex/contrib/nwejm/doc/examples/article-in-dutch.pdf
index ea1377925e..e0c9d68ced 100644
--- a/macros/latex/contrib/nwejm/doc/examples/article-in-dutch.pdf
+++ b/macros/latex/contrib/nwejm/doc/examples/article-in-dutch.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/doc/examples/article-in-english.pdf b/macros/latex/contrib/nwejm/doc/examples/article-in-english.pdf
index f22973941b..949d85495f 100644
--- a/macros/latex/contrib/nwejm/doc/examples/article-in-english.pdf
+++ b/macros/latex/contrib/nwejm/doc/examples/article-in-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/doc/examples/article-in-french.pdf b/macros/latex/contrib/nwejm/doc/examples/article-in-french.pdf
index a333ca930b..78b2ca4bde 100644
--- a/macros/latex/contrib/nwejm/doc/examples/article-in-french.pdf
+++ b/macros/latex/contrib/nwejm/doc/examples/article-in-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/doc/examples/article-in-german.pdf b/macros/latex/contrib/nwejm/doc/examples/article-in-german.pdf
index 9f226a86f4..d78a34e74a 100644
--- a/macros/latex/contrib/nwejm/doc/examples/article-in-german.pdf
+++ b/macros/latex/contrib/nwejm/doc/examples/article-in-german.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/doc/examples/issue.pdf b/macros/latex/contrib/nwejm/doc/examples/issue.pdf
index 9ed713d94a..a5be13e1bd 100644
--- a/macros/latex/contrib/nwejm/doc/examples/issue.pdf
+++ b/macros/latex/contrib/nwejm/doc/examples/issue.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/doc/examples/sample.pdf b/macros/latex/contrib/nwejm/doc/examples/sample.pdf
index 98ab36d425..78ac4e0e52 100644
--- a/macros/latex/contrib/nwejm/doc/examples/sample.pdf
+++ b/macros/latex/contrib/nwejm/doc/examples/sample.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/doc/nwejm-fr.pdf b/macros/latex/contrib/nwejm/doc/nwejm-fr.pdf
index 556fa88645..43f0b010ff 100644
--- a/macros/latex/contrib/nwejm/doc/nwejm-fr.pdf
+++ b/macros/latex/contrib/nwejm/doc/nwejm-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/source/nwejm.dtx b/macros/latex/contrib/nwejm/source/nwejm.dtx
index a5efc1fe1e..9c130bc183 100644
--- a/macros/latex/contrib/nwejm/source/nwejm.dtx
+++ b/macros/latex/contrib/nwejm/source/nwejm.dtx
@@ -13,7 +13,7 @@ new journal "North-Western European Journal of Mathematics".
Release
-------
-2019/03/18 v0.98f
+2020-01-28 v1.0.0
Development
-----------
@@ -44,7 +44,7 @@ https://github.com/dbitouze/nwejm.
\input l3docstrip.tex
\Msg{********************************************************}
\Msg{* Installation}
-\Msg{* Class: nwejm 2019/03/18 v0.98f}
+\Msg{* Class: nwejm 2020-01-28 v1.0.0}
\Msg{* for the journal}
\Msg{* "North-Western European Journal of Mathematics" (DB)}
\Msg{********************************************************}
@@ -61,7 +61,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later
\endpreamble
\postamble
-Copyright (C) 2015-2019 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
+Copyright (C) 2015-2020 by Denis Bitouze <denis.bitouze@univ-littoral.fr>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -174,7 +174,7 @@ Running "make install" installs the files in the local TeX tree.
%
%\maketitle
%
-% \changes{v0.98f}{2019/03/18}{%
+% \changes{v1.0.0}{2020-01-28}{%
% \begin{itemize}
% \item ix page numbers of the standalone articles were not deduced from the
% whole issue.
@@ -312,8 +312,8 @@ Running "make install" installs the files in the local TeX tree.
\ProvidesExplClass
%<class> {nwejm}
%<class-article> {nwejmart}
- {2019/03/18}
- {0.98f}
+ {2020-01-28}
+ {1.0.0}
{
Class for the journal "North-Western European Journal of Mathematics".
}
@@ -642,11 +642,6 @@ Running "make install" installs the files in the local TeX tree.
\RequirePackage{xr}
% \end{macrocode}
%
-% \item Provide file name and path of input files:
-% \begin{macrocode}
-\RequirePackage{currfile}
-% \end{macrocode}
-%
% \item A range of footnote options:
% \begin{macrocode}
\RequirePackage[multiple]{footmisc}%
@@ -677,6 +672,76 @@ Running "make install" installs the files in the local TeX tree.
\RequirePackage{ifoddpage}%
% \end{macrocode}
%
+% \item Control float placement:
+% \begin{macrocode}
+\RequirePackage{placeins}%
+% \end{macrocode}
+%
+% \item Define commands that appear not to eat spaces:
+% \begin{macrocode}
+\RequirePackage{xspace}%
+% \end{macrocode}
+%
+% \item Context sensitive quotation facilities:
+% \begin{macrocode}
+\RequirePackage[autostyle]{csquotes}%
+% \end{macrocode}
+%
+% \item Extended implementation of the \LaTeX{} array and
+% tabular–environments:
+% \begin{macrocode}
+\RequirePackage{array}
+% \end{macrocode}
+%
+% \item Publication quality tables in \LaTeX{}:
+% \begin{macrocode}
+\RequirePackage{booktabs}
+% \end{macrocode}
+%
+% \item Extension to \Pkg{amsmath}: correct various bugs/defeciencies in amsmath
+% and useful tools for mathematical typesetting\footnote{The \Pkg{mathtools}
+% loads \pkg{amsmath}, hence it's not necessary to load the
+% latter. It has to be loaded before \pkg{datatool} and \pkg{kpfonts}.}:
+% \begin{macrocode}
+\RequirePackage{mathtools}
+% \end{macrocode}
+%
+% \item Extensions to theorem environments:
+% \begin{macrocode}
+\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem}
+% \end{macrocode}
+%
+% \item Support for using RSFS fonts in maths:
+% \begin{macrocode}
+\RequirePackage{rsfso}
+% \end{macrocode}
+%
+% \item Vector arrows:
+% \begin{macrocode}
+\RequirePackage{esvect}
+% \end{macrocode}
+%
+% Load of main font to be used:
+% \begin{macrocode}
+\RequirePackage[easyscsl,noDcommand]{kpfonts}
+% %<class-article>\RequirePackage[noDcommand]{kpfonts}
+% \end{macrocode}
+%
+% \item Flexible and easy interface to page dimensions:
+% \begin{macrocode}
+\RequirePackage{geometry}
+% \end{macrocode}
+%
+% \item Internationalisation of \LaTeXe{} packages:
+% \begin{macrocode}
+\RequirePackage{translations}%
+% \end{macrocode}
+%
+% \item Provide file name and path of input files:
+% \begin{macrocode}
+\RequirePackage{currfile}
+% \end{macrocode}
+%
% \begin{macrocode}
%</class|class-article>
% \end{macrocode}
@@ -772,71 +837,6 @@ Running "make install" installs the files in the local TeX tree.
%<*class|class-article>
% \end{macrocode}
%
-% \item Control float placement:
-% \begin{macrocode}
-\RequirePackage{placeins}%
-% \end{macrocode}
-%
-% \item Define commands that appear not to eat spaces:
-% \begin{macrocode}
-\RequirePackage{xspace}%
-% \end{macrocode}
-%
-% \item Context sensitive quotation facilities:
-% \begin{macrocode}
-\RequirePackage[autostyle]{csquotes}%
-% \end{macrocode}
-%
-% \item Extended implementation of the \LaTeX{} array and
-% tabular–environments:
-% \begin{macrocode}
-\RequirePackage{array}
-% \end{macrocode}
-%
-% \item Publication quality tables in \LaTeX{}:
-% \begin{macrocode}
-\RequirePackage{booktabs}
-% \end{macrocode}
-%
-% \item Extension to \Pkg{amsmath}: correct various bugs/defeciencies in amsmath
-% and useful tools for mathematical typesetting\footnote{The \Pkg{mathtools}
-% loads \pkg{amsmath}, hence it's not necessary to load the
-% latter. It has to be loaded before \pkg{datatool} and \pkg{kpfonts}.}:
-% \begin{macrocode}
-\RequirePackage{mathtools}
-% \end{macrocode}
-%
-% \item Extensions to theorem environments:
-% \begin{macrocode}
-\RequirePackage[amsmath,thmmarks,fleqn]{ntheorem}
-% \end{macrocode}
-%
-% \item Support for using RSFS fonts in maths:
-% \begin{macrocode}
-\RequirePackage{rsfso}
-% \end{macrocode}
-%
-% \item Vector arrows:
-% \begin{macrocode}
-\RequirePackage{esvect}
-% \end{macrocode}
-%
-% Load of main font to be used:
-% \begin{macrocode}
-\RequirePackage[easyscsl,noDcommand]{kpfonts}
-% %<class-article>\RequirePackage[noDcommand]{kpfonts}
-% \end{macrocode}
-%
-% \item Flexible and easy interface to page dimensions:
-% \begin{macrocode}
-\RequirePackage{geometry}
-% \end{macrocode}
-%
-% \item Internationalisation of \LaTeXe{} packages:
-% \begin{macrocode}
-\RequirePackage{translations}%
-% \end{macrocode}
-%
% \item Display the value of a \LaTeX{} counter in a variety of formats
% \begin{macrocode}
\RequirePackage{fmtcount}%
@@ -1051,10 +1051,18 @@ Running "make install" installs the files in the local TeX tree.
% \begin{macrocode}
\tl_const:Nn \c_@@_computer_engineering_string_tl {Computer~engineering~issues}
% \end{macrocode}
-% For the printer.
+% For the graphic design.
% \begin{macrocode}
\tl_const:Nn \c_@@_graphicdesign_string_tl {Graphic~design}
% \end{macrocode}
+% For the director of the publication.
+% \begin{macrocode}
+\tl_const:Nn \c_@@_publication_director_string_tl {Directeur~de~la~publication}
+% \end{macrocode}
+% For the director of the publication.
+% \begin{macrocode}
+\tl_const:Nn \c_@@_composed_by_string_tl {Composition}
+% \end{macrocode}
% For configuration file.
% \begin{macrocode}
\tl_const:Nn \c_@@_configuration_file_string_tl {nwejm.cfg}
@@ -1669,7 +1677,7 @@ Running "make install" installs the files in the local TeX tree.
% % \begin{macrocode}
% \cleardoublepage
% \pagenumbering{roman}%
-% \setcounter{page}{\c_three}
+% \setcounter{page}{3}
% % \end{macrocode}
% %
% % On the backcover, we want the table of contents (displayed as a chapter,
@@ -1865,7 +1873,7 @@ Running "make install" installs the files in the local TeX tree.
\bfseries%
\adjustbox{stack=l}{%
\c_@@_journal_title_string_tl
-%<class> \\\tl_mixed_case:n{\GetTranslation{volume-abbreviated}}\c_space_tl\int_use:N \g_@@_issue_number_int
+%<class> \\\text_titlecase:n{\GetTranslation{volume-abbreviated}}\c_space_tl\int_use:N \g_@@_issue_number_int
%<class-article> \mbox{}
}
}
@@ -2388,11 +2396,15 @@ Running "make install" installs the files in the local TeX tree.
\medskip%
}
}{
- \_@@_citeauthor_no_giveninits:n {\c_@@_issue_bib_key_tl -#1-
- \exp_not:V\DTLcurrentindex}%
- \tl_if_empty:NF \l_@@_people_email_tl
- {
- \c_space_tl(\_@@_email:n {\l_@@_people_email_tl})
+ \tl_if_in:NnTF \l_@@_people_role_tl { publicationdirector } {
+ \_@@_citeauthor_no_giveninits:n {\c_@@_issue_bib_key_tl -#1- \exp_not:V\DTLcurrentindex},~
+ \l_@@_people_affiliation_tl%
+ }{
+ \_@@_citeauthor_no_giveninits:n {\c_@@_issue_bib_key_tl -#1- \exp_not:V\DTLcurrentindex}%
+ \tl_if_empty:NF \l_@@_people_email_tl
+ {
+ \c_space_tl(\_@@_email:n {\l_@@_people_email_tl})
+ }
}
}
}
@@ -2640,6 +2652,20 @@ Running "make install" installs the files in the local TeX tree.
\_@@_display_people_by_role:n { graphicdesign }
\end{description}
\g_@@_font_designer_text_tl
+ \par
+ \vspace*{\stretch{1}}
+ \selectlanguage{french}
+ \shorthandon{;:!?}
+ \begin{description}
+ \item[\c_@@_publication_director_string_tl{}~:]
+ \_@@_display_people_by_role:n { publicationdirector }
+ \item[\c_@@_composed_by_string_tl{}~:]
+ \_@@_display_people_by_role:n { composer }
+ \end{description}
+ \DTMlangsetup*{showdayofmonth=false}
+ \centering
+ \g_@@_masthead_tl
+ \selectlanguage{english}
\bool_gset_false:N \g_@@_inside_backcover_bool
}
% \end{macrocode}
@@ -2752,7 +2778,7 @@ Running "make install" installs the files in the local TeX tree.
\tl_if_empty:NF {#2}
{
\tl_if_eq:NNF {\c_@@_date_received_tl} {#1} { \c_@@_dates_separator_tl }
- \tl_mixed_case:n { \exp_args:No \GetTranslation{#1} }
+ \text_titlecase:n { \exp_args:No \GetTranslation{#1} }
\c_@@_colon_tl\c_space_tl
\DTMdate{#2}%
}
@@ -2819,7 +2845,7 @@ Running "make install" installs the files in the local TeX tree.
% needs the main file name to be fixed (chosen name: \enquote{issue}). If that's
% not the case an error is thrown.
% \begin{macrocode}
-%<class>\str_if_eq_x:nnTF \c_sys_jobname_str \c_@@_main_file_name_tl {
+%<class>\str_if_eq:eeTF \c_sys_jobname_str \c_@@_main_file_name_tl {
%<class> \bool_if:NT {\g_@@_cover_bool} {
%<class> \msg_error:nn{nwejm}{Wrong~cover's~main~file~name!}
%<class> }
@@ -2925,6 +2951,14 @@ Running "make install" installs the files in the local TeX tree.
{
\_@@_people:nnnnn {#1}{#2}{#3}{#4}{secretary}
}
+\NewDocumentCommand \publicationdirector {mmmm}
+{
+ \_@@_people:nnnnn {#1}{#2}{#3}{#4}{publicationdirector}
+}
+\NewDocumentCommand \composer {mmmm}
+{
+ \_@@_people:nnnnn {#1}{#2}{#3}{#4}{composer}
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3073,6 +3107,20 @@ Running "make install" installs the files in the local TeX tree.
}
}
% \end{macrocode}
+%
+% \begin{macro}{\masthead}
+% We define the command that lets us specify the masthead (\enquote{ours} in French). This
+% setup is likely to be rarely changed.
+% \begin{macrocode}
+\tl_new:N \g_@@_masthead_tl
+\NewDocumentCommand \masthead { +m } {
+ \IfNoValueF {#1}
+ {
+ \tl_gset:Nn \g_@@_masthead_tl {#1}
+ }
+}
+% \end{macrocode}
+%
% \begin{macrocode}
%</class>
% \end{macrocode}
@@ -3205,11 +3253,11 @@ Running "make install" installs the files in the local TeX tree.
}
\clist_map_inline:Nn \l_tmpa_clist {
\crefname{#1}{
- \tl_lower_case:n{
+ \text_lowercase:n{
\GetTranslationFor{french}{#1}
}
}{%
- \tl_lower_case:n{
+ \text_lowercase:n{
\GetTranslationFor{french}{plural-#1}
}
}
@@ -3349,7 +3397,7 @@ Running "make install" installs the files in the local TeX tree.
\clist_map_inline:Nn \g_@@_counters_to_be_reset_clist {
\@ifundefined{c@##1}{
}{
- \setcounter{##1}{\c_zero}
+ \setcounter{##1}{\c_zero_int}
}
}
% \end{macrocode}
@@ -3767,7 +3815,7 @@ Running "make install" installs the files in the local TeX tree.
\noindent
{
\bfseries
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-keyword}
\c_@@_colon_tl
}
@@ -4044,22 +4092,22 @@ Running "make install" installs the files in the local TeX tree.
\int_set:Nn \l_@@_abs_int {\int_abs:n {#1}}
\ifcurrentbaselanguage{english}{
\int_use:N \l_@@_abs_int
- \int_set:Nn \l_tmpa_int {\int_mod:nn {\l_@@_abs_int} {\c_one_hundred}}
+ \int_set:Nn \l_tmpa_int {\int_mod:nn {\l_@@_abs_int} { 100 }}
\int_case:nnF
{ \l_tmpa_int }
{
- { \c_eleven } { \fmtord{th} }
- { \c_twelve } { \fmtord{th} }
- { \c_thirteen } { \fmtord{th} }
+ { 11 } { \fmtord{th} }
+ { 12 } { \fmtord{th} }
+ { 13 } { \fmtord{th} }
}{
- \int_set:Nn \l_tmpb_int {\int_mod:nn {\l_@@_abs_int} {\c_ten}}
+ \int_set:Nn \l_tmpb_int {\int_mod:nn {\l_@@_abs_int} { 10 }}
\int_case:nnF
{ \l_tmpb_int }
{
- { \c_zero } { \fmtord{th} }
- { \c_one } { \fmtord{st} }
- { \c_two } { \fmtord{nd} }
- { \c_three } { \fmtord{rd} }
+ { 0 } { \fmtord{th} }
+ { 1 } { \fmtord{st} }
+ { 2 } { \fmtord{nd} }
+ { 3 } { \fmtord{rd} }
}{
\fmtord{th}
}
@@ -4256,42 +4304,41 @@ Running "make install" installs the files in the local TeX tree.
{
\IfTranslation{English}{#1}{%
}{%
- \DeclareTranslation{English}{#1}{\tl_mixed_case:n{#2}}%
+ \DeclareTranslation{English}{#1}{\text_titlecase:n{#2}}%
}
\IfTranslation{French}{#1}{%
}{%
- \DeclareTranslation{French}{#1}{\tl_mixed_case:n{#3}}%
+ \DeclareTranslation{French}{#1}{\text_titlecase:n{#3}}%
}
\IfTranslation{German}{#1}{%
}{%
- \DeclareTranslation{German}{#1}{\tl_mixed_case:n{#4}}%
+ \DeclareTranslation{German}{#1}{\text_titlecase:n{#4}}%
}
\IfTranslation{Dutch}{#1}{%
}{%
- \DeclareTranslation{Dutch}{#1}{\tl_mixed_case:n{#5}}%
+ \DeclareTranslation{Dutch}{#1}{\text_titlecase:n{#5}}%
}
%
\IfTranslation{English}{#1-plural}{%
}{%
- \DeclareTranslation{English}{#1-plural}{\tl_mixed_case:n{#6}}%
+ \DeclareTranslation{English}{#1-plural}{\text_titlecase:n{#6}}%
}
\IfTranslation{French}{#1-plural}{%
}{%
- \DeclareTranslation{French}{#1-plural}{\tl_mixed_case:n{#7}}%
+ \DeclareTranslation{French}{#1-plural}{\text_titlecase:n{#7}}%
}
\IfTranslation{German}{#1-plural}{%
}{%
- \DeclareTranslation{German}{#1-plural}{\tl_mixed_case:n{#8}}%
+ \DeclareTranslation{German}{#1-plural}{\text_titlecase:n{#8}}%
}
\IfTranslation{Dutch}{#1-plural}{%
}{%
- \DeclareTranslation{Dutch}{#1-plural}{\tl_mixed_case:n{#9}}%
+ \DeclareTranslation{Dutch}{#1-plural}{\text_titlecase:n{#9}}%
}
- \_@@_orig_newtheorem{#1}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \_@@_orig_newtheorem{#1}{\text_titlecase:n{ \GetTranslation{#1} }}
\bool_if:NF {\g_@@_no_numbered_theorem_bool} {
- \_@@_orig_newtheorem*{#1_@@_nonumbered}{\tl_mixed_case:n{ \GetTranslation{#1} }}
+ \_@@_orig_newtheorem*{#1_@@_nonumbered}{\text_titlecase:n{ \GetTranslation{#1} }}
}
-
}
\cs_generate_variant:Nn \_@@_new_theorem:nnnnnnnnn { nVVVVVVVV }
% \end{macrocode}
@@ -4445,11 +4492,11 @@ Running "make install" installs the files in the local TeX tree.
\clist_put_right:Nn \g_@@_counters_to_be_reset_clist {#2}
}
\ifcurrentbaselanguage{french}{%
- \crefname{#2}{\tl_lower_case:n{ \GetTranslation{#2} }}{\tl_lower_case:n{ \GetTranslation{#2-plural} }}
+ \crefname{#2}{\text_lowercase:n{ \GetTranslation{#2} }}{\text_lowercase:n{ \GetTranslation{#2-plural} }}
}{%
\crefname{#2}{\GetTranslation{#2}}{\GetTranslation{#2-plural}}
}
- \Crefname{#2}{\tl_mixed_case:n{ \GetTranslation{#2} }}{\tl_mixed_case:n{ \GetTranslation{#2-plural} }}
+ \Crefname{#2}{\text_titlecase:n{ \GetTranslation{#2} }}{\text_titlecase:n{ \GetTranslation{#2-plural} }}
}
% \end{macrocode}
%
@@ -4512,20 +4559,20 @@ Running "make install" installs the files in the local TeX tree.
}
\clist_map_inline:Nn \l_tmpa_clist {
\crefname{#1}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
\Crefname{#1}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
@@ -4552,12 +4599,12 @@ Running "make install" installs the files in the local TeX tree.
\normalfont
(
\textsf{
- \tl_upper_case:n {\tl_head:f {\GetTranslation{#1}}}
+ \text_uppercase:n {\tl_head:f {\GetTranslation{#1}}}
}
$\c_math_subscript_token\mathsf{\arabic*}$),
ref=(
\textsf{
- \tl_upper_case:n {\tl_head:f {\GetTranslation{#1}}}
+ \text_uppercase:n {\tl_head:f {\GetTranslation{#1}}}
}
$_\mathsf{\arabic*}$
)
@@ -4568,11 +4615,11 @@ Running "make install" installs the files in the local TeX tree.
\GetTranslation{plural-#1}
}
\Crefname{#1i}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{#1}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\GetTranslation{plural-#1}
}
}
@@ -4623,7 +4670,7 @@ Running "make install" installs the files in the local TeX tree.
}
\tl_if_empty:cT {l_@@_newenumeration_#2_label_tl} {
\tl_set:cV {l_@@_newenumeration_#2_label_tl} {
- \tl_upper_case:n {
+ \text_uppercase:n {
\tl_head:f {
\tl_use:c {l_@@_newenumeration_#2_singular_tl}
}
@@ -4657,11 +4704,11 @@ Running "make install" installs the files in the local TeX tree.
\tl_use:c {l_@@_newenumeration_#1_plural_tl}
}
\Crefname{#1i}{
- \tl_mixed_case:n{
+ \text_titlecase:n{
\tl_use:c {l_@@_newenumeration_#1_singular_tl}
}
}{%
- \tl_mixed_case:n{
+ \text_titlecase:n{
\tl_use:c {l_@@_newenumeration_#1_plural_tl}
}
}
@@ -5615,7 +5662,7 @@ Running "make install" installs the files in the local TeX tree.
\bool_if:NF \g_@@_nolocaltoc_bool {
% \setcounter{lastpagearticle}{\value{page}}
\newpage
- \setcounter{page}{\c_zero}
+ \setcounter{page}{\c_zero_int}
\pagenumbering{roman}%
\etocarticlestylenomarks
% \end{macrocode}
@@ -5693,7 +5740,7 @@ Running "make install" installs the files in the local TeX tree.
\expandafter\def\expandafter\pdfstringdefPreHook
\expandafter{%
\pdfstringdefPreHook
- \renewcommand{\acrshort}[1]{\tl_upper_case:n {\glsentryshort{##1}}}%
+ \renewcommand{\acrshort}[1]{\text_uppercase:n {\glsentryshort{##1}}}%
}
% \end{macrocode}
%
@@ -6636,11 +6683,6 @@ $bibtex = 'biber -U %O %B';
$makeindex = 'texindy -L english';
-add_cus_dep('idx', 'ind', 0, 'texindy');
-sub texindy{
- system("texindy -L english \"$_[0].idx\"");
-}
-
push @generated_exts, "aux", "idx", "ind", "lo*", "out", "toc", "acn", "acr",
"alg", "bbl", "bcf", "fls", "gl*", "ist", "run.xml", "sbl*", "sl*", "sym*",
"xdy", "unq", "mw", "*~" "sta" ;
diff --git a/macros/latex/contrib/pdfpages/pdfpages.dtx b/macros/latex/contrib/pdfpages/pdfpages.dtx
index d9d974377b..3cd8f9cb0f 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.dtx
+++ b/macros/latex/contrib/pdfpages/pdfpages.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%<*(package,pppdftexdef,ppluatexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmxdef,ppnulldef)>
-%% Copyright (C) 2001-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{4965}
+% \CheckSum{5022}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -368,6 +368,8 @@
% is inserted in front of the first page.
% Either `true' or `false' (or no value, which
% is equivalent to `true'). \df{openright=false}
+% \item[openrighteach] Similar to |openright| but affects
+% \emph{each} file processed by |\includepdfmerge|.
% \item[pagecommand] Declares \LaTeX\ commands, which are executed
% on each sheet of paper.
% \df{pagecommand=\{\bslash thispagestyle\{empty\}\}}
@@ -852,8 +854,7 @@
% A comma separated list of filenames and
% optional \meta{page spec} specifiers.
% A \meta{page spec} can be everything the
-% option |pages| accepts. Leading and trailing
-% spaces of items in the list is stripped.
+% option |pages| accepts.
%
% \end{tabular}
% \end{quote}
@@ -1198,6 +1199,7 @@
% \subsection{Booleans}
% \begin{macrocode}
\newif\ifAM@openright\AM@openrightfalse
+\newif\ifAM@openrighteach\AM@openrighteachfalse
\newif\ifAM@frame\AM@framefalse
\newif\ifAM@landscape\AM@landscapefalse
\newif\ifAM@turn\AM@turntrue
@@ -1350,11 +1352,12 @@
% \begin{macrocode}
\newcommand*{\includepdf}[2][]{%
\begingroup
+ \AM@pagecnt\@ne
\let\AM@threadname\relax
\def\AM@tmp{pdfpages}
\expandafter\AM@split@options
\expandafter\AM@tmp
- \expandafter{\the\AM@global@opts,#1}
+ \expandafter{\the\AM@global@opts,#1}%
\edef\AM@temp{{pdfpages}{\the\@temptokena}}%
\expandafter\setkeys\AM@temp
% \end{macrocode}
@@ -1414,6 +1417,7 @@
% \begin{macrocode}
\newcommand*{\includepdfmerge}[2][]{%
\begingroup
+ \AM@pagecnt\@ne
\let\AM@currentdocname\relax
\def\AM@tmp{pdfpages}
\expandafter\AM@split@options
@@ -1521,7 +1525,7 @@
\let\AM@ynup\AM@temp}%
}{}%
\AM@setphantom
- \ifthenelse{\boolean{AM@openright}}
+ \ifthenelse{\boolean{AM@openright}\and\not\boolean{AM@openrighteach}}
{\AM@openright}{}%
\ifx\AM@signature\@empty\AM@filluppagelist
\else\AM@prepare@signature\AM@signaturetrue\AM@turnfalse\fi
@@ -2064,22 +2068,47 @@
% page numbers, page ranges, and/or document names. The
% results are stored in two macros: |\AM@pagelist| which
% contains only page numbers (page ranges are split into
-% several page numbers) and |\AM@doclist| which contains
+% separate page numbers) and |\AM@doclist| which contains
% the document names; one name for each page number in
% |\AM@pagelist|.
% \begin{macrocode}
-\newif\ifAM@defaultone
+\newif\ifAM@default@range@added
\newcommand*{\AM@readlist}[1]{%
- \AM@defaultonefalse
+ \AM@default@range@addedtrue
\def\AM@pagelist{}%
\def\AM@doclist{}%
\AM@readlisti#1,\END,
- \ifAM@defaultone\AM@append{1}\fi
+ \AM@add@default@range
\edef\AM@doclist{\expandafter\@gobble\AM@doclist\@empty}%
\edef\AM@pagelist{\expandafter\@gobble\AM@pagelist\@empty}%
}
% \end{macrocode}
% \begin{macrocode}
+\def\AM@add@default@range{%
+ \ifAM@default@range@added
+ \else
+ \expandafter\AM@read@defaultpages\AM@pagestemp,\END,
+ \fi
+ \AM@default@range@addedtrue
+}
+% \end{macrocode}
+% \begin{macrocode}
+\def\AM@read@defaultpages#1,{%
+ \ifx\END#1
+ \else
+ \edef\AM@x{\AM@trim@space{#1}}%
+ \ifx\AM@x\@empty
+ \AM@append{}%
+ \AM@ReturnAfterElseFiFi\AM@read@defaultpages
+ \else
+ \expandafter\AM@checkrange\AM@x-\END
+ \AM@expand@range\AM@i\AM@ii
+ \AM@ReturnAfterFiFi\AM@read@defaultpages
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \begin{macrocode}
\newcommand{\AM@readlisti}{}
\def\AM@readlisti#1,{%
\ifx\AM@currentdocname\relax
@@ -2098,7 +2127,7 @@
\def\AM@range@or@docname#1{%
\edef\AM@arg{\AM@trim@space{#1}}%
\ifx\AM@arg\@empty
- \AM@append{}
+ \AM@append{}%
\else
\expandafter\AM@checkrange\AM@arg-\END
\ifAM@isrange
@@ -2106,8 +2135,10 @@
\AM@setnewdocname{\AM@arg}%
\else
\AM@expand@range\AM@i\AM@ii
+ \AM@default@range@addedtrue
\fi
\else
+ \AM@add@default@range
\AM@setnewdocname{\AM@arg}%
\fi
\fi
@@ -2211,16 +2242,21 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*{\AM@setnewdocname}[1]{%
- \ifAM@defaultone
- \AM@append{1}%
+ \ifAM@openrighteach
+ \ifodd\AM@pagecnt
+ \AM@append{}
+ \fi
\fi
+ \AM@add@default@range
\edef\AM@temp{\AM@trim@space{#1}}%
\AM@findfile{\AM@temp}%
- \AM@defaultonetrue
+ \AM@default@range@addedfalse
}
% \end{macrocode}
% \begin{macrocode}
+\newcount\AM@pagecnt
\newcommand*{\AM@append}[1]{%
+ \advance\AM@pagecnt\@ne
\edef\AM@doclist{\AM@doclist,\AM@currentdocname}%
\edef\AM@pagelist{\AM@pagelist,#1}%
\ifAM@doublepages
@@ -2236,7 +2272,6 @@
\edef\AM@pagelist{\AM@pagelist,#1}%
\repeat
\fi
- \AM@defaultonefalse
}
% \end{macrocode}
% \macro{\AM@getfirst}
@@ -2294,6 +2329,7 @@
% \begin{macrocode}
\def\AM@ReturnAfterFi#1\fi{\fi#1}
\def\AM@ReturnAfterFiFi#1\fi\fi{\fi\fi#1}
+\def\AM@ReturnAfterElseFiFi#1\else#2\fi#3\fi{\fi\fi#1}
% \end{macrocode}
% \begin{macrocode}
\newcommand{\AM@getlasti}{}
@@ -2562,6 +2598,7 @@
\equal{offset}{\AM@temp}\or
\equal{frame}{\AM@temp}\or
\equal{openright}{\AM@temp}\or
+ \equal{openrighteach}{\AM@temp}\or
\equal{pagecommand}{\AM@temp}\or
\equal{landscape}{\AM@temp}\or
\equal{turn}{\AM@temp}\or
@@ -3140,6 +3177,7 @@
\define@key{pdfpages}{offset}{\AM@parse@offset#1 \\}
\define@key{pdfpages}{frame}[true]{\setboolean{AM@frame}{#1}}
\define@key{pdfpages}{openright}[true]{\setboolean{AM@openright}{#1}}
+\define@key{pdfpages}{openrighteach}[true]{\setboolean{AM@openrighteach}{#1}}
\define@key{pdfpages}{pagecommand}{\def\AM@pagecommand{#1}}
\define@key{pdfpages}{landscape}[true]{\setboolean{AM@landscape}{#1}}
\define@key{pdfpages}{turn}[true]{\setboolean{AM@turn}{#1}}
@@ -4720,6 +4758,28 @@
% Rewritten |\AM@range@or@docname|, |\AM@checkrange|, |\AM@expand@range|, ...
% \end{itemize}
%
+% \subsection*{2019/11/21 v0.5o}
+% \begin{itemize}
+% \item This update fixes a bug with grffile.sty. Pdfpages tried to use
+% an internal command of grffile.sty, which no longer exists, since
+% grffile.sty is an empty dummy package nowadays.
+% \end{itemize}
+%
+% \subsection*{2019/12/17 v0.5p}
+% \begin{itemize}
+% \item Bug fix: Make empty pages empty. Empty pages like [pages={3,,5}]
+% weren't empty, but set as page 1, which was due to a bug in
+% |\AM@range@or@docname|.
+% \end{itemize}
+%
+% \subsection*{2020/01/27 v0.5q}
+% \begin{itemize}
+% \item Now |\includepdfmerge| supports option |pages|,
+% too. E.g. |\includepdfmerge[pages={2-}]{a.pdf, b.pdf}| inserts all pages
+% but the first of each pdf.
+% \item Option |openrighteach| added.
+% \end{itemize}
+%
% \Finale
%
% \iffalse
diff --git a/macros/latex/contrib/pdfpages/pdfpages.pdf b/macros/latex/contrib/pdfpages/pdfpages.pdf
index 45790dd807..9d03242372 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.pdf
+++ b/macros/latex/contrib/pdfpages/pdfpages.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md
index 65fa5358e0..6ef119fe5f 100644
--- a/macros/latex/contrib/tuda-ci/README.md
+++ b/macros/latex/contrib/tuda-ci/README.md
@@ -1,8 +1,8 @@
# TUDa-CI – Corporate Design LaTeX-Templates for TU Darmstadt
- Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2019
+ Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2020
- tuda-ci 2019/12/18 v2.05
+ tuda-ci 2020/01/28 v2.07
***************************************************************************
@@ -69,7 +69,7 @@ Farbskalen von tuda-pgfplots: https://github.com/tudace/tuda_latex_templates/blo
## Liste aller enthaltenen Dateien:
* README.md
-* demo/
+* example/
- DEMO-TUDaAnnouncement.tex
- DEMO-TUDaBeamer.tex
- DEMO-TUDaBibliography.bib
@@ -174,4 +174,7 @@ exercise sheets/exams | DEMO-TUDaExercise.tex | tudaexercise.cls
- add mechanism to use \studentID for tudapub's thesis mode
- extend documentation
- improved implementation of tudaexercise's headline mechanism
- * v2.05 (2019-12-18) Fix identbarcolor mechanism in tudaexercise \ No newline at end of file
+ * v2.05 (2019-12-18) Fix identbarcolor mechanism in tudaexercise
+ * v2.06 (2020-01-18) Reimplement pdf/a mechanisms to work with newer expl3 kernel
+ * v2.07 (2020-01-28) Restore compatibility for older expl3 kernels
+ - add key to change license information for `\tuprints`
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
index c559762146..58da583d4b 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
index 9465f0e1b2..44d322c562 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
index 26b9cc0d0a..e44e6d7e4e 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
index 1757af32a9..ae62f8dbb9 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
index 4b3ec7c138..5b9838345a 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
index 55f882155e..723096190a 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
index ec4b9c5b69..32cad90cb2 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
index 12a4dda609..a1af5a7c56 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
index 1a441c4fe4..cb60640da8 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
index 3ffe10d85a..f5cd1f5da8 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
index 33d355cb57..a742590772 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaAnnouncement.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaAnnouncement.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
index 9d3860ac9a..01016ad7b1 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBeamer.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaBeamer.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
index 405e22132e..2883b3224b 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBibliography.bib' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaBibliography.bib' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
index 480d4b1435..00d6a071b1 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaExercise.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaExercise.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
index 6456eba7ba..2ca11773bf 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaFromaddress.lco' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaFromaddress.lco' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
index ca79b72a4d..7a513275d8 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLetter.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaLetter.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
index 818c58afd9..81291f4dd4 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPhD.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaPhD.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -42,7 +42,7 @@
custommargins=true,% Ränder werden mithilfe von typearea automatisch berechnet
marginpar=false,% Kopfzeile und Fußzeile erstrecken sich nicht über die Randnotizspalte
%BCOR=5mm,%Bindekorrektur, falls notwendig
-% parskip=half-,%Absatzkennzeichnung durch Abstand vgl. KOMA-Sript
+% parskip=half-,%Absatzkennzeichnung durch Abstand vgl. KOMA-Script
fontsize=11pt,%Basisschriftgröße laut Corporate Design ist mit 9pt häufig zu klein
% logofile=example-image, %Falls die Logo Dateien nicht vorliegen
]{tudapub}
@@ -97,14 +97,14 @@
\begin{document}
\Metadata{
- title=TUDaPhD -- LaTeX-Dissertationstemplate im CD der TU Darmstadt,
+ title=TUDaPhD - LaTeX-Dissertationstemplate im CD der TU Darmstadt,
author=Marei Peischl
}
\frontmatter
-\title{\LaTeX{} im Corporate Design der TU Darmstadt}
+\title{TUDaPhD -- \LaTeX-Dissertationstemplate im CD der TU Darmstadt}
\subtitle{\LaTeX{} using TU Darmstadt's Corporate Design}
\author[M. Peischl]{Marei Peischl}%optionales Argument ist die Signatur,
\birthplace{Geburtsort}%Geburtsort, bei Dissertationen zwingend notwendig
@@ -235,6 +235,8 @@ Es ist zu beachten, dass für die Erzeugung der Titelseite nach Übergabe aller
\end{verbatim}
Falls das Argument kein Gleichheitszeichen erkennt, wird der Wert als \code{printid} gesetzt und keine URN angegeben.
+ Ab Version 2.07 ist es zudem möglich einen eigenen Lizenztext über den Schlüssel \verb|license| zu übergeben. Dieser ersetzt dann die voreingestellte Lizenzangabe.
+
\item[titleimage] Hier kann Code übergeben werden, der den farbigen Block im unteren Teil der Titelseite ersetzt. Als Maße können hier die Längen \verb+\layerwidth+ und \verb+\layerheight+ verwendet werden. Sie passen sich dem Verfügbaren Platz an. Für ein Beispiel sei auf die TUDapub-Dokumentation verwiesen.
\item[titleintro] Ab Version 2.03 kann zusätzlich über diesen Hook ein beliebiger Text direkt nach dem Untertitel und vor den automatischen Informationen ergänzt werden.
\item[titleaddendum] Wie \code{\tbs{}titleintro} jedoch als letztes Element des Blocks.
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
index 5c1411fb41..9a777921df 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPoster.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaPoster.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
index 3ea201e9fb..21e3efb07c 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPub.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaPub.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -51,8 +51,16 @@
\begin{document}
+%Zusätzliche Metadaten für PDF/A. In diesem Fall notwendig, weil Titel ein Makro enthält.
+\Metadata{
+ author=Marei Peischl (peiTeX),
+ title=TUDaPub - LaTeX-Paper im Corporate Design der TU Darmstadt,
+ subject=Basisdokumentation und Template zur Nutzung der tudapub-Dokumentenkasse,
+ date=2019-04-29,
+ keywords=TU Darmstadt \sep Corporate Design \sep LaTeX
+}
-\title{\texorpdfstring{TUDaPub -- \LaTeX-Paper im Corporate Design der TU Darmstadt}{TUDaPub -- LaTeX-Paper im Corporate Design der TU Darmstadt}}
+\title{TUDaPub -- \LaTeX-Paper im Corporate Design der TU Darmstadt}
\subtitle{Die Dokumentenklasse tudapub}
\author{Marei Peischl\thanks{pei\TeX{} \TeX{}nical Solutions}\and der \TeX-Löwe}
@@ -68,14 +76,6 @@
%\addTitleBoxLogo*{\includegraphics[width=.3\linewidth]{example-image}}
-%Zusätzliche Metadaten für PDF/A. In diesem Fall notwendig, weil Titel ein Makro enthält.
-\Metadata{
- author=Marei Peischl (peiTeX),
- title=TUDaPub -- LaTeX-Paper im Corporate Design der TU Darmstadt,
- subject=Basisdokumentation und Template zur Nutzung der tudapub-Dokumentenkasse,
- date=2019-04-29,
- keywords=TU Darmstadt \sep Corporate Design \sep LaTeX
-}
\maketitle
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
index 92b8a73d16..893c2c6fed 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaReport.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaReport.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
index 4bd7819409..32b816a961 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaSciPoster.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaSciPoster.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -165,7 +165,7 @@ Diese Mechanismen ermöglichen Auch Querverweise einfacher zu positionieren. Hie
\begin{posterboxenv}[TUDa-boxed]{name=boxed-notitle,column=4, below=colored}
Ein Beispiel für die den Stil \code{boxed} ohne Titel.
-\end{posterboxenv}\pck{tc
+\end{posterboxenv}
\begin{posterboxenv}[title=Box mit Link,TUDa-boxed]{name=relative,column=4, above=row6}
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
index cbab0ef2f2..69357878b6 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaThesis.tex' version 2.05 (2019/12/18),
+%% This is file `DEMO-TUDaThesis.tex' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -93,11 +93,11 @@
\begin{document}
\Metadata{
- title=TUDaThesis -- Template für Abschlussarbeiten im CD der TU Darmstadt,
+ title=TUDaThesis - Abschlussarbeiten im CD der TU Darmstadt,
author=Marei Peischl
}
-\title{\LaTeX{} im Corporate Design der TU Darmstadt}
+\title{TUDaThesis -- Abschlussarbeiten im CD der TU Darmstadt}
\subtitle{\LaTeX{} using TU Darmstadt's Corporate Design}
\author[M. Peischl]{Marei Peischl}%optionales Argument ist die Signatur,
\birthplace{Geburtsort}%Geburtsort, bei Dissertationen zwingend notwendig
diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
index 52a78abf8b..8fc27f0b9d 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 2.05 (2019/12/18),
+%% This is file `beamercolorthemeTUDa.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamercolorthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
index 8140400cd8..0b1a9f63dd 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 2.05 (2019/12/18),
+%% This is file `beamerfontthemeTUDa.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerfontthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
index eeef4ee466..c4963be09c 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 2.05 (2019/12/18),
+%% This is file `beamerinnerthemeTUDa.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/10/15),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
@@ -170,8 +170,7 @@
\dim_set:Nn \l_TUDa_titlegraphic_wd_dim{\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent}
\let\width\l_TUDa_titlegraphic_wd_dim
\nointerlineskip
- \begin{beamercolorbox}[wd=\width,
- ]{titlegraphic}
+ \begin{beamercolorbox}[wd=\width,center]{titlegraphic}
\raisebox{-\c_TUDa_largerule_dim}[\dim_eval:n {\height-\c_TUDa_largerule_dim}][0pt]{\inserttitlegraphic}
\end{beamercolorbox}
}
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
index 33ef9467ee..957515d9fd 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 2.05 (2019/12/18),
+%% This is file `beamerouterthemeTUDa.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerouterthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
index f88d873270..3f90f630d9 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 2.05 (2019/12/18),
+%% This is file `beamerthemeTUDa.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerthemeTUDa}
[\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt]
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
index 3de1961d19..373e1c823e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a0paper.clo' version 2.05 (2019/12/18),
+%% This is file `tuda-a0paper.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{125pt}{165pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
index 78e2ac08aa..f18bfe56e9 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a1paper.clo' version 2.05 (2019/12/18),
+%% This is file `tuda-a1paper.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{86pt}{120pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
index b036c3bce8..6887329fff 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a2paper.clo' version 2.05 (2019/12/18),
+%% This is file `tuda-a2paper.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a0paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{65pt}{82pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
index a442d61016..eb6fc90c07 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a3paper.clo' version 2.05 (2019/12/18),
+%% This is file `tuda-a3paper.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a3paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{47pt}{61pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
index ade1f8161e..f4926b142c 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a4paper.clo' version 2.05 (2019/12/18),
+%% This is file `tuda-a4paper.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a4paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{36pt}{47pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
index d98d438596..1e2f481550 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a5paper.clo' version 2.05 (2019/12/18),
+%% This is file `tuda-a5paper.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci size adjustments for a5paper}
\cs_set:Nn \TUDa_setup_title_sizes: {
\cs_set:Nn \TUDa_title_fontsize: {{22pt}{28pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
index 00fe3f99f0..43f6eb270e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
@@ -1,4 +1,4 @@
-%% This is file `tuda-pgfplots.sty' version 2.05 (2019/12/18),
+%% This is file `tuda-pgfplots.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
% Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt
% The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme
\ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
index 95ba4dc953..30c48c55ac 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 2.05 (2019/12/18),
+%% This is file `tudabeamer.cls' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{tudabeamer}
[\filedate\space\fileversion\space]
@@ -167,9 +167,19 @@
\endgroup
}
\cs_new:Nn \TUDa_write_xmp_line:nn {
- \cs_if_exist:cTF {\tl_mixed_case:n {#1}} {
+ %Fallback test for older kernels
+ \cs_if_exist:NTF \str_uppercase:f {
+ \tl_set:Nx \l_tmpa_tl {
+ \str_uppercase:f {\tl_head:n {#1}}
+ \str_lowercase:f { \tl_tail:n {#1}}
+ }
+ } {
+ %may be removed in some time
+ \tl_set:Nx \l_tmpa_tl {\tl_mixed_case:n {#1}}
+ }
+ \cs_if_exist:cTF {\l_tmpa_tl}{
\iow_now:Nx \TUDa@xmpdata_stream {
- \c_backslash_str \tl_mixed_case:n {#1} {#2}\iow_newline:
+ \c_backslash_str \l_tmpa_tl {\exp_not:n {#2}}
}
}{
\msg_error:nnn {TUDapub} {unknown-metadata} {#1}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
index ccc4a9c820..0d3d3fc7b0 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 2.05 (2019/12/18),
+%% This is file `tudacolors.def' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\ProvidesFile{tudacolors.def}
[\filedate\space\fileversion\space Color definitions for tuda-ci]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
index 312d90d056..5302f5e76c 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 2.05 (2019/12/18),
+%% This is file `tudacolors.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
@@ -84,14 +84,14 @@
\colorlet{textonaccentcolor}{white}
} {
\colorlet{textonaccentcolor}{black}
- \msg_warning:nnxx {tudacolors} {unselectable-color} {white} {textonaccentcolor}
+ \tl_if_in:NnT \g_TUDa_color_accent_tl {TUDa} {\msg_warning:nnxx {tudacolors} {unselectable-color} {white} {textonaccentcolor}}
}
} {
\clist_if_in:NVTF \c_TUDa_color_allow_blacktext_clist \g_TUDa_color_accent_tl {
\colorlet{textonaccentcolor}{black}
} {
\colorlet{textonaccentcolor}{white}
- \msg_warning:nnxx {tudacolors} {unselectable-color} {black} {textonaccentcolor}
+ \tl_if_in:NnT \g_TUDa_color_accent_tl {TUDa} {msg_warning:nnxx {tudacolors} {unselectable-color} {black} {textonaccentcolor}}
}
}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
index 2c36b9b711..f8c5952ef8 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaexercise.cls' version 2.05 (2019/12/18),
+%% This is file `tudaexercise.cls' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudaexercise}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
index 7dabda5414..d4c8c64971 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 2.05 (2019/12/18),
+%% This is file `tudafonts.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudafonts}
[\filedate\space\fileversion\space
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
index 1686cd9fc5..0a53b10e1b 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 2.05 (2019/12/18),
+%% This is file `tudaletter.cls' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudaletter}
@@ -429,9 +429,19 @@
}
}
\cs_new:Nn \TUDa_write_xmp_line:nn {
- \cs_if_exist:cTF {\tl_mixed_case:n {#1}} {
+ %Fallback test for older kernels
+ \cs_if_exist:NTF \str_uppercase:f {
+ \tl_set:Nx \l_tmpa_tl {
+ \str_uppercase:f {\tl_head:n {#1}}
+ \str_lowercase:f { \tl_tail:n {#1}}
+ }
+ } {
+ %may be removed in some time
+ \tl_set:Nx \l_tmpa_tl {\tl_mixed_case:n {#1}}
+ }
+ \cs_if_exist:cTF {\l_tmpa_tl}{
\iow_now:Nx \TUDa@xmpdata_stream {
- \c_backslash_str \tl_mixed_case:n {#1} {#2}\iow_newline:
+ \c_backslash_str \l_tmpa_tl {\exp_not:n {#2}}
}
}{
\msg_error:nnn {TUDapub} {unknown-metadata} {#1}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
index c410f63667..605636571a 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudalettersize10pt.clo' version 2.05 (2019/12/18),
+%% This is file `tudalettersize10pt.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
%% This is file `tudalettersize10pt.clo' version 1.0 (2018/12/12),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
index ff358cee1a..124e84146d 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 2.05 (2019/12/18),
+%% This is file `tudaposter.cls' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
@@ -102,6 +102,8 @@
\ExplSyntaxOff
\LoadClass[parskip=half-]{scrartcl}
+\RequirePackage{scrlayer}
+\RequirePackage{scrlayer-notecolumn}
\ExplSyntaxOn
\tl_if_empty:NT \g_TUDa_paper_tl {\keys_set:nn {TUDa/poster} {paper=a0}}
@@ -123,12 +125,9 @@
\setkomafont{subtitle}{\expandafter\fontsize\TUDa_titleinfo_fontsize:\selectfont}
\newkomafont{titleinfo}{\expandafter\fontsize\TUDa_titleinfo_fontsize:\selectfont}
-
-\KOMAoptions{fontsize=\g_TUDa_fontsize_tl}
-
-
-
-
+\ExplSyntaxOff
+\KOMAoptions{fontsize=\csname g_TUDa_fontsize_tl\endcsname}
+\ExplSyntaxOn
\RequirePackage{tudafonts}
\renewcommand*{\familydefault}{\sfdefault}
@@ -219,11 +218,6 @@
}
%%%%%%%%%%%%%%%%%%%%%%
-
-
-\RequirePackage{scrlayer}
-
-
\dim_new:N \g_TUDa_qrcode_dim
\dim_gset:Nn \g_TUDa_qrcode_dim {.7\c_TUDa_logoheight_dim}
@@ -300,8 +294,6 @@
}
]{TUDa.poster.rule}
-
-\RequirePackage{scrlayer-notecolumn}
\DeclareNewLayer[
clone=notecolumn.marginpar,
]{TUDa.poster.marginpar}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
index fc3f3a277b..70f6ce6cc6 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 2.05 (2019/12/18),
+%% This is file `tudapub.cls' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudapub}
@@ -814,9 +814,19 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
\cs_new:Nn \TUDa_write_xmp_line:nn {
\begingroup
\cs_set:Npn \sep {\exp_not:N \sep}
- \cs_if_exist:cTF {\tl_mixed_case:n {#1}} {
+ %Fallback test for older kernels
+ \cs_if_exist:NTF \str_uppercase:f {
+ \tl_set:Nx \l_tmpa_tl {
+ \str_uppercase:f {\tl_head:n {#1}}
+ \str_lowercase:f { \tl_tail:n {#1}}
+ }
+ } {
+ %may be removed in some time
+ \tl_set:Nx \l_tmpa_tl {\tl_mixed_case:n {#1}}
+ }
+ \cs_if_exist:cTF {\l_tmpa_tl}{
\iow_now:Nx \TUDa@xmpdata_stream {
- \c_backslash_str \tl_mixed_case:n {#1} {\exp_not:n {#2}}
+ \c_backslash_str \l_tmpa_tl {\exp_not:n {#2}}
}
}{
\msg_error:nnn {TUDaPub} {unknown-metadata} {#1}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
index c4d7050f37..dd63ba84a5 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 2.05 (2019/12/18),
+%% This is file `tudarules.sty' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
index 89d3479b14..7a963dfa7e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 2.05 (2019/12/18),
+%% This is file `tudasciposter.cls' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
@@ -239,9 +239,19 @@
}
\cs_new:Nn \TUDa_write_xmp_line:nn {
- \cs_if_exist:cTF {\tl_mixed_case:n {#1}} {
+ %Fallback test for older kernels
+ \cs_if_exist:NTF \str_uppercase:f {
+ \tl_set:Nx \l_tmpa_tl {
+ \str_uppercase:f {\tl_head:n {#1}}
+ \str_lowercase:f { \tl_tail:n {#1}}
+ }
+ } {
+ %may be removed in some time
+ \tl_set:Nx \l_tmpa_tl {\tl_mixed_case:n {#1}}
+ }
+ \cs_if_exist:cTF {\l_tmpa_tl}{
\iow_now:Nx \TUDa@xmpdata_stream {
- \c_backslash_str \tl_mixed_case:n {#1} {\exp_not:n {#2}}%\iow_newline:
+ \c_backslash_str \l_tmpa_tl {\exp_not:n {#2}}
}
}{
\msg_error:nnn {TUDapub} {unknown-metadata} {#1}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
index 36700d6b46..c1313d3570 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudasize9pt.clo' version 2.05 (2019/12/18),
+%% This is file `tudasize9pt.clo' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
%% This is file `tudasize9pt.clo' version 1.0 (2018/12/12),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
index aa7e3732bc..2364e1e51f 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 2.05 (2019/12/18),
+%% This is file `tudathesis.cfg' version 2.07 (2020/01/28),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.05}
-\def\filedate{2019/12/18}
+\def\fileversion{2.07}
+\def\filedate{2020/01/28}
\RequirePackage{expl3}
\ProvidesExplFile{tudathesis.cfg}
{\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Coporate Design (tuda-ci)}
@@ -69,7 +69,7 @@
{
\TUDa_declare_caption:Nnn \departmentname {Fachbereich} {department}
\TUDa_declare_caption:Nnn \TUDa_in_department {im~ \departmentname}{in~the~\departmentname{}~ of}
- \TUDa_declare_caption:Nnn \departmentfullname {\departmentname{}~ \TUDa@department} { \TUDa@department{}~ \tl_mixed_case:n{\departmentname}}
+ \TUDa_declare_caption:Nnn \departmentfullname {\departmentname{}~ \TUDa@department} { \TUDa@department{}~ \text_titlecase:n{\departmentname}}
}
{\bool_if:NTF \g_TUDa_dr_bool
{
@@ -248,7 +248,7 @@
\seq_map_inline:Nn \g_TUDa_reviewer_seq
{
\int_incr:N \l_tmpb_int
- \int_to_arabic:n {\l_tmpb_int}.~\tl_mixed_case:n{\TUDa@reviewname}:~\exp_not:n {##1}\\
+ \int_to_arabic:n {\l_tmpb_int}.~\text_titlecase:n{\TUDa@reviewname}:~\exp_not:n {##1}\\
}
}
@@ -287,7 +287,12 @@
urn .tl_gset:N =\g_TUDa_thesis_urn_tl,
urn .initial:V = \c_empty_tl,
printid .tl_gset:N = \g_TUDa_thesis_tuprints_tl,
- printid .initial:V = \c_empty_tl
+ printid .initial:V = \c_empty_tl,
+ license .tl_gset:N = \g_TUDa_license_info_tl,
+ license .initial:n = {Die~Veröffentlichung~steht~unter~folgender~Creative~Commons~Lizenz:\\
+ Namensnennung~--~Keine~kommerzielle~Nutzung~--~Keine~Bearbeitung~ 2.0~Deutschland\\
+ \url{http://creativecommons.org/licenses/by-nc-nd/2.0/de/}
+ }
}
\newcommand{\tuprints}[1]{%
@@ -303,18 +308,13 @@
E-Publishing-Service~der~TU~Darmstadt\\
\url{http://tuprints.ulb.tu-darmstadt.de}\\
\url{tuprints@ulb.tu-darmstadt.de}\\[2\baselineskip]
- % \includegraphics{TUDa-CI-by-nc-nd}\\[\baselineskip]
- Die~Veröffentlichung~steht~unter~folgender~Creative~Commons~Lizenz:\\
- Namensnennung~--~Keine~kommerzielle~Nutzung~--~Keine~Bearbeitung~ 2.0~Deutschland\\
- \url{http://creativecommons.org/licenses/by-nc-nd/2.0/de/}
- % Namensnennung~--~Nicht~kommerziell~--~Keine~Bearbeitungen~ 4.0~International\\
- % \url{https://creativecommons.org/licenses/by-nc-nd/4.0/deed.de}
+ \tl_if_empty:NF \g_TUDa_license_info_tl {\\[2\baselineskip]\g_TUDa_license_info_tl}
}%
}
\gdef\@subject{
\cs_if_exist:NT \TUDa@thesisStatus {\TUDa@thesisStatus{}~ }
- \tl_mixed_case:n{\TUDa@thesisType}~
+ \text_titlecase:n{\TUDa@thesisType}~
\tl_if_empty:NF \TUDa@in_department {\TUDa@in_department{}~}
\seq_if_empty:NF \g_TUDa_author_seq {\TUDa@byname\nobreakspace\@author}
\tl_if_empty:NF \TUDa@birthplace {\space\TUDa@fromname\space\TUDa@birthplace}
@@ -339,20 +339,6 @@
}
}
-
-%\msg_new:nn {tudathesis.cfg} {unknown-choiche} {
-% The key #1 only accepts a fix set of choices.
-%
-%}
-%
-%\msg_error:nnxxx { mymodule } { unknown-choice }
-%{ key } % Name of choice key
-%{ choice-a , choice-b , choice-c } % Valid choices
-%{ \exp_not:n {#1} } % Invalid choice given
-
-%department .tl_gset:N = \g_TUDa_department_choice_tl,
-%field-of-study .tl_gset:N = \g_TUDa_field_of_study_choice_tl,
-
%%Studienbereich (field of study):
%%ce - Computational Engineering
%%ese - Energy Science and Engineering
@@ -604,4 +590,9 @@ Bei einer Thesis des Fachbereichs Architektur entspricht die eingereichte elektr
\PassOptionsToPackage{ngerman}{babel}
}
+% Fallback mechanism for older l3 kernels
+\cs_if_exist:NF \text_titlecase:n {
+ \cs_set_eq:NN\text_titlecase:n\tl_mixed_case:n
+}
+
\endinput