summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/tudscr/README10
-rw-r--r--Master/texmf-dist/doc/latex/tudscr/tudscr.pdfbin1052691 -> 1052693 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdfbin1044131 -> 1044096 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdfbin664070 -> 666416 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdfbin153497 -> 153497 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdfbin180981 -> 180981 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdfbin870588 -> 870491 bytes
-rw-r--r--Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex2
-rw-r--r--Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx246
-rw-r--r--Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx2
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/mathswap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls123
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls123
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty123
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrman.cls4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrman.sty4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls123
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty4
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/twocolfix.sty2
23 files changed, 468 insertions, 316 deletions
diff --git a/Master/texmf-dist/doc/latex/tudscr/README b/Master/texmf-dist/doc/latex/tudscr/README
index 49c8fa70b7f..8fa16103a3d 100644
--- a/Master/texmf-dist/doc/latex/tudscr/README
+++ b/Master/texmf-dist/doc/latex/tudscr/README
@@ -53,6 +53,11 @@ Das Bundle beinhaltet:
Versionen
---------
+**v2.04c** (2015/11/29)
+
++ Bugfix für fehlenden Schriften bei Verwendung von Paket `fontspec`
+
+
**v2.04b** (2015/10/06)
+ Bugfix für KOMA-Script v3.19
@@ -177,6 +182,11 @@ The bundle offers:
Versions
--------
+**v2.04c** (2015/11/29)
+
++ bug fix for missing fonts when using package `fontspec`
+
+
**v2.04b** (2015/10/06)
+ bug fix for KOMA-Script v3.19
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
index ad922f396fa..98bcae7cad0 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
index 5aef7088f74..d873bf105f1 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf b/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
index 21bc60dedfd..d59b076f1bb 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
index 00a7c4883c0..3043a13fa0b 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
index 2a51c19b3e9..d688997fece 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf b/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
index e04bdd2c416..fbe1bcf8bc1 100644
--- a/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
+++ b/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex b/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
index 9c26d5458ad..d1cdd53e7d0 100644
--- a/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
+++ b/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
@@ -18,7 +18,7 @@
\endgroup%
}
\faculty{\protect\cdurl}
-\date{06.10.2015}
+\date{29.11.2015}
\author{Falk Hanisch\thanks{\noexpand\Email{\tudscrmail}}}
\subject{\TUDScript{} \vTUDScript{} basierend auf \KOMAScript{}}
\title{%
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
index 7fa676b88e6..0d76d2dbc86 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{1300}
+% \CheckSum{1323}
% \iffalse meta-comment
%
% ============================================================================
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-fonts.dtx}[%
- 2015/06/12 v2.04 TUD-KOMA-Script\space%
+ 2015/11/29 v2.04c TUD-KOMA-Script\space%
%</driver>
%<package&identify>\NeedsTeXFormat{LaTeX2e}
%<package&identify>\ProvidesPackage{%
@@ -91,6 +91,8 @@
% \changes{v2.02}{2014/08/29}{Unterstützung für \pkg{fontspec}}^^A
% \changes{v2.04}{2015/02/27}{Interaktion mit Paketen insbesondere für
% den Mathematiksatz verbessert}^^A
+% \changes{v2.04c}{2015/11/29}{Bugfix für \pkg{fontspec} bei fehlenden
+% Schriften}^^A
%
% \section{Schriften des \CDs}
%
@@ -453,19 +455,64 @@
% \end{macro}^^A \tud@font@check
% \begin{macro}{\tud@font@init}
% \changes{v2.04}{2014/03/10}{neu}^^A
+% \begin{macro}{\textuln}
+% \begin{macro}{\texturn}
+% \begin{macro}{\textubn}
+% \begin{macro}{\textuxn}
+% \begin{macro}{\textuls}
+% \begin{macro}{\texturs}
+% \begin{macro}{\textubs}
+% \begin{macro}{\textuxs}
+% \begin{macro}{\textdbn}
% Das Makro \cs{tud@font@init} wird für die Defintion aller Befehle zur Auswahl
% der Schriften des \CDs verwendet. Er wird als Hook genutzt und abhängig vom
% Schalter \cs{if@tud@fontspec} entweder für die Verwendung von \pkg{fontspec}
% oder des NFSS-Schemas mit \cs{preto}\cs{tud@font@init}\marg{Makro} angepasst.
+% \begin{macrocode}
+\newcommand*\tud@font@init{%
+% \end{macrocode}
+% Außerdem werden für die Schriften noch die entsprechenden Textauswahlbefehle
+% bereitgestellt.
+% \begin{macrocode}
+ \newcommand*\textuln{}%
+ \newcommand*\texturn{}%
+ \newcommand*\textubn{}%
+ \newcommand*\textuxn{}%
+ \newcommand*\textuls{}%
+ \newcommand*\texturs{}%
+ \newcommand*\textubs{}%
+ \newcommand*\textuxs{}%
+ \newcommand*\textdbn{}%
+ \DeclareTextFontCommand{\textuln}{\univln}%
+ \DeclareTextFontCommand{\texturn}{\univrn}%
+ \DeclareTextFontCommand{\textubn}{\univbn}%
+ \DeclareTextFontCommand{\textuxn}{\univxn}%
+ \DeclareTextFontCommand{\textuls}{\univls}%
+ \DeclareTextFontCommand{\texturs}{\univrs}%
+ \DeclareTextFontCommand{\textubs}{\univbs}%
+ \DeclareTextFontCommand{\textuxs}{\univxs}%
+ \DeclareTextFontCommand{\textdbn}{\dinbn}%
+% \end{macrocode}
% Nach der optionsabhängigen Definition der Schriftauswahlbefehle werden die
% Initialisierungsbefehle undefiniert gesetzt.
% \begin{macrocode}
-\newcommand*\tud@font@init{%
\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%
}
% \end{macrocode}
+% \end{macro}^^A \textdbn
+% \end{macro}^^A \textuxs
+% \end{macro}^^A \textubs
+% \end{macro}^^A \texturs
+% \end{macro}^^A \textuls
+% \end{macro}^^A \textuxn
+% \end{macro}^^A \textubn
+% \end{macro}^^A \texturn
+% \end{macro}^^A \textuln
% \end{macro}^^A \tud@font@init
% \begin{macro}{\univln}
% \begin{macro}{\univrn}
@@ -475,136 +522,147 @@
% \begin{macro}{\univrs}
% \begin{macro}{\univbs}
% \begin{macro}{\univxs}
-% \begin{macro}{\textuln}
-% \begin{macro}{\texturn}
-% \begin{macro}{\textubn}
-% \begin{macro}{\textuxn}
-% \begin{macro}{\textuls}
-% \begin{macro}{\texturs}
-% \begin{macro}{\textubs}
-% \begin{macro}{\textuxs}
% \begin{macro}{\dinbn}
% \begin{macro}{\@dinbn}
-% \begin{macro}{\textdbn}
% Es werden mehrere Schalter zur expliziten Auswahl für die Schriftschnitte
% Univers~45~Light, Univers~55~Regular, Univers~65~Bold, Univers~75~Black,
% Univers~45~Light~Oblique, Univers~55~Regular~Oblique, Univers~65~Bold~Oblique
% sowie Univers~75~Black~Oblique und DIN~Bold definiert. Diese können so im
% Dokument unabhängig von der Option \opt{cdfont} genutzt werden. Bei der
% Schriftauswahl der DIN~Bold wird neben dieser noch die entsprechende
-% Mathematikschrift aktiviert.
+% Mathematikschrift aktiviert. Dabei ist zu beachten, dass die Schriften evtl.
+% gar nicht installiert sind und für diesen Fall eine Rückfallebene notwendig
+% ist.
% \begin{macro}{\tud@font@init@fontspec}
% \changes{v2.04}{2014/03/10}{neu}^^A
-% Zuerst wird das Makro für die Defintion nach \pkg{fontspec}-Manier definiert,
-% danach .
-% \begin{macrocode}
-\newcommand*\tud@font@init@fontspec{%
-% \end{macrocode}
-% Für die Schriften werden hierfür feste NFSS-Namen vergeben, um diese unter
-% anderem auch beim Setzen des Kopfes im \CD der \TnUD explizit auswählen zu
-% können.
-% \begin{macrocode}
- \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}}%
+% \begin{macro}{\if@tud@fontspec@missing}
+% \changes{v2.04c}{2015/11/29}{neu}^^A
+% \begin{macro}{\tud@fontface}
+% \changes{v2.04c}{2015/11/29}{neu}^^A
+% \begin{macro}{\tud@fontspec@flag}
+% \changes{v2.04c}{2015/11/29}{neu}^^A
+% \begin{macro}{\tud@fontspec@error}
+% \changes{v2.04c}{2015/11/29}{neu}^^A
+% Leider exisitiert im Paket \pkg{fontspec} keine einfache Möglichkeit, auf das
+% Vorhandensein von Schriften zu testen. Deshalb wird hier etwa getrickst, um
+% die Schriften nur zu laden, falls diese auch tatsächlich existieren und die
+% ggf. auftrtende Fehlermeldung zu unterdrücken.
+% \begin{macrocode}
+\newif\if@tud@fontspec@missing
+\newcommand*\tud@font@init@fontspec{}
+% \end{macrocode}
+% Alles etwas umständlich, aber leider geht es nicht anders. Um die Fehler
+% zu unterdrücken, ist die Syntax von \LaTeX{}3 notwendig. Es wird mit
+% dem Paket \pkg{xparse} der Befehl \cs{tud@fontface} welcher eigentlch den
+% Befehl \cs{newfontface} nutzt und für denn Fall, dass keine Schrift
+% exisitiert, den entsprechenden Befehl leer definiert.
+% \begin{macrocode}
+\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%
+ }%
% \end{macrocode}
-% Nach der Univers-Schriftfamilie wird für DIN~Bold äquivalent verfahren.
+% Um die Fehler bei dem Laden der Schrift zu unterdrücken, wird der dafür
+% verantwortliche Befehl gesichertr und anschließend passend neu definiert.
+% \begin{macrocode}
+ \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
+% \end{macrocode}
+% Für die Schriften werden feste NFSS-Namen vergeben, um diese unter anderem
+% auch beim Setzen des Kopfes im \CD der \TnUD explizit auswählen zu können.
+% \begin{macrocode}
+ \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]%
+% \end{macrocode}
+% Nach der Univers-Schriftfamilie wird für DIN~Bold äquivalent verfahren. Da
+% dieser Schriftschnitt zwingend für die Überschriften benötigt wird, sollte
+% dieser zumindest auch auf deren Stil schalten.
+% \begin{macrocode}
+ \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%
+% \end{macrocode}
+% Zum Schluss wird noch die Fehlermeldungen auf ihre ursprüngliche Definition
+% gesetzt und damit ist der ganze Zauber vorbei.
% \begin{macrocode}
- \newfontface\@dinbn{DIN Bold}[NFSSFamily=DINBold,BoldFont = DIN Bold]%
- \newcommand*\dinbn{\@dinbn\if@tud@dinbold\mathversion{dinbold}\fi}%
- \newcommand*\textdbn[1]{{\dinbn##1}}%
-}
+ \cs_set_eq:NN \__fontspec_error:nx \tud@fontspec@error
+ }%
+ \ExplSyntaxOff
+\fi%
% \end{macrocode}
+% \end{macro}^^A \tud@fontspec@error
+% \end{macro}^^A \tud@fontspec@flag
+% \end{macro}^^A \tud@fontface
+% \end{macro}^^A \if@tud@fontspec@missing
% \end{macro}^^A \tud@font@init@fontspec
% \begin{macro}{\tud@font@init@nfss}
% \changes{v2.04}{2014/03/10}{neu}^^A
% Falls \opt{fontspec} nicht aktiv ist, werden die Schriften klassisch nach dem
-% NFSS definiert.
+% NFSS definiert. Sind die Univer-Schriften installiert, dann werden dazu
+% passende Schalter erstellt.
% \begin{macrocode}
\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}}%
+ \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}}%
% \end{macrocode}
% Ansonsten werden die Schalter für die Rückfallebene so definert, dass diese
% einfach nichts machen.
% \begin{macrocode}
\else%
- \newcommand*\univln{}%
- \newcommand*\univrn{}%
- \newcommand*\univbn{}%
- \newcommand*\univxn{}%
- \newcommand*\univls{}%
- \newcommand*\univrs{}%
- \newcommand*\univbs{}%
- \newcommand*\univxs{}%
+ \newrobustcmd*\univln{}%
+ \newrobustcmd*\univrn{}%
+ \newrobustcmd*\univbn{}%
+ \newrobustcmd*\univxn{}%
+ \newrobustcmd*\univls{}%
+ \newrobustcmd*\univrs{}%
+ \newrobustcmd*\univbs{}%
+ \newrobustcmd*\univxs{}%
\fi%
% \end{macrocode}
-% Außerdem werden für die Schriften noch die entsprechenden Textauswahlbefehle
-% bereitgestellt.
-% \begin{macrocode}
- \newcommand*\textuln{}%
- \newcommand*\texturn{}%
- \newcommand*\textubn{}%
- \newcommand*\textuxn{}%
- \newcommand*\textuls{}%
- \newcommand*\texturs{}%
- \newcommand*\textubs{}%
- \newcommand*\textuxs{}%
- \DeclareTextFontCommand{\textuln}{\univln}%
- \DeclareTextFontCommand{\texturn}{\univrn}%
- \DeclareTextFontCommand{\textubn}{\univbn}%
- \DeclareTextFontCommand{\textuxn}{\univxn}%
- \DeclareTextFontCommand{\textuls}{\univls}%
- \DeclareTextFontCommand{\texturs}{\univrs}%
- \DeclareTextFontCommand{\textubs}{\univbs}%
- \DeclareTextFontCommand{\textuxs}{\univxs}%
-% \end{macrocode}
% Nach der Univers-Schriftfamilie wird für DIN~Bold äquivalent verfahren.
% \begin{macrocode}
\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}%
}
% \end{macrocode}
-% \end{macro}^^A \tud@font@init@fontspec
-% \end{macro}^^A \textdbn
+% \end{macro}^^A \tud@font@init@nfss
% \end{macro}^^A \@dinbn
% \end{macro}^^A \dinbn
-% \end{macro}^^A \textuxs
-% \end{macro}^^A \textubs
-% \end{macro}^^A \texturs
-% \end{macro}^^A \textuls
-% \end{macro}^^A \textuxn
-% \end{macro}^^A \textubn
-% \end{macro}^^A \texturn
-% \end{macro}^^A \textuln
% \end{macro}^^A \univxs
% \end{macro}^^A \univbs
% \end{macro}^^A \univrs
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
index b2ee779c159..634cb00ef66 100644
--- a/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
+++ b/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
@@ -114,7 +114,7 @@
%<*!(package|class)>
\fi%
%</!(package|class)>
- \@TUDVersion{2015/10/06 v2.04b TUD-KOMA-Script}%
+ \@TUDVersion{2015/11/29 v2.04c TUD-KOMA-Script}%
\endgroup%
% \end{macrocode}
% \ToDo{Version eintragen}[Release]
diff --git a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
index 29b43aee263..4cca739c48a 100644
--- a/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
@@ -36,7 +36,7 @@
%%% From File: tudscr-mathswap.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mathswap}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-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 ba07374f98c..4ccc8a202a4 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.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}{}%
@@ -1155,51 +1155,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{}%
@@ -1208,6 +1163,7 @@
\newcommand*\texturs{}%
\newcommand*\textubs{}%
\newcommand*\textuxs{}%
+ \newcommand*\textdbn{}%
\DeclareTextFontCommand{\textuln}{\univln}%
\DeclareTextFontCommand{\texturn}{\univrn}%
\DeclareTextFontCommand{\textubn}{\univbn}%
@@ -1216,16 +1172,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}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
index ae0f75038be..d40caf278c6 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
@@ -52,7 +52,7 @@
\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}
\@ifundefined{TUDScript}{%
@@ -65,7 +65,7 @@
%%% From File: tudscr-base.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudscrbase}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-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 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}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
index c2fad264f81..86b639bea7c 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
@@ -52,7 +52,7 @@
\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}
\@ifundefined{TUDScript}{%
@@ -65,7 +65,7 @@
%%% From File: tudscr-color.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudscrcolor}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-Script
package
(corporate design colors)%
]
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
index 74b76da4789..176e949d78e 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
@@ -54,7 +54,7 @@
\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}
\@ifundefined{TUDClassName}{%
@@ -76,7 +76,7 @@
%%% From File: tudscr-comp.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudscrcomp}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-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 0b3bc5305c9..b93404dff19 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
@@ -53,14 +53,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}{}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index 59c28cea562..3daf6378063 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
@@ -59,7 +59,7 @@
\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}
\@ifundefined{TUDScript}{%
@@ -74,7 +74,7 @@
\ProvidesPackage{%
tudscrfonts%
}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-Script
package
(corporate design fonts)%
]
@@ -436,51 +436,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{}%
@@ -489,6 +444,7 @@
\newcommand*\texturs{}%
\newcommand*\textubs{}%
\newcommand*\textuxs{}%
+ \newcommand*\textdbn{}%
\DeclareTextFontCommand{\textuln}{\univln}%
\DeclareTextFontCommand{\texturn}{\univrn}%
\DeclareTextFontCommand{\textubn}{\univbn}%
@@ -497,16 +453,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}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrman.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrman.cls
index 02179bcfb49..cfba225f9a3 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrman.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrman.cls
@@ -56,14 +56,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@ProvidesWrapperClass[3]{%
\newcommand*\TUDClassName@Parent{#2}%
\newcommand*\TUDClassName{#1}%
\ProvidesClass{#1}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-Script
^^J#3 (#2)%
]%
\TUD@ClassInfo%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrman.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrman.sty
index bff035447d4..8ea6d25f448 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrman.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrman.sty
@@ -56,7 +56,7 @@
\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}
\@ifundefined{TUDClassName}{%
@@ -78,7 +78,7 @@
%%% From File: tudscr-manual.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudscrman}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-Script
package (internal tutorials)%
]
%%% From File: tudscr-base.dtx
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
index 4c15db48042..05f5a9d1104 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.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}{}%
@@ -1278,51 +1278,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{}%
@@ -1331,6 +1286,7 @@
\newcommand*\texturs{}%
\newcommand*\textubs{}%
\newcommand*\textuxs{}%
+ \newcommand*\textdbn{}%
\DeclareTextFontCommand{\textuln}{\univln}%
\DeclareTextFontCommand{\texturn}{\univrn}%
\DeclareTextFontCommand{\textubn}{\univbn}%
@@ -1339,16 +1295,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}%
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
index de08ceb470b..8edd364fab6 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
@@ -54,7 +54,7 @@
\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}
\@ifundefined{TUDClassName}{%
@@ -76,7 +76,7 @@
%%% From File: tudscr-supervisor.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudscrsupervisor}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-Script
package
(commands for supervisors)%
]
diff --git a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
index b068e5d5bbc..d494b199a7e 100644
--- a/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
@@ -36,7 +36,7 @@
%%% From File: tudscr-twocolfix.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{twocolfix}[%
- 2015/10/06 v2.04b TUD-KOMA-Script
+ 2015/11/29 v2.04c TUD-KOMA-Script
package
(twocolumn layout bugfix)%
]