From 4c5af96bdbb207b50d1c8f8d0edf287a95a8ab3d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Jul 2019 20:33:55 +0000 Subject: tudscr (18jul19) git-svn-id: svn://tug.org/texlive/trunk@51662 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tudscr/fix-tudscrfonts.sty | 21 ++-- Master/texmf-dist/tex/latex/tudscr/mathswap.sty | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls | 121 ++++++++++++--------- Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty | 51 +++++---- Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls | 121 ++++++++++++--------- Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty | 21 ++-- .../tex/latex/tudscr/tudscrcomp-book.sty | 21 ++-- .../tex/latex/tudscr/tudscrcomp-poster.sty | 21 ++-- Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty | 21 ++-- Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls | 18 +-- Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty | 108 +++++++++--------- .../texmf-dist/tex/latex/tudscr/tudscrmanual.cls | 21 ++-- .../texmf-dist/tex/latex/tudscr/tudscrposter.cls | 121 ++++++++++++--------- Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls | 121 ++++++++++++--------- .../tex/latex/tudscr/tudscrsupervisor.sty | 21 ++-- .../texmf-dist/tex/latex/tudscr/tudscrtutorial.sty | 21 ++-- Master/texmf-dist/tex/latex/tudscr/twocolfix.sty | 4 +- 17 files changed, 456 insertions(+), 381 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 dde66ea34ce..70902c7d10b 100644 --- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty +++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty @@ -15,7 +15,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -58,26 +58,23 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{fix-tudscrfonts}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script package for font fixes (compatibility for old tud(scr) classes)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty index ccbff40817a..e85f3242023 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -29,7 +29,7 @@ %%% From File: tudscr-mathswap.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{mathswap}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b 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 344ec1c7854..56ec33aa249 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls @@ -6,6 +6,7 @@ %% %% tudscr-version.dtx (with options: `class,article') %% tudscr-base.dtx (with options: `class,article,load') +%% tudscr-base.dtx (with options: `class,article,option') %% tudscr-fonts.dtx (with options: `class,article,option') %% tudscr-area.dtx (with options: `class,article,option') %% tudscr-pagestyle.dtx (with options: `class,article,option') @@ -29,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -72,13 +73,13 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script ^^J#3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% @@ -102,21 +103,30 @@ \providecommand*\TUDClassName{\TUDScriptClassName} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-base.dtx \RequirePackage{tudscrbase}[\TUD@Version] \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}} \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions} +%%% From File: tudscr-base.dtx +\newcommand*\tud@komafont@set[2]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{#2\nobreak}% +} +\newcommand*\tud@komafont@unset[1]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{\relax}% +} +\newcommand*\tud@komafont@reset[1]{% + \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}% +} %%% From File: tudscr-fonts.dtx \PreventPackageFromLoading[% \ClassWarning{\TUD@Class@Name}{% @@ -1175,6 +1185,7 @@ \csdef{tud@v@2.05m}{3} \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} +\csdef{tud@v@2.06b}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1529,26 +1540,14 @@ }% \else% \def\tud@res@b##1##2{% - \begingroup% - \@tud@res@swatrue% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \if@tud@res@swa% - \tud@lowerstring\tud@res@b{##1}% - \edef\tud@res@b{\tud@res@b##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \if@tud@res@swa% - \edef\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \edef\tud@res@a{% - \endgroup% - \if@tud@res@swa% - \noexpand\tud@res@a{\tud@res@b}% - \fi% - }% - \tud@res@a% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1##2.fd}% + }% + \tud@res@a% + }% }% \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}% \fi% @@ -1565,15 +1564,14 @@ \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}% }% \def\tud@res@b##1##2{% - \begingroup% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \edef\tud@res@a{% - \endgroup% - \noexpand\IfFileExists{\tud@res@b}{}{% - \noexpand\tud@res@a{##1}{\tud@res@b}% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1}{##1##2.fd}% }% - }% - \tud@res@a% + \tud@res@a% + }% }% \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}% \if@tud@res@swa\else% @@ -2448,7 +2446,7 @@ }% \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}% \tud@if@issymbolfont{tuditgrk}{% - \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}% + \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}% }{% \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}% }% @@ -2533,13 +2531,13 @@ }{}% \let\tud@res@a\@empty% \if@tud@lgrgreeks% - \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{% + \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{% \def\tud@res@a{\tud@cs@use{familydefault}}% }{% - \IfFileExists{lgr\tud@math@letters@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{% \let\tud@res@a\tud@math@letters@fam% }{% - \IfFileExists{lgr\tud@math@operators@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{% \let\tud@res@a\tud@math@operators@fam% }{}% }% @@ -2557,18 +2555,18 @@ {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}% \let\tud@res@c\@empty% \def\tud@res@b##1##2{% - \ifcsundef{it##1}{% - \eappto\tud@res@c{% - \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% - {\noexpand\mathalpha}{tuditgrk}{##2}% - }% - }{}% \ifcsundef{up##1}{% \eappto\tud@res@c{% \noexpand\DeclareMathSymbol{\csname up##1\endcsname}% {\noexpand\mathalpha}{tudupgrk}{##2}% }% }{}% + \ifcsundef{it##1}{% + \eappto\tud@res@c{% + \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% + {\noexpand\mathalpha}{tuditgrk}{##2}% + }% + }{}% }% \tud@res@b{Gamma}{71}% \tud@res@b{Delta}{68}% @@ -2668,7 +2666,30 @@ }% } \newcommand*\tud@cdmath@init{% + \@tud@res@swafalse% \if@tud@cdfont@fam@exist% + \@tud@res@swatrue% + \if@tud@cdoldfont@active\else% + \tud@if@fdfileexists{LGR}{cmr}{}{% + \@tud@res@swafalse% + \def\tud@res@a{% + \ClassWarningNoLine{\TUD@Class@Name}% + {% + The packages `cbfonts/cbgreek' and\MessageBreak% + `cbfonts-fd' have to be installed for using\MessageBreak% + corporate design fonts in math mode. As they\MessageBreak% + are not, standard math versions are applied% + }% + }% + \if@tud@cdmath@active% + \tud@res@a% + \else% + \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}% + \fi% + }% + \fi% + \fi% + \if@tud@res@swa% \if@tud@cdoldfont@active\else% \if@tud@cdmath@active% \def\tud@res@a##1{% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty index e31586220c2..605da2f997d 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -52,26 +52,23 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-base.dtx \ProvidesPackage{tudscrbase}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script package (basics for the bundle)% ] @@ -165,16 +162,26 @@ \expandafter\def\expandafter #1\expandafter{#1}% }% } -\newcommand*\tud@komafont@set[2]{% - \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% - \csdef{tud@komafont@#1}{#2\nobreak}% -} -\newcommand*\tud@komafont@unset[1]{% - \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% - \csdef{tud@komafont@#1}{\relax}% -} -\newcommand*\tud@komafont@reset[1]{% - \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}% +\newcommand*\tud@if@fdfileexists[2]{% + \begingroup% + \@tud@res@swatrue% + \tud@lowerstring\tud@res@a{#1#2.fd}% + \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}% + \if@tud@res@swa% + \tud@lowerstring\tud@res@a{#1}% + \edef\tud@res@a{\tud@res@a#2.fd}% + \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}% + \fi% + \if@tud@res@swa% + \edef\tud@res@a{#1#2.fd}% + \IfFileExists{\tud@res@a}{\@tud@res@swafalse}{}% + \fi% + \if@tud@res@swa% + \aftergroup\@secondoftwo% + \else% + \aftergroup\@firstoftwo% + \fi% + \endgroup% } \DefineFamily{TUD} \newcommand*\TUDProcessOptions{\FamilyProcessOptions{TUD}} diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls index 4ef4de020be..59c992a596d 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls @@ -6,6 +6,7 @@ %% %% tudscr-version.dtx (with options: `class,book') %% tudscr-base.dtx (with options: `class,book,load') +%% tudscr-base.dtx (with options: `class,book,option') %% tudscr-fonts.dtx (with options: `class,book,option') %% tudscr-area.dtx (with options: `class,book,option') %% tudscr-pagestyle.dtx (with options: `class,book,option') @@ -29,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -72,13 +73,13 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script ^^J#3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% @@ -102,21 +103,30 @@ \providecommand*\TUDClassName{\TUDScriptClassName} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-base.dtx \RequirePackage{tudscrbase}[\TUD@Version] \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}} \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions} +%%% From File: tudscr-base.dtx +\newcommand*\tud@komafont@set[2]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{#2\nobreak}% +} +\newcommand*\tud@komafont@unset[1]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{\relax}% +} +\newcommand*\tud@komafont@reset[1]{% + \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}% +} %%% From File: tudscr-fonts.dtx \PreventPackageFromLoading[% \ClassWarning{\TUD@Class@Name}{% @@ -1243,6 +1253,7 @@ \csdef{tud@v@2.05m}{3} \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} +\csdef{tud@v@2.06b}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1608,26 +1619,14 @@ }% \else% \def\tud@res@b##1##2{% - \begingroup% - \@tud@res@swatrue% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \if@tud@res@swa% - \tud@lowerstring\tud@res@b{##1}% - \edef\tud@res@b{\tud@res@b##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \if@tud@res@swa% - \edef\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \edef\tud@res@a{% - \endgroup% - \if@tud@res@swa% - \noexpand\tud@res@a{\tud@res@b}% - \fi% - }% - \tud@res@a% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1##2.fd}% + }% + \tud@res@a% + }% }% \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}% \fi% @@ -1644,15 +1643,14 @@ \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}% }% \def\tud@res@b##1##2{% - \begingroup% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \edef\tud@res@a{% - \endgroup% - \noexpand\IfFileExists{\tud@res@b}{}{% - \noexpand\tud@res@a{##1}{\tud@res@b}% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1}{##1##2.fd}% }% - }% - \tud@res@a% + \tud@res@a% + }% }% \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}% \if@tud@res@swa\else% @@ -2527,7 +2525,7 @@ }% \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}% \tud@if@issymbolfont{tuditgrk}{% - \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}% + \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}% }{% \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}% }% @@ -2612,13 +2610,13 @@ }{}% \let\tud@res@a\@empty% \if@tud@lgrgreeks% - \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{% + \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{% \def\tud@res@a{\tud@cs@use{familydefault}}% }{% - \IfFileExists{lgr\tud@math@letters@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{% \let\tud@res@a\tud@math@letters@fam% }{% - \IfFileExists{lgr\tud@math@operators@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{% \let\tud@res@a\tud@math@operators@fam% }{}% }% @@ -2636,18 +2634,18 @@ {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}% \let\tud@res@c\@empty% \def\tud@res@b##1##2{% - \ifcsundef{it##1}{% - \eappto\tud@res@c{% - \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% - {\noexpand\mathalpha}{tuditgrk}{##2}% - }% - }{}% \ifcsundef{up##1}{% \eappto\tud@res@c{% \noexpand\DeclareMathSymbol{\csname up##1\endcsname}% {\noexpand\mathalpha}{tudupgrk}{##2}% }% }{}% + \ifcsundef{it##1}{% + \eappto\tud@res@c{% + \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% + {\noexpand\mathalpha}{tuditgrk}{##2}% + }% + }{}% }% \tud@res@b{Gamma}{71}% \tud@res@b{Delta}{68}% @@ -2747,7 +2745,30 @@ }% } \newcommand*\tud@cdmath@init{% + \@tud@res@swafalse% \if@tud@cdfont@fam@exist% + \@tud@res@swatrue% + \if@tud@cdoldfont@active\else% + \tud@if@fdfileexists{LGR}{cmr}{}{% + \@tud@res@swafalse% + \def\tud@res@a{% + \ClassWarningNoLine{\TUD@Class@Name}% + {% + The packages `cbfonts/cbgreek' and\MessageBreak% + `cbfonts-fd' have to be installed for using\MessageBreak% + corporate design fonts in math mode. As they\MessageBreak% + are not, standard math versions are applied% + }% + }% + \if@tud@cdmath@active% + \tud@res@a% + \else% + \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}% + \fi% + }% + \fi% + \fi% + \if@tud@res@swa% \if@tud@cdoldfont@active\else% \if@tud@cdmath@active% \def\tud@res@a##1{% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty index e47abb819ff..ed1212d72a5 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -52,26 +52,23 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-color.dtx \ProvidesPackage{tudscrcolor}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b 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 5c11c0a0eb5..9ef12511257 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -55,7 +55,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -70,20 +70,17 @@ \fi \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{tudscrcomp-book}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script package (compatibility for old tud(scr) classes)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty index 4927a9cf7f6..e5993d56b09 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -55,7 +55,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -70,20 +70,17 @@ \fi \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{tudscrcomp-poster}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b 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 0efdf9d6656..4b85b0cd66e 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -52,7 +52,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -67,20 +67,17 @@ \fi \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-comp.dtx \ProvidesPackage{tudscrcomp}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b 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 2c96fad574f..79f33eede0d 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -57,13 +57,13 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script ^^J#3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% @@ -87,11 +87,12 @@ \providecommand*\TUDClassName{\TUDScriptClassName} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-base.dtx @@ -270,7 +271,6 @@ \newcommand*\vKOMAScript{v\TUD@Version@KOMA} \newcommand*\tud@english[1]{#1} \AtBeginDocument{% - \providecommand*\iflanguageloaded[3]{#3}% \iflanguageloaded{english}{% \renewcommand*\tud@english[1]{\foreignlanguage{english}{#1}}% }{}% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty index 1cafff8cf00..9172689ce2f 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -60,26 +60,23 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-fonts.dtx \ProvidesPackage{tudscrfonts}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script package (corporate design fonts)% ] @@ -510,6 +507,7 @@ \csdef{tud@v@2.05m}{3} \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} +\csdef{tud@v@2.06b}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -768,26 +766,14 @@ }% \else% \def\tud@res@b##1##2{% - \begingroup% - \@tud@res@swatrue% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \if@tud@res@swa% - \tud@lowerstring\tud@res@b{##1}% - \edef\tud@res@b{\tud@res@b##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \if@tud@res@swa% - \edef\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \edef\tud@res@a{% - \endgroup% - \if@tud@res@swa% - \noexpand\tud@res@a{\tud@res@b}% - \fi% - }% - \tud@res@a% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1##2.fd}% + }% + \tud@res@a% + }% }% \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}% \fi% @@ -804,15 +790,14 @@ \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}% }% \def\tud@res@b##1##2{% - \begingroup% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \edef\tud@res@a{% - \endgroup% - \noexpand\IfFileExists{\tud@res@b}{}{% - \noexpand\tud@res@a{##1}{\tud@res@b}% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1}{##1##2.fd}% }% - }% - \tud@res@a% + \tud@res@a% + }% }% \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}% \if@tud@res@swa\else% @@ -1693,7 +1678,7 @@ }% \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}% \tud@if@issymbolfont{tuditgrk}{% - \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}% + \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}% }{% \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}% }% @@ -1778,13 +1763,13 @@ }{}% \let\tud@res@a\@empty% \if@tud@lgrgreeks% - \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{% + \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{% \def\tud@res@a{\tud@cs@use{familydefault}}% }{% - \IfFileExists{lgr\tud@math@letters@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{% \let\tud@res@a\tud@math@letters@fam% }{% - \IfFileExists{lgr\tud@math@operators@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{% \let\tud@res@a\tud@math@operators@fam% }{}% }% @@ -1802,18 +1787,18 @@ {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}% \let\tud@res@c\@empty% \def\tud@res@b##1##2{% - \ifcsundef{it##1}{% - \eappto\tud@res@c{% - \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% - {\noexpand\mathalpha}{tuditgrk}{##2}% - }% - }{}% \ifcsundef{up##1}{% \eappto\tud@res@c{% \noexpand\DeclareMathSymbol{\csname up##1\endcsname}% {\noexpand\mathalpha}{tudupgrk}{##2}% }% }{}% + \ifcsundef{it##1}{% + \eappto\tud@res@c{% + \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% + {\noexpand\mathalpha}{tuditgrk}{##2}% + }% + }{}% }% \tud@res@b{Gamma}{71}% \tud@res@b{Delta}{68}% @@ -1913,7 +1898,30 @@ }% } \newcommand*\tud@cdmath@init{% + \@tud@res@swafalse% \if@tud@cdfont@fam@exist% + \@tud@res@swatrue% + \if@tud@cdoldfont@active\else% + \tud@if@fdfileexists{LGR}{cmr}{}{% + \@tud@res@swafalse% + \def\tud@res@a{% + \PackageWarningNoLine{tudscrfonts}% + {% + The packages `cbfonts/cbgreek' and\MessageBreak% + `cbfonts-fd' have to be installed for using\MessageBreak% + corporate design fonts in math mode. As they\MessageBreak% + are not, standard math versions are applied% + }% + }% + \if@tud@cdmath@active% + \tud@res@a% + \else% + \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}% + \fi% + }% + \fi% + \fi% + \if@tud@res@swa% \if@tud@cdoldfont@active\else% \if@tud@cdmath@active% \def\tud@res@a##1{% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls index 0c1af5f519c..f60ad31436a 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -59,13 +59,13 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesWrapperClass[3]{% \ProvidesClass{#1}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script ^^J#3 (#2)% ]% \newcommand*\TUD@Class@Parent{#2}% @@ -87,15 +87,12 @@ \providecommand*\TUDClassName{\TUDScriptClassName} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-manual.dtx diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls index 1b2be34bca2..e11b4fa6d62 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls @@ -6,6 +6,7 @@ %% %% tudscr-version.dtx (with options: `class,poster') %% tudscr-base.dtx (with options: `class,poster,load') +%% tudscr-base.dtx (with options: `class,poster,option') %% tudscr-fonts.dtx (with options: `class,poster,option') %% tudscr-area.dtx (with options: `class,poster,option') %% tudscr-pagestyle.dtx (with options: `class,poster,option') @@ -29,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -72,13 +73,13 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script ^^J#3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% @@ -102,21 +103,30 @@ \providecommand*\TUDClassName{\TUDScriptClassName} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-base.dtx \RequirePackage{tudscrbase}[\TUD@Version] \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}} \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions} +%%% From File: tudscr-base.dtx +\newcommand*\tud@komafont@set[2]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{#2\nobreak}% +} +\newcommand*\tud@komafont@unset[1]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{\relax}% +} +\newcommand*\tud@komafont@reset[1]{% + \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}% +} %%% From File: tudscr-fonts.dtx \PreventPackageFromLoading[% \ClassWarning{\TUD@Class@Name}{% @@ -1081,6 +1091,7 @@ \csdef{tud@v@2.05m}{3} \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} +\csdef{tud@v@2.06b}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1435,26 +1446,14 @@ }% \else% \def\tud@res@b##1##2{% - \begingroup% - \@tud@res@swatrue% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \if@tud@res@swa% - \tud@lowerstring\tud@res@b{##1}% - \edef\tud@res@b{\tud@res@b##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \if@tud@res@swa% - \edef\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \edef\tud@res@a{% - \endgroup% - \if@tud@res@swa% - \noexpand\tud@res@a{\tud@res@b}% - \fi% - }% - \tud@res@a% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1##2.fd}% + }% + \tud@res@a% + }% }% \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}% \fi% @@ -1471,15 +1470,14 @@ \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}% }% \def\tud@res@b##1##2{% - \begingroup% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \edef\tud@res@a{% - \endgroup% - \noexpand\IfFileExists{\tud@res@b}{}{% - \noexpand\tud@res@a{##1}{\tud@res@b}% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1}{##1##2.fd}% }% - }% - \tud@res@a% + \tud@res@a% + }% }% \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}% \if@tud@res@swa\else% @@ -2354,7 +2352,7 @@ }% \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}% \tud@if@issymbolfont{tuditgrk}{% - \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}% + \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}% }{% \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}% }% @@ -2439,13 +2437,13 @@ }{}% \let\tud@res@a\@empty% \if@tud@lgrgreeks% - \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{% + \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{% \def\tud@res@a{\tud@cs@use{familydefault}}% }{% - \IfFileExists{lgr\tud@math@letters@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{% \let\tud@res@a\tud@math@letters@fam% }{% - \IfFileExists{lgr\tud@math@operators@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{% \let\tud@res@a\tud@math@operators@fam% }{}% }% @@ -2463,18 +2461,18 @@ {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}% \let\tud@res@c\@empty% \def\tud@res@b##1##2{% - \ifcsundef{it##1}{% - \eappto\tud@res@c{% - \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% - {\noexpand\mathalpha}{tuditgrk}{##2}% - }% - }{}% \ifcsundef{up##1}{% \eappto\tud@res@c{% \noexpand\DeclareMathSymbol{\csname up##1\endcsname}% {\noexpand\mathalpha}{tudupgrk}{##2}% }% }{}% + \ifcsundef{it##1}{% + \eappto\tud@res@c{% + \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% + {\noexpand\mathalpha}{tuditgrk}{##2}% + }% + }{}% }% \tud@res@b{Gamma}{71}% \tud@res@b{Delta}{68}% @@ -2574,7 +2572,30 @@ }% } \newcommand*\tud@cdmath@init{% + \@tud@res@swafalse% \if@tud@cdfont@fam@exist% + \@tud@res@swatrue% + \if@tud@cdoldfont@active\else% + \tud@if@fdfileexists{LGR}{cmr}{}{% + \@tud@res@swafalse% + \def\tud@res@a{% + \ClassWarningNoLine{\TUD@Class@Name}% + {% + The packages `cbfonts/cbgreek' and\MessageBreak% + `cbfonts-fd' have to be installed for using\MessageBreak% + corporate design fonts in math mode. As they\MessageBreak% + are not, standard math versions are applied% + }% + }% + \if@tud@cdmath@active% + \tud@res@a% + \else% + \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}% + \fi% + }% + \fi% + \fi% + \if@tud@res@swa% \if@tud@cdoldfont@active\else% \if@tud@cdmath@active% \def\tud@res@a##1{% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls index 47657f91a21..0460f67bc50 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls @@ -6,6 +6,7 @@ %% %% tudscr-version.dtx (with options: `class,report') %% tudscr-base.dtx (with options: `class,report,load') +%% tudscr-base.dtx (with options: `class,report,option') %% tudscr-fonts.dtx (with options: `class,report,option') %% tudscr-area.dtx (with options: `class,report,option') %% tudscr-pagestyle.dtx (with options: `class,report,option') @@ -29,7 +30,7 @@ %% %% TUD-Script -- Corporate Design of Technische Universitaet Dresden %% -%% 2019/07/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -72,13 +73,13 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} \newcommand*\TUD@ProvidesClass[3]{% \ProvidesClass{#1}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script ^^J#3 (#2)% ]% \newcommand*\TUD@Class@KOMA{#2}% @@ -102,21 +103,30 @@ \providecommand*\TUDClassName{\TUDScriptClassName} \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-base.dtx \RequirePackage{tudscrbase}[\TUD@Version] \renewcommand*\TUD@KOMAoptions[1]{\PassOptionsToClass{#1}{\TUD@Class@KOMA}} \AfterClass{\TUD@Class@KOMA}{\let\TUD@KOMAoptions\KOMAoptions} +%%% From File: tudscr-base.dtx +\newcommand*\tud@komafont@set[2]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{#2\nobreak}% +} +\newcommand*\tud@komafont@unset[1]{% + \ifcsdef{tud@komafont@#1}{}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}% + \csdef{tud@komafont@#1}{\relax}% +} +\newcommand*\tud@komafont@reset[1]{% + \ifcsdef{tud@komafont@#1}{\addtokomafont{#1}{\csuse{tud@komafont@#1}}}{}% +} %%% From File: tudscr-fonts.dtx \PreventPackageFromLoading[% \ClassWarning{\TUD@Class@Name}{% @@ -1247,6 +1257,7 @@ \csdef{tud@v@2.05m}{3} \csdef{tud@v@2.06}{4} \csdef{tud@v@2.06a}{4} +\csdef{tud@v@2.06b}{4} \csdef{tud@v@last}{4} \newcommand*\tud@v@get[2]{% \begingroup% @@ -1612,26 +1623,14 @@ }% \else% \def\tud@res@b##1##2{% - \begingroup% - \@tud@res@swatrue% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \if@tud@res@swa% - \tud@lowerstring\tud@res@b{##1}% - \edef\tud@res@b{\tud@res@b##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \if@tud@res@swa% - \edef\tud@res@b{##1##2.fd}% - \IfFileExists{\tud@res@b}{\@tud@res@swafalse}{}% - \fi% - \edef\tud@res@a{% - \endgroup% - \if@tud@res@swa% - \noexpand\tud@res@a{\tud@res@b}% - \fi% - }% - \tud@res@a% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1##2.fd}% + }% + \tud@res@a% + }% }% \@for\tud@res@c:={#4}\do{\tud@res@b{\encodingdefault}{\tud@res@c}}% \fi% @@ -1648,15 +1647,14 @@ \tud@cdfont@missing[##1]{##2}{\tud@cdmath@wrn}% }% \def\tud@res@b##1##2{% - \begingroup% - \tud@lowerstring\tud@res@b{##1##2.fd}% - \edef\tud@res@a{% - \endgroup% - \noexpand\IfFileExists{\tud@res@b}{}{% - \noexpand\tud@res@a{##1}{\tud@res@b}% + \tud@if@fdfileexists{##1}{##2}{}{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\tud@res@a{##1}{##1##2.fd}% }% - }% - \tud@res@a% + \tud@res@a% + }% }% \@for\tud@res@c:={#1}\do{\tud@res@b{\tud@res@c}{#2}}% \if@tud@res@swa\else% @@ -2531,7 +2529,7 @@ }% \SetSymbolFont{tudupgrk}{bold}{LGR}{#1}{#3}{#4}% \tud@if@issymbolfont{tuditgrk}{% - \SetSymbolFont{tudupgrk}{normal}{LGR}{#1}{#2}{#5}% + \SetSymbolFont{tuditgrk}{normal}{LGR}{#1}{#2}{#5}% }{% \DeclareSymbolFont{tuditgrk}{LGR}{#1}{#2}{#5}% }% @@ -2616,13 +2614,13 @@ }{}% \let\tud@res@a\@empty% \if@tud@lgrgreeks% - \IfFileExists{lgr\tud@cs@use{familydefault}.fd}{% + \tud@if@fdfileexists{LGR}{\tud@cs@use{familydefault}}{% \def\tud@res@a{\tud@cs@use{familydefault}}% }{% - \IfFileExists{lgr\tud@math@letters@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@letters@fam}{% \let\tud@res@a\tud@math@letters@fam% }{% - \IfFileExists{lgr\tud@math@operators@fam.fd}{% + \tud@if@fdfileexists{LGR}{\tud@math@operators@fam}{% \let\tud@res@a\tud@math@operators@fam% }{}% }% @@ -2640,18 +2638,18 @@ {\tud@cs@use{updefault}}{\tud@cs@use{itdefault}}% \let\tud@res@c\@empty% \def\tud@res@b##1##2{% - \ifcsundef{it##1}{% - \eappto\tud@res@c{% - \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% - {\noexpand\mathalpha}{tuditgrk}{##2}% - }% - }{}% \ifcsundef{up##1}{% \eappto\tud@res@c{% \noexpand\DeclareMathSymbol{\csname up##1\endcsname}% {\noexpand\mathalpha}{tudupgrk}{##2}% }% }{}% + \ifcsundef{it##1}{% + \eappto\tud@res@c{% + \noexpand\DeclareMathSymbol{\csname it##1\endcsname}% + {\noexpand\mathalpha}{tuditgrk}{##2}% + }% + }{}% }% \tud@res@b{Gamma}{71}% \tud@res@b{Delta}{68}% @@ -2751,7 +2749,30 @@ }% } \newcommand*\tud@cdmath@init{% + \@tud@res@swafalse% \if@tud@cdfont@fam@exist% + \@tud@res@swatrue% + \if@tud@cdoldfont@active\else% + \tud@if@fdfileexists{LGR}{cmr}{}{% + \@tud@res@swafalse% + \def\tud@res@a{% + \ClassWarningNoLine{\TUD@Class@Name}% + {% + The packages `cbfonts/cbgreek' and\MessageBreak% + `cbfonts-fd' have to be installed for using\MessageBreak% + corporate design fonts in math mode. As they\MessageBreak% + are not, standard math versions are applied% + }% + }% + \if@tud@cdmath@active% + \tud@res@a% + \else% + \eappto\tud@cdmath@wrn{\expandonce\tud@res@a}% + \fi% + }% + \fi% + \fi% + \if@tud@res@swa% \if@tud@cdoldfont@active\else% \if@tud@cdmath@active% \def\tud@res@a##1{% diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty index 4e39d66a3cb..18ed90ecf40 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -54,7 +54,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -69,20 +69,17 @@ \fi \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-supervisor.dtx \ProvidesPackage{tudscrsupervisor}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script package (commands for supervisors)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty index 2423a8c8ad4..506c25c3524 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -57,7 +57,7 @@ \fi% } \fi - \TUD@Version@Check{2019/07/09 v2.06a TUD-Script} + \TUD@Version@Check{2019/07/17 v2.06b TUD-Script} \endgroup \NeedsTeXFormat{LaTeX2e} \providecommand*\tudscrmail{hanisch.latex@outlook.com} @@ -72,20 +72,17 @@ \fi \@ifundefined{TUDScript}{% \DeclareRobustCommand\TUDScript{% - \begingroup% - \def\tud@res@b##1{T\kern.05em U\kern.05em D\kern.1em-\kern.1em ##1}% - \tud@ifdin{% - \edef\tud@res@a{\tud@res@b{SCRIPT}}% - }{% - \edef\tud@res@a{\noexpand\textsf{\tud@res@b{Script}}}% - }% - \expandafter\endgroup\tud@res@a% - \csname xspace\endcsname% + \textsf{% + T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script% + }% + \ifcsname xspace\endcsname% + \xspace% + \fi% }% }{} %%% From File: tudscr-manual.dtx \ProvidesPackage{tudscrtutorial}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script package (internal tutorials)% ] diff --git a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty index ccf4a8c7dd4..cb60a1deb82 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/09 v2.06a TUD-Script +%% 2019/07/17 v2.06b TUD-Script %% %% Copyright (C) Falk Hanisch , 2012-2019 %% @@ -29,7 +29,7 @@ %%% From File: tudscr-twocolfix.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{twocolfix}[% - 2019/07/09 v2.06a TUD-Script + 2019/07/17 v2.06b TUD-Script package (twocolumn layout bugfix)% ] -- cgit v1.2.3