tudscr (29nov15)

git-svn-id: svn://tug.org/texlive/trunk@38975 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 72 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
index ca8dee44081..e3763367369 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
@@ -70,14 +70,14 @@
       \fi%
     }%
   \fi%
-  \@TUDVersion{2015/10/06 v2.04b TUD-KOMA-Script}%
+  \@TUDVersion{2015/11/29 v2.04c TUD-KOMA-Script}%
 \endgroup%
 \providecommand*\tudscrmail{tudscr@gmail.com}
 \newcommand*\TUD@ProvidesClass[3]{%
   \newcommand*\TUDClassName@KOMA{#2}%
   \@ifundefined{TUDClassName@Parent}{\newcommand*\TUDClassName{#1}}{}%
   \ProvidesClass{#1}[%
-  2015/10/06 v2.04b TUD-KOMA-Script
+  2015/11/29 v2.04c TUD-KOMA-Script
     ^^J#3 (#2)%
   ]%
   \@ifundefined{TUDClassName@Parent}{\TUD@ClassInfo}{}%
@@ -1274,51 +1274,6 @@
   \undef\tud@font@check%
 }
 \newcommand*\tud@font@init{%
-  \undef\tud@font@init@fontspec%
-  \undef\tud@font@init@nfss%
-  \undef\tud@font@init%
-}
-\newcommand*\tud@font@init@fontspec{%
-  \newfontface\univln{Univers Light}[NFSSFamily=UniversLight]%
-  \newfontface\univrn{Univers}[NFSSFamily=UniversRegular]%
-  \newfontface\univbn{Univers Bold}[NFSSFamily=UniversBold]%
-  \newfontface\univxn{Univers Black}[NFSSFamily=UniversBlack]%
-  \newfontface\univls{Univers Light Oblique}[NFSSFamily=UniversLightOblique]%
-  \newfontface\univrs{Univers Oblique}[NFSSFamily=UniversRegularOblique]%
-  \newfontface\univbs{Univers Bold Oblique}[NFSSFamily=UniversBoldOblique]%
-  \newfontface\univxs{Univers Black Oblique}[NFSSFamily=UniversBlackOblique]%
-  \newcommand*\textuln[1]{{\univln##1}}%
-  \newcommand*\texturn[1]{{\univrn##1}}%
-  \newcommand*\textubn[1]{{\univbn##1}}%
-  \newcommand*\textuxn[1]{{\univxn##1}}%
-  \newcommand*\textuls[1]{{\univls##1}}%
-  \newcommand*\texturs[1]{{\univrs##1}}%
-  \newcommand*\textubs[1]{{\univbs##1}}%
-  \newcommand*\textuxs[1]{{\univxs##1}}%
-  \newfontface\@dinbn{DIN Bold}[NFSSFamily=DINBold,BoldFont = DIN Bold]%
-  \newcommand*\dinbn{\@dinbn\if@tud@dinbold\mathversion{dinbold}\fi}%
-  \newcommand*\textdbn[1]{{\dinbn##1}}%
-}
-\newcommand*\tud@font@init@nfss{%
-  \if@tud@univers%
-    \newcommand*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}%
-    \newcommand*\univrn{\usefont{\encodingdefault}{\tud@univers}{m}{n}}%
-    \newcommand*\univbn{\usefont{\encodingdefault}{\tud@univers}{b}{n}}%
-    \newcommand*\univxn{\usefont{\encodingdefault}{\tud@univers}{eb}{n}}%
-    \newcommand*\univls{\usefont{\encodingdefault}{\tud@univers}{l}{sl}}%
-    \newcommand*\univrs{\usefont{\encodingdefault}{\tud@univers}{m}{sl}}%
-    \newcommand*\univbs{\usefont{\encodingdefault}{\tud@univers}{b}{sl}}%
-    \newcommand*\univxs{\usefont{\encodingdefault}{\tud@univers}{eb}{sl}}%
-  \else%
-    \newcommand*\univln{}%
-    \newcommand*\univrn{}%
-    \newcommand*\univbn{}%
-    \newcommand*\univxn{}%
-    \newcommand*\univls{}%
-    \newcommand*\univrs{}%
-    \newcommand*\univbs{}%
-    \newcommand*\univxs{}%
-  \fi%
   \newcommand*\textuln{}%
   \newcommand*\texturn{}%
   \newcommand*\textubn{}%
@@ -1327,6 +1282,7 @@
   \newcommand*\texturs{}%
   \newcommand*\textubs{}%
   \newcommand*\textuxs{}%
+  \newcommand*\textdbn{}%
   \DeclareTextFontCommand{\textuln}{\univln}%
   \DeclareTextFontCommand{\texturn}{\univrn}%
   \DeclareTextFontCommand{\textubn}{\univbn}%
@@ -1335,16 +1291,81 @@
   \DeclareTextFontCommand{\texturs}{\univrs}%
   \DeclareTextFontCommand{\textubs}{\univbs}%
   \DeclareTextFontCommand{\textuxs}{\univxs}%
+  \DeclareTextFontCommand{\textdbn}{\dinbn}%
+  \undef\tud@font@init@fontspec%
+  \undef\tud@fontface%
+  \undef\tud@fontspec@flag%
+  \undef\tud@fontspec@error%
+  \undef\tud@font@init@nfss%
+  \undef\tud@font@init%
+}
+\newif\if@tud@fontspec@missing
+\newcommand*\tud@font@init@fontspec{}
+\IfFileExists{xparse.sty}{\@tempswatrue}{\@tempswafalse}%
+\if@tempswa
+  \RequirePackage{xparse}
+  \newcommand*\tud@fontspec@flag{\global\@tud@fontspec@missingtrue\@gobbletwo}%
+  \NewDocumentCommand\tud@fontface{mmo}{%
+    \global\@tud@fontspec@missingfalse%
+    \newfontface#1{#2}[#3]%
+    \if@tud@fontspec@missing%
+      \renewrobustcmd*#1{}%
+    \fi%
+  }%
+  \ExplSyntaxOn
+  \renewcommand*\tud@font@init@fontspec{%
+    \cs_set_eq:NN \tud@fontspec@error \__fontspec_error:nx
+    \cs_set_eq:NN \__fontspec_error:nx \tud@fontspec@flag
+    \tud@fontface\univln{Univers Light}[NFSSFamily=UniversLight]%
+    \tud@fontface\univrn{Univers}[NFSSFamily=UniversRegular]%
+    \tud@fontface\univbn{Univers Bold}[NFSSFamily=UniversBold]%
+    \tud@fontface\univxn{Univers Black}[NFSSFamily=UniversBlack]%
+    \tud@fontface\univls{Univers Light Oblique}[NFSSFamily=UniversLightOblique]%
+    \tud@fontface\univrs{Univers Oblique}[NFSSFamily=UniversRegularOblique]%
+    \tud@fontface\univbs{Univers Bold Oblique}[NFSSFamily=UniversBoldOblique]%
+    \tud@fontface\univxs{Univers Black Oblique}[NFSSFamily=UniversBlackOblique]%
+    \tud@fontface\@dinbn{DIN Bold}[NFSSFamily=DINBold,BoldFont = DIN Bold]%
+    \if@tud@fontspec@missing%
+      \newrobustcmd*\dinbn{\sectfont}%
+    \else%
+      \if@tud@dinbold%
+        \newrobustcmd*\dinbn{\@dinbn\mathversion{dinbold}}%
+      \else%
+        \newrobustcmd*\dinbn{\@dinbn}%
+      \fi%
+    \fi%
+    \cs_set_eq:NN \__fontspec_error:nx \tud@fontspec@error
+  }%
+  \ExplSyntaxOff
+\fi%
+\newcommand*\tud@font@init@nfss{%
+  \if@tud@univers%
+    \newrobustcmd*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}%
+    \newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud@univers}{m}{n}}%
+    \newrobustcmd*\univbn{\usefont{\encodingdefault}{\tud@univers}{b}{n}}%
+    \newrobustcmd*\univxn{\usefont{\encodingdefault}{\tud@univers}{eb}{n}}%
+    \newrobustcmd*\univls{\usefont{\encodingdefault}{\tud@univers}{l}{sl}}%
+    \newrobustcmd*\univrs{\usefont{\encodingdefault}{\tud@univers}{m}{sl}}%
+    \newrobustcmd*\univbs{\usefont{\encodingdefault}{\tud@univers}{b}{sl}}%
+    \newrobustcmd*\univxs{\usefont{\encodingdefault}{\tud@univers}{eb}{sl}}%
+  \else%
+    \newrobustcmd*\univln{}%
+    \newrobustcmd*\univrn{}%
+    \newrobustcmd*\univbn{}%
+    \newrobustcmd*\univxn{}%
+    \newrobustcmd*\univls{}%
+    \newrobustcmd*\univrs{}%
+    \newrobustcmd*\univbs{}%
+    \newrobustcmd*\univxs{}%
+  \fi%
   \if@tud@dinbold%
-    \newcommand*\dinbn{%
+    \newrobustcmd*\dinbn{%
       \usefont{\encodingdefault}{\tud@dinbold}{b}{n}%
       \mathversion{dinbold}%
     }%
   \else%
-    \let\dinbn\sectfont%
+    \newrobustcmd*\dinbn{\sectfont}%
   \fi%
-  \newcommand*\textdbn{}%
-  \DeclareTextFontCommand{\textdbn}{\dinbn}%
 }
 \newcommand*\cdfont[1]{%
   \@cdfont{#1}%