Merge branch 'hotfix/v2.06l'

tud-cd · Mar 30, 2021 · cb05af6 · cb05af6
2 parents 64e5bc6 + f1cf1a0
commit cb05af6
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 31 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -2,7 +2,7 @@
  TUD-Script &ndash; Corporate Design of Technische Universität Dresden
 ----------------------------------------------------------------------------
 
- Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
+ Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
 
 ----------------------------------------------------------------------------
 

diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
  TUD-Script &ndash; Corporate Design of Technische Universität Dresden
 ----------------------------------------------------------------------------
 
- Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
+ Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
 
- tudscr 2020/11/10 v2.06k
+ tudscr 2021/03/30 v2.06l
 
  The current release is shiped via CTAN: https://www.ctan.org/pkg/tudscr
 
@@ -57,6 +57,10 @@ Das Bundle beinhaltet:
 Versionen
 ---------
 
+**v2.06l** (2021/03/30)
++ Fix für Festlegung des Seitenstils in der Präambel
++ Fix für das Durchreichen von Optionen mit LaTeX 2021/05/01
+
 **v2.06k** (2020/11/10)
 + Fix für doppelte Leerzeichen in `\confirmation` etc.
 
@@ -272,6 +276,10 @@ The bundle offers:
 Versions
 --------
 
+**v2.06l** (2021/03/30)
++ bug fix for defining the page style in the preamble
++ bug fix for passing options with LaTeX 2021/05/01
+
 **v2.06k** (2020/11/10)
 + bug fix for multiple spaces in `\confirmation` etc.
 

diff --git a/source/doc/tudscr.tex b/source/doc/tudscr.tex
@@ -29,7 +29,7 @@
   \endgroup%
 }
 \faculty{\cdurl}
-\date{2020-11-10}
+\date{2021-03-30}
 \author{%
   Falk Hanisch%
   \expandafter\emailaddress\expandafter{\tudscrmail}%

diff --git a/source/doc/tutorials/mathswap.tex b/source/doc/tutorials/mathswap.tex
@@ -31,7 +31,7 @@
   \hypersetup{%
     pdfauthor = {\@author},%
     pdftitle = {\@title},%
-    pdfsubject = {Mathematiksatz in \hologo{LaTeXe}},%
+    pdfsubject = {Mathematiksatz in LaTeX},%
     pdfkeywords = {LaTeX, \TUDScript, Tutorial, Mathematiksatz},%
   }%
 \endgroup%

diff --git a/source/doc/tutorials/mathtype.tex b/source/doc/tutorials/mathtype.tex
@@ -30,7 +30,7 @@
   \hypersetup{%
     pdfauthor = {\@author},%
     pdftitle = {\@title},%
-    pdfsubject = {Mathematiksatz in \hologo{LaTeXe}},%
+    pdfsubject = {Mathematiksatz in LaTeX},%
     pdfkeywords = {LaTeX, \TUDScript, Tutorial, Mathematiksatz},%
   }%
 \endgroup%

diff --git a/source/doc/tutorials/treatise.tex b/source/doc/tutorials/treatise.tex
@@ -75,18 +75,12 @@
 \usetikzlibrary{decorations.markings}
 \tikzset{on grid}
 
+% TODO pst-pdf funktioniert momentan nicht mit hyperref 
+%      github.com/rolfn/pst-pdf/issues/6
 \usepackage{pstricks,pst-node}
 
 \makeatletter
 \newcommand*\pcolumnfuzz[1]{\pretocmd{\@endpbox}{\hfuzz=#1}{}{}}
-\newcommand*\setpspicturecounter[1]{\setcounter{pspicture}{#1}}
-\AfterPackage*{pst-pdf}{%
-  \@ifpackagelater{pst-pdf}{2017/06/23}{%
-    \renewcommand*\setpspicturecounter[1]{%
-      \@latex@warning{Package `pst-pdf' was updated}%
-    }
-  }{}%
-}
 \makeatother
 
 \usepackage{bookmark}
@@ -179,7 +173,7 @@
   \hypersetup{%
     pdfauthor = {\@author},%
     pdftitle = {\@title},%
-    pdfsubject = {Tutorial für \hologo{LaTeXe}},%
+    pdfsubject = {Tutorial für LaTeX},%
     pdfkeywords = {LaTeX, \TUDScript, Tutorial, Anwenderleitfaden},%
   }%
 \endgroup%
@@ -3121,7 +3115,6 @@ \subsection{Das Paket \Package{pstricks}}
 %
 Die innerhalb einer Gleitumgebung erzeugte \Package{pstricks}"=Grafik ist in 
 \autoref{fig:pstricks} dargestellt.
-\setpspicturecounter{24}%
 \begin{Hint?}
 \begin{figure}
 \begin{pspicture}(0,-2)(100,64)

diff --git a/source/tudscr-comp.dtx b/source/tudscr-comp.dtx
@@ -1,10 +1,10 @@
-% \CheckSum{1458}
+% \CheckSum{1459}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
 %
 % ----------------------------------------------------------------------------
 %
@@ -393,6 +393,8 @@
 % \changes{v2.06j}{2020/09/29}{neu}^^A
 % \begin{macro}{\tud@v@2.06k}
 % \changes{v2.06k}{2020/11/10}{neu}^^A
+% \begin{macro}{\tud@v@2.06l}
+% \changes{v2.06l}{2021/03/30}{neu}^^A
 % \begin{macro}{\tud@v@last}
 % \changes{v2.02}{2014/08/22}{neu}^^A
 % \changes{v2.03}{2015/01/13}{angepasst}^^A
@@ -440,9 +442,11 @@
 \csdef{tud@v@2.06i}{4}
 \csdef{tud@v@2.06j}{4}
 \csdef{tud@v@2.06k}{4}
+\csdef{tud@v@2.06l}{4}
 \csdef{tud@v@last}{4}
 %    \end{macrocode}
 % \end{macro}^^A \tud@v@last
+% \end{macro}^^A \tud@v@2.06l
 % \end{macro}^^A \tud@v@2.06k
 % \end{macro}^^A \tud@v@2.06j
 % \end{macro}^^A \tud@v@2.06i

diff --git a/source/tudscr-misc.dtx b/source/tudscr-misc.dtx
@@ -1,10 +1,10 @@
-% \CheckSum{324}
+% \CheckSum{334}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
 %
 % ----------------------------------------------------------------------------
 %
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-misc.dtx}[2020/09/29 v2.06j TUD-Script\space%
+\ProvidesFile{tudscr-misc.dtx}[2021/03/30 v2.06l TUD-Script\space%
   (miscellaneous)%
 ]
 %
@@ -344,7 +344,7 @@
 %    \begin{macrocode}
 \newcommand*\tud@x@scr@checkoptions{%
   \expandafter\tud@x@scr@pt\CurrentOption pt\@nil%
-  \PassOptionsToClass{\CurrentOption}{\TUD@Class@KOMA}%
+  \expandafter\PassOptionsToClass\expandafter{\CurrentOption}{\TUD@Class@KOMA}%
 }
 %    \end{macrocode}
 % Wird die Schriftgröße im veralteten Format \val{\dots pt} übergeben, so wird 
@@ -557,21 +557,21 @@
 %    \begin{macrocode}
 %<*package>
 %<*fonts>
-\DeclareOption*{\KOMAoptions{\CurrentOption}}
+\DeclareOption*{\expandafter\KOMAoptions\expandafter{\CurrentOption}}
 %</fonts>
 %<*fixfonts>
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{tudscrfonts}}
+\DeclareOption*{\expandafter\PassOptionsToPackage\expandafter{\CurrentOption}{tudscrfonts}}
 %</fixfonts>
 %<*comp>
-\DeclareOption*{\TUDoptions{\CurrentOption}}
+\DeclareOption*{\expandafter\TUDoptions\expandafter{\CurrentOption}}
 %</comp>
 %</package>
 %<*class>
 %<*!inherit>
 \DeclareOption*{\tud@x@scr@checkoptions}
 %</!inherit>
 %<*inherit>
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{\TUD@Class@Parent}}
+\DeclareOption*{\expandafter\PassOptionsToClass\expandafter{\CurrentOption}{\TUD@Class@Parent}}
 %</inherit>
 %</class>
 %    \end{macrocode}

diff --git a/source/tudscr-pagestyle.dtx b/source/tudscr-pagestyle.dtx
@@ -1,10 +1,10 @@
-% \CheckSum{2044}
+% \CheckSum{2046}
 % \iffalse meta-comment
 %
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
 %
 % ----------------------------------------------------------------------------
 %
@@ -52,7 +52,7 @@
 % \fi
 %
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-pagestyle.dtx}[2020/09/29 v2.06j TUD-Script\space%
+\ProvidesFile{tudscr-pagestyle.dtx}[2021/03/30 v2.06l TUD-Script\space%
   (pagestyle)%
 ]
 %
@@ -121,6 +121,7 @@
 \if@tud@x@standalone@crop
   \PreventPackageFromLoading{scrlayer-scrpage}%
 \else
+  \PassOptionsToPackage{automark}{scrlayer-scrpage}%
   \AtEndPreamble{\RequirePackage{scrlayer-scrpage}[2020/09/21]}%
 \fi
 %    \end{macrocode}
@@ -649,6 +650,7 @@
 %    \begin{macrocode}
 \tud@cs@store{pagestyle}
 \renewcommand*\pagestyle[1]{%
+  \csuse{ps@#1}%
   \AfterAtEndOfPackage*{scrlayer-scrpage}{\pagestyle{#1}}%
 }
 \BeforePackage{scrlayer-scrpage}{%

diff --git a/source/tudscr-version.dtx b/source/tudscr-version.dtx
@@ -4,7 +4,7 @@
 %  TUD-Script -- Corporate Design of Technische Universität Dresden
 % ----------------------------------------------------------------------------
 %
-%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
+%  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
 %
 % ----------------------------------------------------------------------------
 %
@@ -128,7 +128,7 @@
 %<*!(package|class)>
   \fi
 %</!(package|class)>
-  \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
+  \TUD@Version@Check{2021/03/30 v2.06l TUD-Script}
 \endgroup
 %    \end{macrocode}
 % \end{macro}^^A \TUDScriptVersionNumber
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
      TUD-Script &ndash; Corporate Design of Technische Universität Dresden
     ----------------------------------------------------------------------------
-     Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
+     Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
     ----------------------------------------------------------------------------
@@ Expand Down @@