summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-26 23:18:36 +0000
committerKarl Berry <karl@freefriends.org>2013-12-26 23:18:36 +0000
commit9b219d1b664067729034647a4b37626cf2bf5e26 (patch)
tree00708467b44f90736dc32ed1bebb95e9c4710139 /Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
parentc00c8298eb6913b74270a36c1f1018f1e9946f7b (diff)
koma-script (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32489 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.sty237
1 files changed, 117 insertions, 120 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 9a68b924979..0852a04ac5d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -1,19 +1,18 @@
%%
%% This is file `scrkbase.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package,scrkbase')
-%% scrkbase.dtx (with options: `package,option,koma')
-%% scrkfont.dtx (with options: `package,option,scrkbase')
+%% scrkernel-version.dtx (with options: `package,scrkbase')
+%% scrkernel-basics.dtx (with options: `package,option,koma')
+%% scrkernel-fonts.dtx (with options: `package,option,scrkbase')
%% scrlfile.dtx (with options: `load')
-%% scrkbase.dtx (with options: `package,body,koma')
-%% scrkfont.dtx (with options: `package,body,scrkbase')
+%% scrkernel-basics.dtx (with options: `package,body,koma')
+%% scrkernel-fonts.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,9 +44,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -67,14 +66,17 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- \KOMAScriptVersion\space package
- (KOMA-Script-dependent basics and keyval usage)]
+ 2013/12/19 v3.12 KOMA-Script
+ package (%
+ KOMA-Script-dependent
+ basics and keyval usage)]
\RequirePackage{scrbase}[\KOMAScriptVersion]
\newcommand*{\KOMA@key}[1][.\@currname.\@currext]{%
\DefineFamilyMember{KOMA}%
@@ -83,64 +85,19 @@
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
\KOMAProcessOptions\relax
-%%% From File: scrkfont.dtx
-%%% From File: scrlfile.dtx
-\def\scrlfileversion{2012/06/15 v3.12}
-\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
-\@tempa
-%%% From File: scrkbase.dtx
-\newcommand*{\KOMAExecuteOptions}{\FamilyExecuteOptions{KOMA}}
-\@onlypreamble\KOMAExecuteOptions
-\newcommand*{\KOMAoptions}[1]{%
- \let\post@kopt@hook\@empty
- \KOMA@options{#1}{%
- \PackageError{scrkbase}{%
- unknown KOMA option `\scr@key@name'%
- }{%
- You have used \string\KOMAoptions\space to set
- `\scr@key@atlist',\MessageBreak
- but KOMA-Script does not know any option named
- `\scr@key@name'.\MessageBreak
- See the KOMA-Script manual for more informations about options
- and\MessageBreak
- their values.%
- }%
- }%
- \post@kopt@hook\let\post@kopt@hook\relax
-}
-\newcommand*{\KOMA@options}{\Family@Options{KOMA}}
-\newcommand*{\post@kopt@hook}{}
-\let\post@kopt@hook\relax
-\newcommand*{\AfterKOMAoptions}{%
- \ifx\post@kopt@hook\relax
- \PackageWarning{scrkbase}{%
- \string\AfterKOMAoptions\space can only be used inside a\MessageBreak
- KOMA-Script option that is called using \string\KOMAoptions.\MessageBreak
- Because of this, command will be ignored%
- }%
- \expandafter\@gobbletwo
- \else
- \expandafter\l@addto@macro
- \fi
- \post@kopt@hook
-}
-\newcommand*{\KOMAoption}[2]{%
- \let\post@kopt@hook\@empty
- \Family@Option{KOMA}{#1}{#2}{%
- \PackageError{scrkbase}{%
- unknown KOMA option `\scr@key@name'%
- }{%
- You have used \string\KOMAoption\space to set
- `\scr@key@name',\MessageBreak
- but KOMA-Script does not know any option named
- `\scr@key@name'.\MessageBreak
- See the KOMA-Script manual for more informations about options
- and\MessageBreak
- their values.%
- }%
- }%
- \post@kopt@hook\let\post@kopt@hook\relax
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
+\RequirePackage{scrlfile}[%
+ 2013/12/19 v3.12 KOMA-Script
+]
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
+ \FamilyExecuteOptions[#1]{KOMA}%
}
+\newcommand*{\KOMAoptions}{\FamilyOptions{KOMA}}
+\newcommand*{\AfterKOMAoptions}{}
+\let\AfterKOMAoptions\AtEndOfFamilyOptions
+\newcommand*{\KOMAoption}{\FamilyOption{KOMA}}
\newcommand*{\KOMA@unknown@keyval}{\FamilyUnknownKeyValue{KOMA}}
\newcommand*{\KOMA@ifkey}{%
\DefineFamilyMember{KOMA}%
@@ -165,14 +122,22 @@
}
\newcommand*{\KOMA@UseDeprecatedOption}[3]{%
\let\scr@sr@co\CurrentOption
- #1{%
- You've used obsolete option `#2'.\MessageBreak
- Usage of this option indicates an old document and\MessageBreak
- changes compatibility level using\MessageBreak
- `#3,version=first'.\MessageBreak
- If you don't want this, you should simply replace\MessageBreak
- usage of option `#2' by `#3'%
- }%
+ \begingroup
+ #1{%
+ You've used obsolete option `#2'.\MessageBreak
+ Usage of this option indicates an old document and\MessageBreak
+ \scr@ifundefinedorrelax{KV@KOMA.\@currname.\@currext @version}{%
+ changes compatibility level using\MessageBreak
+ `#3,version=first'.\MessageBreak
+ If you don't want this, y%
+ }{%
+ is deprecated.\MessageBreak
+ Y%
+ }%
+ ou should simply replace\MessageBreak
+ usage of option `#2' by `#3'%
+ }%
+ \endgroup
\KOMAExecuteOptions{#3,version=first}%
\let\CurrentOption\scr@sr@co
}
@@ -200,55 +165,21 @@
\KOMAExecuteOptions{#3}%
\let\CurrentOption\scr@sr@co
}
-\newcommand*{\KOMA@DeclareObsoleteOption}{%
- \@ifnextchar [%]
- {\KOMA@@DeclareObsoleteOption}%
- {\KOMA@@DeclareObsoleteOption[\@gobbletwo]}%
-}
-\newcommand*{\KOMA@@DeclareObsoleteOption}{}
-\def\KOMA@@DeclareObsoleteOption[#1]{%
- \@ifnextchar [%]
- {\KOMA@@@DeclareObsoleteOption{#1}}%
- {\KOMA@@@DeclareObsoleteOption{#1}[]}%
-}
-\newcommand*{\KOMA@@@DeclareObsoleteOption}{}
-\def\KOMA@@@DeclareObsoleteOption#1[#2]#3#4{%
- \ifstr{#2}{}{%
- \KOMA@iv@DeclareObsoleteOption{#1}{\@currname}{#3}{#4}%
- }{%
- \KOMA@UseObsoleteOption{#1}{#2}{#3}{#4}%
- }%
-}
-\newcommand*{\KOMA@iv@DeclareObsoleteOption}[4]{%
- \DeclareOption{#3}{\KOMA@UseObsoleteOption{#1{#2}}{#3}{#4}}%
-}
-\newcommand*{\KOMA@UseObsoleteOption}[3]{%
- \let\scr@sr@co\CurrentOption
- #1{%
- You've used obsolete option `#2'.\MessageBreak
- \protect\KOMAExecuteOptions{#3} will be\MessageBreak
- used instead.\MessageBreak
- You may simply replace `#2'\MessageBreak
- by `#3'%
- }%
- \KOMAExecuteOptions{#3}%
- \let\CurrentOption\scr@sr@co
-}
\newcommand*{\scr@sr@co}{}
-\newcommand*{\KOMA@newobsoletecommand}[3][\@gobbletwo]{%
- \newcommand*{#2}{\KOMA@UseObsoleteCommand{#1}{\string#2}{#3}}%
+\newcommand*{\KOMA@newdeprecatedcommand}[3][\@gobbletwo]{%
+ \newcommand*{#2}{\KOMA@UseDeprecatedCommand{#1}{\string#2}{#3}}%
}
-\newcommand*{\KOMA@UseObsoleteCommand}[3]{%
+\newcommand*{\KOMA@UseDeprecatedCommand}[3]{%
#1{%
scrkbase%
}{%
- You've used the obsolete command `#2'.\MessageBreak
+ You've used deprecated command `#2'.\MessageBreak
\protect\KOMAoptions{#3} will be used instead.\MessageBreak
You should also replace `#2' by `\protect\KOMAoptions{#3}'%
}%
\KOMAoptions{#3}%
}
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*{\setkomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -336,6 +267,72 @@
\@nameuse{scr@fnt@#1}%
}%
}
+\newcommand*{\usesizeofkomafont}[1]{%
+ \begingroup
+ \let\color\@gobble\let\normalcolor\relax
+ \@tempcnta=\currentgrouplevel
+ \usekomafont{#1}{%
+ \ifnum \currentgrouplevel>\numexpr\@tempcnta\relax
+ \edef\reserved@a{\noexpand\egroup\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}%
+ \noexpand\bgroup}%
+ \else
+ \edef\reserved@a{\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}}%
+ \fi
+ \reserved@a
+ }%
+ \selectfont
+}
+\newcommand*{\usefamilyofkomafont}{\use@ofkomafont{family}}
+\newcommand*{\useseriesofkomafont}{\use@ofkomafont{series}}
+\newcommand*{\useshaperofkomafont}{\use@ofkomafont{shape}}
+\newcommand*{\useencodingofkomafont}{\use@ofkomafont{encoding}}
+\newcommand*{\usefontofkomafont}[1]{%
+ \begingroup
+ \let\color\@gobble\let\normalcolor\relax
+ \@tempcnta=\currentgrouplevel
+ \usekomafont{#1}{%
+ \ifnum \currentgrouplevel>\numexpr\@tempcnta\relax
+ \edef\reserved@a{\noexpand\egroup\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}%
+ \noexpand\fontfamily{\f@family}%
+ \noexpand\fontseries{\f@series}%
+ \noexpand\fontshape{\f@shape}%
+ \noexpand\fontencoding{\f@encoding}%
+ \noexpand\bgroup}%
+ \else
+ \edef\reserved@a{\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}}%
+ \noexpand\fontfamily{\f@family}%
+ \noexpand\fontseries{\f@series}%
+ \noexpand\fontshape{\f@shape}%
+ \noexpand\fontencoding{\f@encoding}%
+ \fi
+ \reserved@a
+ }%
+ \selectfont
+}
+\newcommand*{\use@ofkomafont}[2]{%
+ \begingroup
+ \let\color\@gobble\let\normalcolor\relax
+ \@tempcnta=\currentgrouplevel
+ \usekomafont{#2}{%
+ \ifnum \currentgrouplevel>\numexpr\@tempcnta\relax
+ \edef\reserved@a{\noexpand\egroup\noexpand\endgroup
+ \expandafter\noexpand\csname font#1\endcsname
+ {\csname f@#1\endcsname}%
+ \noexpand\bgroup}%
+ \else
+ \edef\reserved@a{\noexpand\endgroup
+ \expandafter\noexpand\csname font#1\endcsname
+ {\csname f@#1\endcsname}%
+ }%
+ \fi
+ \reserved@a
+ }%
+ \selectfont
+}
\newcommand*{\newkomafont}[3][\relax]{%
\expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
\expandafter\expandafter\expandafter\newcommand
@@ -344,7 +341,7 @@
\csname @#2font\endcsname%
}%
\ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
+ \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname[1]{#1}%
\fi
}
\newcommand*{\aliaskomafont}[2]{%
@@ -352,7 +349,7 @@
#2%
}%
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}