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 --- .../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 ++++++++++++---------- 15 files changed, 94 insertions(+), 67 deletions(-) (limited to 'macros/latex/contrib/tudscr/source/doc') 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} % -- cgit v1.2.3