summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrkbase.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty46
1 files changed, 35 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 7eafbe65746..0c1794f7de8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,19 +67,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(%
KOMA-Script-dependent
@@ -243,16 +243,16 @@
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: option)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{scrlfile}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: body)
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
@@ -420,15 +420,22 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\newcommand*{\IfExistskomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
+ \scr@ifundefinedorrelax{scr@fnt@#1}{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
}{%
\@firstoftwo
}%
}
+\newcommand*{\IfIsAliaskomafont}[1]{%
+ \scr@ifundefinedorrelax{scr@fnt@#1}{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
+ }{%
+ \@secondoftwo
+ }%
+}
\newcommand*{\setkomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -604,6 +611,13 @@
\l@addto@macro\scr@komafontonearglist{\do#1}%
}
\newcommand*{\newkomafont}[3][\relax]{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@#2}{}{%
+ \PackageWarning{scrkbase}{%
+ Making stand-alone element `#2' from\MessageBreak
+ alias to `\@nameuse{scr@fnt@instead@#2}'
+ }%
+ \expandafter\let\csname scr@fnt@instead@#2\endcsname\relax
+ }%
\expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
\expandafter\expandafter\expandafter\newcommand
\expandafter\expandafter\expandafter*%
@@ -615,6 +629,16 @@
\fi
}
\newcommand*{\aliaskomafont}[2]{%
+ \scr@ifundefinedorrelax{scr@fnt@#1}{}{%
+ \PackageWarning{scrkbase}{%
+ Redefining stand alone element `#1' as\MessageBreak
+ alias to `#2'%
+ }
+ \expandafter\let\csname scr@fnt@#1\endcsname\relax
+ }%
+ \scr@ifundefinedorrelax{scr@fnt@wrn@#1}{}{%
+ \expandafter\let\csname scr@fnt@wrn@#1\encsname\relax
+ }
\expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
#2%
}%