From 3bd863734612dc2fe9c5c7c1405358ffb1228afb Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 15 Jan 2020 03:00:56 +0000 Subject: CTAN sync 202001150300 --- macros/latex/contrib/tudscr/README.md | 10 +- macros/latex/contrib/tudscr/doc/LICENSE.md | 2 +- macros/latex/contrib/tudscr/doc/tudscr.pdf | Bin 1160022 -> 1153970 bytes macros/latex/contrib/tudscr/doc/tudscr_print.pdf | Bin 1144517 -> 1138793 bytes macros/latex/contrib/tudscr/doc/tudscrsource.pdf | Bin 1016743 -> 1015159 bytes .../contrib/tudscr/doc/tutorials/mathswap.pdf | Bin 122341 -> 121062 bytes .../contrib/tudscr/doc/tutorials/mathtype.pdf | Bin 139909 -> 138011 bytes .../contrib/tudscr/doc/tutorials/treatise.pdf | Bin 889140 -> 888937 bytes .../tudscr/source/doc/examples/dissertation.tex | 8 +- .../tudscr/source/doc/examples/document.tex | 8 +- .../tudscr/source/doc/examples/evaluation.tex | 8 +- .../source/doc/examples/mathswap-example.tex | 9 +- .../source/doc/examples/mathtype-example.tex | 9 +- .../contrib/tudscr/source/doc/examples/notice.tex | 8 +- .../contrib/tudscr/source/doc/examples/poster.tex | 8 +- .../contrib/tudscr/source/doc/examples/task.tex | 8 +- .../contrib/tudscr/source/doc/examples/thesis.tex | 8 +- .../source/doc/examples/treatise-example.tex | 9 +- .../contrib/tudscr/source/doc/tudscr-hints.tex | 8 +- macros/latex/contrib/tudscr/source/doc/tudscr.tex | 10 +- .../tudscr/source/doc/tutorials/mathswap.tex | 17 ++-- .../tudscr/source/doc/tutorials/mathtype.tex | 17 ++-- .../tudscr/source/doc/tutorials/treatise.tex | 26 ++--- macros/latex/contrib/tudscr/source/tudscr-area.dtx | 10 +- macros/latex/contrib/tudscr/source/tudscr-base.dtx | 110 ++++----------------- .../latex/contrib/tudscr/source/tudscr-color.dtx | 10 +- macros/latex/contrib/tudscr/source/tudscr-comp.dtx | 18 ++-- macros/latex/contrib/tudscr/source/tudscr-doc.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-fields.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-fonts.dtx | 18 ++-- .../contrib/tudscr/source/tudscr-frontmatter.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-layout.dtx | 10 +- .../contrib/tudscr/source/tudscr-localization.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-manual.dtx | 32 +++--- .../contrib/tudscr/source/tudscr-mathswap.dtx | 10 +- macros/latex/contrib/tudscr/source/tudscr-misc.dtx | 12 +-- .../contrib/tudscr/source/tudscr-pagestyle.dtx | 10 +- .../contrib/tudscr/source/tudscr-supervisor.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-texindy.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-title.dtx | 10 +- .../contrib/tudscr/source/tudscr-twocolfix.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-version.dtx | 14 +-- macros/latex/contrib/tudscr/source/tudscr.ins | 4 +- .../latex/contrib/tudscr/source/tudscrsource.tex | 8 +- 44 files changed, 243 insertions(+), 276 deletions(-) (limited to 'macros/latex/contrib/tudscr') diff --git a/macros/latex/contrib/tudscr/README.md b/macros/latex/contrib/tudscr/README.md index 6079525067..c0c90ecafa 100644 --- a/macros/latex/contrib/tudscr/README.md +++ b/macros/latex/contrib/tudscr/README.md @@ -2,9 +2,9 @@ TUD-Script – Corporate Design of Technische Universität Dresden ---------------------------------------------------------------------------- - Copyright (C) Falk Hanisch , 2012-2019 + Copyright (C) Falk Hanisch , 2012-2020 - tudscr 2019/10/23 v2.06e + tudscr 2020/01/14 v2.06f ---------------------------------------------------------------------------- @@ -53,6 +53,9 @@ Das Bundle beinhaltet: Versionen --------- +**v2.06f** (2020/01/14) ++ Anpassungen für Paket `scrbase v3.28` + **v2.06e** (2019/10/23) + Bugfix für Paket `scrlfile v3.27` @@ -248,6 +251,9 @@ The bundle offers: Versions -------- +**v2.06f** (2020/01/14) ++ adaptions for package `scrbase v3.28` + **v2.06e** (2019/10/23) + bug fix for package `scrlfile v3.27` diff --git a/macros/latex/contrib/tudscr/doc/LICENSE.md b/macros/latex/contrib/tudscr/doc/LICENSE.md index 52ebe38692..ae0225297b 100644 --- a/macros/latex/contrib/tudscr/doc/LICENSE.md +++ b/macros/latex/contrib/tudscr/doc/LICENSE.md @@ -2,7 +2,7 @@ TUD-Script – Corporate Design of Technische Universität Dresden ---------------------------------------------------------------------------- - Copyright (C) Falk Hanisch , 2012-2019 + Copyright (C) Falk Hanisch , 2012-2020 ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tudscr/doc/tudscr.pdf b/macros/latex/contrib/tudscr/doc/tudscr.pdf index ad14527739..c185ea1696 100644 Binary files a/macros/latex/contrib/tudscr/doc/tudscr.pdf and b/macros/latex/contrib/tudscr/doc/tudscr.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tudscr_print.pdf b/macros/latex/contrib/tudscr/doc/tudscr_print.pdf index f19d5c7e5c..25869aaf2b 100644 Binary files a/macros/latex/contrib/tudscr/doc/tudscr_print.pdf and b/macros/latex/contrib/tudscr/doc/tudscr_print.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tudscrsource.pdf b/macros/latex/contrib/tudscr/doc/tudscrsource.pdf index b8f5161304..82ac3b089d 100644 Binary files a/macros/latex/contrib/tudscr/doc/tudscrsource.pdf and b/macros/latex/contrib/tudscr/doc/tudscrsource.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf b/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf index 3d2697d4da..09fe12442b 100644 Binary files a/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf and b/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf b/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf index 7d7587a50d..364aea0e73 100644 Binary files a/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf and b/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf b/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf index 460f57d175..f9f8d8dc7a 100644 Binary files a/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf and b/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf differ diff --git a/macros/latex/contrib/tudscr/source/doc/examples/dissertation.tex b/macros/latex/contrib/tudscr/source/doc/examples/dissertation.tex index d5ba74a3bb..8f5a379426 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/dissertation.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/dissertation.tex @@ -2,12 +2,12 @@ english,ngerman,% BCOR=6mm,cdgeometry=no,DIV=13% ]{tudscrreprt} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{isodate} \usepackage{blindtext} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/document.tex b/macros/latex/contrib/tudscr/source/doc/examples/document.tex index 9751d1c3d6..368b0134ee 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/document.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/document.tex @@ -1,10 +1,10 @@ \documentclass[ngerman]{tudscrreprt} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage[math]{blindtext} \begin{document} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/evaluation.tex b/macros/latex/contrib/tudscr/source/doc/examples/evaluation.tex index c93670d7e6..23f9b8c4ed 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/evaluation.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/evaluation.tex @@ -1,10 +1,10 @@ \documentclass[ngerman]{tudscrartcl} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{isodate} \usepackage{tudscrsupervisor} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/mathswap-example.tex b/macros/latex/contrib/tudscr/source/doc/examples/mathswap-example.tex index fd3e58d804..7df7fccfa4 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/mathswap-example.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/mathswap-example.tex @@ -1,6 +1,11 @@ \documentclass[english,ngerman]{tudscrartcl}% andere Klassen möglich -\usepackage[T1]{fontenc} -\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{} +\usepackage{iftex} +\iftutex + \usepackage{fontspec} +\else + \usepackage[T1]{fontenc} + \usepackage[ngerman=ngerman-x-latest]{hyphsubst} +\fi \usepackage{babel} \usepackage{microtype} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/mathtype-example.tex b/macros/latex/contrib/tudscr/source/doc/examples/mathtype-example.tex index 532bf94bbd..d88cd8a6da 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/mathtype-example.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/mathtype-example.tex @@ -1,6 +1,11 @@ \documentclass[ngerman]{tudscrartcl}% andere Klassen sind möglich -\usepackage[T1]{fontenc} -\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{} +\usepackage{iftex} +\iftutex + \usepackage{fontspec} +\else + \usepackage[T1]{fontenc} + \usepackage[ngerman=ngerman-x-latest]{hyphsubst} +\fi \usepackage{babel} \usepackage{microtype} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/notice.tex b/macros/latex/contrib/tudscr/source/doc/examples/notice.tex index 51ceaf2836..b62df43571 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/notice.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/notice.tex @@ -1,10 +1,10 @@ \documentclass[ngerman]{tudscrreprt} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{isodate} \usepackage{tudscrsupervisor} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/poster.tex b/macros/latex/contrib/tudscr/source/doc/examples/poster.tex index 61cb19989d..fb5c2f6276 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/poster.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/poster.tex @@ -4,12 +4,12 @@ paper=A1,fontsize=22pt,% cdfoot=5ex,ddcfoot% ]{tudscrposter} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{blindtext} \usepackage{multicol} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/task.tex b/macros/latex/contrib/tudscr/source/doc/examples/task.tex index 114a6cbfd9..4fe0b71e8c 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/task.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/task.tex @@ -1,10 +1,10 @@ \documentclass[ngerman]{tudscrreprt} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{isodate} \usepackage{tudscrsupervisor} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/thesis.tex b/macros/latex/contrib/tudscr/source/doc/examples/thesis.tex index 5d88a8c2bd..e935bfcd8e 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/thesis.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/thesis.tex @@ -1,10 +1,10 @@ \documentclass[ngerman,BCOR=4mm]{tudscrreprt} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{isodate} \begin{document} diff --git a/macros/latex/contrib/tudscr/source/doc/examples/treatise-example.tex b/macros/latex/contrib/tudscr/source/doc/examples/treatise-example.tex index 83d092306e..4d274ddd20 100644 --- a/macros/latex/contrib/tudscr/source/doc/examples/treatise-example.tex +++ b/macros/latex/contrib/tudscr/source/doc/examples/treatise-example.tex @@ -1,11 +1,12 @@ \documentclass[english,ngerman]{tudscrreprt} \usepackage{babel} -\ifpdftex{ +\usepackage{iftex} +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{scrhack} \usepackage{tudscrsupervisor} diff --git a/macros/latex/contrib/tudscr/source/doc/tudscr-hints.tex b/macros/latex/contrib/tudscr/source/doc/tudscr-hints.tex index 87ea1b6056..5a8a13a5d3 100644 --- a/macros/latex/contrib/tudscr/source/doc/tudscr-hints.tex +++ b/macros/latex/contrib/tudscr/source/doc/tudscr-hints.tex @@ -102,8 +102,12 @@ könnte folgendermaßen aussehen: \begin{quoting}[rightmargin=0pt] \begin{Code}[escapechar=§] \documentclass[ngerman,§\PName{Klassenoptionen}§]§\Parameter{Dokumentklasse}§ -\usepackage[T1]{fontenc} -\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{} +\iftutex + \usepackage{fontspec} +\else + \usepackage[T1]{fontenc} + \usepackage[ngerman=ngerman-x-latest]{hyphsubst} +\fi \usepackage{babel} §\dots§ \end{Code} diff --git a/macros/latex/contrib/tudscr/source/doc/tudscr.tex b/macros/latex/contrib/tudscr/source/doc/tudscr.tex index eae520f34a..0dc90c5597 100644 --- a/macros/latex/contrib/tudscr/source/doc/tudscr.tex +++ b/macros/latex/contrib/tudscr/source/doc/tudscr.tex @@ -1,10 +1,10 @@ \documentclass[english,ngerman,ttfont=roboto]{tudscrmanual} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \lstset{% inputencoding=utf8,extendedchars=true, literate=% @@ -29,7 +29,7 @@ \endgroup% } \faculty{\cdurl} -\date{23.10.2019} +\date{14.01.2020} \author{% Falk Hanisch% \expandafter\emailaddress\expandafter{\tudscrmail}% diff --git a/macros/latex/contrib/tudscr/source/doc/tutorials/mathswap.tex b/macros/latex/contrib/tudscr/source/doc/tutorials/mathswap.tex index 92e081b5b6..2078d7da2f 100644 --- a/macros/latex/contrib/tudscr/source/doc/tutorials/mathswap.tex +++ b/macros/latex/contrib/tudscr/source/doc/tutorials/mathswap.tex @@ -1,10 +1,10 @@ \documentclass[english,ngerman]{tudscrartcl} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{tudscrtutorial} \lstset{% @@ -64,8 +64,13 @@ Pakete geladen. % \begin{Preamble} \documentclass[english,ngerman]{tudscrartcl}% andere Klassen möglich -\usepackage[T1]{fontenc} -\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{} +\usepackage{iftex} +\iftutex + \usepackage{fontspec} +\else + \usepackage[T1]{fontenc} + \usepackage[ngerman=ngerman-x-latest]{hyphsubst} +\fi \usepackage{babel} \usepackage{microtype} diff --git a/macros/latex/contrib/tudscr/source/doc/tutorials/mathtype.tex b/macros/latex/contrib/tudscr/source/doc/tutorials/mathtype.tex index 9f9625ab7b..7f11fb3168 100644 --- a/macros/latex/contrib/tudscr/source/doc/tutorials/mathtype.tex +++ b/macros/latex/contrib/tudscr/source/doc/tutorials/mathtype.tex @@ -1,10 +1,10 @@ \documentclass[english,ngerman]{tudscrartcl} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{tudscrtutorial} \lstset{% @@ -53,8 +53,13 @@ Pakete geladen. % \begin{Preamble} \documentclass[ngerman]{tudscrartcl}% andere Klassen sind möglich -\usepackage[T1]{fontenc} -\ifpdftex{\usepackage[ngerman=ngerman-x-latest]{hyphsubst}}{} +\usepackage{iftex} +\iftutex + \usepackage{fontspec} +\else + \usepackage[T1]{fontenc} + \usepackage[ngerman=ngerman-x-latest]{hyphsubst} +\fi \usepackage{babel} \usepackage{microtype} diff --git a/macros/latex/contrib/tudscr/source/doc/tutorials/treatise.tex b/macros/latex/contrib/tudscr/source/doc/tutorials/treatise.tex index 8e69888920..1cb217b7d1 100644 --- a/macros/latex/contrib/tudscr/source/doc/tutorials/treatise.tex +++ b/macros/latex/contrib/tudscr/source/doc/tutorials/treatise.tex @@ -3,12 +3,12 @@ english,ngerman,% cdgeometry=no,DIV=12,automark% ]{tudscrartcl} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{tudscrtutorial} \lstset{% @@ -285,12 +285,13 @@ Informationen zur Verwendung von \Package{hyphsubst} sowie zum Thema \emph{Worttrennung} finden. % \begin{Preamble} -\ifpdftex{ +\usepackage{iftex} +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \end{Preamble} % Für die \KOMAScript-Klassen wird außerdem das Paket \Package{scrhack} @@ -2657,12 +2658,13 @@ Beginn einer Dokumentpräambel könnte folgendermaßen aussehen: % \begin{Hint} \documentclass[ngerman,§\PName{Klassenoptionen}§]§\Parameter{Dokumentklasse}§ -\ifpdftex{ +\usepackage{iftex} +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \end{Hint} % diff --git a/macros/latex/contrib/tudscr/source/tudscr-area.dtx b/macros/latex/contrib/tudscr/source/tudscr-area.dtx index 818f3e0097..0c1c3f1f6b 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-area.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-area.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-base.dtx b/macros/latex/contrib/tudscr/source/tudscr-base.dtx index 8bbe69e572..7d65f4e5cb 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-base.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-base.dtx @@ -1,10 +1,10 @@ -% \CheckSum{903} +% \CheckSum{843} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -52,7 +52,7 @@ % \fi % \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi -\ProvidesFile{tudscr-base.dtx}[2019/10/23 v2.06e TUD-Script\space% +\ProvidesFile{tudscr-base.dtx}[2020/01/14 v2.06f TUD-Script\space% % % \iffalse % @@ -69,12 +69,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} @@ -140,91 +140,17 @@ % % Das Paket \pkg{scrbase} wird zur Optionsdefinition benötigt, \pkg{scrlfile} % für verschiedene Hooks vor sowie nach Klassen und Paketen. -% \begin{macrocode} -\RequirePackage{scrbase}[2018/03/30] -% \end{macrocode} -% \changes{v2.06e}{2019/10/23}{Bugfix für \pkg{scrlfile} \val{v3.27}}^^A -% Das Paket \pkg{scrlfile} in der \KOMAScript-Version \val{v3.27} enthält einen -% Bug, der erst mit \val{v3.27a} gefixt wird. -% \ToDo{Bugfix für \pkg{scrlfile} raus, v3.27a notwendig}[v3.27a] -% \begin{macrocode} -\@ifpackageloaded{scrlfile}{% - \@ifpackagelater{scrlfile}{2019/10/13}{}{% - \renewcommand*{\scr@load@hook}[2]{% - \edef\scr@hookname{#1}% - \def\scr@cmd@hook{before}% - \ifx\scr@hookname\scr@cmd@hook - \expandafter\def\csname #2-l@ading\endcsname{#2}% - \fi - \let\scr@cmd@hook\@undefined - \@ifundefined{#2-@#1}{}{% - \@nameuse{#2-@#1}% - \expandafter\let\csname #2-@#1\endcsname\relax - }% - \edef\scr@hookname{#1}% - \def\scr@cmp@hook{after}% - \ifx\scr@hookname\scr@cmp@hook - \expandafter\let\csname #2-l@ading\endcsname\@undefined - \fi - \let\scr@hookname\@undefined - }% - \renewcommand*{\@@AfterClass}[2]{% - \@ifundefined{#2.\@clsextension-l@ading}{% - \@sAfterClass - }{% - \@AfterClass - }% - {#2}% - }% - \renewcommand*{\@@@AfterClass}[2]{% - \@ifundefined{#2.\@clsextension-l@ading}{% - \@ifclassloaded{#2}{% - \@sAfterClass - }{% - \AfterAtEndOfClass - }% - }{% - \AfterAtEndOfClass - }% - {#2}% - }% - \renewcommand*{\@@AfterPackage}[2]{% - \@ifundefined{#2.\@pkgextension-l@ading}{% - \@sAfterPackage - }{% - \@AfterPackage - }% - {#2}% - }% - \renewcommand*{\@@@AfterPackage}[2]{% - \@ifundefined{#2.\@pkgextension-l@ading}{% - \@ifpackageloaded{#2}{% - \@sAfterPackage - }{% - \@AfterAtEndOfPackage - }% - }{% - \@AfterAtEndOfPackage - }% - {#2}% - }% - \renewcommand*{\AfterAtEndOfPackage}[1]{% - \@ifpackageloaded{#1}{% - \@ifundefined{#1.\@pkgextension-l@ading}{% - \@gobbletwo - }{% - \@AfterAtEndOfPackage - }% - }{% - \@AfterAtEndOfPackage - }% - {#1}% - }% - \newcommand*{\@AfterAtEndOfPackage}[1]{% - \scr@set@load@hook{lateafter}{#1.\@pkgextension}% - }% - }% -}{} +% \ToDo{Provisorium entfernen}[v2.07] +% \begin{macrocode} +\providecommand*{\ifstr}{\Ifstr} +\providecommand*{\ifstrstart}{\Ifstrstart} +\providecommand*{\ifisskip}{\Ifisskip} +\providecommand*{\ifdimen}{\Ifdimen} +\providecommand*{\ifisdimen}{\Ifisdimen} +\providecommand*{\ifisdimension}{\Ifisdimension} +\providecommand*{\ifnumber}{\Ifnumber} +\RequirePackage{scrbase}[2019/12/23] +\RequirePackage{iftex}[2019/11/07] % \end{macrocode} % Die folgenden Pakete werden für die Manipulation bereits definierter % Makros sowie zur erweiterten Auswertung boolescher Ausdrücke benötigt. diff --git a/macros/latex/contrib/tudscr/source/tudscr-color.dtx b/macros/latex/contrib/tudscr/source/tudscr-color.dtx index c581f28f6b..4bc961987d 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-color.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-color.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -69,12 +69,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-comp.dtx b/macros/latex/contrib/tudscr/source/tudscr-comp.dtx index ece623438d..4158956194 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-comp.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-comp.dtx @@ -1,10 +1,10 @@ -% \CheckSum{1452} +% \CheckSum{1453} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -52,7 +52,7 @@ % \fi % \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi -\ProvidesFile{tudscr-comp.dtx}[2019/10/23 v2.06e TUD-Script\space% +\ProvidesFile{tudscr-comp.dtx}[2020/01/14 v2.06f TUD-Script\space% % % \iffalse % @@ -73,12 +73,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} @@ -381,6 +381,8 @@ % \changes{v2.06d}{2019/08/27}{neu}^^A % \begin{macro}{\tud@v@2.06e} % \changes{v2.06e}{2019/10/23}{neu}^^A +% \begin{macro}{\tud@v@2.06f} +% \changes{v2.06f}{2020/01/14}{neu}^^A % \begin{macro}{\tud@v@last} % \changes{v2.02}{2014/08/22}{neu}^^A % \changes{v2.03}{2015/01/13}{angepasst}^^A @@ -422,9 +424,11 @@ \csdef{tud@v@2.06c}{4} \csdef{tud@v@2.06d}{4} \csdef{tud@v@2.06e}{4} +\csdef{tud@v@2.06f}{4} \csdef{tud@v@last}{4} % \end{macrocode} % \end{macro}^^A \tud@v@last +% \end{macro}^^A \tud@v@2.06f % \end{macro}^^A \tud@v@2.06e % \end{macro}^^A \tud@v@2.06d % \end{macro}^^A \tud@v@2.06c diff --git a/macros/latex/contrib/tudscr/source/tudscr-doc.dtx b/macros/latex/contrib/tudscr/source/tudscr-doc.dtx index ef3754d43a..eb2401bde0 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-doc.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-doc.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-fields.dtx b/macros/latex/contrib/tudscr/source/tudscr-fields.dtx index dbf9cb46b8..f56f953e97 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-fields.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-fields.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx b/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx index 228304d9ee..c0fb49b803 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx @@ -1,10 +1,10 @@ -% \CheckSum{3123} +% \CheckSum{3124} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -52,7 +52,7 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi % \fi % -\ProvidesFile{tudscr-fonts.dtx}[2019/08/27 v2.06d TUD-Script\space% +\ProvidesFile{tudscr-fonts.dtx}[2020/01/14 v2.06f TUD-Script\space% % % \iffalse % @@ -69,12 +69,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} @@ -3889,7 +3889,7 @@ % der Fall, weshalb hier etwas nachgeholfen werden muss, indem nach der Glyphe % schlichtweg ein Klammernpaar in der richtigen Kodierung eingefügt wird. % \begin{macrocode} - \scr@ifluatex{% + \ifluatex% \begingroup% \def\tud@res@a{\if@tud@cdmath@active\fontencoding{LGR}\selectfont{}\fi}% \def\tud@res@b##1{% @@ -3903,7 +3903,7 @@ \tud@res@b{it#1}% \tud@res@b{up#1}% \endgroup% - }{}% + \fi% } % \end{macrocode} % \end{macro}^^A \tud@cdmath@declare@greek@@lgr diff --git a/macros/latex/contrib/tudscr/source/tudscr-frontmatter.dtx b/macros/latex/contrib/tudscr/source/tudscr-frontmatter.dtx index 57017e1136..3ae42e3e83 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-frontmatter.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-frontmatter.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-layout.dtx b/macros/latex/contrib/tudscr/source/tudscr-layout.dtx index 4e6fe56ae7..3bf9ec030c 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-layout.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-layout.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-localization.dtx b/macros/latex/contrib/tudscr/source/tudscr-localization.dtx index 954773033b..d137660867 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-localization.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-localization.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-manual.dtx b/macros/latex/contrib/tudscr/source/tudscr-manual.dtx index 3249409e97..8346c60f7c 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-manual.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-manual.dtx @@ -1,10 +1,10 @@ -% \CheckSum{4450} +% \CheckSum{4457} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -69,12 +69,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} @@ -4941,10 +4941,14 @@ % \changes{v2.06}{2019/06/21}{neu}^^A % Für das verschachtelte Aufrufen von \app{pdflatex} bzw. \app{lualatex}. % \begin{macrocode} -\newcommand*\tud@latex@ext{} -\ifpdftex% - {\def\tud@latex@ext{pdflatex\space}}% - {\def\tud@latex@ext{lualatex\space}}% +\newcommand*\tud@latex@ext{pdflatex\space} +\iftutex + \ifxetex + \renewcommand*\tud@latex@ext{xelatex\space} + \else + \renewcommand*\tud@latex@ext{lualatex\space} + \fi +\fi % \end{macrocode} % \end{macro}^^A \tud@latex@ext % \begin{macro}{\Tutorial} @@ -5575,12 +5579,12 @@ \if@tempswa% \begin{filecontents*}{\tud@tut@temp-standalone.tex} \documentclass[english,ngerman]{tudscrreprt} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrsupervisor} \usepackage{isodate} diff --git a/macros/latex/contrib/tudscr/source/tudscr-mathswap.dtx b/macros/latex/contrib/tudscr/source/tudscr-mathswap.dtx index 158befa025..0c9418e669 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-mathswap.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-mathswap.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -72,12 +72,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-misc.dtx b/macros/latex/contrib/tudscr/source/tudscr-misc.dtx index 72beb47c8a..4cc2abc463 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-misc.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-misc.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} @@ -226,7 +226,7 @@ \BeforeTOCHead[toc]{% \tud@x@bookmark@startatroot% \let\@tempc\relax% - \iftocfeature{toc}{totoc}{}{% + \Iftocfeature{toc}{totoc}{}{% \if@tud@bookmarks% \setuptoc{toc}{totoc}% \tud@cs@store{addtocontents}% diff --git a/macros/latex/contrib/tudscr/source/tudscr-pagestyle.dtx b/macros/latex/contrib/tudscr/source/tudscr-pagestyle.dtx index e6cb0a94e4..1faf440673 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-pagestyle.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-pagestyle.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-supervisor.dtx b/macros/latex/contrib/tudscr/source/tudscr-supervisor.dtx index 7e73840d5c..7645826e38 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-supervisor.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-supervisor.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -69,12 +69,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-texindy.dtx b/macros/latex/contrib/tudscr/source/tudscr-texindy.dtx index a666c74ef5..747cd157ff 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-texindy.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-texindy.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-title.dtx b/macros/latex/contrib/tudscr/source/tudscr-title.dtx index b6ec69ff30..1f46c490ca 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-title.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-title.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -58,12 +58,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-twocolfix.dtx b/macros/latex/contrib/tudscr/source/tudscr-twocolfix.dtx index ff86b18493..26e9c62026 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-twocolfix.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-twocolfix.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -70,12 +70,12 @@ % %<*dtx> \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr-version.dtx b/macros/latex/contrib/tudscr/source/tudscr-version.dtx index 8b58d0b69b..f7bef28b00 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-version.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-version.dtx @@ -4,7 +4,7 @@ % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -110,7 +110,7 @@ \def\@tempb##1 v##2 ##3\relax##4\relax{\gdef\TUDScriptVersionNumber{##2}}% \edef\@tempa{\TUD@Version}% \expandafter\@tempb\@tempa\relax? ? \relax\relax% - \gdef\TUD@Version@KOMA{3.25}% + \gdef\TUD@Version@KOMA{3.28}% } \else \newcommand*\TUD@Version@Check[1]{% @@ -128,7 +128,7 @@ %<*!(package|class)> \fi % - \TUD@Version@Check{2019/10/23 v2.06e TUD-Script} + \TUD@Version@Check{2020/01/14 v2.06f TUD-Script} \endgroup % \end{macrocode} % \end{macro}^^A \TUDScriptVersionNumber @@ -145,12 +145,12 @@ % % \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} diff --git a/macros/latex/contrib/tudscr/source/tudscr.ins b/macros/latex/contrib/tudscr/source/tudscr.ins index 3503f12938..e29f63d076 100644 --- a/macros/latex/contrib/tudscr/source/tudscr.ins +++ b/macros/latex/contrib/tudscr/source/tudscr.ins @@ -2,7 +2,7 @@ % TUD-Script -- Corporate Design of Technische Universitaet Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch , 2012-2019 +% Copyright (C) Falk Hanisch , 2012-2020 % % ---------------------------------------------------------------------------- % @@ -53,7 +53,7 @@ TUD-Script -- Corporate Design of Technische Universitaet Dresden \TUD@Version -Copyright (C) Falk Hanisch , 2012-2019 +Copyright (C) Falk Hanisch , 2012-2020 This file was generated from file(s) of the TUD-Script bundle. ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tudscr/source/tudscrsource.tex b/macros/latex/contrib/tudscr/source/tudscrsource.tex index f1bbcf9d9c..aa11b0f111 100644 --- a/macros/latex/contrib/tudscr/source/tudscrsource.tex +++ b/macros/latex/contrib/tudscr/source/tudscrsource.tex @@ -5,12 +5,12 @@ \endgroup \ProvidesFile{tudscrsource.tex}[\TUDScriptVersion (sourcedoc)] \documentclass[english,ngerman,xindy]{tudscrdoc} -\ifpdftex{ +\iftutex + \usepackage{fontspec} +\else \usepackage[T1]{fontenc} \usepackage[ngerman=ngerman-x-latest]{hyphsubst} -}{ - \usepackage{fontspec} -} +\fi \usepackage{babel} \usepackage{tudscrfonts} \KOMAoptions{parskip=half-} -- cgit v1.2.3