summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tudscr
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-30 21:33:00 +0000
committerKarl Berry <karl@freefriends.org>2017-03-30 21:33:00 +0000
commit4553a2ccc50b634761d35616915c77e84a324089 (patch)
tree1ab8f39e928b5846298e774b68f8e831f4f26632 /Master/texmf-dist/tex/latex/tudscr
parent0e46115a9e4b82fb0937ed78d10fef17016d34fe (diff)
tudscr (30mar17)
git-svn-id: svn://tug.org/texlive/trunk@43649 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tudscr')
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty12
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/mathswap.sty4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls333
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls333
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls6
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty318
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls12
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls324
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls333
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty6
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty12
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/twocolfix.sty4
17 files changed, 988 insertions, 739 deletions
diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
index 2c2641f7289..b488988f0a0 100644
--- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
@@ -12,7 +12,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -55,7 +55,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -68,7 +68,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{fix-tudscrfonts}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package for font fixes
(compatibility for old tud(scr) classes)%
]
@@ -105,8 +105,8 @@
\ifx\usepackage\RequirePackage
\newcommand*\tud@fontsfix@maybe@err{%
\PackageError{fix-tudscrfonts}{Package too late}{%
- You must load `fix-tudscrfonts' before\MessageBreak%
- any document class with `\string\RequirePackage'%
+ You must load `fix-tudscrfonts' with\MessageBreak%
+ `\string\RequirePackage' before any document class.%
}%
}%
\else
@@ -117,7 +117,7 @@
`tudbeamer', `tudfax', `tudform', `tudhaus',\MessageBreak%
and `tudletter' as well as `tudposter'\MessageBreak%
and `tudmathposter'. Otherwise it's adequate\MessageBreak%
- to use package `tudscrfonts' as usual%
+ to use package `tudscrfonts' as usual.%
}%
}%
\fi
diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
index 6daf8e17175..ab4cc2e73c1 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -29,7 +29,7 @@
%%% From File: tudscr-mathswap.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mathswap}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l 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 3883b4e76f3..adffb64e540 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
\newcommand*\TUD@ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD@Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if@tud@x@fontspec@enabled
-\AfterPackage*{fontspec}{\@tud@x@fontspec@enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud@x@fontspec@enabledtrue%
+ }{%
+ \@tud@x@fontspec@enabledfalse%
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver@fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if@tud@cdfont@din
\newif\if@tud@cdfont@ultrabold
\@tud@cdfont@dintrue
@@ -172,24 +185,29 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% heavy
\renewcommand*\tud@cdfont@num{2}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% normalbold
\@tud@cdfont@ultraboldfalse%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% ultrabold
\@tud@cdfont@ultraboldtrue%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% nodin
\@tud@cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud@fontsize@settrue\endcsname%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool@lock{@tud@cdmath}
+\bool@std@lock{@tud@cdmath}{true}%
\TUD@key{cdmath}[true]{%
\TUD@set@numkey{cdmath}{@tempa}{%
\TUD@bool@numkey,%
@@ -946,7 +966,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD@Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -954,7 +974,7 @@
KOMA-Script v\TUD@Version@KOMA is required%
}{%
\TUD@Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD@Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -984,6 +1004,7 @@
\csdef{tud@v@2.05h}{3}
\csdef{tud@v@2.05i}{3}
\csdef{tud@v@2.05k}{3}
+\csdef{tud@v@2.05l}{3}
\csdef{tud@v@last}{3}
\newcommand*\tud@v@get[2]{%
\begingroup%
@@ -1007,7 +1028,8 @@
\fi%
}{%
\def\tud@reserved{%
- \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
There's no defined macro `\string\tud@v@\@tempa'%
}%
@@ -1017,7 +1039,7 @@
\tud@reserved%
}
\TUD@key{fontspec}[true]{%
- \ClassWarning{\TUD@Class@Name}%
+ \ClassWarningNoLine{\TUD@Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -1037,7 +1059,7 @@
\FamilyKeyStateProcessed%
}%
\if@tud@x@fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD@key{cdfonts}[true]{%
@@ -1236,7 +1258,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1316,88 +1338,103 @@
\newcommand*\tud@dinbold{0m6}
\newif\if@tud@dinbold
\newif\if@tud@dinboldmath
-\newcommand*\tud@x@fontspec@noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if@tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud@x@fontspec@noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud@font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if@tud@cdmath%
+ \tud@font@math@missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud@univers}{\@tud@universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if@tud@cdmath%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
+ \fi%
\if@tud@x@fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud@x@fontspec@noerror%
- \global\@tud@universtrue%
- \@tempc{Univers Light}{\global\@tud@universfalse}%
- \@tempc{Univers}{\global\@tud@universfalse}%
- \@tempc{Univers Bold}{\global\@tud@universfalse}%
- \@tempc{Univers Black}{\global\@tud@universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud@universfalse}%
- \global\@tud@dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud@dinboldfalse}%
- \endgroup%
+ \@tud@universtrue%
+ \@tempc{Univers Light}{\@tud@universfalse}%
+ \@tempc{Univers}{\@tud@universfalse}%
+ \@tempc{Univers Bold}{\@tud@universfalse}%
+ \@tempc{Univers Black}{\@tud@universfalse}%
+ \@tempc{Univers LightOblique}{\@tud@universfalse}%
+ \@tempc{Univers Oblique}{\@tud@universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud@universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud@universfalse}%
+ \@tud@dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud@dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if@tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud@univers}{\@tud@universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\undef\tud@font@check%
}
+\newcommand*\tud@font@missing@wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if@tud@x@fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if@tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD@Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud@font@math@missing@wrn[1]{%
+ \ClassWarning{\TUD@Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud@raggedright{\raggedright}
\newcommand*\tud@RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1418,13 +1455,15 @@
\if@atdocument%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
\if@tud@univers\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' fonts not found}%
+ \tud@font@missing@wrn{Univers}%
\fi%
\if@tud@dinbold\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud@font@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud@cdfont@num\relax% false
@@ -1445,7 +1484,6 @@
\tud@cmd@restore{mdseries@sf}%
\tud@cmd@restore{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{false}%
\ifcase\tud@cd@num\relax% false
\cs@std@lock{tud@head@font@num}{0}%
\else% !false
@@ -1469,35 +1507,26 @@
\tud@cmd@store{mdseries@sf}%
\tud@cmd@store{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{true}%
\cs@std@lock{tud@head@font@num}{\tud@cdfont@num}%
\if@tud@univers%
\if@tud@x@fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud@univers%
- ]%
+ \setsansfont{Univers}[\tud@x@fontspec@set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud@univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud@univers t%
]%
\else%
\renewcommand*\sfdefault{\tud@univers}%
@@ -1583,9 +1612,51 @@
\tud@skip@set{belowcaptionskip}{\z@}%
\tud@skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud@dinbn{}
-\let\tud@dinbn\relax
\newcommand*\tud@font@init{%
+ \if@tud@x@fontspec@enabled%
+ \if@tud@univers%
+ \newcommand*\tud@x@fontspec@set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@univ{Univers}[%
+ \tud@x@fontspec@set@univ,NFSSFamily=\tud@univers%
+ ]%
+ \fi%
+ \if@tud@dinbold%
+ \newcommand*\tud@x@fontspec@set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@din{DIN-Bold}[%
+ \tud@x@fontspec@set@din,NFSSFamily=\tud@dinbold%
+ ]%
+ \fi%
+ \fi%
\if@tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud@univers}{m}{n}}%
@@ -1600,36 +1671,20 @@
\newrobustcmd*\univrn{\tud@font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud@font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud@font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud@font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud@font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud@font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud@font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud@font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud@font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud@font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if@tud@dinbold%
- \if@tud@x@fontspec@enabled%
- \newfontface\tud@dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud@dinbold%
- ]%
- \else%
- \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
\if@tud@dinboldmath%
\appto\tud@dinbn{\mathversion{dinbold}}%
\fi%
\newrobustcmd*\dinbn{\tud@dinbn}%
\else%
\newrobustcmd*\tud@dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud@font@wrn{DIN Bold}\tud@dinbn}%
+ \newrobustcmd*\dinbn{\tud@font@fallback@wrn{DIN-Bold}\tud@dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1652,10 +1707,10 @@
\undef\tud@font@init%
}
\newcommand*\tud@font@fallback[3]{%
- \tud@font@wrn{#1}%
+ \tud@font@fallback@wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud@font@wrn[1]{%
+\newcommand*\tud@font@fallback@wrn[1]{%
\ClassWarning{\TUD@Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1856,17 +1911,16 @@
}
\newcommand*\tud@font@math@set{%
\if@atdocument%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \if@tud@universmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if@tud@dinboldmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if@tud@cdmath%
+ \if@tud@universmath\else%
+ \tud@font@math@missing@wrn{Univers}%
+ \fi%
+ \if@tud@dinboldmath\else%
+ \tud@font@math@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\if@tud@universmath%
@@ -1914,8 +1968,8 @@
\ifundef{\mdseries@tt}{\edef\mdseries@tt{\mddefault}}{}%
\fi%
\tud@font@check%
- \tud@font@set%
\tud@font@init%
+ \tud@font@set%
\if@tud@x@bm@requested%
\tud@font@math@init%
\UnPreventPackageFromLoading{bm}%
@@ -4064,7 +4118,6 @@
\newcommand*\tud@head@fontsize{}
\newcommand*\tud@head@font@light{}
\newcommand*\tud@head@font@bold{}
-\newcommand*\tud@head@font@@bold{}
\newcommand*\tud@head@font@set{%
\ifcase\tud@head@font@num\relax% false
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
@@ -4082,9 +4135,6 @@
{\sfdefault}{\mddefault}{\updefault}{\tud@head@fontsize}%
\DeclareFixedFont{\tud@head@font@bold}{\encodingdefault}%
{\sfdefault}{\bfdefault}{\updefault}{\tud@head@fontsize}%
- \protected\gdef\tud@head@font@@bold{%
- \usefont{\encodingdefault}{\sfdefault}{\bfdefault}{\updefault}%
- }%
\ifcase\tud@head@font@num\relax\else% true/heavy
\if@tud@univers%
\ifcase\tud@head@font@num\relax\or% true
@@ -4096,9 +4146,6 @@
\fi%
\DeclareFixedFont{\tud@head@font@bold}{\encodingdefault}%
{\tud@univers}{b}{n}{\tud@head@fontsize}%
- \protected\gdef\tud@head@font@@bold{%
- \usefont{\encodingdefault}{\tud@univers}{b}{n}%
- }%
\fi%
\fi%
\global\@tud@head@font@setfalse%
@@ -5569,7 +5616,7 @@
}{%
\ifstr{#1}{custom}{\bool@set@lock{@tud@cdgeometry@cover}{false}}{%
\ifstr{#1}{user}{\bool@set@lock{@tud@cdgeometry@cover}{false}}{%
- \TUD@parameter@error{cdgeometry}{true,false}%
+ \TUD@parameter@error{cdgeometry}{true, false}%
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
index 46c1e320a17..266b08cac9c 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -52,7 +52,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -65,7 +65,7 @@
}{}
%%% From File: tudscr-base.dtx
\ProvidesPackage{tudscrbase}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(basics for the bundle)%
]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
index 35422e36cda..877291c0c89 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
\newcommand*\TUD@ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD@Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if@tud@x@fontspec@enabled
-\AfterPackage*{fontspec}{\@tud@x@fontspec@enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud@x@fontspec@enabledtrue%
+ }{%
+ \@tud@x@fontspec@enabledfalse%
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver@fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if@tud@cdfont@din
\newif\if@tud@cdfont@ultrabold
\@tud@cdfont@dintrue
@@ -172,24 +185,29 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% heavy
\renewcommand*\tud@cdfont@num{2}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% normalbold
\@tud@cdfont@ultraboldfalse%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% ultrabold
\@tud@cdfont@ultraboldtrue%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% nodin
\@tud@cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud@fontsize@settrue\endcsname%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool@lock{@tud@cdmath}
+\bool@std@lock{@tud@cdmath}{true}%
\TUD@key{cdmath}[true]{%
\TUD@set@numkey{cdmath}{@tempa}{%
\TUD@bool@numkey,%
@@ -1061,7 +1081,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD@Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -1069,7 +1089,7 @@
KOMA-Script v\TUD@Version@KOMA is required%
}{%
\TUD@Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD@Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -1099,6 +1119,7 @@
\csdef{tud@v@2.05h}{3}
\csdef{tud@v@2.05i}{3}
\csdef{tud@v@2.05k}{3}
+\csdef{tud@v@2.05l}{3}
\csdef{tud@v@last}{3}
\newcommand*\tud@v@get[2]{%
\begingroup%
@@ -1122,7 +1143,8 @@
\fi%
}{%
\def\tud@reserved{%
- \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
There's no defined macro `\string\tud@v@\@tempa'%
}%
@@ -1132,7 +1154,7 @@
\tud@reserved%
}
\TUD@key{fontspec}[true]{%
- \ClassWarning{\TUD@Class@Name}%
+ \ClassWarningNoLine{\TUD@Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -1152,7 +1174,7 @@
\FamilyKeyStateProcessed%
}%
\if@tud@x@fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD@key{cdfonts}[true]{%
@@ -1351,7 +1373,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1431,88 +1453,103 @@
\newcommand*\tud@dinbold{0m6}
\newif\if@tud@dinbold
\newif\if@tud@dinboldmath
-\newcommand*\tud@x@fontspec@noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if@tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud@x@fontspec@noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud@font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if@tud@cdmath%
+ \tud@font@math@missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud@univers}{\@tud@universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if@tud@cdmath%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
+ \fi%
\if@tud@x@fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud@x@fontspec@noerror%
- \global\@tud@universtrue%
- \@tempc{Univers Light}{\global\@tud@universfalse}%
- \@tempc{Univers}{\global\@tud@universfalse}%
- \@tempc{Univers Bold}{\global\@tud@universfalse}%
- \@tempc{Univers Black}{\global\@tud@universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud@universfalse}%
- \global\@tud@dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud@dinboldfalse}%
- \endgroup%
+ \@tud@universtrue%
+ \@tempc{Univers Light}{\@tud@universfalse}%
+ \@tempc{Univers}{\@tud@universfalse}%
+ \@tempc{Univers Bold}{\@tud@universfalse}%
+ \@tempc{Univers Black}{\@tud@universfalse}%
+ \@tempc{Univers LightOblique}{\@tud@universfalse}%
+ \@tempc{Univers Oblique}{\@tud@universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud@universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud@universfalse}%
+ \@tud@dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud@dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if@tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud@univers}{\@tud@universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\undef\tud@font@check%
}
+\newcommand*\tud@font@missing@wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if@tud@x@fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if@tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD@Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud@font@math@missing@wrn[1]{%
+ \ClassWarning{\TUD@Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud@raggedright{\raggedright}
\newcommand*\tud@RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1533,13 +1570,15 @@
\if@atdocument%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
\if@tud@univers\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' fonts not found}%
+ \tud@font@missing@wrn{Univers}%
\fi%
\if@tud@dinbold\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud@font@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud@cdfont@num\relax% false
@@ -1560,7 +1599,6 @@
\tud@cmd@restore{mdseries@sf}%
\tud@cmd@restore{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{false}%
\ifcase\tud@cd@num\relax% false
\cs@std@lock{tud@head@font@num}{0}%
\else% !false
@@ -1584,35 +1622,26 @@
\tud@cmd@store{mdseries@sf}%
\tud@cmd@store{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{true}%
\cs@std@lock{tud@head@font@num}{\tud@cdfont@num}%
\if@tud@univers%
\if@tud@x@fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud@univers%
- ]%
+ \setsansfont{Univers}[\tud@x@fontspec@set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud@univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud@univers t%
]%
\else%
\renewcommand*\sfdefault{\tud@univers}%
@@ -1698,9 +1727,51 @@
\tud@skip@set{belowcaptionskip}{\z@}%
\tud@skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud@dinbn{}
-\let\tud@dinbn\relax
\newcommand*\tud@font@init{%
+ \if@tud@x@fontspec@enabled%
+ \if@tud@univers%
+ \newcommand*\tud@x@fontspec@set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@univ{Univers}[%
+ \tud@x@fontspec@set@univ,NFSSFamily=\tud@univers%
+ ]%
+ \fi%
+ \if@tud@dinbold%
+ \newcommand*\tud@x@fontspec@set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@din{DIN-Bold}[%
+ \tud@x@fontspec@set@din,NFSSFamily=\tud@dinbold%
+ ]%
+ \fi%
+ \fi%
\if@tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud@univers}{m}{n}}%
@@ -1715,36 +1786,20 @@
\newrobustcmd*\univrn{\tud@font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud@font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud@font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud@font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud@font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud@font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud@font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud@font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud@font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud@font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if@tud@dinbold%
- \if@tud@x@fontspec@enabled%
- \newfontface\tud@dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud@dinbold%
- ]%
- \else%
- \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
\if@tud@dinboldmath%
\appto\tud@dinbn{\mathversion{dinbold}}%
\fi%
\newrobustcmd*\dinbn{\tud@dinbn}%
\else%
\newrobustcmd*\tud@dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud@font@wrn{DIN Bold}\tud@dinbn}%
+ \newrobustcmd*\dinbn{\tud@font@fallback@wrn{DIN-Bold}\tud@dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1767,10 +1822,10 @@
\undef\tud@font@init%
}
\newcommand*\tud@font@fallback[3]{%
- \tud@font@wrn{#1}%
+ \tud@font@fallback@wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud@font@wrn[1]{%
+\newcommand*\tud@font@fallback@wrn[1]{%
\ClassWarning{\TUD@Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1971,17 +2026,16 @@
}
\newcommand*\tud@font@math@set{%
\if@atdocument%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \if@tud@universmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if@tud@dinboldmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if@tud@cdmath%
+ \if@tud@universmath\else%
+ \tud@font@math@missing@wrn{Univers}%
+ \fi%
+ \if@tud@dinboldmath\else%
+ \tud@font@math@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\if@tud@universmath%
@@ -2029,8 +2083,8 @@
\ifundef{\mdseries@tt}{\edef\mdseries@tt{\mddefault}}{}%
\fi%
\tud@font@check%
- \tud@font@set%
\tud@font@init%
+ \tud@font@set%
\if@tud@x@bm@requested%
\tud@font@math@init%
\UnPreventPackageFromLoading{bm}%
@@ -4183,7 +4237,6 @@
\newcommand*\tud@head@fontsize{}
\newcommand*\tud@head@font@light{}
\newcommand*\tud@head@font@bold{}
-\newcommand*\tud@head@font@@bold{}
\newcommand*\tud@head@font@set{%
\ifcase\tud@head@font@num\relax% false
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
@@ -4201,9 +4254,6 @@
{\sfdefault}{\mddefault}{\updefault}{\tud@head@fontsize}%
\DeclareFixedFont{\tud@head@font@bold}{\encodingdefault}%
{\sfdefault}{\bfdefault}{\updefault}{\tud@head@fontsize}%
- \protected\gdef\tud@head@font@@bold{%
- \usefont{\encodingdefault}{\sfdefault}{\bfdefault}{\updefault}%
- }%
\ifcase\tud@head@font@num\relax\else% true/heavy
\if@tud@univers%
\ifcase\tud@head@font@num\relax\or% true
@@ -4215,9 +4265,6 @@
\fi%
\DeclareFixedFont{\tud@head@font@bold}{\encodingdefault}%
{\tud@univers}{b}{n}{\tud@head@fontsize}%
- \protected\gdef\tud@head@font@@bold{%
- \usefont{\encodingdefault}{\tud@univers}{b}{n}%
- }%
\fi%
\fi%
\global\@tud@head@font@setfalse%
@@ -6072,7 +6119,7 @@
}{%
\ifstr{#1}{custom}{\bool@set@lock{@tud@cdgeometry@cover}{false}}{%
\ifstr{#1}{user}{\bool@set@lock{@tud@cdgeometry@cover}{false}}{%
- \TUD@parameter@error{cdgeometry}{true,false}%
+ \TUD@parameter@error{cdgeometry}{true, false}%
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
index 9de33c46321..0e131d6b2fa 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -52,7 +52,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -65,7 +65,7 @@
}{}
%%% From File: tudscr-color.dtx
\ProvidesPackage{tudscrcolor}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l 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 d229da4f038..cc64c191fef 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -55,7 +55,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -77,7 +77,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{tudscrcomp-book}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l 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 4466fa7e7fe..9c3033922b5 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -55,7 +55,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -77,7 +77,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{tudscrcomp-poster}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l 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 6a7a9bf3d10..1047734623a 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -52,7 +52,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -74,7 +74,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{tudscrcomp}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l 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 08ca39a8079..79bb61b8572 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -57,13 +57,13 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
\newcommand*\TUD@ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD@Class@KOMA{#2}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index dbe72da1a03..bebce102735 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
@@ -16,7 +16,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -59,7 +59,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -72,7 +72,7 @@
}{}
%%% From File: tudscr-fonts.dtx
\ProvidesPackage{tudscrfonts}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(corporate design fonts)%
]
@@ -100,7 +100,20 @@
\RequirePackage{tudscrbase}[\TUD@Version]
%%% From File: tudscr-fonts.dtx
\newif\if@tud@x@fontspec@enabled
-\AfterPackage*{fontspec}{\@tud@x@fontspec@enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud@x@fontspec@enabledtrue%
+ }{%
+ \@tud@x@fontspec@enabledfalse%
+ \PackageWarningNoLine{tudscrfonts}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver@fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if@tud@cdfont@din
\newif\if@tud@cdfont@ultrabold
\@tud@cdfont@dintrue
@@ -126,24 +139,29 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% heavy
\renewcommand*\tud@cdfont@num{2}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% normalbold
\@tud@cdfont@ultraboldfalse%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% ultrabold
\@tud@cdfont@ultraboldtrue%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% nodin
\@tud@cdfont@dinfalse%
@@ -175,6 +193,7 @@
\csname @tud@fontsize@settrue\endcsname%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -204,6 +223,7 @@
\FamilyKeyStateProcessed%
}
\bool@lock{@tud@cdmath}
+\bool@std@lock{@tud@cdmath}{true}%
\TUD@key{cdmath}[true]{%
\TUD@set@numkey{cdmath}{@tempa}{%
\TUD@bool@numkey,%
@@ -303,6 +323,7 @@
\csdef{tud@v@2.05h}{3}
\csdef{tud@v@2.05i}{3}
\csdef{tud@v@2.05k}{3}
+\csdef{tud@v@2.05l}{3}
\csdef{tud@v@last}{3}
\newcommand*\tud@v@get[2]{%
\begingroup%
@@ -326,7 +347,8 @@
\fi%
}{%
\def\tud@reserved{%
- \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+ \PackageWarningNoLine{tudscrfonts}%
+ {%
Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
There's no defined macro `\string\tud@v@\@tempa'%
}%
@@ -336,7 +358,7 @@
\tud@reserved%
}
\TUD@key{fontspec}[true]{%
- \PackageWarning{tudscrfonts}%
+ \PackageWarningNoLine{tudscrfonts}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -356,7 +378,7 @@
\FamilyKeyStateProcessed%
}%
\if@tud@x@fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD@key{cdfonts}[true]{%
@@ -450,88 +472,103 @@
\newcommand*\tud@dinbold{0m6}
\newif\if@tud@dinbold
\newif\if@tud@dinboldmath
-\newcommand*\tud@x@fontspec@noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if@tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud@x@fontspec@noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud@font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \PackageWarningNoLine{tudscrfonts}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if@tud@cdmath%
+ \tud@font@math@missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud@univers}{\@tud@universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if@tud@cdmath%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
+ \fi%
\if@tud@x@fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \PackageWarningNoLine{tudscrfonts}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud@x@fontspec@noerror%
- \global\@tud@universtrue%
- \@tempc{Univers Light}{\global\@tud@universfalse}%
- \@tempc{Univers}{\global\@tud@universfalse}%
- \@tempc{Univers Bold}{\global\@tud@universfalse}%
- \@tempc{Univers Black}{\global\@tud@universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud@universfalse}%
- \global\@tud@dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud@dinboldfalse}%
- \endgroup%
+ \@tud@universtrue%
+ \@tempc{Univers Light}{\@tud@universfalse}%
+ \@tempc{Univers}{\@tud@universfalse}%
+ \@tempc{Univers Bold}{\@tud@universfalse}%
+ \@tempc{Univers Black}{\@tud@universfalse}%
+ \@tempc{Univers LightOblique}{\@tud@universfalse}%
+ \@tempc{Univers Oblique}{\@tud@universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud@universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud@universfalse}%
+ \@tud@dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud@dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \PackageWarningNoLine{tudscrfonts}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if@tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud@univers}{\@tud@universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\undef\tud@font@check%
}
+\newcommand*\tud@font@missing@wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if@tud@x@fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if@tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \PackageWarning{tudscrfonts}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud@font@math@missing@wrn[1]{%
+ \PackageWarning{tudscrfonts}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud@raggedright{\raggedright}
\newcommand*\tud@RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -560,13 +597,15 @@
\if@atdocument%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
\if@tud@univers\else%
- \PackageWarning{tudscrfonts}%
- {`Univers' fonts not found}%
+ \tud@font@missing@wrn{Univers}%
\fi%
\if@tud@dinbold\else%
- \PackageWarning{tudscrfonts}%
- {`DIN Bold' fonts not found}%
+ \tud@font@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud@cdfont@num\relax% false
@@ -587,7 +626,6 @@
\tud@cmd@restore{mdseries@sf}%
\tud@cmd@restore{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{false}%
\else% true/heavy
\tud@cmd@store{rmdefault}%
\tud@cmd@store{sfdefault}%
@@ -606,34 +644,25 @@
\tud@cmd@store{mdseries@sf}%
\tud@cmd@store{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{true}%
\if@tud@univers%
\if@tud@x@fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud@univers%
- ]%
+ \setsansfont{Univers}[\tud@x@fontspec@set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud@univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud@univers t%
]%
\else%
\renewcommand*\sfdefault{\tud@univers}%
@@ -717,9 +746,51 @@
\tud@skip@set{belowcaptionskip}{\z@}%
\tud@skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud@dinbn{}
-\let\tud@dinbn\relax
\newcommand*\tud@font@init{%
+ \if@tud@x@fontspec@enabled%
+ \if@tud@univers%
+ \newcommand*\tud@x@fontspec@set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@univ{Univers}[%
+ \tud@x@fontspec@set@univ,NFSSFamily=\tud@univers%
+ ]%
+ \fi%
+ \if@tud@dinbold%
+ \newcommand*\tud@x@fontspec@set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@din{DIN-Bold}[%
+ \tud@x@fontspec@set@din,NFSSFamily=\tud@dinbold%
+ ]%
+ \fi%
+ \fi%
\if@tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud@univers}{m}{n}}%
@@ -734,36 +805,20 @@
\newrobustcmd*\univrn{\tud@font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud@font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud@font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud@font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud@font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud@font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud@font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud@font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud@font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud@font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if@tud@dinbold%
- \if@tud@x@fontspec@enabled%
- \newfontface\tud@dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud@dinbold%
- ]%
- \else%
- \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
\if@tud@dinboldmath%
\appto\tud@dinbn{\mathversion{dinbold}}%
\fi%
\newrobustcmd*\dinbn{\tud@dinbn}%
\else%
\newrobustcmd*\tud@dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud@font@wrn{DIN Bold}\tud@dinbn}%
+ \newrobustcmd*\dinbn{\tud@font@fallback@wrn{DIN-Bold}\tud@dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -786,10 +841,10 @@
\undef\tud@font@init%
}
\newcommand*\tud@font@fallback[3]{%
- \tud@font@wrn{#1}%
+ \tud@font@fallback@wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud@font@wrn[1]{%
+\newcommand*\tud@font@fallback@wrn[1]{%
\PackageWarning{tudscrfonts}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -990,17 +1045,16 @@
}
\newcommand*\tud@font@math@set{%
\if@atdocument%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \if@tud@universmath\else%
- \PackageWarning{tudscrfonts}%
- {`Univers' math fonts not found}%
- \fi%
- \if@tud@dinboldmath\else%
- \PackageWarning{tudscrfonts}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if@tud@cdmath%
+ \if@tud@universmath\else%
+ \tud@font@math@missing@wrn{Univers}%
\fi%
+ \if@tud@dinboldmath\else%
+ \tud@font@math@missing@wrn{DIN-Bold}%
+ \fi%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\if@tud@universmath%
@@ -1049,8 +1103,8 @@
\fi%
\tud@font@check%
\ifdef{\sectfont}{}{\let\sectfont\relax}%
- \tud@font@set%
\tud@font@init%
+ \tud@font@set%
\if@tud@x@bm@requested%
\tud@font@math@init%
\UnPreventPackageFromLoading{bm}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
index 5b662d73681..172feccf612 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -59,13 +59,13 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
\newcommand*\TUD@ProvidesWrapperClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD@Class@Parent{#2}%
@@ -183,7 +183,7 @@
\@ifpackagelater{geometry}{2010/09/13}{%
\ClassWarning{\TUD@Class@Name}{%
Package `geometry' was updated so some patches\MessageBreak%
- are maybe outdated
+ are maybe outdated%
}%
}{}%
\newcommand*\vTUDScript{v\TUDScriptVersionNumber}
@@ -367,7 +367,7 @@
{%
It is strongly recommended to load package `hyperref'.\MessageBreak%
Nevertheless, essential commands are rudimentarily\MessageBreak%
- defined. At least the package `url' is loaded.%
+ defined. At least the package `url' is loaded%
}%
\providecommand*\hypersetup[1]{}%
\providecommand*\href[3][]{#3}%
@@ -1130,7 +1130,7 @@
\def\@tempb{%
\ClassWarning{tudscrmanual}{%
Label #1\MessageBreak%
- is missing, no cross-reference created.%
+ is missing, no cross-reference created%
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
index f2d7a65974a..eba0ab27e6c 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
\newcommand*\TUD@ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD@Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if@tud@x@fontspec@enabled
-\AfterPackage*{fontspec}{\@tud@x@fontspec@enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud@x@fontspec@enabledtrue%
+ }{%
+ \@tud@x@fontspec@enabledfalse%
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver@fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if@tud@cdfont@din
\newif\if@tud@cdfont@ultrabold
\@tud@cdfont@dintrue
@@ -172,24 +185,29 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% heavy
\renewcommand*\tud@cdfont@num{2}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% normalbold
\@tud@cdfont@ultraboldfalse%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% ultrabold
\@tud@cdfont@ultraboldtrue%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% nodin
\@tud@cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud@fontsize@settrue\endcsname%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool@lock{@tud@cdmath}
+\bool@std@lock{@tud@cdmath}{true}%
\TUD@key{cdmath}[true]{%
\TUD@set@numkey{cdmath}{@tempa}{%
\TUD@bool@numkey,%
@@ -837,7 +857,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD@Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -845,7 +865,7 @@
KOMA-Script v\TUD@Version@KOMA is required%
}{%
\TUD@Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD@Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -875,6 +895,7 @@
\csdef{tud@v@2.05h}{3}
\csdef{tud@v@2.05i}{3}
\csdef{tud@v@2.05k}{3}
+\csdef{tud@v@2.05l}{3}
\csdef{tud@v@last}{3}
\newcommand*\tud@v@get[2]{%
\begingroup%
@@ -898,7 +919,8 @@
\fi%
}{%
\def\tud@reserved{%
- \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
There's no defined macro `\string\tud@v@\@tempa'%
}%
@@ -908,7 +930,7 @@
\tud@reserved%
}
\TUD@key{fontspec}[true]{%
- \ClassWarning{\TUD@Class@Name}%
+ \ClassWarningNoLine{\TUD@Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -928,7 +950,7 @@
\FamilyKeyStateProcessed%
}%
\if@tud@x@fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD@key{cdfonts}[true]{%
@@ -1127,7 +1149,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1207,88 +1229,103 @@
\newcommand*\tud@dinbold{0m6}
\newif\if@tud@dinbold
\newif\if@tud@dinboldmath
-\newcommand*\tud@x@fontspec@noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if@tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud@x@fontspec@noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud@font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if@tud@cdmath%
+ \tud@font@math@missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud@univers}{\@tud@universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if@tud@cdmath%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
+ \fi%
\if@tud@x@fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud@x@fontspec@noerror%
- \global\@tud@universtrue%
- \@tempc{Univers Light}{\global\@tud@universfalse}%
- \@tempc{Univers}{\global\@tud@universfalse}%
- \@tempc{Univers Bold}{\global\@tud@universfalse}%
- \@tempc{Univers Black}{\global\@tud@universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud@universfalse}%
- \global\@tud@dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud@dinboldfalse}%
- \endgroup%
+ \@tud@universtrue%
+ \@tempc{Univers Light}{\@tud@universfalse}%
+ \@tempc{Univers}{\@tud@universfalse}%
+ \@tempc{Univers Bold}{\@tud@universfalse}%
+ \@tempc{Univers Black}{\@tud@universfalse}%
+ \@tempc{Univers LightOblique}{\@tud@universfalse}%
+ \@tempc{Univers Oblique}{\@tud@universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud@universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud@universfalse}%
+ \@tud@dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud@dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if@tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud@univers}{\@tud@universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\undef\tud@font@check%
}
+\newcommand*\tud@font@missing@wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if@tud@x@fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if@tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD@Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud@font@math@missing@wrn[1]{%
+ \ClassWarning{\TUD@Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud@raggedright{\raggedright}
\newcommand*\tud@RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1309,13 +1346,15 @@
\if@atdocument%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
\if@tud@univers\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' fonts not found}%
+ \tud@font@missing@wrn{Univers}%
\fi%
\if@tud@dinbold\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud@font@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud@cdfont@num\relax% false
@@ -1336,7 +1375,6 @@
\tud@cmd@restore{mdseries@sf}%
\tud@cmd@restore{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{false}%
\ifcase\tud@cd@num\relax% false
\cs@std@lock{tud@head@font@num}{0}%
\else% !false
@@ -1360,35 +1398,26 @@
\tud@cmd@store{mdseries@sf}%
\tud@cmd@store{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{true}%
\cs@std@lock{tud@head@font@num}{\tud@cdfont@num}%
\if@tud@univers%
\if@tud@x@fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud@univers%
- ]%
+ \setsansfont{Univers}[\tud@x@fontspec@set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud@univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud@univers t%
]%
\else%
\renewcommand*\sfdefault{\tud@univers}%
@@ -1474,9 +1503,51 @@
\tud@skip@set{belowcaptionskip}{\z@}%
\tud@skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud@dinbn{}
-\let\tud@dinbn\relax
\newcommand*\tud@font@init{%
+ \if@tud@x@fontspec@enabled%
+ \if@tud@univers%
+ \newcommand*\tud@x@fontspec@set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@univ{Univers}[%
+ \tud@x@fontspec@set@univ,NFSSFamily=\tud@univers%
+ ]%
+ \fi%
+ \if@tud@dinbold%
+ \newcommand*\tud@x@fontspec@set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@din{DIN-Bold}[%
+ \tud@x@fontspec@set@din,NFSSFamily=\tud@dinbold%
+ ]%
+ \fi%
+ \fi%
\if@tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud@univers}{m}{n}}%
@@ -1491,36 +1562,20 @@
\newrobustcmd*\univrn{\tud@font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud@font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud@font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud@font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud@font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud@font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud@font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud@font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud@font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud@font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if@tud@dinbold%
- \if@tud@x@fontspec@enabled%
- \newfontface\tud@dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud@dinbold%
- ]%
- \else%
- \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
\if@tud@dinboldmath%
\appto\tud@dinbn{\mathversion{dinbold}}%
\fi%
\newrobustcmd*\dinbn{\tud@dinbn}%
\else%
\newrobustcmd*\tud@dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud@font@wrn{DIN Bold}\tud@dinbn}%
+ \newrobustcmd*\dinbn{\tud@font@fallback@wrn{DIN-Bold}\tud@dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1543,10 +1598,10 @@
\undef\tud@font@init%
}
\newcommand*\tud@font@fallback[3]{%
- \tud@font@wrn{#1}%
+ \tud@font@fallback@wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud@font@wrn[1]{%
+\newcommand*\tud@font@fallback@wrn[1]{%
\ClassWarning{\TUD@Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1747,17 +1802,16 @@
}
\newcommand*\tud@font@math@set{%
\if@atdocument%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \if@tud@universmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if@tud@dinboldmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if@tud@cdmath%
+ \if@tud@universmath\else%
+ \tud@font@math@missing@wrn{Univers}%
\fi%
+ \if@tud@dinboldmath\else%
+ \tud@font@math@missing@wrn{DIN-Bold}%
+ \fi%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\if@tud@universmath%
@@ -1805,8 +1859,8 @@
\ifundef{\mdseries@tt}{\edef\mdseries@tt{\mddefault}}{}%
\fi%
\tud@font@check%
- \tud@font@set%
\tud@font@init%
+ \tud@font@set%
\if@tud@x@bm@requested%
\tud@font@math@init%
\UnPreventPackageFromLoading{bm}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
index 882dfabcbc5..b487e4f6666 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
\newcommand*\TUD@ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD@Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if@tud@x@fontspec@enabled
-\AfterPackage*{fontspec}{\@tud@x@fontspec@enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud@x@fontspec@enabledtrue%
+ }{%
+ \@tud@x@fontspec@enabledfalse%
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver@fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if@tud@cdfont@din
\newif\if@tud@cdfont@ultrabold
\@tud@cdfont@dintrue
@@ -172,24 +185,29 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% heavy
\renewcommand*\tud@cdfont@num{2}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% normalbold
\@tud@cdfont@ultraboldfalse%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% ultrabold
\@tud@cdfont@ultraboldtrue%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
\fi%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\or% nodin
\@tud@cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud@fontsize@settrue\endcsname%
\ifcase\tud@cdfont@num\relax% false to true
\renewcommand*\tud@cdfont@num{1}%
+ \bool@std@lock{@tud@cdmath}{true}%
\TUD@SpecialOptionAtDocument{tud@font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool@lock{@tud@cdmath}
+\bool@std@lock{@tud@cdmath}{true}%
\TUD@key{cdmath}[true]{%
\TUD@set@numkey{cdmath}{@tempa}{%
\TUD@bool@numkey,%
@@ -1065,7 +1085,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD@Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -1073,7 +1093,7 @@
KOMA-Script v\TUD@Version@KOMA is required%
}{%
\TUD@Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD@Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD@Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -1103,6 +1123,7 @@
\csdef{tud@v@2.05h}{3}
\csdef{tud@v@2.05i}{3}
\csdef{tud@v@2.05k}{3}
+\csdef{tud@v@2.05l}{3}
\csdef{tud@v@last}{3}
\newcommand*\tud@v@get[2]{%
\begingroup%
@@ -1126,7 +1147,8 @@
\fi%
}{%
\def\tud@reserved{%
- \ClassWarningNoLine{\TUD@Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD@Class@Name}%
+ {%
Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
There's no defined macro `\string\tud@v@\@tempa'%
}%
@@ -1136,7 +1158,7 @@
\tud@reserved%
}
\TUD@key{fontspec}[true]{%
- \ClassWarning{\TUD@Class@Name}%
+ \ClassWarningNoLine{\TUD@Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -1156,7 +1178,7 @@
\FamilyKeyStateProcessed%
}%
\if@tud@x@fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD@key{cdfonts}[true]{%
@@ -1355,7 +1377,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1435,88 +1457,103 @@
\newcommand*\tud@dinbold{0m6}
\newif\if@tud@dinbold
\newif\if@tud@dinboldmath
-\newcommand*\tud@x@fontspec@noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if@tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud@x@fontspec@noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud@font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if@tud@cdmath%
+ \tud@font@math@missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud@univers}{\@tud@universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud@dinbold}{\@tud@dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if@tud@cdmath%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
+ \fi%
\if@tud@x@fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud@x@fontspec@noerror%
- \global\@tud@universtrue%
- \@tempc{Univers Light}{\global\@tud@universfalse}%
- \@tempc{Univers}{\global\@tud@universfalse}%
- \@tempc{Univers Bold}{\global\@tud@universfalse}%
- \@tempc{Univers Black}{\global\@tud@universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud@universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud@universfalse}%
- \global\@tud@dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud@dinboldfalse}%
- \endgroup%
+ \@tud@universtrue%
+ \@tempc{Univers Light}{\@tud@universfalse}%
+ \@tempc{Univers}{\@tud@universfalse}%
+ \@tempc{Univers Bold}{\@tud@universfalse}%
+ \@tempc{Univers Black}{\@tud@universfalse}%
+ \@tempc{Univers LightOblique}{\@tud@universfalse}%
+ \@tempc{Univers Oblique}{\@tud@universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud@universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud@universfalse}%
+ \@tud@dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud@dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD@Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if@tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud@font@missing@wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud@univers}{\@tud@universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud@dinbold}{\@tud@dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\undef\tud@font@check%
}
+\newcommand*\tud@font@missing@wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if@tud@x@fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if@tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD@Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud@font@math@missing@wrn[1]{%
+ \ClassWarning{\TUD@Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud@raggedright{\raggedright}
\newcommand*\tud@RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1537,13 +1574,15 @@
\if@atdocument%
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
\if@tud@univers\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' fonts not found}%
+ \tud@font@missing@wrn{Univers}%
\fi%
\if@tud@dinbold\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud@font@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@univers} and bool {@tud@dinbold}}{}{%
+ \renewcommand*\tud@cdfont@num{0}%
+ \bool@std@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud@cdfont@num\relax% false
@@ -1564,7 +1603,6 @@
\tud@cmd@restore{mdseries@sf}%
\tud@cmd@restore{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{false}%
\ifcase\tud@cd@num\relax% false
\cs@std@lock{tud@head@font@num}{0}%
\else% !false
@@ -1588,35 +1626,26 @@
\tud@cmd@store{mdseries@sf}%
\tud@cmd@store{mdseries@tt}%
\fi%
- \bool@std@lock{@tud@cdmath}{true}%
\cs@std@lock{tud@head@font@num}{\tud@cdfont@num}%
\if@tud@univers%
\if@tud@x@fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud@univers%
- ]%
+ \setsansfont{Univers}[\tud@x@fontspec@set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud@univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud@univers t%
]%
\else%
\renewcommand*\sfdefault{\tud@univers}%
@@ -1702,9 +1731,51 @@
\tud@skip@set{belowcaptionskip}{\z@}%
\tud@skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud@dinbn{}
-\let\tud@dinbn\relax
\newcommand*\tud@font@init{%
+ \if@tud@x@fontspec@enabled%
+ \if@tud@univers%
+ \newcommand*\tud@x@fontspec@set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@univ{Univers}[%
+ \tud@x@fontspec@set@univ,NFSSFamily=\tud@univers%
+ ]%
+ \fi%
+ \if@tud@dinbold%
+ \newcommand*\tud@x@fontspec@set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud@x@fontspec@fam@din{DIN-Bold}[%
+ \tud@x@fontspec@set@din,NFSSFamily=\tud@dinbold%
+ ]%
+ \fi%
+ \fi%
\if@tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud@univers}{m}{n}}%
@@ -1719,36 +1790,20 @@
\newrobustcmd*\univrn{\tud@font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud@font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud@font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud@font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud@font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud@font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud@font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud@font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud@font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud@font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if@tud@dinbold%
- \if@tud@x@fontspec@enabled%
- \newfontface\tud@dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud@dinbold%
- ]%
- \else%
- \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud@dinbn{\usefont{\encodingdefault}{\tud@dinbold}{b}{n}}%
\if@tud@dinboldmath%
\appto\tud@dinbn{\mathversion{dinbold}}%
\fi%
\newrobustcmd*\dinbn{\tud@dinbn}%
\else%
\newrobustcmd*\tud@dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud@font@wrn{DIN Bold}\tud@dinbn}%
+ \newrobustcmd*\dinbn{\tud@font@fallback@wrn{DIN-Bold}\tud@dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1771,10 +1826,10 @@
\undef\tud@font@init%
}
\newcommand*\tud@font@fallback[3]{%
- \tud@font@wrn{#1}%
+ \tud@font@fallback@wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud@font@wrn[1]{%
+\newcommand*\tud@font@fallback@wrn[1]{%
\ClassWarning{\TUD@Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1975,17 +2030,16 @@
}
\newcommand*\tud@font@math@set{%
\if@atdocument%
- \ifnum\tud@cdfont@num>\z@\relax% true/heavy
- \if@tud@cdmath%
- \if@tud@universmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if@tud@dinboldmath\else%
- \ClassWarning{\TUD@Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if@tud@cdmath%
+ \if@tud@universmath\else%
+ \tud@font@math@missing@wrn{Univers}%
+ \fi%
+ \if@tud@dinboldmath\else%
+ \tud@font@math@missing@wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud@universmath} and bool {@tud@dinboldmath}}{}{%
+ \bool@set@lock{@tud@cdmath}{false}%
+ }%
\fi%
\fi%
\if@tud@universmath%
@@ -2033,8 +2087,8 @@
\ifundef{\mdseries@tt}{\edef\mdseries@tt{\mddefault}}{}%
\fi%
\tud@font@check%
- \tud@font@set%
\tud@font@init%
+ \tud@font@set%
\if@tud@x@bm@requested%
\tud@font@math@init%
\UnPreventPackageFromLoading{bm}%
@@ -4184,7 +4238,6 @@
\newcommand*\tud@head@fontsize{}
\newcommand*\tud@head@font@light{}
\newcommand*\tud@head@font@bold{}
-\newcommand*\tud@head@font@@bold{}
\newcommand*\tud@head@font@set{%
\ifcase\tud@head@font@num\relax% false
\ifnum\tud@cdfont@num>\z@\relax% true/heavy
@@ -4202,9 +4255,6 @@
{\sfdefault}{\mddefault}{\updefault}{\tud@head@fontsize}%
\DeclareFixedFont{\tud@head@font@bold}{\encodingdefault}%
{\sfdefault}{\bfdefault}{\updefault}{\tud@head@fontsize}%
- \protected\gdef\tud@head@font@@bold{%
- \usefont{\encodingdefault}{\sfdefault}{\bfdefault}{\updefault}%
- }%
\ifcase\tud@head@font@num\relax\else% true/heavy
\if@tud@univers%
\ifcase\tud@head@font@num\relax\or% true
@@ -4216,9 +4266,6 @@
\fi%
\DeclareFixedFont{\tud@head@font@bold}{\encodingdefault}%
{\tud@univers}{b}{n}{\tud@head@fontsize}%
- \protected\gdef\tud@head@font@@bold{%
- \usefont{\encodingdefault}{\tud@univers}{b}{n}%
- }%
\fi%
\fi%
\global\@tud@head@font@setfalse%
@@ -6073,7 +6120,7 @@
}{%
\ifstr{#1}{custom}{\bool@set@lock{@tud@cdgeometry@cover}{false}}{%
\ifstr{#1}{user}{\bool@set@lock{@tud@cdgeometry@cover}{false}}{%
- \TUD@parameter@error{cdgeometry}{true,false}%
+ \TUD@parameter@error{cdgeometry}{true, false}%
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
index 5fca505f20e..7624cf24bf5 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -54,7 +54,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -76,7 +76,7 @@
}{}
%%% From File: tudscr-supervisor.dtx
\ProvidesPackage{tudscrsupervisor}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l 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 667bcdf801d..e0779f21288 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -57,7 +57,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD@Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -79,7 +79,7 @@
}{}
%%% From File: tudscr-manual.dtx
\ProvidesPackage{tudscrtutorial}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(internal tutorials)%
]
@@ -163,7 +163,7 @@
\@ifpackagelater{geometry}{2010/09/13}{%
\ClassWarning{\TUD@Class@Name}{%
Package `geometry' was updated so some patches\MessageBreak%
- are maybe outdated
+ are maybe outdated%
}%
}{}%
\newcommand*\vTUDScript{v\TUDScriptVersionNumber}
@@ -268,7 +268,7 @@
{%
It is strongly recommended to load package `hyperref'.\MessageBreak%
Nevertheless, essential commands are rudimentarily\MessageBreak%
- defined. At least the package `url' is loaded.%
+ defined. At least the package `url' is loaded%
}%
\providecommand*\hypersetup[1]{}%
\providecommand*\href[3][]{#3}%
@@ -1223,8 +1223,8 @@
\begin{filecontents*}{\tud@tut@temp-standalone.tex}
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrreprt}
-\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
\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 39d3d69b9d0..3a65bb2c8c2 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
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017
%%
@@ -29,7 +29,7 @@
%%% From File: tudscr-twocolfix.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{twocolfix}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(twocolumn layout bugfix)%
]