summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty65
1 files changed, 49 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 628817a715d..400505151ed 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.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{%
scrbase%
}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(%
KOMA-Script-independent
@@ -431,7 +431,7 @@
\long\def\l@addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-%%% 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)
\newcommand*{\dont@let@as@internal@defined}{/}
\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse
@@ -453,9 +453,9 @@
%%% (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*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
@@ -1528,19 +1528,39 @@
}
\newcommand*{\scr@key@run@errors}{}
\newcommand*{\scr@execute@elseoption}[1]{%
+ \begingroup
\protected@edef\reserved@a{%
- \noexpand\def\noexpand\scr@key@name{@else@}%
+ \unexpanded{%
+ \endgroup
+ \let\scr@key@name@else\scr@key@name
+ \let\scr@key@value@else\scr@key@value
+ \def\scr@key@name{@else@}%
+ }%
\noexpand\def\noexpand\scr@key@value{%
\unexpanded\expandafter{\scr@key@atlist}}%
\noexpand\def\noexpand\scr@key@atlist{%
@else@={\unexpanded\expandafter{\scr@key@atlist}}}%
\noexpand\scr@execute@option{#1}%
- \noexpand\def\noexpand\scr@key@atlist{
+ \noexpand\def\noexpand\scr@key@atlist{%
\unexpanded\expandafter{\scr@key@atlist}}%
\noexpand\def\noexpand\scr@key@name{%
\unexpanded\expandafter{\scr@key@name}}%
\noexpand\def\noexpand\scr@key@value{%
\unexpanded\expandafter{\scr@key@value}}%
+ \scr@ifundefinedorrelax{scr@key@name@else}{%
+ \unexpanded{\let\scr@key@name@else\relax}%
+ }{%
+ \noexpand\def\noexpand\scr@key@name@else{%
+ \unexpanded\expandafter{\scr@key@name@else}%
+ }%
+ }
+ \scr@ifundefinedorrelax{scr@key@value@else}{%
+ \unexpanded{\let\scr@key@value@else\relax}%
+ }{%
+ \noexpand\def\noexpand\scr@key@value@else{%
+ \unexpanded\expandafter{\scr@key@value@else}%
+ }%
+ }%
}\reserved@a
}
\newif\ifscr@key@found@
@@ -1886,13 +1906,15 @@
\let\reserved@b=\@empty
\@tempswafalse
\@for\@valuelist:=#4\do{%
- \if@tempswa\else
- \edef\reserved@c{\expandafter\@firstoftwo\@valuelist}%
- \edef\reserved@a{\reserved@a\reserved@b`\reserved@c'}%
- \edef\reserved@b{, }%
- \ifx\reserved@c\@searched
- \@tempswatrue
- \edef\reserved@a{\expandafter\@secondoftwo\@valuelist}%
+ \ifx\@valuelist\@empty\else
+ \if@tempswa\else
+ \edef\reserved@c{\expandafter\@firstoftwo\@valuelist}%
+ \edef\reserved@a{\reserved@a\reserved@b`\reserved@c'}%
+ \edef\reserved@b{, }%
+ \ifx\reserved@c\@searched
+ \@tempswatrue
+ \edef\reserved@a{\expandafter\@secondoftwo\@valuelist}%
+ \fi
\fi
\fi
}%
@@ -1920,6 +1942,17 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
+\newcommand*{\FamilyCSKey}[3][.\@currname.\@currext]{%
+ \kernel@ifnextchar [%]
+ {\Family@@CS@@Key{#1}{#2}{#3}}{\Family@CS@Key{#1}{#2}{#3}}%
+}
+\newcommand*{\Family@@CS@@Key}{}
+\long\def\Family@@String@@Key#1#2#3[#4]#5{%
+ \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\@namedef{#5}{##1}}%
+}
+\newcommand{\Family@CS@Key}[4]{%
+ \DefineFamilyKey[{#1}]{#2}{#3}{\@namedef{#4}{##1}\FamilyKeyStateProcessed}%
+}
%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
%%% (run: body)
\newcommand*{\defcaptionname}{%