diff options
author | Karl Berry <karl@freefriends.org> | 2019-06-28 21:06:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-06-28 21:06:55 +0000 |
commit | 6677e7d16babf1c0596fd30f9aeb6b13433725cd (patch) | |
tree | 84163738e611a8ebcbbed7102f3efa9238211476 /Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx | |
parent | 2a2ad17b85ef254d44022ec0fbcadb62cc90f431 (diff) |
tudscr (28jun19)
git-svn-id: svn://tug.org/texlive/trunk@51500 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx | 107 |
1 files changed, 61 insertions, 46 deletions
diff --git a/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx b/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx index 78d17bc1536..57017e11361 100644 --- a/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx +++ b/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx @@ -1,10 +1,10 @@ -% \CheckSum{809} +% \CheckSum{815} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden % ---------------------------------------------------------------------------- % -% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2017 +% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2019 % % ---------------------------------------------------------------------------- % @@ -48,17 +48,24 @@ % % \iffalse %%% From File: tudscr-frontmatter.dtx -%<*driver> -\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi -\ProvidesFile{tudscr-frontmatter.dtx}[% - 2017/05/30 v2.05m TUD-Script (frontmatter)% +%<*dtx> +% \fi +% +\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi +\ProvidesFile{tudscr-frontmatter.dtx}[2019/06/28 v2.06 TUD-Script\space% + (frontmatter)% ] -\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst} +% +% \iffalse \documentclass[english,ngerman,xindy]{tudscrdoc} -\usepackage[T1]{fontenc} -\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}} +\ifpdftex{ + \usepackage[T1]{fontenc} + \usepackage[ngerman=ngerman-x-latest]{hyphsubst} +}{ + \usepackage{fontspec} +} \usepackage{babel} -\usepackage{tudscrfonts} % only load this package, if the fonts are installed +\usepackage{tudscrfonts} \KOMAoptions{parskip=half-} \usepackage{bookmark} \usepackage[babel]{microtype} @@ -75,7 +82,7 @@ \tableofcontents \DocInput{\filename} \end{document} -%</driver> +%</dtx> % \fi % % \selectlanguage{ngerman} @@ -170,6 +177,9 @@ % % \begin{macro}{\tud@fm@toc} % \changes{v2.04}{2015/03/20}{neu}^^A +% \changes{v2.06}{2018/02/22}{% +% Bugfix: \cs{csuse\{phantomsection\}} für Anker% +% }^^A % \begin{macro}{\tud@fm@@toc} % \changes{v2.04}{2015/03/20}{neu}^^A % \begin{macro}{\tud@fm@@@toc} @@ -193,6 +203,7 @@ }% \let\clearpage\relax% \sbox\z@{\vbox{#2}}% + \csuse{phantomsection}% \protected@edef\@tempa{% \noexpand\endgroup% \noexpand\ifnumodd{\csname tud@#1@toc@num\endcsname}{% @@ -216,12 +227,12 @@ \ClassWarning{\TUD@Class@Name}{% It isn't possible to use `#1=single'\MessageBreak% %<*book|report> - or `#1=chapter' + or `#1=chapter'\space% %</book|report> with `#1=tocmultiple'% }% \edef\@tempa{% - \noexpand\cs@set@lock{tud@#1@toc@num}{% + \noexpand\tud@locked@num@set{tud@#1@toc@num}{% \the\numexpr\csuse{tud@#1@toc@num}-2\relax% }% }% @@ -543,8 +554,8 @@ % % Des Weiteren werden mehrere Schlüssel für die Anordnung und Positionierung % von Zusammenfassung bzw. Erklärungen bereitgestellt. Diese dienen dem Setzen -% der Optionen \opt{abstract/declaration} mit den Werten \val{single/multi}, -% \val{toc/notoc}, \val{fill/nofill} sowie \val{leveldown}. +% der Optionen \opt{abstract} bzw. \opt{declaration} mit den Werten +% \val{single/multi}, \val{toc/notoc}, \val{fill/nofill} sowie \val{leveldown}. % \begin{macrocode} \newcommand*\tud@fm@switch{% {section}{2},{sect}{2},{sec}{2},{addsec}{2},% @@ -608,11 +619,11 @@ % \begin{macrocode} %<*report|article|poster> \newcommand*\tud@abstract@level@num{0} -%<report|article>\cs@lock{tud@abstract@toc@num}{0} +%<report|article>\tud@locked@newnum{tud@abstract@toc@num}{0} %</report|article|poster> %<*book> \newcommand*\tud@abstract@level@num{3} -\cs@lock{tud@abstract@toc@num}{1} +\tud@locked@newnum{tud@abstract@toc@num}{1} %</book> % \end{macrocode} % \end{macro}^^A \tud@abstract@toc@num@locked @@ -679,21 +690,21 @@ \ifcase\@tempa\relax% false %<*report|article|poster> \renewcommand*\tud@abstract@level@num{0}% -%<report|article> \cs@std@lock{tud@abstract@toc@num}{0}% +%<report|article> \tud@locked@num@preset{tud@abstract@toc@num}{0}% %</report|article|poster> \or% true %<*report|article|poster> \renewcommand*\tud@abstract@level@num{1}% -%<report|article> \cs@std@lock{tud@abstract@toc@num}{0}% +%<report|article> \tud@locked@num@preset{tud@abstract@toc@num}{0}% %</report|article|poster> \or% section \renewcommand*\tud@abstract@level@num{2}% %<*book|report|article> - \cs@std@lock{tud@abstract@toc@num}{1}% + \tud@locked@num@preset{tud@abstract@toc@num}{1}% \or% chapter %<*book|report> \renewcommand*\tud@abstract@level@num{3}% - \cs@std@lock{tud@abstract@toc@num}{1}% + \tud@locked@num@preset{tud@abstract@toc@num}{1}% %</book|report> %</book|report|article> % \end{macrocode} @@ -720,26 +731,26 @@ % Möglichkeiten im Makro \cs{tud@abstract@toc@num} zusammengefasst. % \begin{macrocode} \or% nottotoc - \cs@set@lock{tud@abstract@toc@num}{0}% + \tud@locked@num@set{tud@abstract@toc@num}{0}% \or% totoc \ifnum\tud@abstract@toc@num<\thr@@\relax% - \cs@set@lock{tud@abstract@toc@num}{1}% + \tud@locked@num@set{tud@abstract@toc@num}{1}% \else% - \cs@set@lock{tud@abstract@toc@num}{3}% + \tud@locked@num@set{tud@abstract@toc@num}{3}% \fi% \or% totocleveldown \ifnum\tud@abstract@toc@num<\thr@@\relax% - \cs@set@lock{tud@abstract@toc@num}{2}% + \tud@locked@num@set{tud@abstract@toc@num}{2}% \else% - \cs@set@lock{tud@abstract@toc@num}{4}% + \tud@locked@num@set{tud@abstract@toc@num}{4}% \fi% \or% totocmutliple \ifnum\tud@abstract@toc@num=\z@\relax% - \cs@set@lock{tud@abstract@toc@num}{1}% + \tud@locked@num@set{tud@abstract@toc@num}{1}% \fi% \ifnum\tud@abstract@toc@num<\thr@@\relax% \edef\@tempa{% - \noexpand\cs@set@lock{tud@abstract@toc@num}{% + \noexpand\tud@locked@num@set{tud@abstract@toc@num}{% \the\numexpr\tud@abstract@toc@num+2\relax% }% }\@tempa% @@ -789,8 +800,8 @@ % innerhalb von \cs{tud@abstractbody} verwendet. % \begin{macrocode} %<*report|article|poster> -\csundef{abstract} -\csundef{endabstract} +\undef\abstract +\undef\endabstract %</report|article|poster> \NewEnviron{abstract}[1][]{% % \end{macrocode} @@ -800,8 +811,10 @@ % der Verwendung einer Titelseite der Seitenstil definiert werden. Dafür wird % das dafür verantwortliche Makro \cs{tud@envir@ps} auf \cs{relax} gesetzt. % \begin{macrocode} -%<*book|report|article> +%<*book|report> \ifnum\tud@abstract@level@num>\tw@\relax\@titlepagetrue\fi% chapter +%</book|report> +%<*book|report|article> \let\tud@envir@ps\relax% %</book|report|article> % \end{macrocode} @@ -872,7 +885,7 @@ % \begin{macrocode} \TUD@parameter@family{abstract}{% \TUD@parameter@def{language}{\selectlanguage{#1}}% - \TUD@parameter@def{columns}{\cs@std@lock{tud@x@multicol@num}{#1}}% + \TUD@parameter@def{columns}{\renewcommand*\tud@x@multicol@num{#1}}% %<*book|report|article> \TUD@parameter@def{pagestyle}{\tud@fm@pagestyle{abstract}{#1}}% % \end{macrocode} @@ -946,11 +959,11 @@ % \begin{macrocode} %<*report|article> \newcommand*\tud@declaration@level@num{1} -\cs@lock{tud@declaration@toc@num}{0} +\tud@locked@newnum{tud@declaration@toc@num}{0} %</report|article> %<*book> \newcommand*\tud@declaration@level@num{3} -\cs@lock{tud@declaration@toc@num}{1} +\tud@locked@newnum{tud@declaration@toc@num}{1} %</book> \newif\if@tud@declaration@multi \@tud@declaration@multitrue @@ -978,17 +991,17 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed% \ifcase\@tempa\relax% false \renewcommand*\tud@declaration@level@num{0}% - \cs@std@lock{tud@declaration@toc@num}{0}% + \tud@locked@num@preset{tud@declaration@toc@num}{0}% \or% true \renewcommand*\tud@declaration@level@num{1}% - \cs@std@lock{tud@declaration@toc@num}{0}% + \tud@locked@num@preset{tud@declaration@toc@num}{0}% \or% section \renewcommand*\tud@declaration@level@num{2}% - \cs@std@lock{tud@declaration@toc@num}{1}% + \tud@locked@num@preset{tud@declaration@toc@num}{1}% \or% chapter %<*book|report> \renewcommand*\tud@declaration@level@num{3}% - \cs@std@lock{tud@declaration@toc@num}{1}% + \tud@locked@num@preset{tud@declaration@toc@num}{1}% %</book|report> \or% single \@tud@declaration@multifalse% @@ -1003,26 +1016,26 @@ \or% nomarkboth \@tud@declaration@markbothfalse% \or% nottotoc - \cs@set@lock{tud@declaration@toc@num}{0}% + \tud@locked@num@set{tud@declaration@toc@num}{0}% \or% totoc \ifnum\tud@declaration@toc@num<\thr@@\relax% - \cs@set@lock{tud@declaration@toc@num}{1}% + \tud@locked@num@set{tud@declaration@toc@num}{1}% \else% - \cs@set@lock{tud@declaration@toc@num}{3}% + \tud@locked@num@set{tud@declaration@toc@num}{3}% \fi% \or% totocleveldown \ifnum\tud@declaration@toc@num<\thr@@\relax% - \cs@set@lock{tud@declaration@toc@num}{2}% + \tud@locked@num@set{tud@declaration@toc@num}{2}% \else% - \cs@set@lock{tud@declaration@toc@num}{4}% + \tud@locked@num@set{tud@declaration@toc@num}{4}% \fi% \or% totocmutliple \ifnum\tud@declaration@toc@num=\z@\relax% - \cs@set@lock{tud@declaration@toc@num}{1}% + \tud@locked@num@set{tud@declaration@toc@num}{1}% \fi% \ifnum\tud@declaration@toc@num<\thr@@\relax% \edef\@tempa{% - \noexpand\cs@set@lock{tud@declaration@toc@num}{% + \noexpand\tud@locked@num@set{tud@declaration@toc@num}{% \the\numexpr\tud@declaration@toc@num+2\relax% }% }\@tempa% @@ -1066,7 +1079,9 @@ \newif\if@tud@declarations \NewEnviron{declarations}[1][]{% \@tud@declarationstrue% +%<*book|report> \ifnum\tud@declaration@level@num>\tw@\relax\@titlepagetrue\fi% chapter +%</book|report> \let\tud@envir@ps\relax% \TUD@parameter@set{declaration}{#1}% \tud@x@multicol@check% @@ -1123,7 +1138,7 @@ % \begin{macrocode} \TUD@parameter@family{declaration}{% \TUD@parameter@def{language}{\selectlanguage{#1}}% - \TUD@parameter@def{columns}{\cs@std@lock{tud@x@multicol@num}{#1}}% + \TUD@parameter@def{columns}{\renewcommand*\tud@x@multicol@num{#1}}% \TUD@parameter@def{pagestyle}{\tud@fm@pagestyle{declaration}{#1}}% \TUD@parameter@def{markboth}[true]{% \ifstrbool{#1}{% |