diff options
author | Karl Berry <karl@freefriends.org> | 2015-02-16 21:40:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-02-16 21:40:28 +0000 |
commit | 68695b0b7015bb233b4f5697ebdb9def46b9cb4a (patch) | |
tree | 94745a5ea3bedbf6b6904bf5cbb949151e8f41fd /Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty | |
parent | e016928e2bd0e7163bde478d7ab2419f49468c3c (diff) |
tudscr (16feb15)
git-svn-id: svn://tug.org/texlive/trunk@36296 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty | 583 |
1 files changed, 345 insertions, 238 deletions
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty index 72f0e760f03..dd7c9c864ef 100644 --- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty +++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty @@ -8,12 +8,14 @@ %% tudscr-fonts.dtx (with options: `package,identify') %% tudscr-base.dtx (with options: `load') %% tudscr-fonts.dtx (with options: `package,option') +%% tudscr-comp.dtx (with options: `fonts,option') +%% tudscr-fonts.dtx (with options: `package,execute') %% tudscr-fonts.dtx (with options: `package,body') %% %% ============================================================================ %% %% TUD-KOMA-Script -%% Copyright (c) Falk Hanisch <tudscr[at]gmail.com>, 2012-2014 +%% Copyright (c) Falk Hanisch <tudscr@gmail.com>, 2012-2015 %% %% ============================================================================ %% @@ -27,13 +29,13 @@ %% %% ---------------------------------------------------------------------------- %% -%% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, -%% Version 1.3c, verteilt und/oder veraendert werden. Die neuste Version -%% dieser Lizenz ist http://www.latex-project.org/lppl.txt und Version 1.3c -%% ist Teil aller Verteilungen von LaTeX 2005/12/01 oder spaeter und dieses -%% Werks. Dieses Werk hat den LPPL-Verwaltungs-Status "author-maintained", -%% wird somit allein durch den Autor verwaltet. Der aktuelle Verwalter und -%% Autor dieses Werkes ist Falk Hanisch. +%% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz +%% in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle +%% Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und +%% Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01 +%% oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status +%% "author-maintained", wird somit allein durch den Autor verwaltet. Der +%% aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch. %% %% ============================================================================ %% @@ -55,7 +57,7 @@ \fi% }% \fi% - \@TUDVersion{2014/12/17 v2.02 TUD-KOMA-Script}% + \@TUDVersion{2015/02/15 v2.03 TUD-KOMA-Script}% \endgroup% \providecommand*\tudscrmail{tudscr@gmail.com} \@ifundefined{TUDScript}{% @@ -68,7 +70,7 @@ %%% From File: tudscr-fonts.dtx \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesPackage{tudscrfonts}[% - 2014/12/17 v2.02 TUD-KOMA-Script + 2015/02/15 v2.03 TUD-KOMA-Script package (corporate design fonts)% ] @@ -105,14 +107,18 @@ \newcommand*\tud@dinbold{0m6} \newcommand*\tud@mathenc{OT1} \newif\if@tud@fontspec -\TUD@key@lock{fontspec}[true]{% - \TUD@set@ifkey@lock{fontspec}{@tud@fontspec}{#1}% +\TUD@key{fontspec}[true]{% + \TUD@set@ifkey{fontspec}{@tud@fontspec}{#1}% } -\AtEndOfPackage{% - \TUD@key{fontspec}[]{% - \PackageError{tudscrfonts}{Option `fontspec' too late}{% +\AtEndOfPackage% +{% + \TUD@key{fontspec}[] + {% + \PackageError{tudscrfonts} + {Option `fontspec' too late}{% Option `fontspec' can only be set while loading the\MessageBreak% - package `tudscrfonts' but you have tried to set it up later.% + package `tudscrfonts' + but you have tried to set it up later.% }% \FamilyKeyStateProcessed% }% @@ -122,6 +128,17 @@ the package `fontspec' before `tudscrfonts'.% }% }{} + \if@tud@fontspec% + \PreventPackageFromLoading[% + \PackageWarning{tudscrfonts}% + {% + You must not load the package `fontspec' as it is\MessageBreak% + loaded automatically at the end of the preamble.\MessageBreak% + If you want to pass options to `fontspec' use\MessageBreak% + `\string\PassOptionsToPackage{<option list>}{fontspec}' + }% + ]{fontspec} + \fi% } \AtEndPreamble{% \@expandtwoargs\in@{OT}{\encodingdefault}% @@ -145,9 +162,10 @@ }% \def\@tempb#1{% \PackageWarningNoLine{tudscrfonts}{% - `#1' fonts not found. Please use on of the\MessageBreak% - installation scripts out of the tudscr-bundle,\MessageBreak% - which suits to your OS. A fallback layout is used% + `#1' fonts not found for encoding `\encodingdefault'.\MessageBreak% + Please use on of the installation scripts out of the\MessageBreak% + tudscr-bundle, which suits to your OS or choose a\MessageBreak% + possible encoding. A fallback layout is used% }% }% \fi% @@ -163,6 +181,7 @@ \fi% \@tempa{\@tud@dinboldtrue}{\@tempb{DIN Bold}}% \if@tud@fontspec% + \UnPreventPackageFromLoading{fontspec}% \if@tud@univers\if@tud@dinbold% \PassOptionsToPackage{no-math}{fontspec}% \fi\fi% @@ -170,45 +189,52 @@ \fi% } \RequirePackage{textcase}[2004/10/07] -\patchcmd{\@uclcnotmath}{\@nonchangecase\ensuremath}{% - \@nonchangecase\ensuremath% +\newcommand*\tud@uclcnotmath{% \def\footnote##1##{\toks@{\noexpand\footnote##1}\@footnote}% \def\@footnote##1{\NoCaseChange{\the\toks@{##1}}}% + \def\@mkboth##1##2{\NoCaseChange{\@mkboth{##1}{##2}}}% +} +\patchcmd{\@uclcnotmath}{\@nonchangecase\ensuremath}{% + \@nonchangecase\ensuremath\tud@uclcnotmath }{}{\tud@patch@wrn{@uclcnotmath}}% -\newcommand*\tud@cdfont{0} +\newcommand*\tud@font@heading{\dinbn\tud@raggedright} +\newcommand*\tud@cdfont{1} \TUD@key{cdfont}[true]{% - \TUD@set@numkey{cdfont}{tud@cdfont}{% + \TUD@set@numkey{cdfont}{@tempa}{% \TUD@numkey@bool,% {light}{1},{lightfont}{1},{lite}{1},{litefont}{1},{noheavyfont}{1},% {heavy}{2},{heavyfont}{2},% {nodin}{3},{nodinbold}{3},{noDIN}{3},{noDINBold}{3},% {din}{4},{dinbold}{4},{DIN}{4},{DINBold}{4},% - {serifmath}{7},{serif}{7},{nosansmath}{7},{nosans}{7},% - {sansmath}{8},{sans}{8},% - {upgreek}{9},{uprightgreek}{9},{uprightGreek}{9},% - {slgreek}{10},{slantedgreek}{10},{slantedGreek}{10},% - {fontspec}{11},{luatex}{11},{lualatex}{11}{xetex}{11},{xelatex}{11},% - {nofontspec}{12},{pdftex}{12},{pdflatex}{12}% + {nomath}{8},{nocdmath}{8},% + {serifmath}{8},{serif}{8},{nosansmath}{8},{nosans}{8},% + {math}{9},{cdmath}{9},{sansmath}{9},{sans}{9},% + {upgreek}{10},{upright}{10},{uprightgreek}{10},{uprightGreek}{10},% + {slgreek}{11},{slanted}{11},{slantedgreek}{11},{slantedGreek}{11},% + {fontspec}{12},{luatex}{12},{lualatex}{12}{xetex}{12},{xelatex}{12},% + {nofontspec}{13},{pdftex}{13},{pdflatex}{13}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed% - \ifcase \tud@cdfont\relax% - \TUDoptions{cdfonts=false}% + \ifcase\@tempa\relax% + \def\tud@cdfont{0}% + \if@atdocument\tud@font@set\fi% \or% - \TUDoptions{cdfonts=true}% - \TUDoptions{heavyfont=false}% + \def\tud@cdfont{1}% + \if@atdocument\tud@font@set\fi% \or% - \TUDoptions{cdfonts=true}% - \TUDoptions{heavyfont=true}% + \def\tud@cdfont{2}% + \if@atdocument\tud@font@set\fi% \or% - \TUDoptions{din=false}% + \renewcommand*\tud@font@heading{\tud@RaggedRight}% \or% - \TUDoptions{din=true}% + \renewcommand*\tud@font@heading{\dinbn\tud@raggedright} \or% \or% \or% - \TUDoptions{sansmath=false}% \or% - \TUDoptions{sansmath=true}% + \TUDoptions{cdmath=false}% + \or% + \TUDoptions{cdmath=true}% \or% \TUDoptions{slantedgreek=false}% \or% @@ -220,77 +246,147 @@ \fi% \fi% } -\newif\if@tud@cdfonts -\TUD@key{cdfonts}[true]{% - \TUD@set@ifkey{cdfonts}{@tud@cdfonts}{#1}% +\AtBeginDocument{\tud@font@set}% +\bool@lock{@tud@cdmath} +\TUD@key{cdmath}[true]{% + \TUD@set@numkey{cdmath}{@tempa}{% + \TUD@numkey@bool,% + {serifmath}{0},{serif}{0},{nosansmath}{0},{nosans}{0},% + {sansmath}{1},{sans}{1},% + {upright}{2},{upgreek}{2},{uprightgreek}{2},{uprightGreek}{2},% + {slanted}{3},{slgreek}{3},{slantedgreek}{3},{slantedGreek}{3}% + }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed% - \if@tud@cdfonts% - \if@atdocument\tud@font@cdfonts\fi% - \TUD@std@ifkey@lock{sansmath}{true}% + \ifcase\@tempa\relax% + \bool@set@lock{@tud@cdmath}{false}% + \TUD@std@ifkey@lock{slantedgreek}{false}% + \if@atdocument\tud@font@math@set\fi% + \or% + \bool@set@lock{@tud@cdmath}{true}% \TUD@std@ifkey@lock{slantedgreek}{true}% + \if@atdocument\tud@font@math@set\fi% + \or + \TUDoptions{slantedgreek=false}% + \or + \TUDoptions{slantedgreek=true}% + \fi% + \fi% +} +\newif\if@tud@slantedgreek +\TUD@key@lock{slantedgreek}[true]{% + \TUD@set@ifkey@lock{slantedgreek}{@tud@slantedgreek}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed% + \if@atdocument\tud@font@math@set\fi% + \fi% +} +%%% From File: tudscr-comp.dtx +\newcommand*\tud@deprecated@key[2]{% + \PackageWarning{tudscrfonts}% + {% + The option key `#1' is deprecated.\MessageBreak% + It's recommended to use `#2' instead% + }% +} +\TUD@key{cdfonts}[true]{% + \TUD@set@ifkey{cdfonts}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed% + \tud@deprecated@key{cdfonts}{cdfont}% + \if@tempswa% + \TUDoptions{cdfont=true}% \else% - \if@atdocument% - \tud@cmd@restore{rmdefault}% - \tud@cmd@restore{sfdefault}% - \tud@cmd@restore{ttdefault}% - \tud@cmd@restore{bfdefault}% - \tud@cmd@restore{mddefault}% - \tud@cmd@restore{itdefault}% - \tud@cmd@restore{familydefault}% - \tud@cmd@restore{seriesdefault}% - \tud@cmd@restore{shapedefault}% - \normalfont\selectfont% - \fi% - \TUD@std@ifkey@lock{sansmath}{false}% - \TUD@std@ifkey@lock{slantedgreek}{false}% + \TUDoptions{cdfont=false}% + \fi% + \fi% +} +\TUD@key{tudfonts}[true]{% + \TUD@set@ifkey{tudfonts}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed% + \tud@deprecated@key{tudfonts}{cdfont}% + \if@tempswa% + \TUDoptions{cdfont=true}% + \else% + \TUDoptions{cdfont=false}% \fi% \fi% } -\newif\if@tud@heavyfont \TUD@key{heavyfont}[true]{% - \TUD@set@ifkey{heavyfont}{@tud@heavyfont}{#1}% + \TUD@set@ifkey{heavyfont}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed% - \if@atdocument\tud@font@cdfonts\fi% + \tud@deprecated@key{heavyfont}{cdfont}% + \if@tempswa% + \TUDoptions{cdfont=heavy}% + \else% + \TUDoptions{cdfont=true}% + \fi% \fi% } -\newif\if@tud@din\@tud@dintrue -\TUD@ifkey{din}{@tud@din} -\newif\if@tud@sansmath -\TUD@key@lock{sansmath}[true]{% - \TUD@set@ifkey@lock{sansmath}{@tud@sansmath}{#1}% +\TUD@key{din}[true]{% + \TUD@set@ifkey{din}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed% - \if@atdocument\tud@font@mathfonts\fi% + \tud@deprecated@key{din}{cdfont}% + \if@tempswa% + \TUDoptions{cdfont=din}% + \else% + \TUDoptions{cdfont=nodin}% + \fi% \fi% } -\newif\if@tud@slantedgreek -\TUD@key@lock{slantedgreek}[true]{% - \TUD@set@ifkey@lock{slantedgreek}{@tud@slantedgreek}{#1}% +\TUD@key{nodin}[true]{% + \TUD@set@ifkey{nodin}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed% - \if@atdocument\tud@font@mathfonts\fi% + \tud@deprecated@key{nodin}{cdfont}% + \if@tempswa% + \TUDoptions{cdfont=nodin}% + \else% + \TUDoptions{cdfont=din}% + \fi% \fi% } +\TUD@key{sansmath}[true]{% + \TUD@set@ifkey{sansmath}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed% + \tud@deprecated@key{sansmath}{cdmath}% + \if@tempswa% + \TUDoptions{cdmath=true}% + \else% + \TUDoptions{cdmath=false}% + \fi% + \fi% +} +\TUD@key{serifmath}[true]{% + \TUD@set@ifkey{serifmath}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed% + \tud@deprecated@key{sansmath}{cdmath}% + \if@tempswa% + \TUDoptions{cdmath=false}% + \else% + \TUDoptions{cdmath=true}% + \fi% + \fi% +} +%%% From File: tudscr-fonts.dtx \TUDoptions{cdfont=true} \DeclareOption*{\TUDoptions{\CurrentOption}} \TUDProcessOptions\relax %%% From File: tudscr-fonts.dtx \AtEndPreamble{% \if@tud@fontspec% - \newfontface\univln[NFSSFamily=UniversLight]{Univers Light}% - \newfontface\univrn[NFSSFamily=UniversRegular]{Univers}% - \newfontface\univbn[NFSSFamily=UniversBold]{Univers Bold}% - \newfontface\univxn[NFSSFamily=UniversBlack]{Univers Black}% - \newfontface\univls[NFSSFamily=UniversLightOblique]{Univers Light Oblique}% - \newfontface\univrs[NFSSFamily=UniversRegularOblique]{Univers Oblique}% - \newfontface\univbs[NFSSFamily=UniversBoldOblique]{Univers Bold Oblique}% - \newfontface\univxs[NFSSFamily=UniversBlackOblique]{Univers Black Oblique}% - \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\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}}% \else% \if@tud@univers% \newcommand*\univln{\usefont{\encodingdefault}{\tud@univers}{l}{n}}% @@ -330,9 +426,9 @@ \fi% \ifdef{\sectfont}{}{\let\sectfont\relax}% \if@tud@fontspec% - \newfontface\@dinbn{DIN Bold}[BoldFont = DIN Bold]% + \newfontface\@dinbn{DIN Bold}[NFSSFamily=DINBold,BoldFont = DIN Bold]% \newcommand*\dinbn{\@dinbn\if@tud@dinbold\mathversion{dinbold}\fi}% - \newcommand*\textdbn[1]{{\dinbn#1}} + \newcommand*\textdbn[1]{{\dinbn#1}}% \else% \if@tud@dinbold% \newcommand*\dinbn{% @@ -343,179 +439,192 @@ \let\dinbn\sectfont% \fi% \newcommand*\textdbn{}% - \DeclareTextFontCommand{\textdbn}{\dinbn} + \DeclareTextFontCommand{\textdbn}{\dinbn}% \fi% - \DeclareMathVersion{univers} - \DeclareMathVersion{universbold} - \SetSymbolFont{operators}{univers}{OT1}{\tud@univers}{l}{n} - \SetSymbolFont{letters}{univers}{OML}{\tud@univers}{l}{sl} - \SetSymbolFont{symbols}{univers}{OMS}{\tud@univers}{l}{n} - \SetSymbolFont{largesymbols}{univers}{OMX}{iwona}{m}{n} - \SetSymbolFont{operators}{universbold}{OT1}{\tud@univers}{b}{n} - \SetSymbolFont{letters}{universbold}{OML}{\tud@univers}{b}{sl} - \SetSymbolFont{symbols}{universbold}{OMS}{\tud@univers}{b}{n} - \SetSymbolFont{largesymbols}{universbold}{OMX}{iwona}{b}{n} - \SetMathAlphabet{\mathbf}{univers}{\tud@mathenc}{\tud@univers}{b}{n} - \SetMathAlphabet{\mathsf}{univers}{\tud@mathenc}{\tud@univers}{l}{n} - \SetMathAlphabet{\mathit}{univers}{\tud@mathenc}{\tud@univers}{l}{sl} - \SetMathAlphabet{\mathtt}{univers}{\tud@mathenc}{\tud@univers t}{l}{n} - \SetMathAlphabet{\mathbf}{universbold}{\tud@mathenc}{\tud@univers}{eb}{n} - \SetMathAlphabet{\mathsf}{universbold}{\tud@mathenc}{\tud@univers}{b}{n} - \SetMathAlphabet{\mathit}{universbold}{\tud@mathenc}{\tud@univers}{b}{sl} - \SetMathAlphabet{\mathtt}{universbold}{\tud@mathenc}{\tud@univers t}{b}{n} - \DeclareMathVersion{dinbold} - \SetSymbolFont{operators}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{n} - \SetSymbolFont{letters}{dinbold}{OML}{\tud@dinbold}{b}{sl} - \SetSymbolFont{symbols}{dinbold}{OMS}{\tud@dinbold}{b}{n} - \SetSymbolFont{largesymbols}{dinbold}{OMX}{iwona}{ebc}{n} - \SetMathAlphabet{\mathbf}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{n} - \SetMathAlphabet{\mathsf}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{n} - \SetMathAlphabet{\mathit}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{sl} - \DeclareMathSymbol{\upDelta}{\mathalpha}{operators}{1} - \DeclareMathSymbol{\upOmega}{\mathalpha}{operators}{10} - \DeclareMathSymbol{\upGamma}{\mathalpha}{operators}{0} - \DeclareMathSymbol{\upDelta}{\mathalpha}{operators}{1} - \DeclareMathSymbol{\upTheta}{\mathalpha}{operators}{2} - \DeclareMathSymbol{\upLambda}{\mathalpha}{operators}{3} - \DeclareMathSymbol{\upXi}{\mathalpha}{operators}{4} - \DeclareMathSymbol{\upPi}{\mathalpha}{operators}{5} - \DeclareMathSymbol{\upSigma}{\mathalpha}{operators}{6} - \DeclareMathSymbol{\upUpsilon}{\mathalpha}{operators}{7} - \DeclareMathSymbol{\upPhi}{\mathalpha}{operators}{8} - \DeclareMathSymbol{\upPsi}{\mathalpha}{operators}{9} - \DeclareMathSymbol{\upOmega}{\mathalpha}{operators}{10} - \DeclareMathSymbol{\varGamma}{\mathalpha}{letters}{0} - \DeclareMathSymbol{\varDelta}{\mathalpha}{letters}{1} - \DeclareMathSymbol{\varTheta}{\mathalpha}{letters}{2} - \DeclareMathSymbol{\varLambda}{\mathalpha}{letters}{3} - \DeclareMathSymbol{\varXi}{\mathalpha}{letters}{4} - \DeclareMathSymbol{\varPi}{\mathalpha}{letters}{5} - \DeclareMathSymbol{\varSigma}{\mathalpha}{letters}{6} - \DeclareMathSymbol{\varUpsilon}{\mathalpha}{letters}{7} - \DeclareMathSymbol{\varPhi}{\mathalpha}{letters}{8} - \DeclareMathSymbol{\varPsi}{\mathalpha}{letters}{9} - \DeclareMathSymbol{\varOmega}{\mathalpha}{letters}{10} + \DeclareMathVersion{univers}% + \DeclareMathVersion{universbold}% + \SetSymbolFont{operators}{univers}{OT1}{\tud@univers}{l}{n}% + \SetSymbolFont{letters}{univers}{OML}{\tud@univers}{l}{sl}% + \SetSymbolFont{symbols}{univers}{OMS}{\tud@univers}{l}{n}% + \SetSymbolFont{largesymbols}{univers}{OMX}{iwona}{m}{n}% + \SetSymbolFont{operators}{universbold}{OT1}{\tud@univers}{b}{n}% + \SetSymbolFont{letters}{universbold}{OML}{\tud@univers}{b}{sl}% + \SetSymbolFont{symbols}{universbold}{OMS}{\tud@univers}{b}{n}% + \SetSymbolFont{largesymbols}{universbold}{OMX}{iwona}{b}{n}% + \SetMathAlphabet{\mathbf}{univers}{\tud@mathenc}{\tud@univers}{b}{n}% + \SetMathAlphabet{\mathsf}{univers}{\tud@mathenc}{\tud@univers}{l}{n}% + \SetMathAlphabet{\mathit}{univers}{\tud@mathenc}{\tud@univers}{l}{sl}% + \SetMathAlphabet{\mathtt}{univers}{\tud@mathenc}{\tud@univers t}{l}{n}% + \SetMathAlphabet{\mathbf}{universbold}{\tud@mathenc}{\tud@univers}{eb}{n}% + \SetMathAlphabet{\mathsf}{universbold}{\tud@mathenc}{\tud@univers}{b}{n}% + \SetMathAlphabet{\mathit}{universbold}{\tud@mathenc}{\tud@univers}{b}{sl}% + \SetMathAlphabet{\mathtt}{universbold}{\tud@mathenc}{\tud@univers t}{b}{n}% + \DeclareMathVersion{dinbold}% + \SetSymbolFont{operators}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{n}% + \SetSymbolFont{letters}{dinbold}{OML}{\tud@dinbold}{b}{sl}% + \SetSymbolFont{symbols}{dinbold}{OMS}{\tud@dinbold}{b}{n}% + \SetSymbolFont{largesymbols}{dinbold}{OMX}{iwona}{ebc}{n}% + \SetMathAlphabet{\mathbf}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{n}% + \SetMathAlphabet{\mathsf}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{n}% + \SetMathAlphabet{\mathit}{dinbold}{\tud@mathenc}{\tud@dinbold}{b}{sl}% + \DeclareMathSymbol{\upDelta}{\mathalpha}{operators}{1}% + \DeclareMathSymbol{\upOmega}{\mathalpha}{operators}{10}% + \DeclareMathSymbol{\upGamma}{\mathalpha}{operators}{0}% + \DeclareMathSymbol{\upDelta}{\mathalpha}{operators}{1}% + \DeclareMathSymbol{\upTheta}{\mathalpha}{operators}{2}% + \DeclareMathSymbol{\upLambda}{\mathalpha}{operators}{3}% + \DeclareMathSymbol{\upXi}{\mathalpha}{operators}{4}% + \DeclareMathSymbol{\upPi}{\mathalpha}{operators}{5}% + \DeclareMathSymbol{\upSigma}{\mathalpha}{operators}{6}% + \DeclareMathSymbol{\upUpsilon}{\mathalpha}{operators}{7}% + \DeclareMathSymbol{\upPhi}{\mathalpha}{operators}{8}% + \DeclareMathSymbol{\upPsi}{\mathalpha}{operators}{9}% + \DeclareMathSymbol{\upOmega}{\mathalpha}{operators}{10}% + \DeclareMathSymbol{\varGamma}{\mathalpha}{letters}{0}% + \DeclareMathSymbol{\varDelta}{\mathalpha}{letters}{1}% + \DeclareMathSymbol{\varTheta}{\mathalpha}{letters}{2}% + \DeclareMathSymbol{\varLambda}{\mathalpha}{letters}{3}% + \DeclareMathSymbol{\varXi}{\mathalpha}{letters}{4}% + \DeclareMathSymbol{\varPi}{\mathalpha}{letters}{5}% + \DeclareMathSymbol{\varSigma}{\mathalpha}{letters}{6}% + \DeclareMathSymbol{\varUpsilon}{\mathalpha}{letters}{7}% + \DeclareMathSymbol{\varPhi}{\mathalpha}{letters}{8}% + \DeclareMathSymbol{\varPsi}{\mathalpha}{letters}{9}% + \DeclareMathSymbol{\varOmega}{\mathalpha}{letters}{10}% } -\newcommand*\tud@font@cdfonts{% - \tud@cmd@store{rmdefault}% - \tud@cmd@store{sfdefault}% - \tud@cmd@store{ttdefault}% - \tud@cmd@store{bfdefault}% - \tud@cmd@store{mddefault}% - \tud@cmd@store{itdefault}% - \tud@cmd@store{familydefault}% - \tud@cmd@store{seriesdefault}% - \tud@cmd@store{shapedefault}% - \if@tud@fontspec% - \if@tud@heavyfont% - \setsansfont{Univers}[% - BoldFont = Univers Bold,% - ItalicFont = Univers Oblique,% - BoldItalicFont = Univers Bold Oblique,% - ]% - \setmonofont{LMMono10-Regular}[% - BoldFont = LMMonoLt10-Bold,% - ItalicFont = LMMonoSlant10-Regular,% - BoldItalicFont = LMMonoLt10-BoldOblique,% - ] - \else% - \setsansfont{Univers Light}[% - BoldFont = Univers,% - ItalicFont = Univers Light Oblique,% - BoldItalicFont = Univers Oblique,% - ]% - \setmonofont{LMMonoLt10-Regular}[% - BoldFont = LMMono10-Regular,% - ItalicFont = LMMonoLt10-Oblique,% - BoldItalicFont = LMMonoSlant10-Regular,% - ]% - \ifboolexpr{bool {@tud@oldclass} or bool {@tud@oldscrclass}}{% +\newcommand*\tud@font@set{% + \ifcase\tud@cdfont\relax% + \tud@cmd@restore{rmdefault}% + \tud@cmd@restore{sfdefault}% + \tud@cmd@restore{ttdefault}% + \tud@cmd@restore{bfdefault}% + \tud@cmd@restore{mddefault}% + \tud@cmd@restore{itdefault}% + \tud@cmd@restore{familydefault}% + \tud@cmd@restore{seriesdefault}% + \tud@cmd@restore{shapedefault}% + \bool@std@lock{@tud@cdmath}{false}% + \else% + \tud@cmd@store{rmdefault}% + \tud@cmd@store{sfdefault}% + \tud@cmd@store{ttdefault}% + \tud@cmd@store{bfdefault}% + \tud@cmd@store{mddefault}% + \tud@cmd@store{itdefault}% + \tud@cmd@store{familydefault}% + \tud@cmd@store{seriesdefault}% + \tud@cmd@store{shapedefault}% + \bool@std@lock{@tud@cdmath}{true}% + \if@tud@fontspec% + \ifnum\tud@cdfont=\@ne\relax% \setsansfont{Univers Light}[% - BoldFont = Univers Bold,% + BoldFont = Univers,% ItalicFont = Univers Light Oblique,% - BoldItalicFont = Univers Bold Oblique,% + BoldItalicFont = Univers Oblique,% + ]% + \setmonofont{LMMonoLt10-Regular}[% + BoldFont = LMMono10-Regular,% + ItalicFont = LMMonoLt10-Oblique,% + BoldItalicFont = LMMonoSlant10-Regular,% ]% - }{}% - \fi% - \else% - \if@tud@univers% - \renewcommand*\sfdefault{\tud@univers}% - \renewcommand*\ttdefault{\tud@univers t}% - \if@tud@heavyfont% - \renewcommand*\bfdefault{b}% - \renewcommand*\mddefault{m}% - \else% - \renewcommand*\bfdefault{m}% \ifboolexpr{bool {@tud@oldclass} or bool {@tud@oldscrclass}}{% - \renewcommand*\bfdefault{b}% + \setsansfont{Univers Light}[% + BoldFont = Univers Bold,% + ItalicFont = Univers Light Oblique,% + BoldItalicFont = Univers Bold Oblique,% + ]% }{}% - \renewcommand*\mddefault{l}% + \else% + \setsansfont{Univers}[% + BoldFont = Univers Bold,% + ItalicFont = Univers Oblique,% + BoldItalicFont = Univers Bold Oblique,% + ]% + \setmonofont{LMMono10-Regular}[% + BoldFont = LMMonoLt10-Bold,% + ItalicFont = LMMonoSlant10-Regular,% + BoldItalicFont = LMMonoLt10-BoldOblique,% + ]% + \fi% + \else% + \if@tud@univers% + \renewcommand*\sfdefault{\tud@univers}% + \renewcommand*\ttdefault{\tud@univers t}% + \ifnum\tud@cdfont=\@ne\relax% + \renewcommand*\bfdefault{m}% + \ifboolexpr{bool {@tud@oldclass} or bool {@tud@oldscrclass}}{% + \renewcommand*\bfdefault{b}% + }{}% + \renewcommand*\mddefault{l}% + \else% + \renewcommand*\bfdefault{b}% + \renewcommand*\mddefault{m}% + \fi% \fi% \fi% + \renewcommand*\rmdefault{\sfdefault}% + \renewcommand*\familydefault{\sfdefault}% + \renewcommand*\seriesdefault{\mddefault}% + \renewcommand*\shapedefault{\updefault}% \fi% - \renewcommand*\rmdefault{\sfdefault}% - \renewcommand*\familydefault{\sfdefault}% - \renewcommand*\seriesdefault{\mddefault}% - \renewcommand*\shapedefault{\updefault}% \normalfont\selectfont% + \tud@font@math@set% } -\newcommand*\tud@font@mathfonts{% - \if@tud@sansmath\tud@sansmath\else\tud@serifmath\fi% - \if@tud@slantedgreek\tud@greek@slanted\else\tud@greek@upright\fi% - \mathversion{normal}% -} -\newcommand*\tud@sansmath{% +\newcommand*\tud@font@math@set{% \if@tud@univers% - \tud@cmd@store{mv@normal}% - \tud@cmd@store{mv@bold}% - \let\mv@normal\mv@univers% - \let\mv@bold\mv@universbold% - \mathversion{normal}% + \if@tud@cdmath% + \tud@cmd@store{mv@normal}% + \tud@cmd@store{mv@bold}% + \let\mv@normal\mv@univers% + \let\mv@bold\mv@universbold% + \else% + \tud@cmd@restore{mv@normal}% + \tud@cmd@restore{mv@bold}% + \fi% \fi% -} -\newcommand*\tud@serifmath{% - \if@tud@univers% - \tud@cmd@restore{mv@normal}% - \tud@cmd@restore{mv@bold}% - \mathversion{normal}% + \if@tud@slantedgreek% + \tud@font@greek@slanted% + \else% + \tud@font@greek@upright% \fi% + \mathversion{normal}% } -\newcount\tud@greek@upGamma -\tud@greek@upGamma\Gamma -\newcount\tud@greek@offset +\newcount\tud@font@greek@upGamma +\tud@font@greek@upGamma\Gamma +\newcount\tud@font@greek@offset \let\@tempa\relax \DeclareMathSymbol{\@tempa}{\mathalpha}{letters}{0} -\tud@greek@offset\@tempa -\advance\tud@greek@offset-\Gamma -\newcommand*\tud@greek@slanted{% - \ifnum\Gamma=\tud@greek@upGamma\relax\tud@greek@changeshape\fi% +\tud@font@greek@offset\@tempa +\advance\tud@font@greek@offset-\Gamma +\newcommand*\tud@font@greek@slanted{% + \ifnum\Gamma=\tud@font@greek@upGamma\relax\tud@font@greek@changeshape\fi% } -\newcommand*\tud@greek@upright{% - \ifnum\Gamma>\tud@greek@upGamma% - \tud@greek@offset=-\tud@greek@offset% - \tud@greek@changeshape% - \tud@greek@offset=-\tud@greek@offset% +\newcommand*\tud@font@greek@upright{% + \ifnum\Gamma>\tud@font@greek@upGamma% + \tud@font@greek@offset=-\tud@font@greek@offset% + \tud@font@greek@changeshape% + \tud@font@greek@offset=-\tud@font@greek@offset% \fi% } -\newcommand*\tud@greek@def[2]{% +\newcommand*\tud@font@greek@def[2]{% \expandafter\@tempcnta\csname #1\endcsname% \advance\@tempcnta#2% \expandafter\mathchardef\csname #1\endcsname\@tempcnta% } -\newcommand*\tud@greek@uc{% +\newcommand*\tud@font@greek@uc{% Gamma,Delta,Theta,Lambda,Xi,Pi,Sigma,Upsilon,Phi,Psi,Omega% } -\newcommand*\tud@greek@changeshape{% - \@for\@tempa:=\tud@greek@uc\do{% - \@expandtwoargs\tud@greek@def{\@tempa}{\tud@greek@offset}% +\newcommand*\tud@font@greek@changeshape{% + \@for\@tempa:=\tud@font@greek@uc\do{% + \@expandtwoargs\tud@font@greek@def{\@tempa}{\tud@font@greek@offset}% }% } \newrobustcmd*\ifdin{% - \@tempswafalse + \@tempswafalse% \@expandtwoargs\in@{DINBold}{\f@family}% \ifin@\@tempswatrue\fi% \ifx\f@family\tud@dinbold\relax\@tempswatrue\fi% - \if@tempswa + \if@tempswa% \expandafter\@firstoftwo% \else% \expandafter\@secondoftwo% @@ -618,10 +727,6 @@ \fi% }{}% } -\AtBeginDocument{% - \if@tud@cdfonts\tud@font@cdfonts\fi% - \tud@font@mathfonts% -} \AfterPackage*{amsfonts}{% \DeclareFontFamily{U}{msa}{}% \DeclareFontShape{U}{msa}{m}{n}{% @@ -637,20 +742,22 @@ }{}% } \newcommand*\tud@raggedright{\raggedright} +\newcommand*\tud@RaggedRight{\raggedright} \AfterPackage*{ragged2e}{% \ifdef{\LaTeXraggedright}{% \renewcommand*\tud@raggedright{\LaTeXraggedright}% }{}% + \renewcommand*\tud@RaggedRight{\RaggedRight}% } \@ifclassloaded{tudbook}{% \patchcmd{\@makechapterhead}{\dinBold\Huge\bfseries}% - {\if@tud@din\dinbn\fi\Huge}{}{\tud@patch@wrn{@makechapterhead}}% + {\bfseries\tud@font@heading\Huge}{}{\tud@patch@wrn{@makechapterhead}}% \patchcmd{\@makeschapterhead}{\dinBold\Huge\bfseries}% - {\if@tud@din\dinbn\fi\Huge}{}{\tud@patch@wrn{@makeschapterhead}}% + {\bfseries\tud@font@heading\Huge}{}{\tud@patch@wrn{@makeschapterhead}}% \patchcmd{\section}{\dinBold\Large\bfseries}% - {\if@tud@din\dinbn\fi\Large}{}{\tud@patch@wrn{section}}% + {\bfseries\tud@font@heading\Large}{}{\tud@patch@wrn{section}}% \patchcmd{\showtitle}{\dinBold\Huge\bfseries}% - {\if@tud@din\dinbn\fi\Huge}{}{\tud@patch@wrn{showtitle}}% + {\bfseries\tud@font@heading\Huge}{}{\tud@patch@wrn{showtitle}}% }{} \endinput %% |