summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-08-09 20:01:54 +0000
committerKarl Berry <karl@freefriends.org>2022-08-09 20:01:54 +0000
commitc933b55e9ab028dafd369d7bc0cf16ea24473f45 (patch)
treed7598bec16bf78b2054511106c91d5ccf8550eec /Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
parent4e8c785c29a3d68045a3187b9e63158a778725ed (diff)
tudscr (9aug22)
git-svn-id: svn://tug.org/texlive/trunk@64085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty')
-rw-r--r--Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty230
1 files changed, 128 insertions, 102 deletions
diff --git a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
index cc9ec653bc8..d77d604c88a 100644
--- a/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
+++ b/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% tudscr-version.dtx (with options: `package,fixfonts')
+%% tudscr-version.dtx (with options: `package,fixfonts,identify')
%% tudscr-comp.dtx (with options: `package,fixfonts,identify')
%% tudscr-base.dtx (with options: `package,fixfonts,load')
%% tudscr-layout.dtx (with options: `package,fixfonts,option')
@@ -13,10 +13,11 @@
%% tudscr-comp.dtx (with options: `package,fixfonts,body')
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
+%% 2022/08/09 v2.06o TUD-Script
%%
-%% 2021/07/15 v2.06n TUD-Script
-%%
-%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2021
+%% Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2022
+%% https://github.com/tud-cd/tudscr
+%% https://latex.wcms-file3.tu-dresden.de/phpBB3/
%%
%% This file was generated from file(s) of the TUD-Script bundle.
%% ----------------------------------------------------------------------------
@@ -32,59 +33,65 @@
%%
%% The current maintainer and author of this work is Falk Hanisch.
%%
-%%% From File: tudscr-version.dtx
+%%%% From File: tudscr-version.dtx (no git version info was found)
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\begingroup
- \catcode`\@11\relax
- \ifx\TUD@Version\@undefined
- \newcommand*\TUD@Version@Check[1]{%
+ \catcode`\@11\relax%
+ \ifx\TUD@Version\@undefined%
+ \newcommand*\TUD@@Version[2]{%
\gdef\TUD@Version{#1}%
- \gdef\TUDScriptVersion{#1}%
- \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.32}%
- }
- \else
- \newcommand*\TUD@Version@Check[1]{%
+ \gdef\TUD@KOMAVersion{#2}%
+ }%
+ \else%
+ \newcommand*\TUD@@Version[2]{%
\def\@tempa{#1}%
\ifx\TUD@Version\@tempa\else%
\@latex@warning@no@line{%
\noexpand\TUD@Version\space is `\TUD@Version',\MessageBreak%
but `#1' was expected!\MessageBreak%
You should not use classes, packages or files from\MessageBreak%
- different TUD-Script-Bundle versions%
+ different TUD-Script bundle versions%
}%
\fi%
- }
- \fi
- \TUD@Version@Check{2021/07/15 v2.06n TUD-Script}
+ }%
+ \fi%
+ \TUD@@Version{2022/08/09 v2.06o TUD-Script}{2022/05/01 v3.36 KOMA-Script}%
+ \ifx\TUDScriptVersion\@undefined%
+ \xdef\TUDScriptVersion{\TUD@Version}%
+ \def\@tempa#1 v#2 #3\relax#4\relax#5{\gdef#5{#2}}%
+ \expandafter\@tempa\TUD@Version ? ?\relax\relax{\TUDScriptVersionNumber}%
+ \expandafter\@tempa\TUD@KOMAVersion ? ?\relax\relax{\TUD@KOMAVersionNumber}%
+ \fi%
\endgroup
-\NeedsTeXFormat{LaTeX2e}[2019/10/01]
-\providecommand*\tudscrmail{hanisch.latex@outlook.com}
\@ifundefined{TUDScript}{%
\DeclareRobustCommand\TUDScript{%
- \textsf{%
- T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
- }%
- \ifcsname xspace\endcsname%
- \xspace%
- \fi%
+ \mbox{%
+ \textsf{%
+ T\kern.05em U\kern.05em D\kern.1em-\kern.1em Script%
+ }%
+ }\ifcsname xspace\endcsname\xspace\fi%
}%
}{}
-%%% From File: tudscr-comp.dtx
-\ProvidesPackage{fix-tudscrfonts}[%
- 2021/07/15 v2.06n TUD-Script
+\providecommand*\TUDScriptContact{hanisch.latex@outlook.com}
+\providecommand*\TUDScriptRepository{https://github.com/tud-cd/tudscr}
+\providecommand*\TUDScriptForum{https://latex.wcms-file3.tu-dresden.de/phpBB3/}
+%%%% From File: tudscr-comp.dtx (no git version info was found)
+\ProvidesPackage{fix-tudscrfonts}%
+[%
+ 2022/08/09 v2.06o TUD-Script
package for font fixes
(compatibility for old tud(scr) classes)%
]
-%%% From File: tudscr-base.dtx
-\RequirePackage{tudscrbase}[\TUD@Version]
-%%% From File: tudscr-layout.dtx
-\newif\if@tud@heavyheadings
+%%%% From File: tudscr-base.dtx (no git version info was found)
+\RequirePackage{tudscrbase}[%
+ 2022/08/09 v2.06o TUD-Script
+]
+%%%% From File: tudscr-layout.dtx (no git version info was found)
+\tud@newif\if@tud@heavyheadings
\TUD@key{headings}{%
\TUD@set@numkey{headings}{@tempa}{%
{light}{0},{lightfont}{0},{lite}{0},{litefont}{0},{noheavyfont}{0},%
- {normal}{0},{standard}{0},{std}{0},{normalbold}{0},{boldnormal}{0},%
+ {standard}{0},{std}{0},{normalbold}{0},{boldnormal}{0},%
{heavy}{1},{heavyfont}{1},{bold}{1},{boldfont}{1},%
{ultrabold}{1},{boldultra}{1},{heavybold}{1},{boldheavy}{1},%
{extendedbold}{1},{boldextended}{1}%
@@ -97,29 +104,39 @@
\fi%
\fi%
}
-%%% From File: tudscr-misc.dtx
+%%%% From File: tudscr-misc.dtx (no git version info was found)
+\TUDExecuteOptions{%
+ headings=heavy%
+}
\DeclareOption*{%
\expandafter\PassOptionsToPackage\expandafter{\CurrentOption}%
{tudscrfonts}%
}
-\TUDExecuteOptions{%
- headings=heavy%
-}
\TUDProcessOptions\relax
-%%% From File: tudscr-layout.dtx
+%%%% From File: tudscr-layout.dtx (no git version info was found)
\AfterPackage{tudscrfonts}{%
\newcommand*\tud@sec@fontface[1][]{\tud@sec@@fontface{#1}}%
\newcommand*\tud@sec@@fontface[1]{%
\sectfont#1%
- \if@tud@cdfont@active\if@tud@heavyheadings%
- \if@tud@x@mweights@enabled%
- \edef\bfseries@rm{\tud@cdfont@ebf}%
- \edef\bfseries@sf{\tud@cdfont@ebf}%
- \edef\bfseries@tt{\tud@ttfont@ebf}%
+ \if@tud@cdfont@active%
+ \if@tud@heavyheadings%
+ \if@tud@x@mweights@enabled%
+ \edef\bfseries@rm{\tud@cdfont@ebf}%
+ \edef\bfseries@sf{\tud@cdfont@ebf}%
+ \edef\bfseries@tt{\tud@ttfont@ebf}%
+ \fi%
+ \let\bfdefault\tud@cdfont@ebf%
+ \fontseriesforce{\tud@cdfont@ebf}%
+ \fi%
+ \else%
+ \fontfamily{\tud@cdfont@fam}%
+ \if@tud@heavyheadings%
+ \let\bfdefault\tud@cdfont@ebf%
+ \else%
+ \let\bfdefault\tud@cdfont@bf%
\fi%
- \let\bfdefault\tud@cdfont@ebf%
- \fontseries{\tud@cdfont@ebf}%
- \fi\fi%
+ \fontseriesforce{\bfdefault}%
+ \fi%
\selectfont%
}
\if@tud@cdoldfont@active
@@ -131,48 +148,39 @@
\fi%
}%
\fi
-\newcommand*\tud@sec@format[2][]{%
- \IfArgIsEmpty{#1}{%
- \tud@sec@strut%
- }{%
- \begingroup%
- \usefontofkomafont{#1}%
- \tud@sec@strut%
- \endgroup%
- }%
- #2%
+\tud@newif\if@tud@sec
+\newrobustcmd*\tud@sec@format{%
+ \@tud@sectrue%
+ \kernel@ifstar{\tud@sec@@format{}}{\tud@sec@@format{\strut}}%
}
-\if@tud@cdoldfont@active
- \newcommand*\tud@sec@uppercase{\MakeUppercase}%
- \AfterPackage*{textcase}{%
- \renewcommand*\tud@sec@uppercase{\MakeTextUppercase}%
- }%
- \renewcommand*\tud@sec@format[2][]{%
- \@tud@res@swafalse%
- \IfArgIsEmpty{#1}{%
- \tud@sec@strut%
- \tud@ifdin{\@tud@res@swatrue}{}%
- }{%
- \begingroup%
- \usefontofkomafont{#1}%
- \tud@sec@strut%
- \tud@ifdin{\aftergroup\@tud@res@swatrue}{}%
- \endgroup%
+\newcommand*\tud@sec@@format[1]{%
+ \kernel@ifnextchar[%]
+ {\tud@sec@@@format{#1}}%
+ {\tud@sec@@@format{#1}[]}%
+}
+\newcommand*\tud@sec@@@format{}
+\def\tud@sec@@@format#1[#2]#3{%
+ \begingroup%
+ \IfArgIsEmpty{#2}%
+ {\let\tud@res@a\@firstofone}%
+ {\def\tud@res@a{\usekomafont{#2}}}%
+ \tud@res@a{%
+ \nobreak#1\nobreak\vphantom{\textsuperscript{\tud@font@phantomglyphs}}%
}%
- \if@tud@res@swa%
- \tud@sec@uppercase{#2}%
- \else%
- #2%
- \fi%
- }%
-\fi
-\newrobustcmd*\tud@sec@strut{%
+ \endgroup%
+ \tud@sec@@@@format{#3}%
}
+\newcommand*\tud@sec@@@@format[1]{#1}
+\if@tud@cdoldfont@active
+ \def\tud@sec@@@@format#1{\tud@ifdin{\MakeUppercase{#1}}{#1}}%
+\fi
}
-%%% From File: tudscr-comp.dtx
+%%%% From File: tudscr-comp.dtx (no git version info was found)
\AtEndPreamble{%
\tud@fixfonts@class@check%
- \RequirePackage{tudscrfonts}[\TUD@Version]%
+ \RequirePackage{tudscrfonts}[%
+ 2022/08/09 v2.06o TUD-Script
+ ]%
}
\ifx\usepackage\RequirePackage
\newcommand*\tud@fixfonts@class@check{%
@@ -215,6 +223,8 @@
\tud@cs@store{shapedefault}%
\tud@cs@store{normalfont}%
\let\normalfont\relax%
+ \let\abovecaptionskip\relax%
+ \let\belowcaptionskip\relax%
\PassOptionsToClass{serifmath}{#1}%
}%
\AfterClass{#1}{%
@@ -235,6 +245,10 @@
\tud@cs@restore{seriesdefault}%
\tud@cs@restore{shapedefault}%
\tud@cs@restore{normalfont}%
+ \newlength\abovecaptionskip%
+ \newlength\belowcaptionskip%
+ \setlength\abovecaptionskip{10\p@}%
+ \setlength\belowcaptionskip{0\p@}%
#2%
\AfterPackage{tudscrfonts}{%
\def\dinBold{\dinbn}%
@@ -325,29 +339,41 @@
\tud@fixfonts@class@adapt{tudposter}{}
\tud@fixfonts@class@adapt{tudbeamer}{}
\tud@fixfonts@class@adapt{tudbook}{%
- \patchcmd{\@makechapterhead}{\dinBold\Huge\bfseries}{%
+ \patchcmd\@makechapterhead{%
+ \dinBold\Huge\bfseries%
+ }{%
\tud@sec@fontface%
\if@color\color{HKS41-100}\fi%
\Huge%
}{}{\tud@patch@wrn{@makechapterhead}}%
- \patchcmd{\@makechapterhead}{\MakeUppercase}{%
+ \patchcmd\@makechapterhead{%
+ \MakeUppercase%
+ }{%
\tud@sec@format%
}{}{\tud@patch@wrn{@makechapterhead}}%
- \patchcmd{\@makeschapterhead}{\dinBold\Huge\bfseries}{%
+ \patchcmd\@makeschapterhead{%
+ \dinBold\Huge\bfseries%
+ }{%
\tud@sec@fontface%
\if@color\color{HKS41-100}\fi%
\Huge%
}{}{\tud@patch@wrn{@makeschapterhead}}%
- \patchcmd{\@makeschapterhead}{\MakeUppercase}{%
+ \patchcmd\@makeschapterhead{%
+ \MakeUppercase%
+ }{%
\tud@sec@format%
}{}{\tud@patch@wrn{@makeschapterhead}}%
- \patchcmd{\section}{\dinBold\Large\bfseries\MakeUppercase}{%
+ \patchcmd\section{%
+ \dinBold\Large\bfseries\MakeUppercase%
+ }{%
\tud@sec@fontface%
\if@color\color{HKS41-100}\fi%
\Large%
\tud@sec@format%
}{}{\tud@patch@wrn{section}}%
- \patchcmd{\showtitle}{\dinBold\Huge\bfseries\MakeUppercase}{%
+ \patchcmd\showtitle{%
+ \dinBold\Huge\bfseries\MakeUppercase%
+ }{%
\tud@sec@fontface%
\if@colortitle\color{HKS41-30}\fi%
\Huge%
@@ -355,6 +381,7 @@
}{}{\tud@patch@wrn{showtitle}}%
}
\tud@fixfonts@class@adapt{tudmathposter}{%
+ \ifunivers\PassOptionsToPackage{cdoldfont}{tudscrfonts}\fi%
\def\raggedtitle{\tud@raggedright}%
\renewcommand*\raggedpart{\tud@raggedright}%
\renewcommand*\raggedsection{\tud@raggedright}%
@@ -382,32 +409,31 @@
\fi
}%
}%
- \apptocmd{\maketitle}{\vspace{-6ex}}{}{\tud@patch@wrn{maketitle}}%
+ \apptocmd\maketitle{%
+ \vspace{-6ex}%
+ }{}{\tud@patch@wrn{maketitle}}%
\renewcommand*\subtitlefont{%
\unskip%
\tud@sec@fontface%
\huge%
}%
\renewcommand*\preprocesstitle[1]{\raggedtitle\tud@sec@format{#1}}%
- \if@mathevorgabe%
- \undef\sectionfont%
- \undef\subsectionfont%
- \fi%
- \newcommand*\sectionfont{\bfseries\LARGE}%
- \newcommand*\subsectionfont{\sectionfont\large}%
- \patchcmd{\ps@tudposter}{\textbf{\@einrichtung}}{%
- \textbf{\fontseries{b}\selectfont\@einrichtung}%
+ \def\sectionfont{\tud@sec@fontface\LARGE}%
+ \def\subsectionfont{\tud@sec@fontface\large}%
+ \patchcmd\ps@tudposter{%
+ \textbf{\@einrichtung}%
+ }{%
+ {\fontseries{b}\selectfont\@einrichtung}%
}{}{\tud@patch@wrn{ps@tudposter}}%
\pagestyle{tudposter}%
}
\newcommand*\tud@x@tudfonts@prevent{%
- \RequirePackage{amsmath}%
- \RequirePackage{amsfonts}%
\newif\if@tudfonts@nodin%
\let\DeclareTudMathSizes\@gobblefour%
\let\tud@x@tudfonts@prevent\relax%
}
\PreventPackageFromLoading[\tud@x@tudfonts@prevent]{tudfonts}
+\PreventPackageFromLoading{opensans}
\endinput
%%
%% End of file `fix-tudscrfonts.sty'.