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.sty47
1 files changed, 32 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 64f173801d6..50d512bc3b2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -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 2149 2015-07-02 08:07:30Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,18 +66,18 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2015/07/02 v3.18 KOMA-Script
+ 2015/09/29 v3.19 KOMA-Script
package (%
KOMA-Script-independent
basics and keyval usage)]
@@ -194,7 +194,7 @@
\define@key{#2#1}{#3}{%
\def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
\FamilyKeyStateUnknown
- #4
+ #4%
\def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
}%
\@namedef{KV@#2#1@#3@default}{%
@@ -329,7 +329,7 @@
\let\FamilyKeyState\OptionNotUsed
}%
}{%
- \proteced@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}%
+ \protected@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
\reserved@b
\ifx\FamilyKeyState\FamilyKeyStateUnknown
@@ -387,12 +387,12 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2015/07/02 v3.18 KOMA-Script
+ 2015/09/29 v3.19 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -493,6 +493,13 @@
}%
\reserved@a#1#2\@nil
}
+\newcommand*{\IfArgIsEmpty}[1]{%
+ \if\relax\detokenize{#1}\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
\newcommand*{\ifisdimen}[1]{%
\begingroup
\edef\reserved@a{#1}%
@@ -567,7 +574,17 @@
}{%
\aftergroup\@secondoftwo
}%
- }{\aftergroup\@secondoftwo}%
+ }{%
+ \ifstr{\reserved@a}{\string\baselineskip}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \ifstr{\reserved@a}{\string\parskip}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
+ }%
+ }%
+ }%
\endgroup
}
\newcommand*{\ifisglueexpr}[1]{%
@@ -1221,7 +1238,7 @@
\newcommand*{\FamilySetCounter}[4]{%
\ifiscount{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
\ifisdimen{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\value{#3}=#4\FamilyKeyState\Processed}{%
+ \ifisskip{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
\ifisnumexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
\ifisdimexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
\ifisinteger{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
@@ -1255,7 +1272,7 @@
\begingroup
\ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
\ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyState\Processed}{%
+ \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
\ifisnumexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
\ifisdimexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
\ifisinteger{#4}{%
@@ -1293,7 +1310,7 @@
\newcommand*{\FamilySetLength}[4]{%
\ifiscount{#4}{#3=#4\FamilyKeyStateProcessed}{%
\ifisdimen{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{#3=#4\FamilyKeyState\Processed}{%
+ \ifisskip{#4}{#3=#4\FamilyKeyStateProcessed}{%
\ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
\ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
\ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
@@ -1327,7 +1344,7 @@
\begingroup
\ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
\ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyState\Processed}{%
+ \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyStateProcessed}{%
\ifisnumexpr{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
\ifisdimexpr{#4}{%
\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed
@@ -1406,7 +1423,7 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
-%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
\newcommand*{\defcaptionname}{%
\@ifstar\scr@def@scaptionname\scr@def@captionname
}