summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty')
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty106
1 files changed, 62 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
index 9172689ce2f..6a283e0532c 100644
--- a/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
@@ -17,7 +17,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2019/07/17 v2.06b TUD-Script
+%% 2019/08/20 v2.06c TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019
%%
@@ -60,7 +60,7 @@
\fi%
}
\fi
- \TUD@Version@Check{2019/07/17 v2.06b TUD-Script}
+ \TUD@Version@Check{2019/08/20 v2.06c TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex@outlook.com}
@@ -76,7 +76,7 @@
}{}
%%% From File: tudscr-fonts.dtx
\ProvidesPackage{tudscrfonts}[%
- 2019/07/17 v2.06b TUD-Script
+ 2019/08/20 v2.06c TUD-Script
package
(corporate design fonts)%
]
@@ -417,7 +417,7 @@
\ifcsundef{#1}{%
\begingroup%
\def\tud@res@a{%
- The command `\@backslashchar#1' is deprecated.\MessageBreak%
+ The command `\@backslashchar#1' is deprecated. \MessageBreak%
}%
\def\tud@res@b##1@##2\@nil{%
\IfArgIsEmpty{##2}{%
@@ -451,8 +451,8 @@
\PackageWarningNoLine{tudscrfonts}%
{%
You have set option `tudscrver' to `\@tempa', but\MessageBreak%
- this value is not supported. Because of this, the\MessageBreak%
- value for `tudscrver' was set to `first'%
+ this value is not supported. Because of this,\MessageBreak%
+ `tudscrver=first' was set%
}%
\renewcommand*\tud@v@comp{0}%
}{%
@@ -468,15 +468,7 @@
\AtEndOfPackage%
{%
\RelaxFamilyKey[.comp]{TUD}{tudscrver}%
- \TUD@key{tudscrver}[]{%
- \PackageError{tudscrfonts}%
- {Option `tudscrver' too late}{%
- Option `tudscrver' can only be set while loading the\MessageBreak%
- package `tudscrfonts'\space%
- but you have tried to set it up later.%
- }%
- \FamilyKeyStateProcessed%
- }%
+ \TUD@key@toolate{tudscrver}%
}
\csdef{tud@v@first}{0}
\csdef{tud@v@2.00}{0}
@@ -508,6 +500,7 @@
\csdef{tud@v@2.06}{4}
\csdef{tud@v@2.06a}{4}
\csdef{tud@v@2.06b}{4}
+\csdef{tud@v@2.06c}{4}
\csdef{tud@v@last}{4}
\newcommand*\tud@v@get[2]{%
\begingroup%
@@ -533,7 +526,7 @@
\def\tud@reserved{%
\PackageWarningNoLine{tudscrfonts}%
{%
- Erroneous usage of `\string\tud@if@v@lower'.\MessageBreak%
+ Erroneous usage of `\string\tud@if@v@lower'. \MessageBreak%
There's no defined macro `\string\tud@v@\@tempa'%
}%
\endgroup\@firstoftwo%
@@ -619,23 +612,14 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\PackageWarningNoLine{tudscrfonts}%
{%
- The key `fontspec' is deprecated.\MessageBreak%
+ The key `fontspec' is deprecated. \MessageBreak%
You should load the package `fontspec' manually%
}%
\fi%
}
\AtEndOfPackage%
{%
- \TUD@key{fontspec}[]%
- {%
- \PackageError{tudscrfonts}%
- {Option `fontspec' too late}{%
- Option `fontspec' can only be set while loading the\MessageBreak%
- package `tudscrfonts'\space%
- but you have tried to set it up later.%
- }%
- \FamilyKeyStateProcessed%
- }%
+ \TUD@key@toolate{fontspec}%
\if@tud@x@fontspec@requested%
\RequirePackage{fontspec}[2017/01/24]%
\fi%
@@ -659,6 +643,26 @@
\TUDExecuteOptions{%
}
\TUDProcessOptions\relax
+\newcommand*\TUD@key@toolate[1]{%
+ \csedef{tud@key@#1@error}{%
+ \noexpand\PackageError{tudscrfonts}%
+ {Option `#1' too late}{%
+ Option `#1' can only be set\space%
+ \ifcsname \@currname.\@currext-h@@k\endcsname%
+ as optional \MessageBreak argument while loading\space%
+ package `tudscrfonts'%
+ \else%
+ in the preamble
+ \fi%
+ \MessageBreak but you have tried to set it up later.%
+ }%
+ }%
+ \TUD@key{#1}[]%
+ {%
+ \csuse{tud@key@#1@error}
+ \FamilyKeyStateProcessed%
+ }%
+}
%%% From File: tudscr-fonts.dtx
\newcommand*\tud@cdfont@wrn{\global\let\tud@cdfont@wrn\relax}
\newcommand*\tud@cdmath@wrn{\global\let\tud@cdmath@wrn\relax}
@@ -805,7 +809,7 @@
\if@tud@cdmath@active%
\PackageWarning{tudscrfonts}%
{%
- Some math font encodings are missing.\MessageBreak%
+ Some math font encodings are missing. \MessageBreak%
The option `cdmath=false' is executed. You should\MessageBreak%
either use this option by yourself or install\MessageBreak%
all necessary fonts with a installation script\MessageBreak%
@@ -820,7 +824,7 @@
\begingroup%
\def\tud@res@a{%
`#2' font\MessageBreak%
- not found for `#1' encoding.\MessageBreak%
+ not found for `#1' encoding. \MessageBreak%
}%
\if@tud@x@fontspec@enabled%
\ifstr{\encodingdefault}{#1}{%
@@ -852,7 +856,7 @@
\else%
install package `opensans'%
\fi%
- .\MessageBreak%
+ . \MessageBreak%
}%
\else%
\ifstr{\encodingdefault}{#1}{%
@@ -866,7 +870,7 @@
}%
\appto\tud@res@a{%
choose a possible encoding with package\MessageBreak%
- `fontenc' (\tud@res@b).\MessageBreak%
+ `fontenc' (\tud@res@b). \MessageBreak%
}%
}{}%
\fi%
@@ -909,7 +913,7 @@
\newif\if@tud@x@bm@requested
\@ifpackageloaded{bm}{%
\PackageWarning{tudscrfonts}{%
- Package `bm' must be loaded after `tudscrfonts'.\MessageBreak%
+ Package `bm' must be loaded after `tudscrfonts'. \MessageBreak%
Otherwise the functionality can not be guaranteed%
}%
}{%
@@ -1168,7 +1172,10 @@
\ifcsundef{textrightarrow}{}{%
\tud@cs@store{textrightarrow}%
\renewrobustcmd*{\textrightarrow}{%
- {\fontfamily{iwona}\selectfont\tud@cs@use{textrightarrow}}%
+ \begingroup%
+ \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi%
+ \tud@cs@use{textrightarrow}%
+ \endgroup%
}%
}%
}%
@@ -1878,19 +1885,30 @@
\newcommand*\mv@tudbold{}
\newcommand*\mv@tuddin{}
\AfterPackage*{mathastext}{%
- \CheckCommand*\MTversion{\@ifstar\MTversion@s\MTversion@}%
- \CheckCommand*\MTversion@s[1]{\mathversion{#1}\MTversion@@{#1}}%
\newrobustcmd*\tud@mathversion[1]{%
- \tud@cs@use{mathversion}{#1}%
- \if@tud@cdmath@active%
- \ifstr{#1}{normal}{%
- \MTversion@@{tudnormal}%
- }{%
- \ifstr{#1}{bold}{%
- \MTversion@@{tudbold}%
- }{}%
+ \begingroup%
+ \let\tud@res@a\relax%
+ \if@tud@cdmath@active%
+ \ifstr{#1}{normal}{%
+ \def\tud@res@a{tudnormal}%
+ }{%
+ \ifstr{#1}{bold}{%
+ \def\tud@res@a{tudbold}%
+ }{}%
+ }%
+ \fi%
+ \edef\tud@res@a{%
+ \endgroup%
+ \noexpand\tud@cs@restore{mathversion}%
+ \ifx\tud@res@a\relax%
+ \noexpand\mathversion{#1}%
+ \else%
+ \noexpand\MTversion*{\tud@res@a}%
+ \fi%
+ \noexpand\tud@cs@store{mathversion}%
+ \noexpand\tud@cs@letltx{mathversion}{tud@mathversion}%
}%
- \fi%
+ \tud@res@a%
}%
\AtEndPreamble{%
\tud@cs@store{mathversion}%