Merge branch 'hotfix/v2.06f'

.gitignore

@@ -26,7 +26,9 @@ temp/
 *.lof
 *.log
 *.lot
+*.mw
 *.nav
+*.orig
 *.out
 *.pdf
 *.ps
@@ -36,6 +38,7 @@ temp/
 *.sls
 *.snm
 *.sty
+*.synctex(busy)
 *.synctex.gz*
 *.tdo
 *.toc
@@ -52,4 +55,4 @@ source/doc/tutorials/*-temp*.*
 ## include test files
 !test/*/*.tex
 !test/*/*.cls
-!test/*/*.sty
+!test/*/*.sty

LICENSE.md

@@ -2,7 +2,7 @@
  TUD-Script – Corporate Design of Technische Universität Dresden
 ----------------------------------------------------------------------------
 
- Copyright (C) Falk Hanisch <[email protected]>, 2012-2019
+ Copyright (C) Falk Hanisch <[email protected]>, 2012-2020
 
 ----------------------------------------------------------------------------
 

README.md

@@ -2,9 +2,9 @@
  TUD-Script – Corporate Design of Technische Universität Dresden
 ----------------------------------------------------------------------------
 
- Copyright (C) Falk Hanisch <[email protected]>, 2012-2019
+ Copyright (C) Falk Hanisch <[email protected]>, 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`
 

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}

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}

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}

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}

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}

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}

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}

source/doc/tudscr-hints.tex

@@ -102,8 +102,12 @@ \section{Worttrennungen in deutschsprachigen Texten}
 \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}

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}%

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 @@
 %
 \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}
 

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 @@
 %
 \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}
 

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 @@ \section{Einleitung}
 \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 @@ \section{Worttrennungen}
 %
 \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}
 %

source/install/tudscr-metrics.dtx

@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <[email protected]>, 2012-2019
+%  Copyright (C) Falk Hanisch <[email protected]>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -90,12 +90,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-}

source/install/tudscr-scripts.dtx

@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <[email protected]>, 2012-2019
+%  Copyright (C) Falk Hanisch <[email protected]>, 2012-2020
 %
 % ----------------------------------------------------------------------------
 %
@@ -113,12 +113,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-}