summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-13 22:06:52 +0000
committerKarl Berry <karl@freefriends.org>2017-09-13 22:06:52 +0000
commitd4d66453da7ea3fd6fc443a113b45031e79b0e30 (patch)
tree04a1486ad845a02e1ba67849cb2176831e1e6258 /Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
parentc15b52b518c7d48d1a35d11dd2ba8c34ca8ee373 (diff)
koma-script (14sep17)
git-svn-id: svn://tug.org/texlive/trunk@45292 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrkbase.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty117
1 files changed, 68 insertions, 49 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 6662cc5a994..7eafbe65746 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -13,7 +13,7 @@
%% scrkernel-fonts.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,9 +43,9 @@
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
%% standard classes created by The LaTeX3 Project 1994-1996. You may
%% find a complete unmodified copy of LaTeX2e at
-%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,21 +67,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (prepare)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2017/04/13 v3.23 KOMA-Script
- package (%
+ 2017/09/07 v3.24 KOMA-Script
+ package
+ (%
KOMA-Script-dependent
- basics and keyval usage)]
+ basics and keyval usage)]
\RequirePackage{scrbase}[\KOMAScriptVersion]
\newcommand*{\KOMA@key}[1][.\@currname.\@currext]{%
\DefineFamilyMember[{#1}]{KOMA}%
@@ -241,14 +243,17 @@
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (option)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrlfile.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{scrlfile}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (body)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
}
@@ -415,7 +420,8 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\IfExistskomafont}[1]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
@@ -513,15 +519,19 @@
\newcommand*{\usesizeofkomafont}[1]{%
\begingroup
\scr@prepareforkomafont
+ \def\selectfont{%
+ \global\let\g@scr@f@size\f@size
+ \global\let\g@scr@f@baselineskip\f@baselineskip
+ \global\let\g@scr@f@linespread\f@linespread
+ }%
+ \selectfont
\sbox\@tempboxa{%
- \usekomafont{#1}{%
- \xdef\g@scr@usefont{%
- \noexpand\fontsize{\f@size}{\f@baselineskip}\noexpand\selectfont
- }%
- }%
+ \usekomafont{#1}{\relax}%
}%
\endgroup
- \g@scr@usefont
+ \linespread{\g@scr@f@linespread}%
+ \fontsize{\g@scr@f@size}{\g@scr@f@baselineskip}%
+ \selectfont
}
\newcommand*{\usefamilyofkomafont}{\use@ofkomafont{family}}
\newcommand*{\useseriesofkomafont}{\use@ofkomafont{series}}
@@ -530,53 +540,59 @@
\newcommand*{\usefontofkomafont}[1]{%
\begingroup
\scr@prepareforkomafont
+ \def\selectfont{%
+ \global\let\g@scr@f@encoding\f@encoding
+ \global\let\g@scr@f@family\f@family
+ \global\let\g@scr@f@series\f@series
+ \global\let\g@scr@f@shape\f@shape
+ \global\let\g@scr@f@size\f@size
+ \global\let\g@scr@f@baselineskip\f@baselineskip
+ \global\let\g@scr@f@linespread\f@linespread
+ }%
+ \selectfont
\sbox\@tempboxa{%
- \usekomafont{#1}{%
- \xdef\g@scr@usefont{%
- \noexpand\fontsize{\f@size}{\f@baselineskip}%
- \noexpand\usefont{\f@encoding}{\f@family}{\f@series}{\f@shape}%
- }%
- }%
+ \usekomafont{#1}{\relax}%
}%
\endgroup
- \g@scr@usefont
+ \linespread{\g@scr@f@linespread}%
+ \fontsize{\g@scr@f@size}{\g@scr@f@baselineskip}%
+ \usefont{\g@scr@f@encoding}{\g@scr@f@family}{\g@scr@f@series}{\g@scr@f@shape}%
}
\newcommand*{\use@ofkomafont}[2]{%
\begingroup
\scr@prepareforkomafont
+ \def\selectfont{%
+ \global\expandafter\let\csname g@scr@f@#1\expandafter\endcsname
+ \csname f@#1\endcsname
+ }%
+ \selectfont
\sbox\@tempboxa{%
- \usekomafont{#2}{%
- \xdef\g@scr@usefont{%
- \expandafter\noexpand
- \csname font#1\endcsname{\csname f@#1\endcsname}\noexpand\selectfont
- }%
- }%
+ \usekomafont{#2}{\relax}%
}%
\endgroup
- \g@scr@usefont
-}
-\newcommand*{\g@scr@usefont}{%
- \PackageError{scrkbase}{%
- undefined usage of \string\g@scr@usefont
- }{%
- \string\g@scr@usefont\space is an internal macro of KOMA-Script and
- should\MessageBreak
- not be used this way.\MessageBreak
- This may be an internal error of KOMA-Script, a mistake of a package
- author,\MessageBreak
- or a mistake of the user.%
- }%
-}
+ \@nameuse{font#1}{\csname g@scr@f@#1\endcsname}%
+ \selectfont
+}
+\newcommand*{\g@scr@f@encoding}{}\let\g@scr@f@encoding\f@encoding
+\newcommand*{\g@scr@f@family}{}\let\g@scr@f@family\f@family
+\newcommand*{\g@scr@f@series}{}\let\g@scr@f@series\f@series
+\newcommand*{\g@scr@f@shape}{}\let\g@scr@f@shape\f@shape
+\newcommand*{\g@scr@f@size}{}\let\g@scr@f@size\f@size
+\newcommand*{\g@scr@f@baselineskip}{}\let\g@scr@f@baselineskip\f@baselineskip
+\newcommand*{\g@scr@f@linespread}{}\let\g@scr@f@linespread\f@linespread
\newcommand*{\scr@komafontrelaxlist}{%
\do\normalcolor
- \do\uppercase \do\lowercase \do\MakeUppercase \do\MakeLowercase
}
\newcommand*{\scr@komafontgobblelist}{%
\do\color
}
+\newcommand*{\scr@komafontonearglist}{%
+ \do\MakeUppercase \do\MakeLowercase
+}
\newcommand*{\scr@prepareforkomafont}{%
\long\def\do##1{\let##1\relax}\scr@komafontrelaxlist
\long\def\do##1{\let##1\@gobble}\scr@komafontgobblelist
+ \long\def\do##1{\let##1\@firstofone}\scr@komafontonearglist
}
\newcommand*{\addtokomafontrelaxlist}[1]{%
\l@addto@macro\scr@komafontrelaxlist{\do#1}%
@@ -584,6 +600,9 @@
\newcommand*{\addtokomafontgobblelist}[1]{%
\l@addto@macro\scr@komafontgobblelist{\do#1}%
}
+\newcommand*{\addtokomafontonearglist}[1]{%
+ \l@addto@macro\scr@komafontonearglist{\do#1}%
+}
\newcommand*{\newkomafont}[3][\relax]{%
\expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
\expandafter\expandafter\expandafter\newcommand
@@ -600,7 +619,7 @@
#2%
}%
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}