summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-17 03:01:57 +0000
committerNorbert Preining <norbert@preining.info>2019-11-17 03:01:57 +0000
commitee7abbf3326590ad80cbd11ae7756c9238f7dab8 (patch)
treeb5f8048ef0cee727eac348560289bec2cf3ac687 /macros/latex
parentbad81a00a2943d1fb7ff2de3d0ae48c049dac302 (diff)
CTAN sync 201911170301
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/mathastext/INSTALL.txt6
-rw-r--r--macros/latex/contrib/mathastext/README.md28
-rw-r--r--macros/latex/contrib/mathastext/mathastext.dtx277
-rw-r--r--macros/latex/contrib/mathastext/mathastext.pdfbin475056 -> 480591 bytes
-rw-r--r--macros/latex/contrib/mathastext/mathastexttestalphabets.pdfbin43064 -> 43198 bytes
-rw-r--r--macros/latex/contrib/pst-pdf/CHANGES201
-rw-r--r--macros/latex/contrib/pst-pdf/CHANGES.tex47
-rw-r--r--macros/latex/contrib/pst-pdf/Makefile4
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf-DE.pdfbin508259 -> 508746 bytes
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf-example.pdfbin245954 -> 250157 bytes
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf.dtx51
-rw-r--r--macros/latex/contrib/pst-pdf/pst-pdf.pdfbin517162 -> 434072 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/README.md7
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdfbin576175 -> 576177 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdfbin622081 -> 622081 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdfbin570005 -> 570005 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdfbin590856 -> 590857 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdfbin822097 -> 822079 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdfbin562135 -> 562135 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdfbin852565 -> 852565 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdfbin551804 -> 551796 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdfbin590049 -> 590728 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdfbin816526 -> 816513 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.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex2
-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.sty6
-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.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.def6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaexercise.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudafonts.sty27
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaletter.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaposter.cls66
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudapub.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudarules.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasciposter.cls10
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudathesis.cfg6
-rw-r--r--macros/latex/contrib/unravel/unravel.dtx270
-rw-r--r--macros/latex/contrib/unravel/unravel.pdfbin689310 -> 692007 bytes
62 files changed, 691 insertions, 459 deletions
diff --git a/macros/latex/contrib/mathastext/INSTALL.txt b/macros/latex/contrib/mathastext/INSTALL.txt
index 721c3009fb..3efdaf8bbf 100644
--- a/macros/latex/contrib/mathastext/INSTALL.txt
+++ b/macros/latex/contrib/mathastext/INSTALL.txt
@@ -2,12 +2,6 @@ The simplest for most users is to use the manager script of the TeX
installation to either install or upgrade mathastext to its current
version.
-Else, for manual install, grab mathastext.tds.zip from CTAN then run
-
- unzip -d <destfolder> mathastext.tds.zip
-
-where <destfolder> could be ~/texmf or, on mac os x, ~/Library/texmf.
-
Else, download mathastext.dtx and follow these instructions:
- Run tex or etex on mathastext.dtx to generate the package style
diff --git a/macros/latex/contrib/mathastext/README.md b/macros/latex/contrib/mathastext/README.md
index 7d92a4018b..fd15e83842 100644
--- a/macros/latex/contrib/mathastext/README.md
+++ b/macros/latex/contrib/mathastext/README.md
@@ -14,7 +14,7 @@ The Author of this Work is Jean-Francois Burnol
Copyright (C) 2011-2019 Jean-Francois Burnol (`jfbu at free dot fr`)
- Source: mathastext.dtx 1.3v 2019/09/19
+ Source: mathastext.dtx 1.3w 2019/11/16
DESCRIPTION
@@ -82,6 +82,32 @@ Main options: `italic`, `subdued`, `LGRgreek`.
RECENT CHANGES
==============
+1.3w \[2019/11/16\]
+----
+
+* LaTeX 2019-10-01 release (up to patch level 3 inclusive)
+ together with `amsmath` conspired `:-)` to break `mathastext`,
+ in connexion with math accents. This has been fixed upstream,
+ but I am releasing nevertheless a hot fix to this
+ [issue](https://github.com/latex3/latex2e/issues/216)
+ (this is compatible with future LaTeX releases).
+
+* Fix: the `\hbar` is originally a robust command but
+ becomes a `\mathchardef` token if (e.g.) `amsfonts` is
+ loaded and then with recent LaTeX `\hbar<space>` is
+ made undefined and `mathastext` definition of it
+ remained without effect. The `\mathastext` own `\hbar`
+ is now defined `\protected`.
+
+* Fix: option `noendash` (or `symboldelimiters` which implies
+ it) caused (since `1.3u`) a bug under Unicode engines when
+ setting up the minus sign.
+
+* Version names declared via the optional argument of
+ `\Mathastext` or as first argument of `\MTDeclareVersion`
+ must not be `normal` or `bold`. Enforce that! (this was
+ marked as a bug to fix since `2012/10/24`...)
+
1.3v \[2019/09/19\]
----
diff --git a/macros/latex/contrib/mathastext/mathastext.dtx b/macros/latex/contrib/mathastext/mathastext.dtx
index 09aef6d6cb..30f0d90af6 100644
--- a/macros/latex/contrib/mathastext/mathastext.dtx
+++ b/macros/latex/contrib/mathastext/mathastext.dtx
@@ -2,12 +2,12 @@
% N.B.: this dtx file does NOT use \DocInput, it only uses docstrip.
% The LaTeX source of the documentation is NOT prefixed with percent characters.
%<*dtx>
-\def\dtxtimestamp {Time-stamp: <19-09-2019 at 22:52:52 CEST>}%
-\def\docdate{2019/09/19}
+\def\dtxtimestamp {Time-stamp: <16-11-2019 at 21:27:02 CET>}%
+\def\docdate{2019/11/16}
%</dtx>
%<*drv>
-\def\MSTpkgdate {2019/09/19}
-\def\MSTpkgversion {1.3v}
+\def\MSTpkgdate {2019/11/16}
+\def\MSTpkgversion {1.3w}
%</drv>
%<*dtx>
\iffalse % meta-comment
@@ -29,7 +29,7 @@ The Author of this Work is Jean-Francois Burnol
Copyright (C) 2011-2019 Jean-Francois Burnol (`jfbu at free dot fr`)
- Source: mathastext.dtx 1.3v 2019/09/19
+ Source: mathastext.dtx 1.3w 2019/11/16
%</readme>
%<*dtx>
@@ -45,7 +45,7 @@ not include the documented source code then, in contrast to 1a)+1b) method
%%----------------------------------------------------------------
%% Package: mathastext
%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3v 2019/09/19
+%% Version: 1.3w 2019/11/16
%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
%% Copyright (C) 2011-2019 Jean-Francois Burnol <jfbu at free dot fr>
%% Examples of use of mathastext:
@@ -193,6 +193,33 @@ Main options: `italic`, `subdued`, `LGRgreek`.
RECENT CHANGES
==============
+1.3w \[2019/11/16\]
+----
+
+* LaTeX 2019-10-01 release (up to patch level 3 inclusive)
+ together with `amsmath` conspired `:-)` to break `mathastext`,
+ in connexion with math accents. This has been fixed upstream,
+ but I am releasing nevertheless a hot fix to this
+ [issue](https://github.com/latex3/latex2e/issues/216)
+ (this is compatible with future LaTeX releases).
+
+* Fix: the `\hbar` is originally a robust command but
+ becomes a `\mathchardef` token if (e.g.) `amsfonts` is
+ loaded and then with recent LaTeX `\hbar<space>` is
+ made undefined and `mathastext` definition of it
+ remained without effect. The `\mathastext` own `\hbar`
+ is now defined `\protected`.
+
+* Fix: option `noendash` (or `symboldelimiters` which implies
+ it) caused (since `1.3u`) a bug under Unicode engines when
+ setting up the minus sign.
+
+* Version names declared via the optional argument of
+ `\Mathastext` or as first argument of `\MTDeclareVersion`
+ must not be `normal` or `bold`. Enforce that! (this was
+ marked as a bug to fix since `2012/10/24`...)
+
+
1.3v \[2019/09/19\]
----
@@ -289,6 +316,33 @@ RECENT CHANGES
MATHASTEXT CHANGE LOG
=====================
+1.3w \[2019/11/16\]
+----
+
+* LaTeX 2019-10-01 release (up to patch level 3 inclusive)
+ together with `amsmath` conspired `:-)` to break `mathastext`,
+ in connexion with math accents. This has been fixed upstream,
+ but I am releasing nevertheless a hot fix to this
+ https://github.com/latex3/latex2e/issues/216 issue
+ (this is compatible with future LaTeX releases).
+
+* Fix: the `\hbar` is originally a robust command but
+ becomes a `\mathchardef` token if (e.g.) `amsfonts` is
+ loaded and then with recent LaTeX `\hbar<space>` is
+ made undefined and `mathastext` definition of it
+ remained without effect. The `\mathastext` own `\hbar`
+ is now defined `\protected`.
+
+* Fix: option `noendash` (or `symboldelimiters` which implies
+ it) caused (since `1.3u`) a bug under Unicode engines when
+ setting up the minus sign.
+
+* Version names declared via the optional argument of
+ `\Mathastext` or as first argument of `\MTDeclareVersion`
+ must not be `normal` or `bold`. Enforce that! (this was
+ marked as a bug to fix since `2012/10/24`...)
+
+
1.3v \[2019/09/19\]
----
@@ -4388,7 +4442,7 @@ Numerous examples will be found there:\\
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage {mathastext}
- [2019/09/19 v1.3v Use the text font in math mode (JFB)]
+ [2019/11/16 v1.3w Use the text font in math mode (JFB)]
% \end{macrocode}
% \LaTeX{} |2019-10-01| release has made robust math macros such as the math
% accents and \cs{hbar}.
@@ -4650,6 +4704,31 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% \begin{macrocode}
\ProcessOptions\relax
% \end{macrocode}
+% \begin{macro}{\mst@DeclareMathAccent}
+%
+% I somehow missed realizing \LaTeX{} |2019-10-01| if used together
+% with |amsmath| made repeated usage of \cs{DeclareMathAccent} trigger
+% an error: \url{https://github.com/latex3/latex2e/issues/216}.
+%
+% This broke usage of \cs{Mathastext} macro in preamble.
+%
+% |1.3w| works around this via \cs{mst@DeclareMathAccent}. And other
+% changes were made in \mst code to cope with these complications around
+% robustness.
+% \begin{macrocode}
+\def\mst@DeclareMathAccent#1{\let#1\mst@undefined
+ \expandafter
+ \let\csname\expandafter\@gobble\string#1\space\endcsname\mst@undefined
+ \DeclareMathAccent{#1}}
+% \end{macrocode}
+% \end{macro}
+% Helper macros to test math version names. User is not allowed to redefine
+% via \cs{Mathastext} with optional argument or via \cs{MTDeclareVersion} the
+% |normal| and |bold| math versions! Added at |1.3w|, about 7 years late.
+% \begin{macrocode}
+\def\mst@normalversionname{normal}%
+\def\mst@boldversionname{bold}%
+% \end{macrocode}
% \begin{macro}{\exists} \begin{macro}{\mst@exists@skip}
% \begin{macro}{\forall} \begin{macro}{\mst@forall@skip}
% \begin{macro}{\MTnormalexists}
@@ -5101,11 +5180,9 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% \begin{macrocode}
\def\mst@OnlyIfNotSubdued#1{%
\ifmst@subdued
- \def\mst@tmpa{normal}%
- \ifx\math@version\mst@tmpa
+ \ifx\math@version\mst@normalversionname
\else
- \def\mst@tmpa{bold}%
- \ifx\math@version\mst@tmpa
+ \ifx\math@version\mst@boldversionname
\else
#1%
\fi
@@ -5843,7 +5920,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\DeclareFontSubstitution{FML}{futm}{m}{it}
\DeclareSymbolFont{mathastextfourier}{FML}{futm}{m}{it}
\SetSymbolFont{mathastextfourier}{bold}{FML}{futm}{b}{it}
- \DeclareMathAccent{\fouriervec}{\mathord}{mathastextfourier}{"7E}
+ \mst@DeclareMathAccent{\fouriervec}{\mathord}{mathastextfourier}{"7E}
\fi
% \end{macrocode}
% \end{macro}
@@ -6120,6 +6197,9 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% I need to put amsmath under surveillance to check if it decides to
% robustify \cs{relbar} at some point, now that the \LaTeX\ team has
% taken over maintenance.
+%
+% |2019/09/16| Use \cs{protected} for \cs{right\textbar{}leftarrowfill} in the non
+% \cs{DeclareRobustCommand} branch?
% \begin{macrocode}
\ifmst@nominus
\else
@@ -6177,6 +6257,23 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% this is by actually modifying the assigned mathcode at each version
% change. This means also that |\MTversion| and not |\mathversion|
% must be used for good functioning.
+%
+% |1.3u| improves the handling of the minus sign by letting it be compatible
+% with math versions (and not only with the with subdued mechanism but all
+% math versions) having varying font encodings, even possibly classic 8bit
+% font encoding mixed with TU encoding for Unicode engines. For this it is
+% needed to work around a feature of XeTeX/LuaLaTeX, here is original comment:
+%
+% \begin{quotation}
+% afaict it is
+% impossible to use straightforwardly in extended mathcode assignments
+% a control sequence as created by \cs{Umathchardef}.
+% This is counter-intuitive and breaks expectations.
+% \end{quotation}
+%
+% But the |1.3u| mechanism with \cs{mst@UmathchardefWorkAround@i} introduced a
+% bug which showed under option |noendash| (hence also |symboldelimiters|) with
+% Unicode engines. Fixed at |1.3w|.
% \begin{macrocode}
\let\mst@subduedminus\empty
\let\mst@nonsubduedminus\empty
@@ -6213,10 +6310,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\edef\mst@tmp@enc{\csname mst@encoding@\math@version\endcsname}%
\if1\mst@OneifUniEnc
\mst@Umathcode`\-=\expandafter
- % Working around a bug (or feature...) of XeTeX/LuaTeX: afaict it is
- % impossible to use straightforwardly in extended mathcode assignments
- % a control sequence as created by \Umathchardef.
- % This is counter-intuitive and breaks expectations.
\mst@UmathchardefWorkAround@i
\csname mst@minus@mv\math@version\endcsname
\relax
@@ -6224,6 +6317,17 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\mathcode`\-=\@nameuse{mst@minus@mv\math@version}% self-delimiting
\fi
}% \mst@nonsubduedminus
+% \end{macrocode}
+% The above works only if the \cs{mst@minus@mv<name>} was really
+% defined via \cs{Umathchardef}. If it was defined via \cs{DeclareMathSymbol}
+% then it is a \cs{mathchar}, not a \cs{Umathchar}. At least currently (2019).
+% So we need to correct the definition of \cs{mst@nonsubduedminus}.
+% \begin{macrocode}
+ \ifmst@endash\else\ifmst@emdash\else
+ \def\mst@nonsubduedminus{%
+ \mathcode`\-=\@nameuse{mst@minus@mv\math@version}% self-delimiting
+ }% non Umathchardef \mst@minus@mv<mathversion> macros
+ \fi\fi
\fi
\def\mst@UmathchardefWorkAround@i
{\expandafter\mst@UmathchardefWorkAround@ii\meaning}%
@@ -6255,24 +6359,27 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% before and after skips does not interact well with the rlap construct.
%
% |1.3v 2019/09/19| adapts to maintain the robustness of \cs{hbar} which now
-% applies with \LaTeX{} |2019-10-01|. The \cs{mst@original@hbar} is a
-% meaning holder and there is no need for this macro to be robust in
-% \LaTeX{} sense. Same for the hbar-macros whose names get indexed by math
-% version names. We use them as meaning-holders and suitably access them via
-% \cs{let}. The \cs{mst@ltbar@mv<version>} macros will be robust as they get
-% declared via \cs{DeclareMathAccent}, but this is other matter.
+% applies with \LaTeX{} |2019-10-01|.
+%
+% |1.3w| works around \url{https://github.com/latex3/latex2e/issues/216} via
+% \cs{mst@DeclareMathAccent}. The upstream bug affected the definition of
+% \cs{mst@ltbar@mvnormal} and broke usage of \cs{Mathastext} in preamble.
+%
+% |1.3w| also fixes oversight that \cs{hbar} may have been redefined via
+% \cs{DeclareMathSymbol} by some package (e.g. |amsfonts|) and with \LaTeX{}
+% |2019-10-01| this means \cs{hbar<space>} is now undefined. Modifying it
+% changed nothing to \cs{hbar} behaviour in such circumstances. Finally we
+% opt for a \cs{protected} \cs{hbar} and choose to ignore completely if
+% there is a \cs{hbar<space>} or not. To avoid extra steps we do not
+% undefine it if it exists, because we would need to restore it in
+% subdued math versions.
% \begin{macrocode}
\let\mst@subduedhbar\@empty
\let\mst@nonsubduedhbar\@empty
\ifmst@nohbar\else
- \def\mst@subduedhbar{%
- \expandafter\let\csname hbar\mst@robustifyingspace\endcsname
- \mst@original@hbar
- }%
- \def\mst@nonsubduedhbar{%
- \expandafter\let\csname hbar\mst@robustifyingspace\expandafter\endcsname
- \csname mst@hbar@mv\math@version\endcsname
- }%
+ \def\mst@subduedhbar{\let\hbar\mst@original@hbar}%
+ \def\mst@nonsubduedhbar{\expandafter
+ \let\expandafter\hbar\csname mst@hbar@mv\math@version\endcsname}%
\fi
\def\mst@mathrlap{\mathpalette\mst@mathrlapinternal}
\def\mst@mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}}
@@ -6284,10 +6391,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\begingroup
\def\@text@composite##1\@text@composite##2{##2}%
\let\add@accent\@firstoftwo
- \DeclareMathAccent{#2}{\mathalpha}{mtletterfont}%
+ \mst@DeclareMathAccent{#2}{\mathalpha}{mtletterfont}%
{\csname\mst@tmp@enc\string\=\endcsname{}}%
\endgroup
- \def#1{\mst@mathrlap{#2{\ }}\mst@h}%
+ \protected\def#1{\mst@mathrlap{#2{\ }}\mst@h}%
\fi
}% end of \mst@dothe@hbarstuff
% \end{macrocode}
@@ -7278,11 +7385,30 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
%
% |1.3v| adapts to \LaTeX{} |2019-10-01| which now comes with robust math
% accent macros. The «original»-named macros are without the robustifying
-% space, as they only serve as meaning holders. On the other hand the macros
+% space (NOT true anymore, see |1.3w| next), as they only serve as meaning
+% holders.
+%
+% On the other hand the macros
% indexed by math version names are (in the pdflatex branch) always defined
% via \cs{DeclareMathAccent} hence they will be robust with |2019-10-01| or
% later and we must use the \cs{mst@robustifyingspace} with them to access
% their real meaning (this thus differs from the situation with \cs{hbar}).
+%
+% |1.3w| The above was a bit optimistic as |amsmath| for example modifies
+% \LaTeX{} internals and handles math accents differently.
+%
+% We thus needed to double our
+% |\let|'s as, if |amsmath| is loaded, the cs with space will exist but not
+% be paired in expected way with the original cs. This breaks things by the
+% way if some math accent is written to an external file under a certain
+% context and executed in another context. The new context will be probably
+% ignored if |amsmath| is loaded, as the external file will have an already
+% expanded-once meaning.
+%
+% Some macros with space in name might thus be created as |\relax|. Should I
+% rather create \cs{protected} macros for the math accents with Unicode
+% engines? Anyway, the construct does give good result with the few OpenType
+% text fonts I tested.
% \begin{macrocode}
\let\mst@subduedmathaccents\@empty
\let\mst@nonsubduedmathaccents\@empty
@@ -7291,15 +7417,21 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\@tfor\@tempa:={grave}{acute}{check}{breve}{bar}%
{dot}{ddot}{mathring}{hat}{tilde}%
\do
- {\expandafter\let\csname\@tempa\mst@robustifyingspace\expandafter\endcsname
- \csname mst@original@\@tempa\endcsname}%
+ {\expandafter\let\csname\@tempa\expandafter\endcsname
+ \csname mst@original@\@tempa\endcsname
+ \expandafter\let\csname\@tempa\space\expandafter\endcsname
+ \csname mst@original@\@tempa\space\endcsname
+ }%
}%
\def\mst@nonsubduedmathaccents{%
\@tfor\@tempa:={grave}{acute}{check}{breve}{bar}%
{dot}{ddot}{mathring}{hat}{tilde}%
\do
- {\expandafter\let\csname\@tempa\mst@robustifyingspace\expandafter\endcsname
- \csname mst@\@tempa @mv\math@version\mst@robustifyingspace\endcsname}%
+ {\expandafter\let\csname\@tempa\expandafter\endcsname
+ \csname mst@\@tempa @mv\math@version\endcsname
+ \expandafter\let\csname\@tempa\space\expandafter\endcsname
+ \csname mst@\@tempa @mv\math@version\space\endcsname
+}%
}%
\def\mst@dothe@mathaccentsstuff#1#2{%
\begingroup
@@ -7398,8 +7530,11 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
{dot}{ddot}{mathring}{hat}{tilde}%
\do
{\expandafter\let
- \csname mst@\@tempa @mv#1\mst@robustifyingspace\expandafter\endcsname
- \csname mst@original@\@tempa\endcsname}%
+ \csname mst@\@tempa @mv#1\expandafter\endcsname
+ \csname mst@original@\@tempa\endcsname
+ \expandafter\let
+ \csname mst@\@tempa @mv#1\space\expandafter\endcsname
+ \csname mst@original@\@tempa\space\endcsname}%
}}%
\fi
% \end{macrocode}
@@ -7408,6 +7543,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% |2019-10-01| or later. As we want elsewhere in the package code not to have
% to check if under Unicode engine or not, we need to handle here also some
% definition of robust macros.
+%
+% But wouldn't it be simpler to manage \cs{protected} macros?
% \begin{macrocode}
\ifmst@robust@obsessed@LaTeX@era
\@tfor\@tempa:={grave}{acute}{check}{breve}{bar}%
@@ -7422,45 +7559,47 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% \end{macrocode}
% \cs{DeclareMathAccent} works \cs{global}ly. And with \LaTeX{} |2019-10-01|
% or later it creates robust macros.
+%
+% \cs{mst@DeclareMathAccent} to work around \url{https://github.com/latex3/latex2e/issues/216}
% \begin{macrocode}
% \` -> \grave
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@grave@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\`\endcsname{}}
% \' -> \acute
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@acute@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\'\endcsname{}}
% \v -> \check
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@check@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\v\endcsname{}}
% \u -> \breve
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@breve@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\u\endcsname{}}
% \= -> \bar
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@bar@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\=\endcsname{}}
% \. -> \dot
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@dot@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\.\endcsname{}}
% \" -> \ddot
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@ddot@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\"\endcsname{}}
% \r -> \mathring
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@mathring@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\r\endcsname{}}
% \^ -> \hat
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@hat@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\^\endcsname{}}
% \~ -> \tilde
- \expandafter\DeclareMathAccent\expandafter
+ \expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@tilde@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\~\endcsname{}}
\fi
@@ -7485,7 +7624,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
%
% Note: (|2012/10/24|) I really should check whether the user attempts to
% redefine the `normal' and `bold' versions and issue a warning in
-% that case!
+% that case! Finally done at |1.3w| |2019/11/16|! Better late than never...
%
% |1.3c| (|2013/12/14|) adds an extra optional parameter after all
% previous ones, to inherit the settings from another version. Typically
@@ -7499,13 +7638,27 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% |1.3u| adds storage of macros holding the needed meanings for
% \cs{imath}, \cs{hbar}, math accents, and the minus symbol,
% version wise.
+%
+% |1.3w| adds the check to forbid |normal| and |bold| as version names.
% \begin{macrocode}
\newcommand*\MTDeclareVersion[6][]{%
\edef\mst@declareversionargs{{#1}{#2}{#3}{#4}{#5}{#6}}%
\edef\mst@version{#2}%
- \DeclareMathVersion{\mst@version}%
- \MTDeclareVersion@
+ \if0\ifx\mst@version\mst@normalversionname0\else
+ \ifx\mst@version\mst@boldversionname0\else
+ 1\fi\fi
+ \expandafter\expandafter\expandafter
+ \MTDoNotDeclareVersion@\expandafter\@gobblefour
+ \fi
+ \relax\DeclareMathVersion{\mst@version}\MTDeclareVersion@
}% \MTDeclareVersion
+\newcommand*\MTDoNotDeclareVersion@[1][]{%
+ \PackageWarningNoLine{mathastext}{You asked to declare a version with name
+ `\mst@version'.^^J%
+ \@spaces Sorry but you are not allowed to do that.^^J%
+ \@spaces \ifmst@subdued Anyway the `subdued' option is in force\else
+ Use rather \string\Mathastext\space macro (with no optional argument)\fi
+}}%\MTDoNotDeclareVersion@
\newcommand*\MTDeclareVersion@[1][]{%
\edef\mst@tmp{#1}%
\ifx\mst@tmp\empty\else
@@ -7777,8 +7930,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% \cs{MTeverymathoff}.
% \begin{macrocode}
\ifmst@subdued
- \def\mst@tmpa{normal}%
- \ifx\math@version\mst@tmpa
+ \ifx\math@version\mst@normalversionname
\mst@restorealphabets
\MTstandardgreek
\MTmathoperatorsdonotobeymathxx
@@ -7798,8 +7950,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\mst@subduedmathaccents
\mst@subduedminus
\else
- \def\mst@tmpa{bold}%
- \ifx\math@version\mst@tmpa
+ \ifx\math@version\mst@boldversionname
\mst@restorealphabets
\MTstandardgreek
\MTmathoperatorsdonotobeymathxx
@@ -8286,18 +8437,22 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
%
% |1.3v| adapts to \cs{hbar} and math accents now being robust with \LaTeX{}
% |2019-10-01| or later.
+%
+% |1.3w| pays attention to the fact that \cs{hbar} may well be
+% a |\mathchar| and not a robust macro! And no need to worry about
+% \cs{hbar<space>} finally in revised code.
% \begin{macrocode}
\MTcustomizenewmcodes
- \expandafter\let\expandafter
- \mst@original@hbar
- \csname hbar\mst@robustifyingspace\endcsname
+ \let\mst@original@hbar\hbar
\let\mst@original@imath\imath
\let\mst@original@jmath\jmath
\@tfor\@tempa:={grave}{acute}{check}{breve}{bar}%
{dot}{ddot}{mathring}{hat}{tilde}%
\do
{\expandafter\let\csname mst@original@\@tempa\expandafter\endcsname
- \csname \@tempa\mst@robustifyingspace\endcsname
+ \csname \@tempa\endcsname
+ \expandafter\let\csname mst@original@\@tempa\space\expandafter\endcsname
+ \csname \@tempa\space\endcsname
}%
\ifmst@XeOrLua
\edef\mst@subduedminus
@@ -8530,7 +8685,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
Grave accent \` Left brace \{ Vertical bar \|
Right brace \} Tilde \~}
-\CheckSum{6101}
+\CheckSum{6187}
\makeatletter\check@checksum\makeatother
\Finale
%%
diff --git a/macros/latex/contrib/mathastext/mathastext.pdf b/macros/latex/contrib/mathastext/mathastext.pdf
index 21fdfef499..dc8c864908 100644
--- a/macros/latex/contrib/mathastext/mathastext.pdf
+++ b/macros/latex/contrib/mathastext/mathastext.pdf
Binary files differ
diff --git a/macros/latex/contrib/mathastext/mathastexttestalphabets.pdf b/macros/latex/contrib/mathastext/mathastexttestalphabets.pdf
index 0163ff573e..ff43ebc0d0 100644
--- a/macros/latex/contrib/mathastext/mathastexttestalphabets.pdf
+++ b/macros/latex/contrib/mathastext/mathastexttestalphabets.pdf
Binary files differ
diff --git a/macros/latex/contrib/pst-pdf/CHANGES b/macros/latex/contrib/pst-pdf/CHANGES
index 10adc23fc1..db9952fe79 100644
--- a/macros/latex/contrib/pst-pdf/CHANGES
+++ b/macros/latex/contrib/pst-pdf/CHANGES
@@ -1,143 +1,150 @@
Changes to pst-pdf:
v1.0a
- General: Initial version.
+ General: Initial version.
v1.0b
- General: Some code and documentation cleaning. (RN)
+ General: Some code and documentation cleaning. (RN)
v1.0c
- General: New options “pstricksâ€, “nopstricksâ€, “draft†and
- “finalâ€. (RN)
+ General: New options “pstricksâ€, “nopstricksâ€, “draft†and
+ “finalâ€. (RN)
v1.0d
- General: Redefinition of \includegraphics in modes 0 und 1. Now
- using of eps graphics directly in pdfLaTeX is possible.
- (RN)
+ General: Redefinition of \includegraphics in modes 0 und 1. Now
+ using of eps graphics directly in pdfLaTeX is possible.
+ (RN)
v1.0e
- postscript: “trim†option added. (RN)
+ postscript: “trim†option added. (RN)
v1.0f
- \savepicture: New macro \savepspicture. (RN)
- \usepicture: New macro \usepspicture. Useful for putting a
- PSTricks graphic in a box or something else. (RN)
- General: Config file loading added. (RN)
+ \savepicture: New macro \savepspicture. (RN)
+ \usepicture: New macro \usepspicture. Useful for putting a
+ PSTricks graphic in a box or something else. (RN)
+ General: Config file loading added. (RN)
v1.0g
- \usepicture: Now \usepspicture does accept a numerical
- parameter. (RN)
- General: Definition of \PDFcontainer now with \edef. (RN)
+ \usepicture: Now \usepspicture does accept a numerical
+ parameter. (RN)
+ General: Definition of \PDFcontainer now with \edef. (RN)
v1.0h
- psmatrix: Based no more on the comment environment from the
- verbatim package. (RN)
+ psmatrix: Based no more on the comment environment from the
+ verbatim package. (RN)
v1.0i
- \ppf@is@pdfTeX@graphic: No more errors for given files without
- extensions. (RN)
+ \ppf@is@pdfTeX@graphic: No more errors for given files without
+ extensions. (RN)
v1.0j
- General: Check AtBeginDocument for package ‘pstricks’ even if
- “nopstricks†is given. (RN)
+ General: Check AtBeginDocument for package ‘pstricks’ even if
+ “nopstricks†is given. (RN)
+ For \includegraphics \usepicture and postscript the new
+ options “frameâ€, “framesepâ€, “frameruleâ€, “linewidthâ€,
+ and “ignore†added. (RN)
v1.0k
- \Gin@setfile: Show also the pagenumber if exists. (RN)
- \Ginclude@graphics: Prevent division by zero. (RN)
+ \Gin@setfile: Show also the pagenumber if exists. (RN)
+ \Ginclude@graphics: Prevent division by zero. (RN)
v1.0l
- General: Options “framesepâ€, “frameruleâ€, “linewidth†removed,
- “fname†and “innerframe†added. (RN)
+ General: Options “framesepâ€, “frameruleâ€, “linewidth†removed,
+ “fname†and “innerframe†added. (RN)
v1.0m
- General: New package option “notightpage†added. (RN)
+ General: New package option “notightpage†added. (RN)
v1.0n
- General: Changed marcro names (\savepicture and \usepicture).
- (RN)
- Some code cleaning. (RN)
+ General: Changed marcro names (\savepicture and \usepicture).
+ (RN)
+ Some code cleaning. (RN)
v1.0o
- General: New code for “notightpageâ€. (RN)
- Option “fname†renamed to “shownameâ€. (RN)
+ General: New code for “notightpageâ€. (RN)
+ Option “fname†renamed to “shownameâ€. (RN)
v1.0p
- General: Some code and documentation cleaning. (RN)
+ General: Some code and documentation cleaning. (RN)
v1.0q
- \usepicture: Now \usepspicture works for all kind of graphics.
- (RN)
+ \usepicture: Now \usepspicture works for all kind of graphics.
+ (RN)
v1.0r
- \ppf@is@pdfTeX@graphic: Changed \ppf@is@known@graphic to
- \ppf@is@pdfTeX@graphic. Now pdfTEX graphics are
- prefered. (RN)
+ \ppf@is@pdfTeX@graphic: Changed \ppf@is@known@graphic to
+ \ppf@is@pdfTeX@graphic. Now pdfTeX graphics are
+ prefered. (RN)
v1.0s
- \Gin@ii: Rewritten. (RN)
- General: Scaling e.g. of PostScript pictures now only in
- extraction mode. Some code cleaning. (RN)
+ \Gin@ii: Rewritten. (RN)
+ General: Scaling e.g. of PostScript pictures now only in
+ extraction mode. Some code cleaning. (RN)
v1.1a
- General: Support for the internal PSTricks macro \pst@object.
- (HjG/RN)
+ General: Support for the internal PSTricks macro \pst@object.
+ (HjG/RN)
v1.1b
- General: Ignore the call of \nofiles inside of preview. (RN)
- Some code and documentation cleaning. (RN)
+ General: Ignore the call of \nofiles inside of preview. (RN)
+ Some code and documentation cleaning. (RN)
v1.1c
- General: New package option “tightpage†added. (RN)
- Special support for “tabularxâ€. (RN)
- Supress handling of pdfLaTeX graphic formats in DVI mode.
- (RN)
+ General: New package option “tightpage†added. (RN)
+ Special support for “tabularxâ€. (RN)
+ Supress handling of pdfLaTeX graphic formats in DVI mode.
+ (RN)
v1.1d
- postscript: Support for PSTricks environment “psmatrixâ€. (RN)
+ postscript: Support for PSTricks environment “psmatrixâ€. (RN)
v1.1e
- General: New option “displaymath†(see preview package).
- (HjG/RN)
+ General: New option “displaymath†(see preview package).
+ (HjG/RN)
v1.1f
- General: Package option “ignore†reimplemented. Now the
- compilation of the dtx file in LaTeX mode is possible.
- (RN)
+ General: Package option “ignore†reimplemented. Now the
+ compilation of the dtx file in LaTeX mode is possible.
+ (RN)
v1.1g
- postscript: “psmatrix†environment (preserve math mode).
- (RN/HjG)
- pspicture: pspicture environment must still parse its arguments.
- (RN/HjG)
+ postscript: “psmatrix†environment (preserve math mode).
+ (RN/HjG)
+ pspicture: pspicture environment must still parse its arguments.
+ (RN/HjG)
v1.1h
- \Ginclude@graphics: Check if inside of a PS-related environment
- (correct graphic inclusion). (RN)
+ \Ginclude@graphics: Check if inside of a PS-related environment
+ (correct graphic inclusion). (RN)
v1.1i
- \Ginclude@graphics: Correction of the inside check. (RN/HjG)
- General: \ifpr@outer must be predefined. (HjG/RN)
- Package option “final†also for “graphicxâ€. (RN)
+ \Ginclude@graphics: Correction of the inside check. (RN/HjG)
+ General: \ifpr@outer must be predefined. (HjG/RN)
+ Package option “final†also for “graphicxâ€. (RN)
v1.1k
- General: New environment pst-pdf-defs: Support for PSTricks
- environment “psmatrix†inside user definitions.
- (RN,HjG)
+ General: New environment pst-pdf-defs: Support for PSTricks
+ environment “psmatrix†inside user definitions.
+ (RN,HjG)
v1.1l
- General: Support for the package “psfragxâ€. (RN)
+ General: Support for the package “psfragxâ€. (RN)
v1.1m
- General: Merge english and german version of the documentation.
- (RN)
+ General: Merge english and german version of the documentation.
+ (RN)
v1.1n
- General: \nofiles added (suggestion of Torsten Bronger).
+ General: \nofiles added (suggestion of Torsten Bronger).
v1.1o
- \Gscale@@box: Disable scaling. (RN)
+ \Gscale@@box: Disable scaling. (RN)
v1.1p
- General: \nofiles makes \makeindex and \makeglossary to \relax.
- \@empty is better because of later \renewcommand’s.
-v1.1p1
- General: \let\output\@gobble before loading of “preview†added.
- (RN)
+ General: \let\output\@gobble before loading of “preview†added.
+ (RN)
+ \nofiles makes \makeindex and \makeglossary to \relax.
+ \@empty is better because of later \renewcommand’s.
v1.1q
- General: Problem with “tabularx†and “threeparttabel†solved.
- (RN)
+ General: Problem with “tabularx†and “threeparttabel†solved.
+ (RN)
v1.1r
- General: Fixed values for \PreviewBbAdjust because \paperwidth
- is not allways defined (suggested by Will Robertson).
+ General: Fixed values for \PreviewBbAdjust because \paperwidth
+ is not allways defined (suggested by Will Robertson).
v1.1s
- General: Dummy definition of the page key in DVI mode.
+ General: Dummy definition of the page key in DVI mode.
v1.1t
- General: Remove the line “\let\output\@gobble†because of bad
- side effects. (RN)
- postscript: Using environ the environment postscript is now
- simple and more robust. (RN)
+ General: Remove the line “\let\output\@gobble†because of bad
+ side effects. (RN)
+ postscript: Using environ the environment postscript is now
+ simple and more robust. (RN)
v1.1u
- General: \pdfoutput must be set when loading “pdftex.def†in DVI
- mode. (RN)
+ General: \pdfoutput must be set when loading “pdftex.def†in DVI
+ mode. (RN)
v1.1v
- \Gin@ii: Key settings only for pdf graphics. (RN)
- General: Local redefinition of \pdfoutput to be a counter. (RN)
+ \Gin@ii: Key settings only for pdf graphics. (RN)
+ General: Local redefinition of \pdfoutput to be a counter. (RN)
v1.2a
- General: Engine tests changed (RN)
+ General: Engine tests changed (RN)
v1.2b
- General: Loading packages ‘if*’ at wrong place (RN)
+ General: Loading packages ‘if*’ at wrong place (RN)
v1.2c
- General: “postscript†environment no more allowed before
- \begin{document} (changed example file).
+ General: “postscript†environment no more allowed before
+ \begin{document} (changed example file).
v1.2d
- General: \c@lor@to@ps must not be undefined before loading
- ‘PSTricks’
- Version parameter for ‘graphicx’ and rename \GPT@page to
- \Gin@page at several places
+ General: \c@lor@to@ps must not be undefined before loading
+ ‘PSTricks’
+ Version parameter for ‘graphicx’ and rename \GPT@page to
+ \Gin@page at several places
+v1.2e
+ \ppf@is@pdfTeX@graphic: Parameter #2 is detokenized when
+ expanded to \pdfTeXext
+ General: gobble optional argument for \makeindex, \makeglossary
+ and \printindex
diff --git a/macros/latex/contrib/pst-pdf/CHANGES.tex b/macros/latex/contrib/pst-pdf/CHANGES.tex
deleted file mode 100644
index 8d19127288..0000000000
--- a/macros/latex/contrib/pst-pdf/CHANGES.tex
+++ /dev/null
@@ -1,47 +0,0 @@
-% Rolf Niepraschk, <Rolf.Niepraschk@gmx.de>
-% Hubert Gaesslein
-% 2017-04-24
-\documentclass[draft]{ltxdoc}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[document]{ragged2e}
-\usepackage{calc}
-
-\renewcommand*\familydefault{\ttdefault}
-\renewcommand*\normalsize{\tiny}
-
-\AtBeginDocument{%
- \renewcommand*\usefont[4]{}\renewcommand*\selectfont{}}
-
-\normalfont \normalsize
-
-% Adobe Reader can't cope with \maxdimen ... :-(
-% 5080mm+32sp=947257376sp; 1sp mehr ... und die Schrift verschwindet!
-% 947257376sp ~= 14454pt ~= 200in ~= 14400bp
-\usepackage[%
- paperheight=947257376sp,paperwidth=\widthof{m}*72+2bp,
- left=1bp,right=1bp,top=0bp,bottom=0bp,verbose]{geometry}
-
-\makeatletter
-
-\renewenvironment{theglossary}
-{%
- \setlength\baselineskip{0pt}
- \renewcommand*\pfill{\@tempcnta=\number}
- \let\item\@idxitem \ignorespaces
-}{}
-
-\let\textlatin\@firstofone
-
-\makeatother
-
-\renewcommand*\TeX{TeX} \renewcommand*\LaTeX{LaTeX}% too late! RN.
-
-\setlength\parindent{0pt} \pagestyle{empty} \nofiles \raggedbottom
-
-\begin{document}
-
-\section*{Changes to \textsf{pst-pdf}:}
-\input{pst-pdf.gls}
-
-\end{document}
diff --git a/macros/latex/contrib/pst-pdf/Makefile b/macros/latex/contrib/pst-pdf/Makefile
index df2a53cab7..2c5f7e7305 100644
--- a/macros/latex/contrib/pst-pdf/Makefile
+++ b/macros/latex/contrib/pst-pdf/Makefile
@@ -21,7 +21,7 @@ ADDINPUTS = penguin.eps elephant.ps knuth.png psf-demo.eps \
PDF_CONTAINER = $(EXAMPLE:.tex=-pics.pdf)
ARCHFILES = $(PACKAGE).dtx $(PACKAGE).ins $(ADDINPUTS) Makefile \
- README.md CHANGES CHANGES.tex \
+ README.md CHANGES \
$(PACKAGE).pdf $(PACKAGE)-DE.pdf $(EXAMPLE:.tex=.pdf) \
ps4pdf \
ps4pdf.bat \
@@ -43,7 +43,7 @@ example : $(EXAMPLE:.tex=.pdf)
$(EXAMPLE:.tex=.pdf) : $(EXAMPLE) $(ADDINPUTS) $(PDF_CONTAINER) $(PACKAGE).sty
$(PDFLATEX) $<
-dist : doc doc-DE pdf example
+dist : doc doc-DE pdf example CHANGES
rm -rf $(PACKAGE)
mkdir $(PACKAGE)
cp -p $(ARCHFILES) $(PACKAGE)/
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf b/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf
index e9111d4777..561f570f1b 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf
+++ b/macros/latex/contrib/pst-pdf/pst-pdf-DE.pdf
Binary files differ
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf b/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf
index 8c403ccddf..d910e4a708 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf
+++ b/macros/latex/contrib/pst-pdf/pst-pdf-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf.dtx b/macros/latex/contrib/pst-pdf/pst-pdf.dtx
index 7dfccc7cd4..bf3cbc1a48 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf.dtx
+++ b/macros/latex/contrib/pst-pdf/pst-pdf.dtx
@@ -24,7 +24,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{pst-pdf}
%<*package>
- [2017/06/22 v1.2d PS graphics for pdfLaTeX (RN,HjG)]
+ [2019/11/15 v1.2e PS graphics for pdfLaTeX (RN,HjG)]
%</package>
%
%<*driver>
@@ -50,7 +50,7 @@
%</driver>
% \fi
%
-% \CheckSum{832}
+% \CheckSum{839}
%
% \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
@@ -76,7 +76,7 @@
% \changes{v1.0j}{2005/02/22}{Check AtBeginDocument for package
% `pstricks' even if ``nopstricks'' is given. (RN)}
% \changes{v1.0j}{2005/02/22}{For \cmd{\includegraphics}
-% \cmd{\usepicture} and |postscript| the new options ``frame'',
+% \cmd{\usepicture} and \string\verb+postscript+ the new options ``frame'',
% ``framesep'', ``framerule'', ``linewidth'', and ``ignore'' added. (RN)}
% \changes{v1.0l}{2005/02/25}{Options ``framesep'', ``framerule'',
% ``linewidth'' removed, ``fname'' and ``innerframe'' added. (RN)}
@@ -248,7 +248,7 @@
% Es werden zus\"atzlich die mathematischen Umgebungen
% \env{displaymath}, \env{eqnarray} und \env{\$\$} extrahiert und im
% pdf-Modus
-% als Grafik eingefügt. So k\"onnen zus\"atzliche PSTricks-Erg\"anzungen
+% als Grafik eingef\"ugt. So k\"onnen zus\"atzliche PSTricks-Erg\"anzungen
% leicht dem Inhalt dieser Umgebungen zugef\"ugt werden. (Frage: Wie
% verhalten sich die AMS\LaTeX-Umgebungen?)
%
@@ -484,7 +484,7 @@
% \cmd{\includegraphicx}\oarg{keys}\parg{pfxadd}\ooarg{ovpfgd}\oarg{ovpbgd}%
% \marg{filename}
% \par\noindent
-% Wie im Paket \pkgname{psfragx} definiert zu verwenden.
+% To be used like defined in package\pkgname{psfragx}.
% \medskip
%
% \DescribeMacro{\savepicture}
@@ -498,18 +498,17 @@
% \DescribeMacro{\usepicture}
% \cmd{\usepicture}\oarg{keys}\marg{name}
% \par\noindent
-% Die zuvor mit \cmd{\savepicture} gespeicherte Grafik wird
-% ausgegeben. Der optionale Parameter entpricht dem bei der Anweisung
-% \cmd{\includegraphics} m\"oglichen.
+% The graphic previously stored with \cmd{\savepicture} is outputted. The
+% optional parameter corresponds to \cmd{\includegraphics}.
% \medskip
%
% \DescribeEnv{pst-pdf-defs}
% \cmd{\begin}\texttt{\{pst-pdf-defs\}} \dots
% \cmd{\end}\texttt{\{pst-pdf-defs\}}
% \par\noindent
-% Sollen eigene Makros oder Umgebungen definiert werden, die das Zeichen
-% \texttt{\&} (andere?) im Ersetzungstext enthalten, so m\"ussen diese
-% Definitionen von der Umgebung |pst-pdf-defs| umschlossen werden.
+% For defining macros or environments, which contain character \texttt{\&}
+% (others?) in the output, these defintions have to be wrapped with
+% environment |pst-pdf-defs|.
% \medskip
% \fi
%
@@ -565,8 +564,8 @@
% \item[innerframe=\TorF] As in ``|frame|'', but the frame is drawn
% around the gra\-phics, not its box.
%
-% \item[ignore=\TorF] If ``|true|'' no graphics is output. With
-% \cmd{\savepicture}\marg{name} the graphics can be used later in a
+% \item[ignore=\TorF] If set to ``|true|'' no graphics are outputted. With
+% macro \cmd{\savepicture}\marg{name} the graphics can be used later in a
% different place via \cmd{\usepicture}. Default: false.
%
% \item[showname=\TorF] A caption of minimal font size records the used
@@ -729,6 +728,8 @@
% extensions. (RN)}
% \changes{v1.0r}{2005/03/25}{Changed \cmd{\ppf@is@known@graphic} to
% \cmd{\ppf@is@pdfTeX@graphic}. Now pdf\TeX\ graphics are prefered. (RN)}
+% \changes{v1.2e}{2019/11/15}{Parameter \string\verb+#2+ is detokenized when
+% expanded to \cmd{\pdfTeXext}}
% \ifGERMAN
% Parameter |#1| ist der Name einer Grafikdatei mit oder ohne Endung,
% Parameter |#2| enth\"alt die g\"ultigen Dateiendungen im pdf-Modus,
@@ -747,7 +748,7 @@
\newcommand*\ppf@is@pdfTeX@graphic[5]{%
\@ppf@pdftex@graphicfalse%
\begingroup
- \edef\pdfTeXext{#2}%
+ \edef\pdfTeXext{\detokenize\expandafter{#2}}%
% \end{macrocode}
% \ifGERMAN
% Statt Einladen einer identifizierten Grafik nur Test der Grafikendung.
@@ -757,9 +758,8 @@
% \fi
% \begin{macrocode}
\def\Gin@setfile##1##2##3{%
- \edef\@tempb{##2}%
- \@for\@tempa:=\pdfTeXext\do{%
- \ifx\@tempa\@tempb\global\@ppf@pdftex@graphictrue\fi}}%
+ \@expandtwoargs\in@{,\detokenize\expandafter{##2},}{,\pdfTeXext,}%
+ \ifin@\global\@ppf@pdftex@graphictrue\fi}%
% \end{macrocode}
% \ifGERMAN
% Es m\"ussen Dateitypen beider Moden gefunden werden, um
@@ -817,12 +817,17 @@
% \changes{v1.1p}{2007/06/04}{\cmd{\nofiles} makes \cmd{\makeindex} and
% \cmd{\makeglossary} to \cmd{\relax}. \cmd{\@empty} is better
% because of later \cmd{\renewcommand}'s.}
+% \changes{v1.2e}{2019/11/15}{gobble optional argument for \cmd{\makeindex},
+% \cmd{\makeglossary} and \cmd{\printindex}}
% \changes{v1.1q}{2008/02/17}{\cmd{\overfullrule} must not be > 0.}
% \begin{macrocode}
\PackageInfo{pst-pdf}{%
MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}
\nofiles
- \let\makeindex\@empty \let\makeglossary\@empty
+ \let\makeindex\@empty \let\makeglossary\@empty \let\printindex\@empty
+ \renewcommand*\makeindex[1][]{}%
+ \renewcommand*\makeglossary[1][]{}%
+ \renewcommand*\printindex[1][]{}%
\AtBeginDocument{\overfullrule=\z@}%
\if@ppf@PST@used\RequirePackage{pstricks}\fi
\RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
@@ -1092,7 +1097,7 @@
\ifpr@outer
% \end{macrocode}
% \ifGERMAN
-% Im allgemeinen Fall sollen pdf\TeX-Grafiken bevorzugt werden (Einfügen
+% Im allgemeinen Fall sollen pdf\TeX-Grafiken bevorzugt werden (Einf\"ugen
% erst im pdf\TeX-Modus). Ist nur eine DVIPS-Graphik vorhanden, dann
% wirkt wieder die Originaldefintion und Registrierung beim
% preview-Paket muss erfolgen.
@@ -1188,7 +1193,9 @@
% \fi
% \begin{macrocode}
\PSTricksOff
- \@ifundefined{c@lor@to@ps}{\def\c@lor@to@ps#1 #2\@@{}}{}}}%
+ \def\c@lor@to@ps#1 #2\@@{}
+ }%
+ }%
% \end{macrocode}
% \ifGERMAN
% \PS-Ausgabe jetzt verhindern und sp\"ater noch einmal.
@@ -1225,7 +1232,7 @@
% \fi
% \changes{v1.1b}{2005/04/09}{Ignore the call of
% \cmd{\nofiles} inside of \pkgname{preview}. (RN)}
-% \changes{v1.1p1}{2007/07/27}{\cmd{\let}\cmd{\output}\cmd{\@gobble}
+% \changes{v1.1p}{2007/07/27}{\cmd{\let}\cmd{\output}\cmd{\@gobble}
% before loading of ``preview'' added. (RN)}
% \changes{v1.1t}{2008/09/09}{Remove the line
% ``\cmd{\let}\cmd{\output}\cmd{\@gobble}'' because of bad side
@@ -1576,7 +1583,7 @@
% \ifGERMAN
% Die im pdf\TeX-Modus unn\"utze Umdefinition von
% \cmd{\includegraphics} (Paket \pkgname{psfragx}) f\"uhrt zu zweifachem
-% Einfügen des Ergebnisses, weshalb die Originaldefition wiederhergestellt
+% Einf\"ugen des Ergebnisses, weshalb die Originaldefition wiederhergestellt
% wird.
% \fi
% \ifENGLISH
diff --git a/macros/latex/contrib/pst-pdf/pst-pdf.pdf b/macros/latex/contrib/pst-pdf/pst-pdf.pdf
index 877c03418f..f314a58682 100644
--- a/macros/latex/contrib/pst-pdf/pst-pdf.pdf
+++ b/macros/latex/contrib/pst-pdf/pst-pdf.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md
index ce76b0fd75..d6ddb2f1ee 100644
--- a/macros/latex/contrib/tuda-ci/README.md
+++ b/macros/latex/contrib/tuda-ci/README.md
@@ -2,7 +2,7 @@
Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2019
- tuda-ci 2019/11/13 v2.01
+ tuda-ci 2019/11/16 v2.02
***************************************************************************
@@ -158,4 +158,7 @@ exercise sheets/exams | DEMO-TUDaExercise.tex | tudaexercise.cls
* v2.01 (2019-11-13) small bugfixes
- Fix expansion of metadata for PDF/A mode
- Adjustment of english translation for thesis mode of tudapub
- - fix support for titlegraphic in announcement mode for tudaposter \ No newline at end of file
+ - fix support for titlegraphic in announcement mode for tudaposter
+ * v2.02 (2019-11-16) bugfixes
+ - fix font issues and Type1 mode
+ - improve marginpar adjustment for tudaposter \ No newline at end of file
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
index 856ae106cc..552fe5cbb3 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 f8eaaeabf0..257bf257a3 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 76dc248a43..b70004355f 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 c318bbd91d..75a018edca 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 3b4339786a..57ad7dc408 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 00aa52e433..2d0fe76807 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 d3a9a4af17..04de365aed 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 a5c98e74ef..6ad66eb453 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 c580f18de0..a839b83327 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 116b202785..aba79da746 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 bde26563c2..5f9b0eeedd 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaAnnouncement.tex' version 2.02 (2019/11/16),
%% 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 89cf55feff..821244ebef 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaBeamer.tex' version 2.02 (2019/11/16),
%% 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 12f355827d..d42301b5b5 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaBibliography.bib' version 2.02 (2019/11/16),
%% 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 25f82f03bf..933e33d70f 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaExercise.tex' version 2.02 (2019/11/16),
%% 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 e0bff89ca6..7f82208ca7 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaFromaddress.lco' version 2.02 (2019/11/16),
%% 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 526ea2fdec..fcf5666be7 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaLetter.tex' version 2.02 (2019/11/16),
%% 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 145f26b9c4..c7b5b2563e 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaPhD.tex' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
index b95c79e973..6d81d3a80d 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaPoster.tex' version 2.02 (2019/11/16),
%% 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 b25284b465..642c03c0b0 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaPub.tex' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
index 9a78837863..3b2c33557d 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaReport.tex' version 2.02 (2019/11/16),
%% 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 bab000854b..e6aaac07c1 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaSciPoster.tex' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
index ce0d59d0ab..4bbaa8a8f0 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.01 (2019/11/13),
+%% This is file `DEMO-TUDaThesis.tex' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
index a72e4b3233..58b89e28d2 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.01 (2019/11/13),
+%% This is file `beamercolorthemeTUDa.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 72f86fe39f..139f70b1e4 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.01 (2019/11/13),
+%% This is file `beamerfontthemeTUDa.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 10d19d0126..3144a417a7 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.01 (2019/11/13),
+%% This is file `beamerinnerthemeTUDa.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/10/15),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
index c3fa00d7b6..805908e02e 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.01 (2019/11/13),
+%% This is file `beamerouterthemeTUDa.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 886d9b99b7..d26992623b 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.01 (2019/11/13),
+%% This is file `beamerthemeTUDa.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 8b7a43a9c1..f331135db5 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.01 (2019/11/13),
+%% This is file `tuda-a0paper.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 ef45abe0d3..8cce9120ea 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.01 (2019/11/13),
+%% This is file `tuda-a1paper.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 50c85ed093..34c3bfb86b 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.01 (2019/11/13),
+%% This is file `tuda-a2paper.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 1df390e693..6461feb52f 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.01 (2019/11/13),
+%% This is file `tuda-a3paper.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 08f76ee9bf..d0a4c62316 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.01 (2019/11/13),
+%% This is file `tuda-a4paper.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 d0b6ad072f..941a77d80e 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.01 (2019/11/13),
+%% This is file `tuda-a5paper.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 889278ec5d..c2ef2b8d53 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.01 (2019/11/13),
+%% This is file `tuda-pgfplots.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
% 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 0aee585f66..95a53f8480 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.01 (2019/11/13),
+%% This is file `tudabeamer.cls' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{tudabeamer}
[\filedate\space\fileversion\space]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
index 44514c4912..48379ba080 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.01 (2019/11/13),
+%% This is file `tudacolors.def' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 9751bd6e96..cc047427ee 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.01 (2019/11/13),
+%% This is file `tudacolors.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
index de853d32be..394ee4388e 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.01 (2019/11/13),
+%% This is file `tudaexercise.cls' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
%%
\def\fileversion{1.01}
\def\filedate{2019/09/09}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
index 719415b373..ca8b53e03a 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.01 (2019/11/13),
+%% This is file `tudafonts.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudafonts}
[\filedate\space\fileversion\space
@@ -42,15 +42,15 @@
\RequirePackage{anyfontsize}
\ifPDFTeX
- \csname @TUDa@T1true\endcsname
- %Fallback for older versions
- \expandafter\ifx\csname DeclareUnicodeCharacter\endcsname\relax
- \RequirePackage[utf8]{inputenc}
- \cs_if_exist:NF \texteuro {\RequirePackage{textcomp}}
- \DeclareUnicodeCharacter{20AC}{\texteuro}
- \fi
-\else
- \RequirePackage{fontspec}
+ \csname @TUDa@T1true\endcsname
+ %Fallback for older versions
+ \expandafter\ifx\csname DeclareUnicodeCharacter\endcsname\relax
+ \RequirePackage[utf8]{inputenc}
+ \fi
+ \expandafter\ifx\csname texteuro\endcsname\relax
+ \RequirePackage{textcomp}
+ \fi
+ \DeclareUnicodeCharacter{20AC}{\texteuro}
\fi
\csname if@TUDa@T1\endcsname
@@ -58,7 +58,8 @@
\PassOptionsToPackage{type1}{roboto}
\PassOptionsToPackage{type1}{roboto-mono}
\else
- \setmainfont{XCharter}
+ \RequirePackage{fontspec}
+ \setmainfont{XCharter}
\fi
\RequirePackage{roboto}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
index 680e8f5286..ccc1cb36b9 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.01 (2019/11/13),
+%% This is file `tudaletter.cls' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudaletter}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
index 5705172403..d57c212c04 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.01 (2019/11/13),
+%% This is file `tudalettersize10pt.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
%% 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 5791839671..49e8165223 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.01 (2019/11/13),
+%% This is file `tudaposter.cls' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
@@ -369,22 +369,36 @@
\box_ht:N \g_TUDa_title_box+.5\c_TUDa_logoheight_dim
}
- \ModifyLayer[
- height=\g_TUDa_titleback_dim
+ \ModifyLayer[
+ height=\g_TUDa_titleback_dim
]{TUDa.poster.background}
\bool_if:NF \g_TUDa_logo@inhead_bool {
\ModifyLayer[
- addvoffset=\g_TUDa_titleback_dim+\c_TUDa_smallrule_dim %+\box_dp:N \g_TUDa_title_box
+ addvoffset=\g_TUDa_titleback_dim+\c_TUDa_smallrule_dim
]{TUDa.poster.logo}
}
+
+ \bool_if:NT \g_TUDa_logo@inhead_bool {
+ \dim_compare:nT {\box_ht:N \g_TUDa_title_info_box+ \box_dp:N \g_TUDa_title_info_box > \box_ht:N \g_TUDa_title_box}
+ {\msg_warning:nn {TUDaPoster} {infobox-too-high}}
+ }
+ \leavevmode\box_use:N \g_TUDa_title_box\par
+ \dim_set:Nn \g_TUDa_titlegraphic_max_height_dim {\textheight-\pagetotal}
+ \global\def\contentheight{\g_TUDa_titlegraphic_max_height_dim}
+ \tl_if_empty:NF \@titlegraphic{
+ \vbox_gset:Nn \g_TUDa_titlegraphic_box {\parbox[t]{\dim_eval:n {\paperwidth-2\g_TUDa_margin_dim}}{\@titlegraphic}}
+ \par\nointerlineskip
+ \box_use:N \g_TUDa_titlegraphic_box
+ }
\DeclareLayer[
- clone=TUDa.poster.marginpar,
- height=\textheight-\box_ht:N \g_TUDa_title_box-\box_dp:N \g_TUDa_title_box-.5\c_TUDa_logoheight_dim,
- addvoffset=\box_ht:N \g_TUDa_title_box+\box_dp:N \g_TUDa_title_box+.5\c_TUDa_logoheight_dim,
+ clone=TUDa.poster.marginpar,
+ height=\bool_if:NF \l_TUDa_marginpar_overlap_bool {-\box_ht:N \g_TUDa_titlegraphic_box-\box_dp:N \g_TUDa_titlegraphic_box}
+ +\textheight-\box_ht:N \g_TUDa_title_box-\box_dp:N \g_TUDa_title_box-.5\c_TUDa_logoheight_dim,
+ addvoffset=\bool_if:NF \l_TUDa_marginpar_overlap_bool {+\box_ht:N\g_TUDa_titlegraphic_box+\box_dp:N \g_TUDa_titlegraphic_box}
+ +\box_ht:N \g_TUDa_title_box+\box_dp:N \g_TUDa_title_box+.5\c_TUDa_logoheight_dim,
]{TUDa.poster.marginpar.title}
-
\tl_if_empty:NF \g_TUDa_poster_qrcode_tl {
\ModifyLayer[addwidth=-\g_TUDa_qrcode_dim-\c_TUDa_rulesep_dim]{TUDa.poster.footer}
@@ -392,25 +406,9 @@
\AddLayersToPageStyle{TUDa.poster.title}{TUDa.poster.marginpar.title}
\AddLayersToPageStyle{TUDa.poster.title}{TUDa.poster.logo}
-
- \begingroup
-
- \bool_if:NT \g_TUDa_logo@inhead_bool {
- \dim_compare:nT {\box_ht:N \g_TUDa_title_info_box+ \box_dp:N \g_TUDa_title_info_box > \box_ht:N \g_TUDa_title_box}
- {\msg_warning:nn {TUDaPoster} {infobox-too-high}}
- }
- \leavevmode\box_use:N \g_TUDa_title_box\par
-% \bool_if:NT \g_TUDa_marginpar_bool {\vspace{\c_TUDa_smallrule_dim}}
- \dim_set:Nn \g_TUDa_titlegraphic_max_height_dim {\textheight-\pagetotal}%-\c_TUDa_smallrule_dim}
- \global\def\contentheight{\g_TUDa_titlegraphic_max_height_dim}
- \tl_if_empty:NF \@titlegraphic{
- \par
- \nointerlineskip
- \vbox{\parbox[t]{\dim_eval:n {\paperwidth-2\g_TUDa_margin_dim}}{\@titlegraphic}}
- }
- \global\def\contentwidth{\linewidth}
\thispagestyle{TUDa.poster.title}
- \endgroup\par
+ \global\def\contentwidth{\linewidth}
+ \par
\let\@title\@empty
\let\@subtitle\@empty
\let\@titleinfo\@empty
@@ -424,6 +422,7 @@
\newcommand{\titlegraphic}[1]{
\def\@titlegraphic{#1}
}
+\box_new:N \g_TUDa_titlegraphic_box
\seq_new:N \g_TUDa_title_info_seq
@@ -516,9 +515,12 @@
You~should~probably~switch~to~logo=bottom~or~reduce~the~number/size~of~InfoBoxes.
}
-\keys_define:nn {TUDa/poster/marginpar}{
+\keys_define:nn {TUDa/poster/marginparopts}{
valign .tl_set:N = \l_TUDa_marginpar_valign_tl,
valign .initial:n = t,
+ overlap .bool_set:N = \l_TUDa_marginpar_overlap_bool,
+ overlap .initial:n = false,
+ overlap .default:n = true
}
@@ -529,10 +531,10 @@
\int_new:N \g_TUDa_marginpar_int
-\NewDocumentCommand{\SetMarginpar}{om}{
+\NewDocumentCommand{\SetMarginpar}{o+m}{
\bool_if:NF \g_TUDa_marginpar_bool {\msg_warning:nn {TUDa/Poster} {marginpar-disabled}}
- \IfNoValueF{#1}{\keys_set:nn {TUDa/poster/marginpar} {#1}}
- \ModifyLayer[contents={\parbox[t][\layerheight][\l_TUDa_marginpar_valign_tl]{\layerwidth}{#2}}]{TUDa.poster.marginpar}
+ \IfNoValueF{#1}{\keys_set:nn {TUDa/poster/marginparopts} {#1}}
+ \ModifyLayer[addvoffset={-\ht\strutbox},contents={\parbox[t][\layerheight][\l_TUDa_marginpar_valign_tl]{\layerwidth}{#2}}]{TUDa.poster.marginpar}
\bool_set_true:N \l_tmpa_bool
}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
index ec07b4e7b0..e7d385dfb3 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.01 (2019/11/13),
+%% This is file `tudapub.cls' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudapub}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
index 644f4e598f..92d8beb714 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.01 (2019/11/13),
+%% This is file `tudarules.sty' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\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 27165b5860..ec359e6885 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.01 (2019/11/13),
+%% This is file `tudasciposter.cls' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
@@ -64,7 +64,7 @@
\PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
},
paper .initial:n = a0,
- fontsize .code:n = \prop_gput:Nnn \g_TUDa_clsopts_prop {fontsize} {#1},
+ fontsize .tl_gset:N = \g_TUDa_fontsize_tl,
logofile .tl_gset:N = \g_TUDa_logofile_tl,
logofile .initial:n = tuda_logo,
title .choice:,
@@ -93,6 +93,8 @@
\TUDa_setup_base_sizes:
}
+\prop_gput:NnV \g_TUDa_clsopts_prop {fontsize} \g_TUDa_fontsize_tl
+
\prop_map_inline:Nn \g_TUDa_clsopts_prop {
\tl_if_empty:nTF {#2}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
index 0d044637ef..5b99254ebc 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.01 (2019/11/13),
+%% This is file `tudasize9pt.clo' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
%% 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 9485b50682..1c8b47c596 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.01 (2019/11/13),
+%% This is file `tudathesis.cfg' version 2.02 (2019/11/16),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.01}
-\def\filedate{2019/11/13}
+\def\fileversion{2.02}
+\def\filedate{2019/11/16}
\RequirePackage{expl3}
\ProvidesExplFile{tudathesis.cfg}
{\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Coporate Design (tuda-ci)}
diff --git a/macros/latex/contrib/unravel/unravel.dtx b/macros/latex/contrib/unravel/unravel.dtx
index cd7e87a4bf..1b205fb31b 100644
--- a/macros/latex/contrib/unravel/unravel.dtx
+++ b/macros/latex/contrib/unravel/unravel.dtx
@@ -23,9 +23,9 @@
%
% \title{The \textsf{unravel} package: \\
% watching TeX digest tokens\thanks{This
-% file has version number 0.2g, last revised 2019/03/23.}}
+% file has version number 0.2h, last revised 2019/11/15.}}
% \author{Bruno Le Floch}
-% \date{2019/03/23}
+% \date{2019/11/15}
%
% \maketitle
% \tableofcontents
@@ -213,6 +213,24 @@
% neither if the option is negative.
% \end{function}
%
+% \begin{function}{prompt-input}
+% Comma-delimited list option (empty by default) whose items are used
+% one by one as if the user typed them at the prompt. Since the
+% key-value list is itself comma-delimited, the value here must be
+% wrapped in braces. For instance, |prompt-input = {s10, m, u\def}|
+% skips $10$ steps, shows the first token's meaning, then continues
+% silently until the first token is~|\def|, and any subsequent prompt
+% is treated normally with user interaction. This can be useful when
+% repeatedly debugging complicated code when the issue is known to lie
+% quite late in the code.
+%
+% As for any |clist|, spaces are discarded around each comma and empty
+% entries are removed, then for each item one pair of braces is
+% removed (if any is present); to get an empty item use an empty brace
+% group, such as in |prompt-input = {s10, {}, x}|. Category codes are
+% those in effect when the |prompt-input| option is read.
+% \end{function}
+%
% \begin{function}{trace-assigns, trace-expansion, trace-other}
% Boolean options (default \texttt{true}) controlling what steps
% produce any output at all. The keys |trace-assigns|,
@@ -246,17 +264,14 @@
% \tn{lastpenalty}, \tn{lastskip}, \tn{currentiflevel} and
% \tn{currentiftype} may have wrong values. Perhaps
% \tn{currentgrouplevel} and \tn{currentgrouptype} too.
-% \item Tokens passed to \tn{afterassignment} are not yet kept after
-% \pkg{unravel} is done even if there has been no assignment.
+% \item Setting \tn{globaldefs} to a non-zero value may cause problems.
% \item Tokens passed to \tn{aftergroup} are lost when \pkg{unravel} is
% done.
-% \item In \XeTeX{}, characters beyond the basic multilingual plane may
-% break \pkg{unravel} (not tested).
% \item For \pkg{unravel}, category codes are fixed when a file is read
% using \tn{input},
% while \TeX{} only fixes category codes when the corresponding
% characters are converted to tokens. Similarly, the argument of
-% \tn{scantokens} is converted to the new category code r\'egime in
+% \tn{scantokens} is converted to the new category code regime in
% one go, and the result must be balanced.
% \item Explicit begin-group and end-group characters other than the
% usual left and right braces may make \pkg{unravel} choke, or may be
@@ -273,10 +288,7 @@
% \subsection{Future perhaps}
%
% \begin{itemize}
-% \item Allow users to change some settings globally/for one |\unravel|.
% \item Allow to replay steps that have already been run.
-% \item Fix the display for \tn{if} and \tn{ifcat} (remove extraneous
-% \cs{exp_not:N}).
% \item Use the |file-error| fatal error message: first implement
% \cs{@@_file_if_exist:nTF} and use it to determine whether
% \tn{input} will throw a fatal error in \tn{batchmode} and
@@ -545,7 +557,7 @@
{%
\csname @@_setup_restore:\endcsname
\ProvidesExplPackage
- {unravel} {2019/03/23} {0.2g} {Watching TeX digest tokens}%
+ {unravel} {2019/11/15} {0.2h} {Watching TeX digest tokens}%
\csname @@_setup_unravel:\endcsname
}%
% \end{macrocode}
@@ -870,16 +882,11 @@
%
% \subsubsection{Helpers for control flow}
%
-% \begin{macro}[EXP]{\@@_exit:w, \@@_exit_error:w, \@@_exit_hard:w, \@@_exit_point:}
+% \begin{macro}[EXP]{\@@_exit:w, \@@_exit_hard:w, \@@_exit_point:}
% Jump to the very end of this instance of \cs{unravel}.
% \begin{macrocode}
\cs_new_eq:NN \@@_exit_point: \prg_do_nothing:
\cs_new:Npn \@@_exit:w #1 \@@_exit_point: { }
-\cs_new:Npn \@@_exit_error:w #1 \@@_exit_point: #2 \@@_final_bad:
- {
- \@@_error:nnnnn { runaway-unravel } { } { } { } { }
- #2
- }
\cs_new:Npn \@@_exit_hard:w #1 \@@_exit_point: #2 \@@_exit_point: { }
% \end{macrocode}
% \end{macro}
@@ -1151,31 +1158,31 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_prev_input_join_get:nN}
-% \begin{macro}{\@@_join_get_aux:NNN}
+% \begin{macro}{\@@_prev_input_join_get:nnN}
+% \begin{macro}{\@@_join_get_aux:NNnN}
% Pops the previous-input sequence twice to get some value in
% \cs{l_@@_head_tl} and some sign or decimal number in
% \cs{l_@@_tmpa_tl}. Combines them into a value, using
% the appropriate evaluation function, determined based
% on~|#1|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_prev_input_join_get:nN #1
+\cs_new_protected:Npn \@@_prev_input_join_get:nnN #1
{
\int_case:nnF {#1}
{
- { 2 } { \@@_join_get_aux:NNN \skip_eval:n \tex_glueexpr:D }
- { 3 } { \@@_join_get_aux:NNN \muskip_eval:n \tex_muexpr:D }
+ { 2 } { \@@_join_get_aux:NNnN \skip_eval:n \tex_glueexpr:D }
+ { 3 } { \@@_join_get_aux:NNnN \muskip_eval:n \tex_muexpr:D }
}
{
\@@_error:nnnnn { internal } { join-factor } { } { } { }
- \@@_join_get_aux:NNN \use:n \prg_do_nothing:
+ \@@_join_get_aux:NNnN \use:n \prg_do_nothing:
}
}
-\cs_new_protected:Npn \@@_join_get_aux:NNN #1#2#3
+\cs_new_protected:Npn \@@_join_get_aux:NNnN #1#2#3#4
{
\@@_prev_input_gpop:N \l_@@_head_tl
\@@_prev_input_gpop:N \l_@@_tmpa_tl
- \tl_set:Nx #3 { #1 { \l_@@_tmpa_tl #2 \l_@@_head_tl } }
+ \tl_set:Nx #4 { #1 { \l_@@_tmpa_tl #2 \l_@@_head_tl #3 } }
}
% \end{macrocode}
% \end{macro}
@@ -1212,6 +1219,7 @@
% \g_@@_default_internal_debug_bool , \g_@@_internal_debug_bool ,
% \g_@@_default_number_steps_bool , \g_@@_number_steps_bool ,
% \g_@@_default_online_int , \g_@@_online_int ,
+% \g_@@_default_prompt_input_clist , \g_@@_prompt_input_clist ,
% \g_@@_default_trace_assigns_bool , \g_@@_trace_assigns_bool ,
% \g_@@_default_trace_expansion_bool , \g_@@_trace_expansion_bool ,
% \g_@@_default_trace_other_bool , \g_@@_trace_other_bool ,
@@ -1227,6 +1235,7 @@
\bool_new:N \g_@@_default_internal_debug_bool
\bool_new:N \g_@@_default_number_steps_bool
\int_new:N \g_@@_default_online_int
+\clist_new:N \g_@@_default_prompt_input_clist
\bool_new:N \g_@@_default_trace_assigns_bool
\bool_new:N \g_@@_default_trace_expansion_bool
\bool_new:N \g_@@_default_trace_other_bool
@@ -1241,6 +1250,7 @@
\bool_new:N \g_@@_internal_debug_bool
\bool_new:N \g_@@_number_steps_bool
\int_new:N \g_@@_online_int
+\clist_new:N \g_@@_prompt_input_clist
\bool_new:N \g_@@_trace_assigns_bool
\bool_new:N \g_@@_trace_expansion_bool
\bool_new:N \g_@@_trace_other_bool
@@ -2289,11 +2299,10 @@
\@@_tex_primitive:nnn { pdfximagebbox } { convert } { 31 }
\@@_tex_primitive:nnn { jobname } { convert } { 32 }
\sys_if_engine_luatex:T
- {
- \@@_tex_primitive:nnn { directlua } { convert } { 33 }
- \@@_tex_primitive:nnn { expanded } { convert } { 34 }
- \@@_tex_primitive:nnn { luaescapestring } { convert } { 35 }
- }
+ { \@@_tex_primitive:nnn { directlua } { convert } { 33 } }
+\@@_tex_primitive:nnn { expanded } { convert } { 34 }
+\sys_if_engine_luatex:T
+ { \@@_tex_primitive:nnn { luaescapestring } { convert } { 35 } }
\sys_if_engine_xetex:T
{
\@@_tex_primitive:nnn { Ucharcat } { convert } { 40 }
@@ -2329,8 +2338,11 @@
%
% \begin{macro}{\@@_get_next:}
% \begin{macro}{\@@_get_next_aux:w}
-% If the input is empty, forcefully exit. Otherwise,
-% remove the first token in the input, and store it in
+% If the input is empty, insert a frozen \tn{relax} (the alternative
+% would be either to grab a token in the input stream after
+% \cs{unravel}, which is tough, or simply produce an error and exit;
+% perhaps this should be configurable).
+% Then remove the first token in the input, and store it in
% \cs{l_@@_head_gtl}. Set \cs{l_@@_head_token} equal in meaning to
% that first token. Then set \cs{l_@@_head_tl} to contain the token,
% unless it is a begin-group or end-group character, in which case
@@ -2339,20 +2351,22 @@
\cs_new_protected:Npn \@@_get_next:
{
\@@_input_if_empty:TF
- { \@@_exit_error:w }
{
- \@@_input_gpop:N \l_@@_head_gtl
- \gtl_head_do:NN \l_@@_head_gtl \@@_get_next_aux:w
- \gtl_if_tl:NTF \l_@@_head_gtl
- {
- \tl_set:Nx \l_@@_head_tl
- { \gtl_head:N \l_@@_head_gtl }
- \token_if_eq_meaning:NNT
- \l_@@_head_token \@@_special_relax:
- \@@_get_next_notexpanded:
- }
- { \tl_clear:N \l_@@_head_tl }
+ \@@_error:nnnnn { runaway-unravel } { } { } { } { }
+ \@@_back_input_gtl:N \c_@@_frozen_relax_gtl
}
+ { }
+ \@@_input_gpop:N \l_@@_head_gtl
+ \gtl_head_do:NN \l_@@_head_gtl \@@_get_next_aux:w
+ \gtl_if_tl:NTF \l_@@_head_gtl
+ {
+ \tl_set:Nx \l_@@_head_tl
+ { \gtl_head:N \l_@@_head_gtl }
+ \token_if_eq_meaning:NNT
+ \l_@@_head_token \@@_special_relax:
+ \@@_get_next_notexpanded:
+ }
+ { \tl_clear:N \l_@@_head_tl }
}
\cs_new_protected:Npn \@@_get_next_aux:w
{ \cs_set_eq:NN \l_@@_head_token }
@@ -2582,7 +2596,7 @@
% sequence is \tn{nullfont} or similar (note that we do not search for
% \verb*|select font|, as the code to trim the escape character from
% the meaning may have removed the leading~|s|). Otherwise, we expect
-% the \tn{meaning} to be \tn{char} or \tn{mathchar} followed by
+% the \tn{meaning} to be \tn{char} or \tn{mathchar} or similar followed by
% |"|~and an uppercase hexadecimal number, or one of \tn{count},
% \tn{dimen}, \tn{skip}, \tn{muskip} or \tn{toks} followed by a
% decimal number.
@@ -2610,7 +2624,7 @@
% Insert \cs{q_mark} before the first non-letter (in fact, anything
% less than~|A|) in the \tn{meaning} by looping one character at a
% time (skipping spaces, but there should be none). We expect the
-% first part to be |char| or~|mathchar| (or |kchar| in up\TeX{}),
+% first part to be |char| or~|mathchar| (or |kchar| or |omathchar| in (u)p\TeX{}),
% or one of |count|, |dimen|,
% |skip|, |muskip|, or |toks|. In the first two (three) cases, the command is
% |char_given| or |math_given|. It is otherwise identical to the
@@ -2646,6 +2660,7 @@
{ char } { \@@_set_cmd_aux_given:n { char_given } }
{ kchar } { \@@_set_cmd_aux_given:n { char_given } }
{ mathchar } { \@@_set_cmd_aux_given:n { math_given } }
+ { omathchar } { \@@_set_cmd_aux_given:n { math_given } }
}
{
\@@_set_cmd_aux_primitive:nTF {#1}
@@ -3784,7 +3799,6 @@
% \end{macrocode}
% \end{macro}
%
-% ^^A todo: comment
% \begin{macro}{\@@_scan_expr:N}
% \begin{macro}{\@@_scan_expr_aux:NN, \@@_scan_factor:N}
% \begin{macrocode}
@@ -3974,6 +3988,10 @@
% and |inf| is |#2|. The third argument of this procedure is omitted
% here, as the corresponding shortcut is provided as a separate
% function, \cs{@@_scan_dim_unit:nN}.
+%
+% Ideally, \cs{@@_scan_inf_unit_loop:} would produce an \pkg{unravel}
+% error when reaching the third ``L'', rather than letting TeX produce
+% the error later on.
% \begin{macrocode}
\cs_new_protected:Npn \@@_scan_dimen:nN #1#2
{
@@ -4038,11 +4056,14 @@
{
\@@_prev_input_gpush:
\@@_scan_something_internal:n {#1}
- \@@_prev_input_join_get:nN {#1} \l_@@_tmpa_tl
+ \int_compare:nNnTF \g_@@_val_level_int = { 0 }
+ { \@@_prev_input_join_get:nnN {#1} { sp } \l_@@_tmpa_tl }
+ { \@@_prev_input_join_get:nnN {#1} { } \l_@@_tmpa_tl }
\@@_prev_input_gpush:N \l_@@_tmpa_tl
- \@@_break:w
+ \exp_after:wN \use_none:n \@@_break:w
}
- { \@@_back_input: }
+ { }
+ \@@_back_input:
\int_compare:nNnT {#1} = { 3 }
{
\@@_scan_keyword:nT { mMuU } { \@@_break:w }
@@ -4069,6 +4090,7 @@
\@@_tex_error:nV { missing-pt } \l_@@_head_tl
\@@_prev_input:n { pt }
\@@_break_point:
+ \@@_skip_optional_space:
}
\cs_new_protected:Npn \@@_scan_inf_unit_loop:
{ \@@_scan_keyword:nT { lL } { \@@_scan_inf_unit_loop: } }
@@ -4119,7 +4141,7 @@
{ \@@_break:w }
}
{ \@@_back_input: \@@_scan_dimen:nN {#1} \c_false_bool }
- \@@_prev_input_join_get:nN {#1} \l_@@_tmpa_tl
+ \@@_prev_input_join_get:nnN {#1} { } \l_@@_tmpa_tl
\@@_prev_input_gpush:
\@@_prev_input_gpush:N \l_@@_tmpa_tl
\@@_scan_keyword:nT { pPlLuUsS }
@@ -4127,7 +4149,7 @@
\@@_scan_keyword:nT { mMiInNuUsS }
{ \@@_scan_dimen:nN {#1} \c_true_bool }
\@@_break_point:
- \@@_prev_input_join_get:nN {#1} \l_@@_tmpa_tl
+ \@@_prev_input_join_get:nnN {#1} { } \l_@@_tmpa_tl
\@@_prev_input_silent:V \l_@@_tmpa_tl
}
% \end{macrocode}
@@ -4185,7 +4207,6 @@
% \end{macrocode}
% \end{macro}
%
-% ^^A todo: hash doubling is wrong
% \begin{macro}{\@@_scan_toks_to_str:}
% \begin{macrocode}
\cs_new_protected:Npn \@@_scan_toks_to_str:
@@ -4359,8 +4380,6 @@
% \end{macrocode}
% \end{macro}
%
-% ^^A todo: catch runaway expand/get_x_next. (get_next too, probably)
-%
% \begin{macro}{\@@_scan_alt_rule:}
% \begin{macrocode}
\cs_new_protected:Npn \@@_scan_alt_rule:
@@ -4686,6 +4705,7 @@
% \end{macro}
%
% \begin{macro}{\@@_mathchar:n, \@@_mathchar:x}
+% ^^A todo: \omathchar support
% \begin{macrocode}
\cs_new_protected:Npn \@@_mathchar:n #1
{
@@ -4970,29 +4990,18 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{One step}
-%
-% \begin{macro}{\@@_do_step:}
-% Perform the action if the corresponding command exists. If that
-% command does not exist, complain, and leave the token in the output.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_do_step:
- {
- \@@_set_action_text:
- \bool_if:NT \g_@@_internal_debug_bool
- { \@@_exp_args:Nx \iow_term:n { Cmd:~\int_to_arabic:n { \l_@@_head_cmd_int } } }
- \cs_if_exist_use:cF
- { @@_cmd_ \int_use:N \l_@@_head_cmd_int : }
- { \@@_error:nxxxx { internal } { unknown-command } { } { } { } }
- }
-% \end{macrocode}
-% \end{macro}
-%
% \subsection{Commands}
%
% We will implement commands in order of their command codes (some of
% the more elaborate commands call auxiliaries defined in other
-% sections).
+% sections). Some cases are forbidden.
+%
+% \begin{macro}{\@@_forbidden_case:}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_forbidden_case:
+ { \@@_tex_error:nV { forbidden-case } \l_@@_head_tl }
+% \end{macrocode}
+% \end{macro}
%
% \subsubsection{Characters: from 0 to 15}
%
@@ -5395,8 +5404,6 @@
}
% \end{macrocode}
%
-% ^^A todo: implement \@@_forbidden_case:
-%
% \begin{macro}{\@@_do_move:}
% Scan a dimension and a box, and perform the shift, printing the
% appropriate action.
@@ -7023,8 +7030,8 @@
% \tn{pdffilemoddate}, \tn{pdffilesize}, \tn{pdfmdfivesum},
% \tn{pdffiledump}, \tn{pdfmatch}, \tn{pdflastmatch},
% \tn{pdfuniformdeviate}, \tn{pdfnormaldeviate}, \tn{pdfinsertht},
-% \tn{pdfximagebbox}, \tn{jobname}, and in
-% \LuaTeX{} \tn{directlua}, \tn{expanded}, \tn{luaescapestring}.
+% \tn{pdfximagebbox}, \tn{jobname}, \tn{expanded}, and in
+% \LuaTeX{} \tn{directlua}, \tn{luaescapestring}, and in \XeTeX{} \tn{Ucharcat}.
% \item |the=111| for \tn{the}, \tn{unexpanded}, and \tn{detokenize}.
% \item |top_bot_mark=112| \tn{topmark}, \tn{firstmark}, \tn{botmark},
% \tn{splitfirstmark}, \tn{splitbotmark}, \tn{topmarks},
@@ -7378,7 +7385,8 @@
\cs_if_eq:NNTF #1 \@@_get_token_xdef:
{
\tl_put_right:NV \l_@@_defining_tl \l_@@_head_tl
- \@@_prev_input:V \l_@@_head_tl
+ \@@_prev_input_silent:x { \l_@@_head_tl }
+ \@@_print_action:
}
{
\cs_if_eq:NNTF #1 \@@_get_token_x:
@@ -7624,7 +7632,7 @@
\@@_print_expansion:x
{
\g_@@_action_text_str = false ~
- => ~ skipped ~ to ~ \iow_char:N\\fi
+ => ~ skip ~ to ~ \tl_to_str:N \l_@@_head_tl
}
}
\cs_new_protected:Npn \@@_cond_false_loop:n #1
@@ -7671,7 +7679,6 @@
% \end{macrocode}
% \end{macro}
%
-% ^^A todo: fix interaction with noexpand and active chars (what interaction?)
% \begin{macro}{\@@_test_two_chars:nn, \@@_test_two_chars_get:n, \@@_test_two_chars_gtl:N}
% \begin{macrocode}
\cs_new_protected:Npn \@@_test_two_chars:nn #1
@@ -7710,7 +7717,10 @@
\gtl_if_head_is_group_begin:NTF #1 { \c_group_begin_token }
{
\gtl_if_head_is_group_end:NTF #1 { \c_group_end_token }
- { \exp_not:N \exp_not:N \gtl_head_do:NN #1 \exp_not:N }
+ {
+ \exp_not:N \exp_not:N
+ \exp_not:f { \gtl_head_do:NN #1 \exp_stop_f: }
+ }
}
}
}
@@ -7872,10 +7882,9 @@
\@@_set_action_text:x
{
\g_@@_action_text_str \c_space_tl
- => ~ skipped ~ to ~ \tl_to_str:N \l_@@_head_tl
+ => ~ skip ~ to ~ \tl_to_str:N \l_@@_head_tl
}
}
- % ^^A todo: in the terminal output the token itself is missing.
\@@_print_expansion:
\@@_cond_pop:
}
@@ -8222,13 +8231,28 @@
}
\cs_new_protected:Npn \@@_prompt_aux:
{
- \int_compare:nNnT { \tex_interactionmode:D } = { 3 }
+ \clist_if_empty:NTF \g_@@_prompt_input_clist
{
- \bool_if:NTF \g_@@_explicit_prompt_bool
- { \@@_ior_str_get:Nc \c_@@_prompt_ior }
- { \@@_ior_str_get:Nc \c_@@_noprompt_ior }
- { Your~input }
- \exp_args:Nv \@@_prompt_treat:n { Your~input }
+ \int_compare:nNnT { \tex_interactionmode:D } = { 3 }
+ {
+ \bool_if:NTF \g_@@_explicit_prompt_bool
+ { \@@_ior_str_get:Nc \c_@@_prompt_ior }
+ { \@@_ior_str_get:Nc \c_@@_noprompt_ior }
+ { Your~input }
+ \exp_args:Nv \@@_prompt_treat:n { Your~input }
+ }
+ }
+ {
+ \clist_gpop:NN \g_@@_prompt_input_clist \l_@@_tmpa_tl
+ \group_begin:
+ \@@_set_escapechar:n { 92 }
+ \@@_print:x
+ {
+ \bool_if:NT \g_@@_explicit_prompt_bool { Your~input= }
+ \tl_to_str:N \l_@@_tmpa_tl
+ }
+ \group_end:
+ \exp_args:NV \@@_prompt_treat:n \l_@@_tmpa_tl
}
}
\cs_new_protected:Npn \@@_prompt_treat:n #1
@@ -8248,7 +8272,11 @@
\group_end:
\@@_exit_hard:w
}
- { X } { \tex_batchmode:D \tex_end:D }
+ { X }
+ {
+ \tex_batchmode:D
+ \tex_read:D -1 to \l_@@_tmpa_tl
+ }
{ s } { \@@_prompt_scan_int:nn {#1}
\@@_prompt_silent_steps:n }
{ o } { \@@_prompt_scan_int:nn {#1}
@@ -8379,6 +8407,7 @@
{ \exp_not:N \@@:nn \tl_to_str:N \g_@@_until_tl }
}
{
+ \int_gzero:N \g_@@_nonstop_int
\int_gset:Nn \g_@@_online_int { 1 }
\tl_gclear:N \g_@@_before_print_state_tl
}
@@ -8483,6 +8512,7 @@
max-input .int_gset:N = \g_@@_default_max_input_int ,
number-steps .bool_gset:N = \g_@@_default_number_steps_bool ,
online .int_gset:N = \g_@@_default_online_int ,
+ prompt-input .clist_gset:N = \g_@@_default_prompt_input_clist ,
trace-assigns .bool_gset:N = \g_@@_default_trace_assign_bool ,
trace-expansion .bool_gset:N = \g_@@_default_trace_expansion_bool ,
trace-other .bool_gset:N = \g_@@_default_trace_other_bool ,
@@ -8497,6 +8527,7 @@
max-input .int_gset:N = \g_@@_max_input_int ,
number-steps .bool_gset:N = \g_@@_number_steps_bool ,
online .int_gset:N = \g_@@_online_int ,
+ prompt-input .clist_gset:N = \g_@@_prompt_input_clist ,
trace-assigns .bool_gset:N = \g_@@_trace_assigns_bool ,
trace-expansion .bool_gset:N = \g_@@_trace_expansion_bool ,
trace-other .bool_gset:N = \g_@@_trace_other_bool ,
@@ -8589,6 +8620,7 @@
\@@_exit_point:
\@@_print_outcome:
\@@_final_test:
+ \@@_final_after_assignment:
\@@_exit_point:
}
\cs_new_protected:Npn \unravel_get:nnN #1#2#3
@@ -8609,6 +8641,7 @@
\bool_gset_eq:NN \g_@@_internal_debug_bool \g_@@_default_internal_debug_bool
\bool_gset_eq:NN \g_@@_number_steps_bool \g_@@_default_number_steps_bool
\int_gset_eq:NN \g_@@_online_int \g_@@_default_online_int
+ \clist_gset_eq:NN \g_@@_prompt_input_clist \g_@@_default_prompt_input_clist
\bool_gset_eq:NN \g_@@_trace_assigns_bool \g_@@_default_trace_assigns_bool
\bool_gset_eq:NN \g_@@_trace_expansion_bool \g_@@_default_trace_expansion_bool
\bool_gset_eq:NN \g_@@_trace_other_bool \g_@@_default_trace_other_bool
@@ -8669,6 +8702,22 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@@_do_step:}
+% Perform the action if the corresponding command exists. If that
+% command does not exist, complain, and leave the token in the output.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_do_step:
+ {
+ \@@_set_action_text:
+ \bool_if:NT \g_@@_internal_debug_bool
+ { \@@_exp_args:Nx \iow_term:n { Cmd:~\int_to_arabic:n { \l_@@_head_cmd_int } } }
+ \cs_if_exist_use:cF
+ { @@_cmd_ \int_use:N \l_@@_head_cmd_int : }
+ { \@@_error:nxxxx { internal } { unknown-command } { } { } { } }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% ^^A todo: improve error message
% \begin{macro}{\@@_final_test:, \@@_final_bad:}
% Make sure that the \cs{unravel} finished correctly. The error
@@ -8694,6 +8743,17 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@@_final_after_assignment:}
+% Salvage any remaining \tn{afterassignment} token.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_final_after_assignment:
+ {
+ \gtl_if_empty:NF \g_@@_after_assignment_gtl
+ { \gtl_head_do:NN \g_@@_after_assignment_gtl \tex_afterassignment:D }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Messages}
%
% \begin{macrocode}
@@ -8745,12 +8805,14 @@
\msg_new:nnn { unravel } { bad-unless }
{ \iow_char:N\\unless~not~followed~by~conditional. }
\msg_new:nnn { unravel } { runaway-if }
- { Runaway~\iow_char:N\\if... }
+ { Runaway~\iow_char:N\\if...~Exiting~\iow_char:N\\unravel }
\msg_new:nnn { unravel } { runaway-macro-parameter }
{
Runaway~macro~parameter~\# #2~after \\\\
\iow_indent:n {#1}
}
+\msg_new:nnn { unravel } { runaway-text }
+ { Runaway~braced~argument~for~TeX~primitive.~Exiting~\iow_char:N\\unravel }
\msg_new:nnn { unravel } { extra-or }
{ Extra~\iow_char:N\\or. }
\msg_new:nnn { unravel } { missing-equals }
@@ -8779,12 +8841,32 @@
{ TeX~provides~no~further~help~for~this~error. }
{ TeX's~advice~is:\\\\ \iow_indent:n {#3} }
}
-\msg_new:nnn { unravel } { runaway-unravel }
- { Runaway~\iow_char:N\\unravel }
+\msg_new:nnnn { unravel } { runaway-unravel }
+ { Runaway~\iow_char:N\\unravel,~so~\iow_char:N\\relax~inserted. }
+ {
+ Some~TeX~command~expects~input~beyond~the~end~of~
+ the~argument~of~\iow_char:N\\unravel.
+ }
% \end{macrocode}
%
% Some error messages from \TeX{} itself.
% \begin{macrocode}
+\@@_tex_msg_new:nnn { forbidden-case }
+ {
+ You~can't~use~`\exp_after:wN \token_to_str:N \l_@@_head_tl'~in~
+ \mode_if_vertical:TF { vertical }
+ {
+ \mode_if_horizontal:TF { horizontal }
+ { \mode_if_math:TF { math } { no } }
+ } ~ mode.
+ }
+ {
+ Sorry,~but~I'm~not~programmed~to~handle~this~case;~
+ I'll~just~pretend~that~you~didn't~ask~for~it.~
+ If~you're~in~the~wrong~mode,~you~might~be~able~to~
+ return~to~the~right~one~by~typing~`I\iow_char:N\}'~or~
+ `I\iow_char:N\$'~or~`I\iow_char:N\\par'.
+ }
\@@_tex_msg_new:nnn { incompatible-mag }
{
Incompatible~magnification~
diff --git a/macros/latex/contrib/unravel/unravel.pdf b/macros/latex/contrib/unravel/unravel.pdf
index df3f7437be..b8f069b2bb 100644
--- a/macros/latex/contrib/unravel/unravel.pdf
+++ b/macros/latex/contrib/unravel/unravel.pdf
Binary files differ