From e29e59e8a323a9d90704eb9c2701e38445f56992 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Aug 2019 20:40:27 +0000 Subject: tudscr (21aug19) git-svn-id: svn://tug.org/texlive/trunk@51926 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tudscr/fix-tudscrfonts.sty | 28 +-- Master/texmf-dist/tex/latex/tudscr/mathswap.sty | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls | 126 +++++++------ Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty | 208 ++++++++++----------- Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls | 132 +++++++------ Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty | 6 +- .../tex/latex/tudscr/tudscrcomp-book.sty | 10 +- .../tex/latex/tudscr/tudscrcomp-poster.sty | 6 +- Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty | 6 +- Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls | 13 +- Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty | 106 ++++++----- .../texmf-dist/tex/latex/tudscr/tudscrmanual.cls | 10 +- .../texmf-dist/tex/latex/tudscr/tudscrposter.cls | 124 ++++++------ Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls | 132 +++++++------ .../tex/latex/tudscr/tudscrsupervisor.sty | 18 +- .../texmf-dist/tex/latex/tudscr/tudscrtutorial.sty | 16 +- Master/texmf-dist/tex/latex/tudscr/twocolfix.sty | 4 +- 17 files changed, 512 insertions(+), 437 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tudscr') diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty index 70902c7d10b..e08a79b6ba0 100644 --- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty +++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty @@ -11,11 +11,10 @@ %% tudscr-misc.dtx (with options: `package,fixfonts,execute') %% tudscr-layout.dtx (with options: `package,fixfonts,body') %% tudscr-comp.dtx (with options: `package,fixfonts,body') -%% tudscr-misc.dtx (with options: `package,fixfonts,body') %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -58,7 +57,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -74,7 +73,7 @@ }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{fix-tudscrfonts}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package for font fixes (compatibility for old tud(scr) classes)% ] @@ -105,7 +104,7 @@ } \TUDProcessOptions\relax %%% From File: tudscr-layout.dtx -\AfterPackage*{tudscrfonts}{% +\AfterPackage{tudscrfonts}{% \newcommand*\tud@sec@fontface[1][]{\tud@sec@@fontface{#1}}% \newcommand*\tud@sec@@fontface[1]{% \sectfont#1% @@ -234,7 +233,7 @@ \tud@cs@restore{shapedefault}% \tud@cs@restore{normalfont}% #2% - \AfterPackage*{tudscrfonts}{% + \AfterPackage{tudscrfonts}{% \def\dinBold{\dinbn}% \def\dinfamily{\dinbn}% \AtBeginDocument{% @@ -406,23 +405,6 @@ \let\tud@x@tudfonts@prevent\relax% } \PreventPackageFromLoading[\tud@x@tudfonts@prevent]{tudfonts} -%%% From File: tudscr-misc.dtx -\if@tud@cdoldfont@active - \RequirePackage{textcase}[2004/10/07] - \AfterPackage*{textcase}{% - \robustify\NoCaseChange% - \newcommand*\tud@x@textcase@uclcnotmath{% - \@nonchangecase\hologo% - \def\footnote##1##{\toks@{\noexpand\footnote##1}\@footnote}% - \def\@footnote##1{\NoCaseChange{\the\toks@{##1}}}% - \def\@mkboth##1##2{\NoCaseChange{\@mkboth{##1}{##2}}}% - }% - \patchcmd{\@uclcnotmath}{\@nonchangecase\ensuremath}{% - \@nonchangecase\ensuremath\tud@x@textcase@uclcnotmath% - }{}{\tud@patch@wrn{@uclcnotmath}}% - }% -\fi -\TUD@deprecated@cs{NoCaseChange}{@firstofone} \endinput %% %% End of file `fix-tudscrfonts.sty'. diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty index e85f3242023..ab82a257d54 100644 --- a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty +++ b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty @@ -8,7 +8,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -29,7 +29,7 @@ %%% From File: tudscr-mathswap.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{mathswap}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (swap mathematical separators)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls index 56ec33aa249..7c3dbaf5bee 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls @@ -30,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -73,14 +73,14 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/17 v2.06b TUD-Script - ^^J#3 (#2)% + 2019/08/20 v2.06c TUD-Script + #3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% \ifx\TUD@Class@Parent\@undefined% @@ -1066,7 +1066,7 @@ \ifcsundef{#1}{% \begingroup% \def\tud@res@a{% - The command `\@backslashchar#1' is deprecated.\MessageBreak% + The command `\@backslashchar#1' is deprecated. \MessageBreak% }% \def\tud@res@b##1@##2\@nil{% \IfArgIsEmpty{##2}{% @@ -1096,7 +1096,7 @@ \newcommand*\TUD@deprecated@lengthcs[2][]{% \ifdim\csuse{#2}<\maxdimen\relax% \ClassWarning{\TUD@Class@Name}{% - Using the length `\@backslashchar#2' is deprecated.\MessageBreak% + Using the length `\@backslashchar#2' is deprecated. \MessageBreak% You should use option `#2' instead% }% \csxdef{tud@dim@#2}{\the\csuse{#2}}% @@ -1112,8 +1112,8 @@ \ClassWarningNoLine{\TUD@Class@Name}% {% You have set option `tudscrver' to `\@tempa', but\MessageBreak% - this value is not supported. Because of this, the\MessageBreak% - value for `tudscrver' was set to `first'% + this value is not supported. Because of this,\MessageBreak% + `tudscrver=first' was set% }% \renewcommand*\tud@v@comp{0}% }{% @@ -1129,15 +1129,7 @@ \AtEndOfClass% {% \RelaxFamilyKey[.comp]{TUD}{tudscrver}% - \TUD@key{tudscrver}[]{% - \ClassError{\TUD@Class@Name}% - {Option `tudscrver' too late}{% - Option `tudscrver' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{tudscrver}% \ifcsdef{scr@v@\TUD@Version@KOMA}{% \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax% \ClassError{\TUD@Class@Name}{% @@ -1186,6 +1178,7 @@ \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} \csdef{tud@v@2.06b}{4} +\csdef{tud@v@2.06c}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1211,7 +1204,7 @@ \def\tud@reserved{% \ClassWarningNoLine{\TUD@Class@Name}% {% - Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak% + Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak% There's no defined macro `\string\tud@v@\@tempa'% }% \endgroup\@firstoftwo% @@ -1364,23 +1357,14 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed% \ClassWarningNoLine{\TUD@Class@Name}% {% - The key `fontspec' is deprecated.\MessageBreak% + The key `fontspec' is deprecated. \MessageBreak% You should load the package `fontspec' manually% }% \fi% } \AtEndOfClass% {% - \TUD@key{fontspec}[]% - {% - \ClassError{\TUD@Class@Name}% - {Option `fontspec' too late}{% - Option `fontspec' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{fontspec}% \if@tud@x@fontspec@requested% \RequirePackage{fontspec}[2017/01/24]% \fi% @@ -1408,6 +1392,26 @@ } \TUDProcessOptions\relax \LoadClass{\TUD@Class@KOMA}[2018/03/30] +\newcommand*\TUD@key@toolate[1]{% + \csedef{tud@key@#1@error}{% + \noexpand\ClassError{\noexpand\TUD@Class@Name}% + {Option `#1' too late}{% + Option `#1' can only be set\space% + \ifcsname \@currname.\@currext-h@@k\endcsname% + as optional \MessageBreak argument while loading\space% + class `\noexpand\TUD@Class@Name'% + \else% + in the preamble + \fi% + \MessageBreak but you have tried to set it up later.% + }% + }% + \TUD@key{#1}[]% + {% + \csuse{tud@key@#1@error} + \FamilyKeyStateProcessed% + }% +} %%% From File: tudscr-base.dtx \RequirePackage{environ}[2013/04/01] \newcommand*\tud@x@multicol@num{1} @@ -1579,7 +1583,7 @@ \if@tud@cdmath@active% \ClassWarning{\TUD@Class@Name}% {% - Some math font encodings are missing.\MessageBreak% + Some math font encodings are missing. \MessageBreak% The option `cdmath=false' is executed. You should\MessageBreak% either use this option by yourself or install\MessageBreak% all necessary fonts with a installation script\MessageBreak% @@ -1594,7 +1598,7 @@ \begingroup% \def\tud@res@a{% `#2' font\MessageBreak% - not found for `#1' encoding.\MessageBreak% + not found for `#1' encoding. \MessageBreak% }% \if@tud@x@fontspec@enabled% \ifstr{\encodingdefault}{#1}{% @@ -1626,7 +1630,7 @@ \else% install package `opensans'% \fi% - .\MessageBreak% + . \MessageBreak% }% \else% \ifstr{\encodingdefault}{#1}{% @@ -1640,7 +1644,7 @@ }% \appto\tud@res@a{% choose a possible encoding with package\MessageBreak% - `fontenc' (\tud@res@b).\MessageBreak% + `fontenc' (\tud@res@b). \MessageBreak% }% }{}% \fi% @@ -1936,7 +1940,10 @@ \ifcsundef{textrightarrow}{}{% \tud@cs@store{textrightarrow}% \renewrobustcmd*{\textrightarrow}{% - {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}% + \begingroup% + \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi% + \tud@cs@use{textrightarrow}% + \endgroup% }% }% }% @@ -2646,19 +2653,30 @@ \newcommand*\mv@tudbold{} \newcommand*\mv@tuddin{} \AfterPackage*{mathastext}{% - \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}% - \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}% \newrobustcmd*\tud@mathversion[1]{% - \tud@cs@use{mathversion}{#1}% - \if@tud@cdmath@active% - \ifstr{#1}{normal}{% - \MTversion@@{tudnormal}% - }{% - \ifstr{#1}{bold}{% - \MTversion@@{tudbold}% - }{}% + \begingroup% + \let\tud@res@a\relax% + \if@tud@cdmath@active% + \ifstr{#1}{normal}{% + \def\tud@res@a{tudnormal}% + }{% + \ifstr{#1}{bold}{% + \def\tud@res@a{tudbold}% + }{}% + }% + \fi% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@cs@restore{mathversion}% + \ifx\tud@res@a\relax% + \noexpand\mathversion{#1}% + \else% + \noexpand\MTversion*{\tud@res@a}% + \fi% + \noexpand\tud@cs@store{mathversion}% + \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}% }% - \fi% + \tud@res@a% }% \AtEndPreamble{% \tud@cs@store{mathversion}% @@ -3248,7 +3266,7 @@ } \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}} \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}} -\AfterPackage*{hyperref}{% +\AfterPackage{hyperref}{% \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{% \gdef\@emailaddress{% \begingroup% @@ -3385,7 +3403,7 @@ \ClassWarning{\TUD@Class@Name}{% `\string\date' was not given\MessageBreak% Since a thesis is a self-contained work, an end\MessageBreak% - date should be specified by the author.\MessageBreak% + date should be specified by the author. \MessageBreak% Nevertheless, today's date is used% }% }{% @@ -4237,7 +4255,7 @@ \noexpand\paperheight=\the\paperheight\relax% }% \tud@x@geometry@getlayout{\tud@res@a}% - \epreto{\tud@x@geometry@parameter}{\tud@res@a,}% + \epreto\tud@x@geometry@parameter{\tud@res@a,}% \def\tud@res@a{\tud@cs@use{newgeometry}}% \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}% \edef\tud@x@geometry@init{\tud@x@geometry@parameter}% @@ -5522,7 +5540,7 @@ \ifdim##1<\ta@bcor\relax% \ClassWarning{\TUD@Class@Name}{% The selected page layout means that the\MessageBreak% - logo of TUD extends beyond the printing area.\MessageBreak% + logo of TUD extends beyond the printing area. \MessageBreak% The inner margin is smaller than BCOR\MessageBreak% (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak% Maybe you should decrease the current value\MessageBreak% @@ -5742,7 +5760,7 @@ \def\@tempa{##1}% \@tempswafalse% \else% - \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}% + \l@addto@macro\@tempb{,##1}% \fi% }% \let\@tempc\relax% @@ -5751,9 +5769,9 @@ \preto\tud@footlogo@fileoptions{% keepaspectratio,totalheight=\tud@dim@footlogoheight,% }% - \appto\tud@footlogo@fileoptions{\@tempb}% + \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}% \protected@edef\@tempc{% - \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}% + \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}% }% \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{% The given `\string\footlogo{\@tempa}' is too large.% @@ -6854,7 +6872,7 @@ `\string\makecover' together isn't supported. The\MessageBreak% option `titlepage=firstiscover' will be ignored. If you\MessageBreak% want to create an individual cover, you have to use\MessageBreak% - `\string\extratitle' instead of `\string\makecover'.\MessageBreak% + `\string\extratitle' instead of `\string\makecover'. \MessageBreak% See also the documentation of KOMA-Script% }% \@titlepageiscoverpagefalse% @@ -7526,7 +7544,7 @@ \ClassWarningNoLine{\TUD@Class@Name}{% You've set a layout size, which is different from\MessageBreak% default (paper=a4, paper=portrait). Therefore you\MessageBreak% - should additionally specify an explicit font size.\MessageBreak% + should additionally specify an explicit font size. \MessageBreak% See the manual for further information% }% \fi% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty index 605da2f997d..a013724428e 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty @@ -9,7 +9,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -52,7 +52,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -68,7 +68,7 @@ }{} %%% From File: tudscr-base.dtx \ProvidesPackage{tudscrbase}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (basics for the bundle)% ] @@ -183,6 +183,105 @@ \fi% \endgroup% } +\newcommand*\tud@cs@letltx[2]{% + \expandafter\expandafter\expandafter\LetLtxMacro% + \expandafter\csname #1\expandafter\endcsname\csname #2\endcsname% +} +\newrobustcmd*\tud@cs@store[1]{% + \tud@cs@check{#1}% + \ifcsdef{@@tud@#1}{}{% + \tud@cs@letltx{@@tud@#1}{#1}% + }% +} +\newrobustcmd*\tud@cs@restore[1]{% + \ifcsdef{#1}{}{% + \ifcsdef{@@tud@#1}{% + \cslet{#1}{\relax}% + }{}% + }% + \tud@cs@check{#1}% + \ifcsdef{@@tud@#1}{% + \tud@cs@letltx{#1}{@@tud@#1}% + \csundef{@@tud@#1}% + }{}% +} +\newrobustcmd*\tud@cs@reset[1]{% + \tud@cs@check{#1}% + \ifcsdef{@@tud@#1}{% + \tud@cs@letltx{#1}{@@tud@#1}% + }{}% +} +\newrobustcmd*\tud@cs@update[1]{% + \tud@cs@check{#1}% + \ifcsdef{@@tud@#1}{% + \tud@cs@letltx{@@tud@#1}{#1}% + }{}% +} +\newrobustcmd*\tud@cs@use[1]{% + \tud@cs@check{#1}% + \ifcsdef{@@tud@#1}{% + \csuse{@@tud@#1}% + }{% + \csuse{#1}% + }% +} +\newrobustcmd*\tud@cs@check[1]{% + \ifcsdef{#1}{}{% + \PackageError{tudscrbase}{% + `\@backslashchar#1' is not defined}{% + The command `\@backslashchar#1' was never defined. \MessageBreak% + Please contact the TUD-Script maintainer\MessageBreak% + via \tudscrmail. A bugfix is urgently required.% + }% + }% +} +\newcommand*\tud@skip@store[1]{% + \tud@skip@check{#1}{% + \ifcsdef{@@tud@skip@#1}{}{% + \csedef{@@tud@skip@#1}{\expandafter\the\csname #1\endcsname}% + }% + }% +} +\newcommand*\tud@skip@restore[1]{% + \tud@skip@check{#1}{% + \ifcsdef{@@tud@skip@#1}{% + \csname #1\endcsname=\csname @@tud@skip@#1\endcsname% + \csundef{@@tud@skip@#1}% + }{}% + }% +} +\newcommand*\tud@skip@reset[1]{% + \tud@skip@check{#1}{% + \ifcsdef{@@tud@skip@#1}{% + \csname#1\endcsname=\csname @@tud@skip@#1\endcsname% + }{}% + }% +} +\newcommand*\tud@skip@set[2]{% + \tud@skip@check{#1}{% + \expandafter\setlength\csname #1\endcsname{#2}% + }% +} +\newcommand*\tud@skip@check[1]{% + \begingroup% + \@tempswafalse% + \expandafter\ifisskip\expandafter{\csname#1\endcsname}{\@tempswatrue}{}% + \expandafter\ifisdimen\expandafter{\csname#1\endcsname}{\@tempswatrue}{}% + \if@tempswa% + \aftergroup\@firstofone% + \else% + \aftergroup\@gobble% + \fi% + \endgroup% +} +\newcommand*\tud@patch@wrn[1]{% + \PackageWarning{tudscrbase}{% + It wasn't possible to patch `\@backslashchar#1'\MessageBreak% + Please contact the TUD-Script maintainer\MessageBreak% + via \tudscrmail. Without a bugfix an\MessageBreak% + erroneous output may occur% + }% +} \DefineFamily{TUD} \newcommand*\TUDProcessOptions{\FamilyProcessOptions{TUD}} \newcommand*\TUDExecuteOptions{\FamilyExecuteOptions{TUD}} @@ -303,105 +402,6 @@ }% }% } -\newcommand*\tud@cs@letltx[2]{% - \expandafter\expandafter\expandafter\LetLtxMacro% - \expandafter\csname #1\expandafter\endcsname\csname #2\endcsname% -} -\newrobustcmd*\tud@cs@store[1]{% - \tud@cs@check{#1}% - \ifcsdef{@@tud@#1}{}{% - \tud@cs@letltx{@@tud@#1}{#1}% - }% -} -\newrobustcmd*\tud@cs@restore[1]{% - \ifcsdef{#1}{}{% - \ifcsdef{@@tud@#1}{% - \cslet{#1}{\relax}% - }{}% - }% - \tud@cs@check{#1}% - \ifcsdef{@@tud@#1}{% - \tud@cs@letltx{#1}{@@tud@#1}% - \csundef{@@tud@#1}% - }{}% -} -\newrobustcmd*\tud@cs@reset[1]{% - \tud@cs@check{#1}% - \ifcsdef{@@tud@#1}{% - \tud@cs@letltx{#1}{@@tud@#1}% - }{}% -} -\newrobustcmd*\tud@cs@update[1]{% - \tud@cs@check{#1}% - \ifcsdef{@@tud@#1}{% - \tud@cs@letltx{@@tud@#1}{#1}% - }{}% -} -\newrobustcmd*\tud@cs@use[1]{% - \tud@cs@check{#1}% - \ifcsdef{@@tud@#1}{% - \csuse{@@tud@#1}% - }{% - \csuse{#1}% - }% -} -\newrobustcmd*\tud@cs@check[1]{% - \ifcsdef{#1}{}{% - \PackageError{tudscrbase}{% - `\@backslashchar#1' is not defined}{% - The command `\@backslashchar#1' was never defined.\MessageBreak% - Please contact the TUD-Script maintainer\MessageBreak% - via \tudscrmail. A bugfix is urgently required.% - }% - }% -} -\newcommand*\tud@skip@store[1]{% - \tud@skip@check{#1}{% - \ifcsdef{@@tud@skip@#1}{}{% - \csedef{@@tud@skip@#1}{\expandafter\the\csname #1\endcsname}% - }% - }% -} -\newcommand*\tud@skip@restore[1]{% - \tud@skip@check{#1}{% - \ifcsdef{@@tud@skip@#1}{% - \csname #1\endcsname=\csname @@tud@skip@#1\endcsname% - \csundef{@@tud@skip@#1}% - }{}% - }% -} -\newcommand*\tud@skip@reset[1]{% - \tud@skip@check{#1}{% - \ifcsdef{@@tud@skip@#1}{% - \csname#1\endcsname=\csname @@tud@skip@#1\endcsname% - }{}% - }% -} -\newcommand*\tud@skip@set[2]{% - \tud@skip@check{#1}{% - \expandafter\setlength\csname #1\endcsname{#2}% - }% -} -\newcommand*\tud@skip@check[1]{% - \begingroup% - \@tempswafalse% - \expandafter\ifisskip\expandafter{\csname#1\endcsname}{\@tempswatrue}{}% - \expandafter\ifisdimen\expandafter{\csname#1\endcsname}{\@tempswatrue}{}% - \if@tempswa% - \aftergroup\@firstofone% - \else% - \aftergroup\@gobble% - \fi% - \endgroup% -} -\newcommand*\tud@patch@wrn[1]{% - \PackageWarning{tudscrbase}{% - It wasn't possible to patch `\@backslashchar#1'\MessageBreak% - Please contact the TUD-Script maintainer\MessageBreak% - via \tudscrmail. Without a bugfix an\MessageBreak% - erroneous output may occur% - }% -} \newcommand*\TUD@parameter@@family{} \newcommand*\TUD@parameter@family[2]{% \xdef\TUD@parameter@@family{#1}% @@ -490,8 +490,8 @@ \PackageError{tudscrbase}{% Unknown default value `\kv@value'% }{% - If `\kv@value' is a language, you haven't loaded it.\MessageBreak% - Otherwise, there's no handler for the given value.\MessageBreak% + If `\kv@value' is a language, you haven't loaded it. \MessageBreak% + Otherwise, there's no handler for the given value. \MessageBreak% You should specify a certian key (=\kv@value).% }% \fi% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls index 59c992a596d..8a6c97d24b9 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls @@ -30,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -73,14 +73,14 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/17 v2.06b TUD-Script - ^^J#3 (#2)% + 2019/08/20 v2.06c TUD-Script + #3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% \ifx\TUD@Class@Parent\@undefined% @@ -1134,7 +1134,7 @@ \ifcsundef{#1}{% \begingroup% \def\tud@res@a{% - The command `\@backslashchar#1' is deprecated.\MessageBreak% + The command `\@backslashchar#1' is deprecated. \MessageBreak% }% \def\tud@res@b##1@##2\@nil{% \IfArgIsEmpty{##2}{% @@ -1164,7 +1164,7 @@ \newcommand*\TUD@deprecated@lengthcs[2][]{% \ifdim\csuse{#2}<\maxdimen\relax% \ClassWarning{\TUD@Class@Name}{% - Using the length `\@backslashchar#2' is deprecated.\MessageBreak% + Using the length `\@backslashchar#2' is deprecated. \MessageBreak% You should use option `#2' instead% }% \csxdef{tud@dim@#2}{\the\csuse{#2}}% @@ -1180,8 +1180,8 @@ \ClassWarningNoLine{\TUD@Class@Name}% {% You have set option `tudscrver' to `\@tempa', but\MessageBreak% - this value is not supported. Because of this, the\MessageBreak% - value for `tudscrver' was set to `first'% + this value is not supported. Because of this,\MessageBreak% + `tudscrver=first' was set% }% \renewcommand*\tud@v@comp{0}% }{% @@ -1197,15 +1197,7 @@ \AtEndOfClass% {% \RelaxFamilyKey[.comp]{TUD}{tudscrver}% - \TUD@key{tudscrver}[]{% - \ClassError{\TUD@Class@Name}% - {Option `tudscrver' too late}{% - Option `tudscrver' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{tudscrver}% \ifcsdef{scr@v@\TUD@Version@KOMA}{% \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax% \ClassError{\TUD@Class@Name}{% @@ -1254,6 +1246,7 @@ \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} \csdef{tud@v@2.06b}{4} +\csdef{tud@v@2.06c}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1279,7 +1272,7 @@ \def\tud@reserved{% \ClassWarningNoLine{\TUD@Class@Name}% {% - Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak% + Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak% There's no defined macro `\string\tud@v@\@tempa'% }% \endgroup\@firstoftwo% @@ -1443,23 +1436,14 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed% \ClassWarningNoLine{\TUD@Class@Name}% {% - The key `fontspec' is deprecated.\MessageBreak% + The key `fontspec' is deprecated. \MessageBreak% You should load the package `fontspec' manually% }% \fi% } \AtEndOfClass% {% - \TUD@key{fontspec}[]% - {% - \ClassError{\TUD@Class@Name}% - {Option `fontspec' too late}{% - Option `fontspec' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{fontspec}% \if@tud@x@fontspec@requested% \RequirePackage{fontspec}[2017/01/24]% \fi% @@ -1487,6 +1471,26 @@ } \TUDProcessOptions\relax \LoadClass{\TUD@Class@KOMA}[2018/03/30] +\newcommand*\TUD@key@toolate[1]{% + \csedef{tud@key@#1@error}{% + \noexpand\ClassError{\noexpand\TUD@Class@Name}% + {Option `#1' too late}{% + Option `#1' can only be set\space% + \ifcsname \@currname.\@currext-h@@k\endcsname% + as optional \MessageBreak argument while loading\space% + class `\noexpand\TUD@Class@Name'% + \else% + in the preamble + \fi% + \MessageBreak but you have tried to set it up later.% + }% + }% + \TUD@key{#1}[]% + {% + \csuse{tud@key@#1@error} + \FamilyKeyStateProcessed% + }% +} %%% From File: tudscr-base.dtx \RequirePackage{environ}[2013/04/01] \newcommand*\tud@x@multicol@num{1} @@ -1658,7 +1662,7 @@ \if@tud@cdmath@active% \ClassWarning{\TUD@Class@Name}% {% - Some math font encodings are missing.\MessageBreak% + Some math font encodings are missing. \MessageBreak% The option `cdmath=false' is executed. You should\MessageBreak% either use this option by yourself or install\MessageBreak% all necessary fonts with a installation script\MessageBreak% @@ -1673,7 +1677,7 @@ \begingroup% \def\tud@res@a{% `#2' font\MessageBreak% - not found for `#1' encoding.\MessageBreak% + not found for `#1' encoding. \MessageBreak% }% \if@tud@x@fontspec@enabled% \ifstr{\encodingdefault}{#1}{% @@ -1705,7 +1709,7 @@ \else% install package `opensans'% \fi% - .\MessageBreak% + . \MessageBreak% }% \else% \ifstr{\encodingdefault}{#1}{% @@ -1719,7 +1723,7 @@ }% \appto\tud@res@a{% choose a possible encoding with package\MessageBreak% - `fontenc' (\tud@res@b).\MessageBreak% + `fontenc' (\tud@res@b). \MessageBreak% }% }{}% \fi% @@ -2015,7 +2019,10 @@ \ifcsundef{textrightarrow}{}{% \tud@cs@store{textrightarrow}% \renewrobustcmd*{\textrightarrow}{% - {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}% + \begingroup% + \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi% + \tud@cs@use{textrightarrow}% + \endgroup% }% }% }% @@ -2725,19 +2732,30 @@ \newcommand*\mv@tudbold{} \newcommand*\mv@tuddin{} \AfterPackage*{mathastext}{% - \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}% - \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}% \newrobustcmd*\tud@mathversion[1]{% - \tud@cs@use{mathversion}{#1}% - \if@tud@cdmath@active% - \ifstr{#1}{normal}{% - \MTversion@@{tudnormal}% - }{% - \ifstr{#1}{bold}{% - \MTversion@@{tudbold}% - }{}% + \begingroup% + \let\tud@res@a\relax% + \if@tud@cdmath@active% + \ifstr{#1}{normal}{% + \def\tud@res@a{tudnormal}% + }{% + \ifstr{#1}{bold}{% + \def\tud@res@a{tudbold}% + }{}% + }% + \fi% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@cs@restore{mathversion}% + \ifx\tud@res@a\relax% + \noexpand\mathversion{#1}% + \else% + \noexpand\MTversion*{\tud@res@a}% + \fi% + \noexpand\tud@cs@store{mathversion}% + \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}% }% - \fi% + \tud@res@a% }% \AtEndPreamble{% \tud@cs@store{mathversion}% @@ -3327,7 +3345,7 @@ } \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}} \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}} -\AfterPackage*{hyperref}{% +\AfterPackage{hyperref}{% \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{% \gdef\@emailaddress{% \begingroup% @@ -3464,7 +3482,7 @@ \ClassWarning{\TUD@Class@Name}{% `\string\date' was not given\MessageBreak% Since a thesis is a self-contained work, an end\MessageBreak% - date should be specified by the author.\MessageBreak% + date should be specified by the author. \MessageBreak% Nevertheless, today's date is used% }% }{% @@ -4319,7 +4337,7 @@ \noexpand\paperheight=\the\paperheight\relax% }% \tud@x@geometry@getlayout{\tud@res@a}% - \epreto{\tud@x@geometry@parameter}{\tud@res@a,}% + \epreto\tud@x@geometry@parameter{\tud@res@a,}% \def\tud@res@a{\tud@cs@use{newgeometry}}% \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}% \edef\tud@x@geometry@init{\tud@x@geometry@parameter}% @@ -5605,7 +5623,7 @@ \ifdim##1<\ta@bcor\relax% \ClassWarning{\TUD@Class@Name}{% The selected page layout means that the\MessageBreak% - logo of TUD extends beyond the printing area.\MessageBreak% + logo of TUD extends beyond the printing area. \MessageBreak% The inner margin is smaller than BCOR\MessageBreak% (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak% Maybe you should decrease the current value\MessageBreak% @@ -5825,7 +5843,7 @@ \def\@tempa{##1}% \@tempswafalse% \else% - \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}% + \l@addto@macro\@tempb{,##1}% \fi% }% \let\@tempc\relax% @@ -5834,9 +5852,9 @@ \preto\tud@footlogo@fileoptions{% keepaspectratio,totalheight=\tud@dim@footlogoheight,% }% - \appto\tud@footlogo@fileoptions{\@tempb}% + \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}% \protected@edef\@tempc{% - \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}% + \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}% }% \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{% The given `\string\footlogo{\@tempa}' is too large.% @@ -6647,13 +6665,13 @@ } \newcommand*\tud@chapter@before@hook{} \newcommand*\tud@chapter@after@hook{} -\pretocmd\scr@startchapter{% +\pretocmd{\scr@startchapter}{% \tud@chapter@before@hook% }{}{\tud@patch@wrn{scr@startchapter}} -\apptocmd\scr@@startchapter{% +\apptocmd{\scr@@startchapter}{% \tud@chapter@after@hook% }{}{\tud@patch@wrn{scr@@startchapter}} -\apptocmd\scr@@startschapter{% +\apptocmd{\scr@@startschapter}{% \tud@chapter@after@hook% }{}{\tud@patch@wrn{scr@@startschapter}} \At@startsection{% @@ -7234,7 +7252,7 @@ `\string\makecover' together isn't supported. The\MessageBreak% option `titlepage=firstiscover' will be ignored. If you\MessageBreak% want to create an individual cover, you have to use\MessageBreak% - `\string\extratitle' instead of `\string\makecover'.\MessageBreak% + `\string\extratitle' instead of `\string\makecover'. \MessageBreak% See also the documentation of KOMA-Script% }% \@titlepageiscoverpagefalse% @@ -7915,7 +7933,7 @@ \ClassWarningNoLine{\TUD@Class@Name}{% You've set a layout size, which is different from\MessageBreak% default (paper=a4, paper=portrait). Therefore you\MessageBreak% - should additionally specify an explicit font size.\MessageBreak% + should additionally specify an explicit font size. \MessageBreak% See the manual for further information% }% \fi% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty index ed1212d72a5..155f7b7b2a1 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty @@ -9,7 +9,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -52,7 +52,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -68,7 +68,7 @@ }{} %%% From File: tudscr-color.dtx \ProvidesPackage{tudscrcolor}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (corporate design colors)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty index 9ef12511257..45e93d7cfa2 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty @@ -12,7 +12,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -55,7 +55,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -80,7 +80,7 @@ }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{tudscrcomp-book}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (compatibility for old tud(scr) classes)% ] @@ -129,9 +129,7 @@ \newcommand*\dinfamily{\dinbn} \newcommand*\moreauthor{\authormore} \newcommand*\submitdate{\date} -\newcommand*\supervisorII[1]{% - \expandafter\gdef\expandafter\@supervisor\expandafter{\@supervisor\and #1}% -} +\newcommand*\supervisorII[1]{\g@addto@macro\@supervisor{\and #1}} \newcommand*\supervisedby[1]{\gdef\supervisorname{#1}} \newcommand*\supervisedIIby[1]{\gdef\supervisorothername{#1}} \newcommand*\submittedon[1]{\gdef\datetext{#1}} diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty index e5993d56b09..cac48973398 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty @@ -12,7 +12,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -55,7 +55,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -80,7 +80,7 @@ }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{tudscrcomp-poster}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (compatibility for old tud(scr) classes)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty index 4b85b0cd66e..4ac0cb3ab3e 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty @@ -9,7 +9,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -52,7 +52,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -77,7 +77,7 @@ }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{tudscrcomp}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (compatibility for old tud(scr) classes)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls index 79f33eede0d..ac6e1e0d378 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls @@ -14,7 +14,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -57,14 +57,14 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/17 v2.06b TUD-Script - ^^J#3 (#2)% + 2019/08/20 v2.06c TUD-Script + #3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% \ifx\TUD@Class@Parent\@undefined% @@ -265,6 +265,8 @@ } %%% From File: tudscr-manual.dtx \RequirePackage{scrhack}[2014/02/27] +\PassOptionsToPackage{quiet}{marginnote} +\RequirePackage{marginnote}[2012/03/29] \RequirePackage{xspace}[2009/10/20] \xspaceaddexceptions{"=} \newcommand*\vTUDScript{v\TUDScriptVersionNumber} @@ -320,7 +322,6 @@ \providecommand*\hypersource@ref@codeline[2][]{} \providecommand*\hypersource@ref@page[2][]{} } -\RequirePackage{trimspaces}[2009/09/17] \newcommand*\hrfn[2]{% \href{#1}{\trim@spaces{#2}}% \footnote{% @@ -530,7 +531,7 @@ }% } \@doxcreatedescribes{Macro} -\AfterPackage{marginnote}{% +\AfterPackage*{marginnote}{% \renewcommand*\marginpar[2][]{% \IfArgIsEmpty{#1}{% \marginnote{#2}[\marginnotevskip]% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty index 9172689ce2f..6a283e0532c 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty @@ -17,7 +17,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -60,7 +60,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -76,7 +76,7 @@ }{} %%% From File: tudscr-fonts.dtx \ProvidesPackage{tudscrfonts}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (corporate design fonts)% ] @@ -417,7 +417,7 @@ \ifcsundef{#1}{% \begingroup% \def\tud@res@a{% - The command `\@backslashchar#1' is deprecated.\MessageBreak% + The command `\@backslashchar#1' is deprecated. \MessageBreak% }% \def\tud@res@b##1@##2\@nil{% \IfArgIsEmpty{##2}{% @@ -451,8 +451,8 @@ \PackageWarningNoLine{tudscrfonts}% {% You have set option `tudscrver' to `\@tempa', but\MessageBreak% - this value is not supported. Because of this, the\MessageBreak% - value for `tudscrver' was set to `first'% + this value is not supported. Because of this,\MessageBreak% + `tudscrver=first' was set% }% \renewcommand*\tud@v@comp{0}% }{% @@ -468,15 +468,7 @@ \AtEndOfPackage% {% \RelaxFamilyKey[.comp]{TUD}{tudscrver}% - \TUD@key{tudscrver}[]{% - \PackageError{tudscrfonts}% - {Option `tudscrver' too late}{% - Option `tudscrver' can only be set while loading the\MessageBreak% - package `tudscrfonts'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{tudscrver}% } \csdef{tud@v@first}{0} \csdef{tud@v@2.00}{0} @@ -508,6 +500,7 @@ \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} \csdef{tud@v@2.06b}{4} +\csdef{tud@v@2.06c}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -533,7 +526,7 @@ \def\tud@reserved{% \PackageWarningNoLine{tudscrfonts}% {% - Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak% + Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak% There's no defined macro `\string\tud@v@\@tempa'% }% \endgroup\@firstoftwo% @@ -619,23 +612,14 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed% \PackageWarningNoLine{tudscrfonts}% {% - The key `fontspec' is deprecated.\MessageBreak% + The key `fontspec' is deprecated. \MessageBreak% You should load the package `fontspec' manually% }% \fi% } \AtEndOfPackage% {% - \TUD@key{fontspec}[]% - {% - \PackageError{tudscrfonts}% - {Option `fontspec' too late}{% - Option `fontspec' can only be set while loading the\MessageBreak% - package `tudscrfonts'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{fontspec}% \if@tud@x@fontspec@requested% \RequirePackage{fontspec}[2017/01/24]% \fi% @@ -659,6 +643,26 @@ \TUDExecuteOptions{% } \TUDProcessOptions\relax +\newcommand*\TUD@key@toolate[1]{% + \csedef{tud@key@#1@error}{% + \noexpand\PackageError{tudscrfonts}% + {Option `#1' too late}{% + Option `#1' can only be set\space% + \ifcsname \@currname.\@currext-h@@k\endcsname% + as optional \MessageBreak argument while loading\space% + package `tudscrfonts'% + \else% + in the preamble + \fi% + \MessageBreak but you have tried to set it up later.% + }% + }% + \TUD@key{#1}[]% + {% + \csuse{tud@key@#1@error} + \FamilyKeyStateProcessed% + }% +} %%% From File: tudscr-fonts.dtx \newcommand*\tud@cdfont@wrn{\global\let\tud@cdfont@wrn\relax} \newcommand*\tud@cdmath@wrn{\global\let\tud@cdmath@wrn\relax} @@ -805,7 +809,7 @@ \if@tud@cdmath@active% \PackageWarning{tudscrfonts}% {% - Some math font encodings are missing.\MessageBreak% + Some math font encodings are missing. \MessageBreak% The option `cdmath=false' is executed. You should\MessageBreak% either use this option by yourself or install\MessageBreak% all necessary fonts with a installation script\MessageBreak% @@ -820,7 +824,7 @@ \begingroup% \def\tud@res@a{% `#2' font\MessageBreak% - not found for `#1' encoding.\MessageBreak% + not found for `#1' encoding. \MessageBreak% }% \if@tud@x@fontspec@enabled% \ifstr{\encodingdefault}{#1}{% @@ -852,7 +856,7 @@ \else% install package `opensans'% \fi% - .\MessageBreak% + . \MessageBreak% }% \else% \ifstr{\encodingdefault}{#1}{% @@ -866,7 +870,7 @@ }% \appto\tud@res@a{% choose a possible encoding with package\MessageBreak% - `fontenc' (\tud@res@b).\MessageBreak% + `fontenc' (\tud@res@b). \MessageBreak% }% }{}% \fi% @@ -909,7 +913,7 @@ \newif\if@tud@x@bm@requested \@ifpackageloaded{bm}{% \PackageWarning{tudscrfonts}{% - Package `bm' must be loaded after `tudscrfonts'.\MessageBreak% + Package `bm' must be loaded after `tudscrfonts'. \MessageBreak% Otherwise the functionality can not be guaranteed% }% }{% @@ -1168,7 +1172,10 @@ \ifcsundef{textrightarrow}{}{% \tud@cs@store{textrightarrow}% \renewrobustcmd*{\textrightarrow}{% - {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}% + \begingroup% + \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi% + \tud@cs@use{textrightarrow}% + \endgroup% }% }% }% @@ -1878,19 +1885,30 @@ \newcommand*\mv@tudbold{} \newcommand*\mv@tuddin{} \AfterPackage*{mathastext}{% - \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}% - \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}% \newrobustcmd*\tud@mathversion[1]{% - \tud@cs@use{mathversion}{#1}% - \if@tud@cdmath@active% - \ifstr{#1}{normal}{% - \MTversion@@{tudnormal}% - }{% - \ifstr{#1}{bold}{% - \MTversion@@{tudbold}% - }{}% + \begingroup% + \let\tud@res@a\relax% + \if@tud@cdmath@active% + \ifstr{#1}{normal}{% + \def\tud@res@a{tudnormal}% + }{% + \ifstr{#1}{bold}{% + \def\tud@res@a{tudbold}% + }{}% + }% + \fi% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@cs@restore{mathversion}% + \ifx\tud@res@a\relax% + \noexpand\mathversion{#1}% + \else% + \noexpand\MTversion*{\tud@res@a}% + \fi% + \noexpand\tud@cs@store{mathversion}% + \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}% }% - \fi% + \tud@res@a% }% \AtEndPreamble{% \tud@cs@store{mathversion}% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls index f60ad31436a..9498ef06277 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls @@ -16,7 +16,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -59,14 +59,14 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesWrapperClass[3]{% \ProvidesClass{#1}[% - 2019/07/17 v2.06b TUD-Script - ^^J#3 (#2)% + 2019/08/20 v2.06c TUD-Script + #3 (#2)% ]% \newcommand*\TUD@Class@Parent{#2}% \newcommand*\TUD@Class@Name{#1}% @@ -375,7 +375,7 @@ \TUD@UnwindPackage{hyperref}{% \ClassWarningNoLine{tudscrmanual}% {% - It is strongly recommended to load package `hyperref'.\MessageBreak% + It is strongly recommended to load package `hyperref'. \MessageBreak% Nevertheless, essential commands are rudimentarily\MessageBreak% defined. At least the package `url' is loaded% }% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls index e11b4fa6d62..138f2aca026 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls @@ -30,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -73,14 +73,14 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/17 v2.06b TUD-Script - ^^J#3 (#2)% + 2019/08/20 v2.06c TUD-Script + #3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% \ifx\TUD@Class@Parent\@undefined% @@ -972,7 +972,7 @@ \ifcsundef{#1}{% \begingroup% \def\tud@res@a{% - The command `\@backslashchar#1' is deprecated.\MessageBreak% + The command `\@backslashchar#1' is deprecated. \MessageBreak% }% \def\tud@res@b##1@##2\@nil{% \IfArgIsEmpty{##2}{% @@ -1002,7 +1002,7 @@ \newcommand*\TUD@deprecated@lengthcs[2][]{% \ifdim\csuse{#2}<\maxdimen\relax% \ClassWarning{\TUD@Class@Name}{% - Using the length `\@backslashchar#2' is deprecated.\MessageBreak% + Using the length `\@backslashchar#2' is deprecated. \MessageBreak% You should use option `#2' instead% }% \csxdef{tud@dim@#2}{\the\csuse{#2}}% @@ -1018,8 +1018,8 @@ \ClassWarningNoLine{\TUD@Class@Name}% {% You have set option `tudscrver' to `\@tempa', but\MessageBreak% - this value is not supported. Because of this, the\MessageBreak% - value for `tudscrver' was set to `first'% + this value is not supported. Because of this,\MessageBreak% + `tudscrver=first' was set% }% \renewcommand*\tud@v@comp{0}% }{% @@ -1035,15 +1035,7 @@ \AtEndOfClass% {% \RelaxFamilyKey[.comp]{TUD}{tudscrver}% - \TUD@key{tudscrver}[]{% - \ClassError{\TUD@Class@Name}% - {Option `tudscrver' too late}{% - Option `tudscrver' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{tudscrver}% \ifcsdef{scr@v@\TUD@Version@KOMA}{% \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax% \ClassError{\TUD@Class@Name}{% @@ -1092,6 +1084,7 @@ \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} \csdef{tud@v@2.06b}{4} +\csdef{tud@v@2.06c}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1117,7 +1110,7 @@ \def\tud@reserved{% \ClassWarningNoLine{\TUD@Class@Name}% {% - Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak% + Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak% There's no defined macro `\string\tud@v@\@tempa'% }% \endgroup\@firstoftwo% @@ -1270,23 +1263,14 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed% \ClassWarningNoLine{\TUD@Class@Name}% {% - The key `fontspec' is deprecated.\MessageBreak% + The key `fontspec' is deprecated. \MessageBreak% You should load the package `fontspec' manually% }% \fi% } \AtEndOfClass% {% - \TUD@key{fontspec}[]% - {% - \ClassError{\TUD@Class@Name}% - {Option `fontspec' too late}{% - Option `fontspec' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{fontspec}% \if@tud@x@fontspec@requested% \RequirePackage{fontspec}[2017/01/24]% \fi% @@ -1314,6 +1298,26 @@ } \TUDProcessOptions\relax \LoadClass{\TUD@Class@KOMA}[2018/03/30] +\newcommand*\TUD@key@toolate[1]{% + \csedef{tud@key@#1@error}{% + \noexpand\ClassError{\noexpand\TUD@Class@Name}% + {Option `#1' too late}{% + Option `#1' can only be set\space% + \ifcsname \@currname.\@currext-h@@k\endcsname% + as optional \MessageBreak argument while loading\space% + class `\noexpand\TUD@Class@Name'% + \else% + in the preamble + \fi% + \MessageBreak but you have tried to set it up later.% + }% + }% + \TUD@key{#1}[]% + {% + \csuse{tud@key@#1@error} + \FamilyKeyStateProcessed% + }% +} %%% From File: tudscr-base.dtx \RequirePackage{environ}[2013/04/01] \newcommand*\tud@x@multicol@num{1} @@ -1485,7 +1489,7 @@ \if@tud@cdmath@active% \ClassWarning{\TUD@Class@Name}% {% - Some math font encodings are missing.\MessageBreak% + Some math font encodings are missing. \MessageBreak% The option `cdmath=false' is executed. You should\MessageBreak% either use this option by yourself or install\MessageBreak% all necessary fonts with a installation script\MessageBreak% @@ -1500,7 +1504,7 @@ \begingroup% \def\tud@res@a{% `#2' font\MessageBreak% - not found for `#1' encoding.\MessageBreak% + not found for `#1' encoding. \MessageBreak% }% \if@tud@x@fontspec@enabled% \ifstr{\encodingdefault}{#1}{% @@ -1532,7 +1536,7 @@ \else% install package `opensans'% \fi% - .\MessageBreak% + . \MessageBreak% }% \else% \ifstr{\encodingdefault}{#1}{% @@ -1546,7 +1550,7 @@ }% \appto\tud@res@a{% choose a possible encoding with package\MessageBreak% - `fontenc' (\tud@res@b).\MessageBreak% + `fontenc' (\tud@res@b). \MessageBreak% }% }{}% \fi% @@ -1842,7 +1846,10 @@ \ifcsundef{textrightarrow}{}{% \tud@cs@store{textrightarrow}% \renewrobustcmd*{\textrightarrow}{% - {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}% + \begingroup% + \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi% + \tud@cs@use{textrightarrow}% + \endgroup% }% }% }% @@ -2552,19 +2559,30 @@ \newcommand*\mv@tudbold{} \newcommand*\mv@tuddin{} \AfterPackage*{mathastext}{% - \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}% - \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}% \newrobustcmd*\tud@mathversion[1]{% - \tud@cs@use{mathversion}{#1}% - \if@tud@cdmath@active% - \ifstr{#1}{normal}{% - \MTversion@@{tudnormal}% - }{% - \ifstr{#1}{bold}{% - \MTversion@@{tudbold}% - }{}% + \begingroup% + \let\tud@res@a\relax% + \if@tud@cdmath@active% + \ifstr{#1}{normal}{% + \def\tud@res@a{tudnormal}% + }{% + \ifstr{#1}{bold}{% + \def\tud@res@a{tudbold}% + }{}% + }% + \fi% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@cs@restore{mathversion}% + \ifx\tud@res@a\relax% + \noexpand\mathversion{#1}% + \else% + \noexpand\MTversion*{\tud@res@a}% + \fi% + \noexpand\tud@cs@store{mathversion}% + \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}% }% - \fi% + \tud@res@a% }% \AtEndPreamble{% \tud@cs@store{mathversion}% @@ -3186,7 +3204,7 @@ } \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}} \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}} -\AfterPackage*{hyperref}{% +\AfterPackage{hyperref}{% \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{% \gdef\@emailaddress{% \begingroup% @@ -3243,7 +3261,7 @@ \ClassWarning{\TUD@Class@Name}{% `\string\date' was not given\MessageBreak% Since a thesis is a self-contained work, an end\MessageBreak% - date should be specified by the author.\MessageBreak% + date should be specified by the author. \MessageBreak% Nevertheless, today's date is used% }% }{% @@ -3912,7 +3930,7 @@ \noexpand\paperheight=\the\paperheight\relax% }% \tud@x@geometry@getlayout{\tud@res@a}% - \epreto{\tud@x@geometry@parameter}{\tud@res@a,}% + \epreto\tud@x@geometry@parameter{\tud@res@a,}% \def\tud@res@a{\tud@cs@use{newgeometry}}% \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}% \edef\tud@x@geometry@init{\tud@x@geometry@parameter}% @@ -5188,7 +5206,7 @@ \ifdim##1<\ta@bcor\relax% \ClassWarning{\TUD@Class@Name}{% The selected page layout means that the\MessageBreak% - logo of TUD extends beyond the printing area.\MessageBreak% + logo of TUD extends beyond the printing area. \MessageBreak% The inner margin is smaller than BCOR\MessageBreak% (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak% Maybe you should decrease the current value\MessageBreak% @@ -5408,7 +5426,7 @@ \def\@tempa{##1}% \@tempswafalse% \else% - \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}% + \l@addto@macro\@tempb{,##1}% \fi% }% \let\@tempc\relax% @@ -5417,9 +5435,9 @@ \preto\tud@footlogo@fileoptions{% keepaspectratio,totalheight=\tud@dim@footlogoheight,% }% - \appto\tud@footlogo@fileoptions{\@tempb}% + \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}% \protected@edef\@tempc{% - \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}% + \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}% }% \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{% The given `\string\footlogo{\@tempa}' is too large.% @@ -6414,7 +6432,7 @@ \ClassWarningNoLine{\TUD@Class@Name}{% You've set a layout size, which is different from\MessageBreak% default (paper=a4, paper=portrait). Therefore you\MessageBreak% - should additionally specify an explicit font size.\MessageBreak% + should additionally specify an explicit font size. \MessageBreak% See the manual for further information% }% \fi% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls index 0460f67bc50..b5675928084 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls @@ -30,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -73,14 +73,14 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/17 v2.06b TUD-Script - ^^J#3 (#2)% + 2019/08/20 v2.06c TUD-Script + #3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% \ifx\TUD@Class@Parent\@undefined% @@ -1138,7 +1138,7 @@ \ifcsundef{#1}{% \begingroup% \def\tud@res@a{% - The command `\@backslashchar#1' is deprecated.\MessageBreak% + The command `\@backslashchar#1' is deprecated. \MessageBreak% }% \def\tud@res@b##1@##2\@nil{% \IfArgIsEmpty{##2}{% @@ -1168,7 +1168,7 @@ \newcommand*\TUD@deprecated@lengthcs[2][]{% \ifdim\csuse{#2}<\maxdimen\relax% \ClassWarning{\TUD@Class@Name}{% - Using the length `\@backslashchar#2' is deprecated.\MessageBreak% + Using the length `\@backslashchar#2' is deprecated. \MessageBreak% You should use option `#2' instead% }% \csxdef{tud@dim@#2}{\the\csuse{#2}}% @@ -1184,8 +1184,8 @@ \ClassWarningNoLine{\TUD@Class@Name}% {% You have set option `tudscrver' to `\@tempa', but\MessageBreak% - this value is not supported. Because of this, the\MessageBreak% - value for `tudscrver' was set to `first'% + this value is not supported. Because of this,\MessageBreak% + `tudscrver=first' was set% }% \renewcommand*\tud@v@comp{0}% }{% @@ -1201,15 +1201,7 @@ \AtEndOfClass% {% \RelaxFamilyKey[.comp]{TUD}{tudscrver}% - \TUD@key{tudscrver}[]{% - \ClassError{\TUD@Class@Name}% - {Option `tudscrver' too late}{% - Option `tudscrver' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{tudscrver}% \ifcsdef{scr@v@\TUD@Version@KOMA}{% \ifnum\scr@compatibility<\csuse{scr@v@3.12}\relax% \ClassError{\TUD@Class@Name}{% @@ -1258,6 +1250,7 @@ \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} \csdef{tud@v@2.06b}{4} +\csdef{tud@v@2.06c}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1283,7 +1276,7 @@ \def\tud@reserved{% \ClassWarningNoLine{\TUD@Class@Name}% {% - Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak% + Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak% There's no defined macro `\string\tud@v@\@tempa'% }% \endgroup\@firstoftwo% @@ -1447,23 +1440,14 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed% \ClassWarningNoLine{\TUD@Class@Name}% {% - The key `fontspec' is deprecated.\MessageBreak% + The key `fontspec' is deprecated. \MessageBreak% You should load the package `fontspec' manually% }% \fi% } \AtEndOfClass% {% - \TUD@key{fontspec}[]% - {% - \ClassError{\TUD@Class@Name}% - {Option `fontspec' too late}{% - Option `fontspec' can only be set while loading the\MessageBreak% - class `\TUD@Class@Name'\space% - but you have tried to set it up later.% - }% - \FamilyKeyStateProcessed% - }% + \TUD@key@toolate{fontspec}% \if@tud@x@fontspec@requested% \RequirePackage{fontspec}[2017/01/24]% \fi% @@ -1491,6 +1475,26 @@ } \TUDProcessOptions\relax \LoadClass{\TUD@Class@KOMA}[2018/03/30] +\newcommand*\TUD@key@toolate[1]{% + \csedef{tud@key@#1@error}{% + \noexpand\ClassError{\noexpand\TUD@Class@Name}% + {Option `#1' too late}{% + Option `#1' can only be set\space% + \ifcsname \@currname.\@currext-h@@k\endcsname% + as optional \MessageBreak argument while loading\space% + class `\noexpand\TUD@Class@Name'% + \else% + in the preamble + \fi% + \MessageBreak but you have tried to set it up later.% + }% + }% + \TUD@key{#1}[]% + {% + \csuse{tud@key@#1@error} + \FamilyKeyStateProcessed% + }% +} %%% From File: tudscr-base.dtx \RequirePackage{environ}[2013/04/01] \newcommand*\tud@x@multicol@num{1} @@ -1662,7 +1666,7 @@ \if@tud@cdmath@active% \ClassWarning{\TUD@Class@Name}% {% - Some math font encodings are missing.\MessageBreak% + Some math font encodings are missing. \MessageBreak% The option `cdmath=false' is executed. You should\MessageBreak% either use this option by yourself or install\MessageBreak% all necessary fonts with a installation script\MessageBreak% @@ -1677,7 +1681,7 @@ \begingroup% \def\tud@res@a{% `#2' font\MessageBreak% - not found for `#1' encoding.\MessageBreak% + not found for `#1' encoding. \MessageBreak% }% \if@tud@x@fontspec@enabled% \ifstr{\encodingdefault}{#1}{% @@ -1709,7 +1713,7 @@ \else% install package `opensans'% \fi% - .\MessageBreak% + . \MessageBreak% }% \else% \ifstr{\encodingdefault}{#1}{% @@ -1723,7 +1727,7 @@ }% \appto\tud@res@a{% choose a possible encoding with package\MessageBreak% - `fontenc' (\tud@res@b).\MessageBreak% + `fontenc' (\tud@res@b). \MessageBreak% }% }{}% \fi% @@ -2019,7 +2023,10 @@ \ifcsundef{textrightarrow}{}{% \tud@cs@store{textrightarrow}% \renewrobustcmd*{\textrightarrow}{% - {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}% + \begingroup% + \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi% + \tud@cs@use{textrightarrow}% + \endgroup% }% }% }% @@ -2729,19 +2736,30 @@ \newcommand*\mv@tudbold{} \newcommand*\mv@tuddin{} \AfterPackage*{mathastext}{% - \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}% - \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}% \newrobustcmd*\tud@mathversion[1]{% - \tud@cs@use{mathversion}{#1}% - \if@tud@cdmath@active% - \ifstr{#1}{normal}{% - \MTversion@@{tudnormal}% - }{% - \ifstr{#1}{bold}{% - \MTversion@@{tudbold}% - }{}% + \begingroup% + \let\tud@res@a\relax% + \if@tud@cdmath@active% + \ifstr{#1}{normal}{% + \def\tud@res@a{tudnormal}% + }{% + \ifstr{#1}{bold}{% + \def\tud@res@a{tudbold}% + }{}% + }% + \fi% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@cs@restore{mathversion}% + \ifx\tud@res@a\relax% + \noexpand\mathversion{#1}% + \else% + \noexpand\MTversion*{\tud@res@a}% + \fi% + \noexpand\tud@cs@store{mathversion}% + \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}% }% - \fi% + \tud@res@a% }% \AtEndPreamble{% \tud@cs@store{mathversion}% @@ -3331,7 +3349,7 @@ } \newrobustcmd*\tud@emailaddress@simple[1]{\gdef\@emailaddress{#1}} \newrobustcmd*\tud@emailaddress@hyper[2][]{\gdef\@emailaddress{#2}} -\AfterPackage*{hyperref}{% +\AfterPackage{hyperref}{% \renewrobustcmd*\tud@emailaddress@hyper[2][hidelinks]{% \gdef\@emailaddress{% \begingroup% @@ -3468,7 +3486,7 @@ \ClassWarning{\TUD@Class@Name}{% `\string\date' was not given\MessageBreak% Since a thesis is a self-contained work, an end\MessageBreak% - date should be specified by the author.\MessageBreak% + date should be specified by the author. \MessageBreak% Nevertheless, today's date is used% }% }{% @@ -4320,7 +4338,7 @@ \noexpand\paperheight=\the\paperheight\relax% }% \tud@x@geometry@getlayout{\tud@res@a}% - \epreto{\tud@x@geometry@parameter}{\tud@res@a,}% + \epreto\tud@x@geometry@parameter{\tud@res@a,}% \def\tud@res@a{\tud@cs@use{newgeometry}}% \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}% \edef\tud@x@geometry@init{\tud@x@geometry@parameter}% @@ -5606,7 +5624,7 @@ \ifdim##1<\ta@bcor\relax% \ClassWarning{\TUD@Class@Name}{% The selected page layout means that the\MessageBreak% - logo of TUD extends beyond the printing area.\MessageBreak% + logo of TUD extends beyond the printing area. \MessageBreak% The inner margin is smaller than BCOR\MessageBreak% (`BCOR=\the\ta@bcor', inner margin is \the##1)\MessageBreak% Maybe you should decrease the current value\MessageBreak% @@ -5826,7 +5844,7 @@ \def\@tempa{##1}% \@tempswafalse% \else% - \expandafter\def\expandafter\@tempb\expandafter{\@tempb,##1}% + \l@addto@macro\@tempb{,##1}% \fi% }% \let\@tempc\relax% @@ -5835,9 +5853,9 @@ \preto\tud@footlogo@fileoptions{% keepaspectratio,totalheight=\tud@dim@footlogoheight,% }% - \appto\tud@footlogo@fileoptions{\@tempb}% + \eappto\tud@footlogo@fileoptions{\expandonce\@tempb}% \protected@edef\@tempc{% - \noexpand\includegraphics[\tud@footlogo@fileoptions]{\@tempa}% + \noexpand\includegraphics[\expandonce\tud@footlogo@fileoptions]{\@tempa}% }% \tud@vlayerbox{#2}{\vss\hbox{\@tempc}\vss\vss}{% The given `\string\footlogo{\@tempa}' is too large.% @@ -6648,13 +6666,13 @@ } \newcommand*\tud@chapter@before@hook{} \newcommand*\tud@chapter@after@hook{} -\pretocmd\scr@startchapter{% +\pretocmd{\scr@startchapter}{% \tud@chapter@before@hook% }{}{\tud@patch@wrn{scr@startchapter}} -\apptocmd\scr@@startchapter{% +\apptocmd{\scr@@startchapter}{% \tud@chapter@after@hook% }{}{\tud@patch@wrn{scr@@startchapter}} -\apptocmd\scr@@startschapter{% +\apptocmd{\scr@@startschapter}{% \tud@chapter@after@hook% }{}{\tud@patch@wrn{scr@@startschapter}} \At@startsection{% @@ -7235,7 +7253,7 @@ `\string\makecover' together isn't supported. The\MessageBreak% option `titlepage=firstiscover' will be ignored. If you\MessageBreak% want to create an individual cover, you have to use\MessageBreak% - `\string\extratitle' instead of `\string\makecover'.\MessageBreak% + `\string\extratitle' instead of `\string\makecover'. \MessageBreak% See also the documentation of KOMA-Script% }% \@titlepageiscoverpagefalse% @@ -7918,7 +7936,7 @@ \ClassWarningNoLine{\TUD@Class@Name}{% You've set a layout size, which is different from\MessageBreak% default (paper=a4, paper=portrait). Therefore you\MessageBreak% - should additionally specify an explicit font size.\MessageBreak% + should additionally specify an explicit font size. \MessageBreak% See the manual for further information% }% \fi% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty index 18ed90ecf40..2749c38cdf7 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty @@ -11,7 +11,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -54,7 +54,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -79,7 +79,7 @@ }{} %%% From File: tudscr-supervisor.dtx \ProvidesPackage{tudscrsupervisor}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (commands for supervisors)% ] @@ -235,9 +235,9 @@ } \newcommand\taskform[3][]{% \begin{task}[#1]% - \ifblank{#2}{}{\minisec{\objectivesname}#2}% + \ifblank{#2}{}{\minisec{\objectivesname}\smallskip#2}% \ifblank{#3}{}{% - \minisec{\focusname}% + \minisec{\focusname}\smallskip% \begin{itemize}\tud@RaggedRight% #3% \end{itemize}% @@ -300,9 +300,9 @@ } \newcommand\evaluationform[5][]{% \begin{evaluation}[#1]% - \ifblank{#2}{}{\minisec{\taskname}#2}% - \ifblank{#3}{}{\minisec{\contentname}#3}% - \ifblank{#4}{}{\minisec{\assessmentname}#4}% + \ifblank{#2}{}{\minisec{\taskname}\smallskip#2}% + \ifblank{#3}{}{\minisec{\contentname}\smallskip#3}% + \ifblank{#4}{}{\minisec{\assessmentname}\smallskip#4}% \ifblank{#5}{}{\def\@grade{#5}}% \end{evaluation}% } @@ -353,7 +353,7 @@ #2% }% \ifblank{#3}{}{% - \minisec{\focusname}% + \minisec{\focusname}\smallskip% \begin{itemize}\tud@RaggedRight% #3% \end{itemize}% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty index 506c25c3524..f0aa20e795d 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty @@ -14,7 +14,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -57,7 +57,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} + \TUD@Version@Check{2019/08/20 v2.06c TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -82,7 +82,7 @@ }{} %%% From File: tudscr-manual.dtx \ProvidesPackage{tudscrtutorial}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (internal tutorials)% ] @@ -221,7 +221,7 @@ \TUD@UnwindPackage{hyperref}{% \PackageWarningNoLine{tudscrtutorial}% {% - It is strongly recommended to load package `hyperref'.\MessageBreak% + It is strongly recommended to load package `hyperref'. \MessageBreak% Nevertheless, essential commands are rudimentarily\MessageBreak% defined. At least the package `url' is loaded% }% @@ -1195,8 +1195,12 @@ \if@tempswa% \begin{filecontents*}{\tud@tut@temp-standalone.tex} \documentclass[english,ngerman]{tudscrreprt} -\usepackage[T1]{fontenc} -\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{} +\ifpdftex{ + \usepackage[T1]{fontenc} + \usepackage[ngerman=ngerman-x-latest]{hyphsubst} +}{ + \usepackage{fontspec} +} \usepackage{babel} \usepackage{tudscrsupervisor} \usepackage{isodate} diff --git a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty index cb60a1deb82..ec628f9ca97 100644 --- a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty +++ b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty @@ -8,7 +8,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/17 v2.06b TUD-Script +%% 2019/08/20 v2.06c TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -29,7 +29,7 @@ %%% From File: tudscr-twocolfix.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{twocolfix}[% - 2019/07/17 v2.06b TUD-Script + 2019/08/20 v2.06c TUD-Script package (twocolumn layout bugfix)% ] -- cgit v1.2.3