From db4718fb5a10b2e1263d6bd79e8cf2450fd49007 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Nov 2015 22:45:49 +0000 Subject: tudscr (29nov15) git-svn-id: svn://tug.org/texlive/trunk@38975 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tudscr/mathswap.sty | 2 +- Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls | 123 ++++++++++++--------- Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls | 123 ++++++++++++--------- Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty | 123 ++++++++++++--------- Master/texmf-dist/tex/latex/tudscr/tudscrman.cls | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrman.sty | 4 +- Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls | 123 ++++++++++++--------- .../tex/latex/tudscr/tudscrsupervisor.sty | 4 +- Master/texmf-dist/tex/latex/tudscr/twocolfix.sty | 2 +- 13 files changed, 304 insertions(+), 220 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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)% ] -- cgit v1.2.3