summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
committerKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
commit4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch)
tree968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/tex/latex/koma-script/scrbase.sty
parent59d9a998c6236de39603cb2ea077c5371e06b842 (diff)
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty80
1 files changed, 47 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 9755a4c3bc2..f5a22cd2751 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -12,7 +12,7 @@
%% scrkernel-language.dtx (with options: `package,body,base')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2002-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,14 +66,14 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package (%
KOMA-Script-independent
basics and keyval usage)]
@@ -174,8 +174,8 @@
\expandafter{\reserved@a}{#2}{#3}%
}%
}
-\newcommand*{\scr@define@family@key}{}
-\def\scr@define@family@key#1#2#3[#4]#5{%
+\newcommand{\scr@define@family@key}{}
+\long\def\scr@define@family@key#1#2#3[#4]#5{%
\scr@if@familymember{#1}{#2}{define a key}{%
\define@key{#2#1}{#3}[{#4}]{%
\def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
@@ -185,7 +185,7 @@
}%
}%
}
-\newcommand*{\scr@define@family@key@nodefault}[4]{%
+\newcommand{\scr@define@family@key@nodefault}[4]{%
\scr@if@familymember{#1}{#2}{define a key}{%
\define@key{#2#1}{#3}{%
\def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
@@ -282,7 +282,7 @@
\scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{%
\let\FamilyKeyState\OptionNotUsed
}{%
- \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{\CurrentOption}%
+ \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{{\CurrentOption}}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
\reserved@b
\ifx\FamilyKeyState\FamilyKeyStateUnknown
@@ -299,7 +299,7 @@
\let\FamilyKeyState\OptionNotUsed
}%
}{%
- \proteced@edef\reserved@b{\noexpand\setkeys{#2}{\CurrentOption}%
+ \proteced@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
\reserved@b
\ifx\FamilyKeyState\FamilyKeyStateUnknown
@@ -315,7 +315,7 @@
\def\reserved@a##1=##2\@nil{\def\reserved@a{##1}}%
\expandafter\reserved@a\CurrentOption=\@nil
\scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{}{%
- \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{\CurrentOption}%
+ \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{{\CurrentOption}}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
\ifx\FamilyKeyState\FamiliyKeyStateProcessed
\reserved@b
@@ -357,12 +357,12 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -392,9 +392,9 @@
\@ifundefined{#1}{%
\begingroup
\expandafter\def\expandafter\reserved@a
- \expandafter{\csname scr@#1\endcsname}
+ \expandafter{\csname scr@#1\endcsname}%
\expandafter\def\expandafter\reserved@b
- \expandafter{\csname #1\endcsname}
+ \expandafter{\csname #1\endcsname}%
\expandafter\expandafter\expandafter\endgroup
\expandafter\expandafter\expandafter\let\expandafter\reserved@b\reserved@a
\if@atdocument\else
@@ -601,7 +601,7 @@
\begingroup
\edef\reserved@a{#1}\expandafter
\scr@ifintegerplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup
}
\newcommand*{\scr@ifintegerplusminus}{}
@@ -626,7 +626,7 @@
\begingroup
\edef\reserved@a{#1\relax}\expandafter
\scr@ifdimensionplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup
}
\newcommand*{\scr@ifdimensionplusminus}{}
@@ -653,7 +653,7 @@
\begingroup
\edef\reserved@a{#1\relax}\expandafter
\scr@ifglueplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup
}
\newcommand*{\scr@ifglueplusminus}{}
@@ -687,7 +687,7 @@
\endgroup
}
\newcommand*{\test@number}[1]{%
- \ifx \scr@next#1
+ \ifx \scr@next#1%
\let\scr@next\relax
\else
\@tempcnta=\expandafter\expandafter\expandafter\number
@@ -868,7 +868,10 @@
\providecommand*{\ClassInfoNoLine}[2]{%
\ClassInfo{#1}{#2\@gobble}%
}
-\newcommand*{\FamilyExecuteOptions}[3][.\@currname.\@currext]{%
+\newcommand*{\FamilyExecuteOptions}[2][.\@currname.\@currext]{%
+ \@FamilyExecuteOptions[{#1}]{#2}%
+}
+\newcommand{\@FamilyExecuteOptions}[3][.\@currname.\@currext]{%
\@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}%
\@for\scr@key@atlist:=#3\do{%
\expandafter\scr@key@split@name@value\scr@key@atlist==\@nil
@@ -939,7 +942,8 @@
}%
\fi
}
-\newcommand*{\FamilyOptions}[2]{%
+\newcommand{\FamilyOptions}[1]{\@FamilyOptions{#1}}
+\newcommand{\@FamilyOptions}[2]{%
\@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}%
\@for\scr@key@atlist:=#2\do{%
\ifx\scr@key@atlist\@empty\else
@@ -1030,25 +1034,31 @@
\noexpand\def\noexpand\scr@key@name{%
\unexpanded\expandafter{\scr@key@name}}%
\noexpand\def\noexpand\scr@key@value{%
- \unexpanded\expandafter{\scr@key@value}}
+ \unexpanded\expandafter{\scr@key@value}}%
\ifx\scr@key@run@errors\relax
\noexpand\let\noexpand\scr@key@run@errors\relax
\else
\noexpand\def\noexpand\scr@key@run@errors{%
\unexpanded\expandafter{\scr@key@run@errors}}%
\fi
- \noexpand\def\expandafter\noexpand
- \csname scr@after@options@#1@hook\endcsname{%
- \expandafter\unexpanded\expandafter\expandafter\expandafter{%
- \csname scr@after@options@#1@hook\endcsname
- }}%
+ \expandafter\ifx\csname scr@after@options@#1@hook\endcsname\relax
+ \noexpand\expandafter\noexpand\let\noexpand\csname
+ scr@after@options@#1@hook\endcsname\relax
+ \else
+ \noexpand\def\expandafter\noexpand
+ \csname scr@after@options@#1@hook\endcsname{%
+ \expandafter\unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@after@options@#1@hook\endcsname
+ }}%
+ \fi
}%
\let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions
\reserved@a
\let\AtEndOfFamilyOptions\@firstofone
\ifx\FamilyKeyState\FamilyKeyStateUnknown
\PackageInfo{scrbase}{Unknown processing state.\MessageBreak
- Processing option `\scr@key@atlist'\MessageBreak
+ Processing option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'\MessageBreak
\ifx\FamilyMemberOfKey\@empty\else
of member `\FamilyMemberOfKey'\MessageBreak
\fi
@@ -1060,17 +1070,21 @@
\FamilyKeyStateProcessed
\fi
}
+\newcommand*{\scr@KV@err}[1]{%
+ \FamilyKeyStateNeedValue
+}
\newcommand*{\scr@key@run@errors}{}
\newif\ifscr@key@found@
\newcommand*{\scr@key@atlist}{}
\newcommand*{\scr@key@name}{}
\newcommand*{\scr@key@value}{}
\newcommand*{\scr@key@split@name@value}{}
-\def\scr@key@split@name@value#1=#2=#3\@nil{%
+\long\def\scr@key@split@name@value#1=#2=#3\@nil{%
\KV@@sp@def\scr@key@name{#1}%
\KV@@sp@def\scr@key@value{#2}%
}
-\newcommand*{\FamilyOption}[3]{%
+\newcommand*{\FamilyOption}[2]{\@FamilyOption{#1}{#2}}
+\newcommand{\@FamilyOption}[3]{%
\expandafter\KV@@sp@def\expandafter\scr@key@name\expandafter{#2}%
\let\reserved@a\@empty
\@for\reserved@b:=#3\do{%
@@ -1112,7 +1126,7 @@
\long\def\l@addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-\newcommand*{\FamilyUnknownKeyValue}[4]{%
+\newcommand{\FamilyUnknownKeyValue}[4]{%
\FamilyKeyStateUnknownValue
\ifx\FamilyElseValues\@empty\else
\PackageWarning{scrbase}{non empty \string\FamilyElseValue
@@ -1299,7 +1313,7 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\defcaptionname}{%
\@ifstar\scr@def@scaptionname\scr@def@captionname
}