summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-11 21:26:48 +0000
committerKarl Berry <karl@freefriends.org>2016-05-11 21:26:48 +0000
commit39c10427f8eee057dc28928380060a585e1e017b (patch)
tree6750074338d5e6b808cfca3671e2ab9763c328ae /Master/texmf-dist/tex
parenta49931ca8756327265b8929a7a147045bf2b3506 (diff)
koma-script (11may16)
git-svn-id: svn://tug.org/texlive/trunk@41038 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/lscape.hak13
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls860
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty964
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls872
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdoc.cls9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty73
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty23
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty202
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty36
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty74
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty68
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty20
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty81
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty25
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls273
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty58
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls872
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty18
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrwfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/setspace.hak12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty1608
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty180
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty53
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco16
48 files changed, 4696 insertions, 1946 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 234a3134101..072776ed881 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
DIN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DIN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 2d8313ae479..a21b7a3f269 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
DINmtext%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DINmtext%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 8077dc7ac55..f31fa9b08c0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -9,7 +9,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,KOMAold,body')
%% scrkernel-notepaper.dtx (with options: `lco,KOMAold,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,7 +41,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
KOMAold%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
KOMAold%
@@ -204,7 +204,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
\def\setpresigskip{\@setplength{sigbeforevskip}}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index dc26dbe9adc..a527581c3b8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 792771e3608..8baa12b30c8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
NF%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
NF%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index f62d6c4471c..e3f6a068dc6 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index d0b640987de..05a723e0199 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index 538f505a0e8..e036541e75a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index b6c667ef994..99f446dea98 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 647d1611a4b..d4fd96b6761 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 5f5cd93a1ed..9f441361f91 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
SN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index 8d9a2cb9ff8..e075ce4142c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
SNleft%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SNleft%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index 1e732069085..77b9e1d17fb 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
UScommercial9
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index 433b76a21e1..2bdb424542f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
UScommercial9DW
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9DW%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index c266ad63a30..41d3b4de5a7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,float,identify')
%% scrhack.dtx (with options: `hack,float,body')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{float.hak}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(hacking package
float)%
]
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\scr@ifexpected{\newfloat}{%
\long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3}
\let\float@do=\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index c8cb2420609..0e8ddab17c2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,floatrow,identify')
%% scrhack.dtx (with options: `hack,floatrow,body')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(hacking package
floatrow)%
]
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\scr@ifexpected{\DeclareNewFloatType}{%
\long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}%
\expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index 13dba4c8217..38ea2882203 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,hyperref,identify')
%% scrhack.dtx (with options: `hack,hyperref,body')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(hacking package
hyperref)%
]
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\scr@ifexpected\@schapter{%
\def\@schapter#1{%
\H@old@schapter{#1}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index 281b6c4ff36..c6370ccb626 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,listings,identify')
%% scrhack.dtx (with options: `hack,listings,body')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{listings.hak}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(hacking package
listings)%
]
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\newcommand*{\scr@do@hack@listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
index ac90c9b09e9..5eae94e91bf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,lscape,identify')
%% scrhack.dtx (with options: `hack,lscape,body')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,17 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{lscape.hak}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(hacking package
lscape)%
]
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
-\RequirePackage{xpatch}
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\xpatchcmd{\landscape}{\textheight=\vsize}{%
\if@scrhack@lscape
\scrh@LT@textheight=\vsize
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index 969e73dc4c1..8997bf6040b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
@@ -7,7 +7,7 @@
%% scraddr.dtx (with options: `scraddr')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2006-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2006-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index f15fabd7eac..ebc4cd252c9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -7,6 +7,7 @@
%% scrkernel-version.dtx (with options: `class,article')
%% scrkernel-basics.dtx (with options: `load')
%% tocbasic.dtx (with options: `class,load')
+%% scrkernel-tocstyle.dtx (with options: `class,article,prepare')
%% scrkernel-sections.dtx (with options: `class,article,prepare')
%% scrkernel-compatibility.dtx (with options: `class,article,option')
%% scrkernel-miscellaneous.dtx (with options: `class,article,option')
@@ -15,6 +16,7 @@
%% scrkernel-typearea.dtx (with options: `class,article,option')
%% scrkernel-paragraphs.dtx (with options: `class,article,option')
%% scrkernel-title.dtx (with options: `class,article,option')
+%% scrkernel-tocstyle.dtx (with options: `class,article,option')
%% scrkernel-sections.dtx (with options: `class,article,option')
%% scrkernel-pagestyles.dtx (with options: `class,article,option')
%% scrkernel-floats.dtx (with options: `class,article,option')
@@ -31,6 +33,11 @@
%% scrkernel-typearea.dtx (with options: `class,article,body')
%% scrkernel-paragraphs.dtx (with options: `class,article,body')
%% scrkernel-title.dtx (with options: `class,article,body')
+%% scrkernel-tocstyle.dtx (with options: `class,article,body')
+%% scrkernel-tocstyle.dtx (with options: `class,article,style,part')
+%% scrkernel-tocstyle.dtx (with options: `class,article,style,section')
+%% scrkernel-tocstyle.dtx (with options: `class,article,style,subsection')
+%% scrkernel-tocstyle.dtx (with options: `class,article,style,default')
%% scrkernel-sections.dtx (with options: `class,article,body')
%% scrkernel-miscellaneous.dtx (with options: `class,article,body')
%% scrkernel-pagestyles.dtx (with options: `class,article,body')
@@ -42,7 +49,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,article,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -74,7 +81,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -96,7 +103,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -111,19 +118,21 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
\RequirePackage{tocbasic}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
]
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: prepare)
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: prepare)
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -174,8 +183,8 @@
\newcommand*{\size@subsubsection}{}
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -183,6 +192,7 @@
\let\if@scr@emulatestandardclasses\iftrue
\KOMAExecuteOptions{%
fontsize=10pt,%
+ headings=standardclasses,%
cleardoublepage=current
}%
\newcommand*{\defaultpapersize}{letter}%
@@ -298,6 +308,7 @@
\@namedef{scr@v@3.18a}{15}
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
+\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -311,7 +322,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -333,8 +344,12 @@
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
+\newcommand*{\@gr@gsffamily}{%
+ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi
+}
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -401,7 +416,25 @@
\KOMAClassFileName
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+\DeclareOption{enabledeprecatedfontcommands}{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ deprecated option `enabledeprecatedfontcommands'.\MessageBreak
+ Note, that this option was already depreacted when\MessageBreak
+ it has been defined. Support for old font commands\MessageBreak
+ has been removed from KOMA-Script more than one\MessageBreak
+ decade ago. It is not recommended to use them any\MessageBreak
+ longer. Therefore usage of this class option also\MessageBreak
+ is not recommended%
+ }%
+ \let\scr@defineobsoletefonts\@ne
+}
+\scr@ifundefinedorrelax{scr@defineobsoletefonts}{%
+ \let\scr@defineobsoletefonts\z@
+}{}
+\BeforePackage{tex4ht}{%
+ \let\scr@defineobsoletefonts\thr@@
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -467,12 +500,12 @@
}{%
\def\FamilyElseValue{, `semi'}%
\KOMA@set@ifkey{twoside}{%
- @tempswa%
+ @twoside%
}{#1}%
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@tempswa\flushbottom
+ \if@twoside\flushbottom
\else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
\fi
\KOMA@kav@xreplacevalue{.%
@@ -490,10 +523,13 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{twocolumn}{@twocolumn}%
- \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twocolumn\twocolumn\sloppy\flushbottom
\else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi
+ \fi}%
\fi
}
\AtEndOfClass{%
@@ -507,7 +543,8 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: option
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -542,6 +579,7 @@
\let\par@update\relax
\newcommand*{\default@par@update}{}
\let\default@par@update\relax
+\AtBeginDocument{\par@update}
\newcommand*{\scr@parindent}{1em}
\newcommand*{\scr@parskip}{\z@}
\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil}
@@ -671,7 +709,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\newif\if@titlepage
\@titlepagefalse
\newif\if@titlepageiscoverpage
@@ -705,7 +743,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: option)
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -831,33 +871,11 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
-\newif\if@hsl
-\KOMA@key{headsepline}[true]{%
- \KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }{%
- \KOMAoptions{headinclude=#1}{}%
- }%
- \fi
-}
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
-\newif\if@fsl
-\KOMA@key{footsepline}[true]{%
- \KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }{%
- \KOMAoptions{footinclude=#1}%
- }%
- \fi
-}
+\KOMA@ifkey{footsepline}{@fsl}%
\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA@key{cleardoublepage}{%
@@ -957,7 +975,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1161,7 +1179,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1631,18 +1649,18 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2032,42 +2050,78 @@
}%
}
\newcommand*{\scr@DeclareOldFontCommand}[3]{%
- \DeclareRobustCommand #1{\@fontswitch {%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#2}'%
- }%
- #2%
- }{%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#3}'%
+ \ifnum\scr@defineobsoletefonts<\z@\else
+ \ifnum\scr@defineobsoletefonts>\tw@
+ \DeclareOldFontCommand{#1}{#2}{#3}%
+ \else
+ \DeclareOldFontCommand{#1}{%
+ \scr@ErrorWarningInfo{#1}{#2}#2%
+ }{%
+ \scr@ErrorWarningInfo{#1}{#3}#3%
}%
- #3%
+ \fi
+ \fi
+}
+\DeclareRobustCommand*{\scr@ErrorWarningInfo}[2]{%
+ \ifnum \scr@defineobsoletefonts=\z@
+ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{%
+ You should note that since 1994 LaTeX2e provides a new font selection
+ scheme\MessageBreak
+ called NFSS2 with several new, combinable font commands. New
+ KOMA-Script\MessageBreak
+ classes have defined the old font commands like `\string#1'
+ only for compatibility\MessageBreak
+ with old LaTeX 2.09 document styles of Script 2.0. Nevertheless,
+ these\MessageBreak
+ commands are deprecated and undocumented at least since
+ 2003. Since 2013\MessageBreak
+ KOMA-Script classes warn abouts soon removement of these deprecated
+ commands.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, these commands will not
+ work any\MessageBreak
+ more. If loading a package results in this error message, you should
+ contact\MessageBreak
+ the author of that package and ask him to replace the deprecated font
+ command\MessageBreak
+ `\string#1', e.g., by `\detokenize{#2}`. Otherwise you should
+ reconfigure\MessageBreak
+ or replace the package. If you have used the old font command
+ `\string#1' yourself,\MessageBreak
+ you should replace it, e.g., by `\detokenize{#2}'.\MessageBreak
+ To make it work for now, you can use the already also deprecated class
+ option\MessageBreak
+ `enabledeprecatedfontcommands'.%
}%
- }%
+ \else
+ \ifcase \scr@defineobsoletefonts
+ \or
+ \expandafter\ClassWarning
+ \or
+ \expandafter\ClassInfo
+ \else
+ \expandafter\@gobbletwo
+ \fi
+ {\KOMAClassName}{deprecated old font command `\string#1' used.\MessageBreak
+ You should note, that since 1994 LaTeX2e provides a\MessageBreak
+ new font selection scheme called NFSS2 with several\MessageBreak
+ new, combinable font commands. New KOMA-Script classes\MessageBreak
+ have defined the old font commands like `\string#1' only for\MessageBreak
+ compatibility with LaTeX 2.09 document styles of\MessageBreak
+ Script 2.0. These commands are deprecated and\MessageBreak
+ undocumented at least since 2003. Since 2013,\MessageBreak
+ KOMA-Script classes warn about soon removement of\MessageBreak
+ these deprecated commands. Now, after two decades of\MessageBreak
+ LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak
+ not work any longer. If loading a package results in\MessageBreak
+ this message you should contact the author of that\MessageBreak
+ package and ask him to replace the depracted font\MessageBreak
+ command `\string#1', e.g., by `\detokenize{#2}'.\MessageBreak
+ Otherwise you should reconfigure or replace the\MessageBreak
+ package. If you have used the old font command\MessageBreak
+ `\string #1' yourself you should replace it, e.g., by\MessageBreak
+ `\detokenize{#2}'%
+ }%
+ \fi
}
\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
@@ -2080,12 +2134,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2129,7 +2183,8 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: body
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -2257,7 +2312,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2294,6 +2349,7 @@
\@thanks\global\let\@thanks\@empty
\clearpage
\csname titlepage@restore\endcsname
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\thispagestyle{empty}%
\let\footnote\thanks
\setcounter{footnote}{0}%
@@ -2596,7 +2652,54 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: body)
+\let\numberline\scr@numberline
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,part)
+\CloneTOCEntryStyle{tocline}{part}
+\TOCEntryStyleStartInitCode{part}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{\hfill}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{\usekomafont{partentry}{##1}}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+ \usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,section)
+\CloneTOCEntryStyle{tocline}{section}
+\TOCEntryStyleStartInitCode{section}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{%
+ \if@sectionentrywithdots
+ \TOCLineLeaderFill\relax
+ \else
+ \hfill
+ \fi
+ }%
+ % F^^fcr die Eintr^^e4ge die Schrift von Element sectionentry verwenden.
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname{\usekomafont{sectionentry}}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{\usekomafont{sectionentry}{\usekomafont{sectionentrypagenumber}{##1}}}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,subsection)
+\CloneTOCEntryStyle{tocline}{subsection}
+\TOCEntryStyleStartInitCode{subsection}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,default)
+\CloneTOCEntryStyle{subsection}{default}
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{3}
\newcommand*{\ifnumbered}[1]{%
@@ -2623,7 +2726,7 @@
}
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
- \string\global\string\@altsecnumformattrue}%
+ \string\global\string\csname\space @altsecnumformattrue\string\endcsname}%
\fi\fi}
\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup%
\expandafter\@@maybeautodot #1\@stop\endgroup\fi
@@ -2657,11 +2760,33 @@
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
+ \kernel@ifstar
+ {\@ssect{#3}{#4}{#5}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+}
+\def\reserved@a#1#2#3#4#5#6{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
\@ifstar
{\@ssect{#3}{#4}{#5}{#6}}%
{\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
}
-\ifx\@startsection\scr@saved@startsection
+\ifcase \ifx\@startsection\scr@saved@startsection 0
+ \else
+ \ifx\@startsection\reserved@a 0
+ \else 1
+ \fi
+ \fi
\newcommand*{\scr@startsection}[6]{%
\if@noskipsec \leavevmode \fi
\par
@@ -2676,7 +2801,7 @@
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
- \@ifstar {%
+ \kernel@ifstar {%
\csname scr@preto@ssect@hook\endcsname
\def\scr@s@ct@@nn@m@{#1}%
\@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
@@ -2707,7 +2832,7 @@
}%
\let\scr@saved@startsection\@startsection
\newcommand*{\scr@startsection}[6]{%
- \@ifstar {%
+ \kernel@ifstar {%
\scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*%
}{%
@@ -2748,7 +2873,7 @@
\expandafter\scr@startsection
\fi
}
-\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}}
+\newcommand*{\SecDef}[2]{\kernel@ifstar{#2}{\scr@section@dblarg{#1}}}
\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
\let\secdef\SecDef
\def\@tempa#1#2#3#4#5#6[#7]#8{%
@@ -2939,7 +3064,7 @@
Neither the then-code nor the else-code will be\MessageBreak
executed.\MessageBreak
You may change this and avoid the warning by LOCALLY\MessageBreak
- setting \string\IsUsePrefixLine\space to either
+ setting \string\IfUsePrefixLine\space to either
\string\@firstoftwo\space or\MessageBreak
\string\@secondoftwo\space before using it%
}%
@@ -2951,26 +3076,40 @@
\DefineFamily{KOMAarg}
\DefineFamilyMember[.dsc]{KOMAarg}
\newcommand*{\DeclareSectionCommandStyleOption}[3]{%
- \DeclareSectionCommandDummyOption{#2}%
+ \AddToSectionCommandOptionsDoList{#2}%
\expandafter\g@addto@macro\csname scr@dsc@style@#1@options\endcsname{%
\DefineFamilyKey[.dsc]{KOMAarg}{#2}{#3}%
}%
}
-\newcommand*{\DeclareSectionCommandDummyOption}[1]{%
- \@ifstar {%
- \g@addto@macro{\scr@dsc@dummyoptions}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{#1}[]{\FamilyKeyStateProcessed}%
+\newcommand*{\AddToSectionCommandOptionsDoList}[1]{%
+ \kernel@ifnextchar [%]
+ {\@AddToSectionCommandOptionListWithDefault{#1}}%
+ {\l@addto@macro\scr@dsc@doopts{\do{#1}}}%
+}
+\newcommand*{\@AddToSectionCommandOptionListWithDefault}{}
+\def\@AddToSectionCommandOptionListWithDefault#1[#2]{%
+ \l@addto@macro\scr@dsc@doopts{\do[{#2}]{#1}}
+}%
+\newcommand*{\scr@dsc@doopts}{}
+\newcommand*{\RelaxSectionCommandOptions}{%
+ \begingroup
+ \def\do@endgroup{\endgroup}%
+ \def\do{%
+ \kernel@ifnextchar [%]
+ {\@do}%
+ {\@do[]}%
}%
- }{%
- \g@addto@macro{\scr@dsc@dummyoptions}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{#1}{\FamilyKeyStateProcessed}%
+ \def\@do[##1]##2{%
+ \l@addto@macro\do@endgroup{\RelaxFamilyKey[.dsc]{KOMAarg}{##2}}%
}%
- }%
+ \scr@dsc@doopts
+ \do@endgroup
}
-\newcommand*{\scr@dsc@dummyoptions}{}
\newcommand*{\DeclareSectionCommandStyleLengthOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetLength{KOMAarg}{#2}{\noexpand\@tempskipa}{##1}%
+ }\reserved@a
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifscr@dsc@expandtopt
\expandafter\edef\csname #3\scr@dsc@current#4\endcsname{%
@@ -2983,9 +3122,11 @@
}
\newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
- \FamilySetCounter{KOMAarg}{#2}{\@tempcnta}{##1}%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{#2}{\noexpand\reserved@a}{##1}
+ }\reserved@a
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \expandafter\edef\csname #3\scr@dsc@current#4 \endcsname{\the\@tempcnta}%
+ \expandafter\let\csname #3\scr@dsc@current#4 \endcsname\reserved@a
\fi
}%
}
@@ -2999,13 +3140,6 @@
\FamilyKeyStateProcessed
}%
}
-\DeclareSectionCommandDummyOption{style}
-\DeclareSectionCommandDummyOption{expandtopt}*
-\DeclareSectionCommandDummyOption{increaselevel}
-\DeclareSectionCommandDummyOption{level}
-\DeclareSectionCommandDummyOption{toclevel}
-\DeclareSectionCommandDummyOption{tocindent}
-\DeclareSectionCommandDummyOption{tocnumwidth}
\newcommand*{\scr@dsc@style@section@options}{}
\DeclareSectionCommandStyleLengthOption{section}
{indent}{scr@}{@sectionindent}
@@ -3022,7 +3156,7 @@
{\csname scr@#1@beforeskip\endcsname}%
{\csname scr@#1@afterskip\endcsname}%
{%
- \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@
+ \ifdim\glueexpr\csname scr@#1@afterskip\endcsname >\z@
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}%
\fi
@@ -3080,11 +3214,10 @@
\newif\ifscr@dsc@parametersonly
\newcommand*{\DeclareSectionCommand}[2][]{%
\edef\scr@dsc@current{#2}%
- \scr@dsc@dummyoptions
\scr@dsc@parametersonlyfalse
\DefineFamilyKey[.dsc]{KOMAarg}{style}{%
- \ifstr{##1}{}{%
- \ifscr@dsc@parametersonlytrue
+ \IfArgIsEmpty{##1}{%
+ \scr@dsc@parametersonlytrue
\FamilyKeyStateProcessed
}{%
\scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{%
@@ -3095,7 +3228,27 @@
}%
}%
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{%
+ \IfArgIsEmpty{##1}{%
+ \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \relax
+ \FamilyKeyStateProcessed
+ }{%
+ \scr@ifundefinedorrelax{scr@dte@def@l@##1}{%
+ \FamilyKeyStateUnknownValue
+ }{%
+ \@namedef{scr@dte@\scr@dsc@current @style}{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{%
+ \FamilyKeyStateProcessed
+ }%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
\begingroup
\scr@ifundefinedorrelax{scr@\scr@dsc@current @style}{%
\scr@declaresectioncommanderror{\scr@dsc@current}
@@ -3103,8 +3256,54 @@
}{}%
\endgroup
\@firstofone{%
- \scr@dsc@dummyoptions
\@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
+ \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{%
+ \scr@ifundefinedorrelax{l@\scr@dsc@current}{%
+ \@namedef{scr@dte@\scr@dsc@current @style}{default}%
+ }{}%
+ }{}%
+ \let\scr@dsc@tocstyle@options\@empty
+ \let\scr@dsc@extra@relax@opts\@empty
+ \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{}{%
+ \begingroup
+ \def\scr@dte@current{#2}%
+ \edef\reserved@a{%
+ \noexpand\@ExecuteTOCEntryStyleInitCode{%
+ \@nameuse{scr@dte@\scr@dsc@current @style}%
+ }{\scr@dsc@current}%
+ }\reserved@a
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \l@addto@macro\do@endgroup{%
+ \l@addto@macro\scr@dsc@extra@relax@opts{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}%
+ }%
+ }%
+ \kernel@ifnextchar[%]
+ {\@dodefault{##1}}%
+ {\@donodefault{##1}}%
+ }%
+ \def\@donodefault##1{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \def\@dodefault##1[##2]{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}[##2]{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \scr@dte@doopts
+ \do@endgroup
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{\FamilyKeyStateProcessed}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{\FamilyKeyStateProcessed}%
\FamilyBoolKey[.dsc]{KOMAarg}{expandtopt}{scr@dsc@expandtopt}%
\scr@dsc@expandtoptfalse
\scr@ifundefinedorrelax{scr@local@levelincrease}{%
@@ -3137,64 +3336,38 @@
\let\scr@local@counterwithout\relax
\FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
\let\scr@local@counterwithin\relax
- \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@tocleveloffset\relax}%
- \edef\scr@local@tocleveloffset{%
- \the\numexpr\scr@local@tocleveloffset
- +\scr@local@levelincrease\relax
+ \scr@ifundefinedorrelax{scr@local@tocleveloffset}{}{%
+ \scr@ifundefinedorrelax{KV@KOMAarg.dsc@toclevel}{%
+ }{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \edef\reserved@a{%
+ \noexpand\l@addto@macro{\noexpand\scr@dsc@tocstyle@options}{%
+ level=\the\numexpr ##1+\scr@local@tocleveloffset\relax,%
}%
+ }\reserved@a
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
+ \FamilyKeyStateProcessed
}%
- }\reserved@a
- }%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifscr@dsc@expandtopt
- \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
- \the\@tempskipa}%
- \else
- \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
- ##1}%
- \fi
- \fi
- }%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifscr@dsc@expandtopt
- \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
- \the\@tempskipa}%
- \else
- \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
- ##1}%
- \fi
- \fi
+ }%
}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \scr@dsc@extra@relax@opts
+ \let\scr@dsc@extra@relax@opts\relax
+ \RelaxSectionCommandOptions
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{expandtopt}%
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
+ }%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{level}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}%
\begingroup
\scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
}{}%
- \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocindent}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry indent}
- {tocindent}%
- }{}%
- \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocnumwidth}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry number
- width}{tocnumwidth}%
- }{}%
\@nameuse{scr@dsc@style@%
\@nameuse{scr@\scr@dsc@current @style}%
@neededoptionstest}%
@@ -3214,7 +3387,7 @@
\else
\@removefromreset{#2}{\scr@local@counterwithin}%
\@addtoreset{#2}{\scr@local@counterwithin}%
- \expandafter\def\csname the#2\expandafter\endcsname{%
+ \expandafter\def\csname the#2\expandafter\endcsname\expandafter{%
\csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
\fi
\fi
@@ -3251,22 +3424,23 @@
}{%
\DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
}%
- \scr@ifundefinedorrelax{#2tocdepth}{%
- \expandafter\let\csname #2tocdepth\expandafter\endcsname
- \csname #2numdepth\endcsname
- }{}%
\expandafter\providecommand\expandafter*%
\csname add#2tocentry\endcsname[2]{%
\addtocentrydefault{#2}{##1}{##2}%
}%
+ \scr@ifundefinedorrelax{scr@dte@#2@style}{%
+ }{%
+ \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{%
+ \@nameuse{scr@dte@#2@style}%
+ }{#2}%
+ }%
\scr@ifundefinedorrelax{l@#2}{%
- \expandafter\edef\csname l@#2\endcsname{%
- \noexpand\bprot@dottedtocline
- \expandafter\noexpand\csname #2tocdepth\endcsname
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
- }%
+ \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{default}{#2}%
}{}%
+ \scr@ifundefinedorrelax{toclevel@part}{}{%
+ \expandafter\let\csname toclevel@#2\expandafter\endcsname
+ \csname #2tocdepth\endcsname
+ }%
}%
}%
\let\scr@dsc@current\relax
@@ -3326,9 +3500,9 @@
}
\newcommand*{\DeclareSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\edef\reserved@a{%
\unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
@@ -3341,9 +3515,9 @@
}
\newcommand*{\DeclareNewSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{}{%
\ClassError{\KOMAClassName}{%
@@ -3371,9 +3545,9 @@
}
\newcommand*{\RedeclareSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{%
\ClassError{\KOMAClassName}{%
@@ -3399,9 +3573,9 @@
}
\newcommand*{\ProvideSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{%
\edef\reserved@a{%
@@ -3409,7 +3583,7 @@
}%
\reserved@a
}{%
- \scr@dsc@dummyoptions
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
\FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
{\scr@local@levelincrease}%
\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
@@ -3417,11 +3591,18 @@
\edef\scr@local@leveloffset{%
\the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
}%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \FamilySetCounterMacro{KOMAarg}{toclevel}{\reserved@b}{##1}%
\edef\scr@local@tocleveloffset{%
\the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{toclevel}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{level}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
}%
}%
\let\scr@local@levelincrease\relax
@@ -3431,19 +3612,11 @@
\newcommand*{\bprot@dottedtocline}[5]{%
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\ifnum #1>\c@tocdepth \else
- \begingroup
- \@tempcnta 20010
- \advance \@tempcnta by -#1
- \ifnum \@tempcnta>\lastpenalty
- \endgroup
+ \ifnum \lastpenalty<\numexpr 20010-#1\relax
\addpenalty{\@lowpenalty}%
- \else
- \endgroup
\fi
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \@tempcnta 20009
- \advance \@tempcnta by -#1
- \penalty\@tempcnta
+ \penalty \numexpr 20009-#1\relax
\fi
\else
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
@@ -3594,39 +3767,6 @@
\part*{#1}%
\addpartmark{}%
}
-\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth <\parttocdepth \else
- \addpenalty{\@secpenalty}%
- \addvspace{2.25em \@plus\p@}%
- \setlength{\@tempdima}{\scr@part@tocnumwidth}%
- \if@tocleft
- \ifx\toc@l@number\@empty\else
- \setlength\@tempdima{0\toc@l@number}%
- \fi
- \fi
- \begingroup
- \parindent \z@ \rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \leavevmode
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- \usekomafont{partentry}{#1\nobreak
- \usekomafont{partentrypagenumber}{\hfil\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \expandafter\ifnum\scr@v@is@gt{2.96}\relax
- \endgroup
- \penalty20010
- \else
- \if@compatibility
- \global\@nobreaktrue
- \everypar{\global\@nobreakfalse\everypar{}}%
- \else
- \penalty\@highpenalty
- \fi
- \endgroup
- \fi
- \fi
-}
\newcounter{part}
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
@@ -3647,42 +3787,6 @@
\aliaskomafont{partprefix}{partnumber}
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
-\newcommand*\l@section[2]{%
- \ifnum \c@tocdepth <\sectiontocdepth\else
- \ifnum \lastpenalty<20009
- \addpenalty{\@secpenalty}%
- \fi
- \addvspace{1.0em \@plus\p@}%
- \setlength\@tempdima{\dimexpr\scr@section@tocnumwidth}%
- \if@tocleft
- \ifx\toc@l@number\@empty\else
- \setlength\@tempdima{0\toc@l@number}%
- \fi
- \fi
- \begingroup
- \raggedsectionentry
- \parindent \z@ \advance\rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \interlinepenalty\@M
- \leavevmode
- \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
- \edef\@pnumwidth{\the\dimexpr\@pnumwidth\relax}%
- \usekomafont{sectionentry}{#1\nobreak
- \usekomafont{sectionentrypagenumber}{%
- {\usekomafont{sectionentrydots}{%
- \if@sectionentrywithdots
- \leaders\hbox{$\m@th
- \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}%
- \fi
- \hfill}}\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \endgroup
- \expandafter\ifnum\scr@v@is@gt{2.96}\relax
- \penalty20008
- \fi
- \fi
-}
\newcommand*{\raggedsectionentry}{}
\newcommand\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
@@ -3777,9 +3881,10 @@
\DeclareSectionCommand[%
style=part,%
level=\z@,%
+ tocstyle=part,%
toclevel=\m@ne,%
tocindent=\z@,%
- tocnumwidth=2em
+ tocnumwidth=2em%
]{part}
\DeclareSectionCommand[%
style=section,%
@@ -3787,6 +3892,7 @@
indent=\z@,%
beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,%
afterskip=2.3ex \@plus.2ex,%
+ tocstyle=section,%
tocindent=0pt,%
tocnumwidth=1.5em%
]{section}
@@ -3796,6 +3902,7 @@
indent=\z@,%
beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
afterskip=1.5ex \@plus .2ex,%
+ tocstyle=subsection,%
tocindent=1.5em,%
tocnumwidth=2.3em%
]{subsection}
@@ -3805,6 +3912,7 @@
indent=\z@,%
beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
afterskip=1.5ex \@plus .2ex,%
+ tocstyle=subsection,%
tocindent=3.8em,%
tocnumwidth=3.2em%
]{subsubsection}
@@ -3814,6 +3922,7 @@
indent=\z@,%
beforeskip=3.25ex \@plus1ex \@minus.2ex,%
afterskip=-1em,%
+ tocstyle=subsection,%
tocindent=7.0em,%
tocnumwidth=4.1em%
]{paragraph}
@@ -3823,6 +3932,7 @@
indent=\scr@parindent,%
beforeskip=3.25ex \@plus1ex \@minus .2ex,%
afterskip=-1em,%
+ tocstyle=subsection,%
tocindent=10em,%
tocnumwidth=5em%
]{subparagraph}
@@ -3833,7 +3943,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3854,7 +3964,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\sffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\setlength{\skip\@mpfootins}{\skip\footins}
@@ -3864,6 +3974,13 @@
\@arabic\c@equation
}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
+\AtBeginDocument{%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \string\providecommand*\string\new@tpo@label[2]{}%
+ }%
+ \fi
+}
\newcommand*{\scr@tpo}{0}
\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
@@ -3886,9 +4003,11 @@
\fi
\endgroup
\edef\is@thispageodd@setlabel{%
- \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
- \noexpand\string
- \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \if@filesw
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \fi
}%
#1%
\@esphack
@@ -3948,7 +4067,7 @@
\let\scr@ttl@saved@subparagraph\subparagraph
}
\AfterPackage{titlesec}{%
- \@ifpackagelater{titlesec}{2014/10/09}{%
+ \@ifpackagelater{titlesec}{2016/03/22}{%
\ClassInfo{\KOMAClassName}{%
Deactivating the `titlesec` workaround,\MessageBreak
because package is newer than expected%
@@ -4008,7 +4127,7 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -4103,7 +4222,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -4123,21 +4242,21 @@
\newif\ifscap@alt
\newcommand*{\@captionbeside}{}
\long\def\@captionbeside[#1]#2{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@captionbeside[{#1}]{#2}}
{\c@pti@nb@sid@[{#1}]{#2}}%
}
\newcommand*{\@@captionbeside}{}
\long\def\@@captionbeside[#1]#2[#3]{%
\def\scap@pos{#3}%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@captionbeside[{#1}]{#2}}
{\c@pti@nb@sid@[{#1}]{#2}}%
}
\newcommand*{\@@@captionbeside}{}
\long\def\@@@captionbeside[#1]#2[#3]{%
\def\scap@width{#3}%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@@captionbeside[{#1}]{#2}}
{\setlength{\@tempdima}{#3}%
\addtolength{\@tempdima}{-\linewidth}%
@@ -4148,7 +4267,7 @@
\newcommand*{\@@@@captionbeside}{}
\long\def\@@@@captionbeside[#1]#2[#3]{%
\def\scap@move{#3}%
- \@ifstar
+ \kernel@ifstar
{\scap@alttrue\c@pti@nb@sid@[{#1}]{#2}}
{\scap@altfalse\c@pti@nb@sid@[{#1}]{#2}}%
}
@@ -4229,7 +4348,7 @@
\newif\ifdofullc@p
\dofullc@ptrue
\newif\if@capbreak\@capbreakfalse
-\newcommand*{\setcapindent}{\@ifstar{\@@setcapindent}{\@setcapindent}}
+\newcommand*{\setcapindent}{\kernel@ifstar{\@@setcapindent}{\@setcapindent}}
\newcommand*{\@setcapindent}[1]{%
\setlength{\@tempdima}{#1}%
\ifdim\@tempdima>\hsize
@@ -4256,7 +4375,7 @@
`\string\setcapindent'%
}%
\captionstyle{indent}%
- \@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}%
+ \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}%
}%
}
\newcommand*{\setcaphanging}{\dofullc@ptrue\@capbreakfalse}
@@ -4365,9 +4484,103 @@
\setcaptionwidth{#2}%
}%
}%
+\newcommand*{\setcapdynwidth}[2][]{%
+ \def\cap@width{#2}%
+ \begingroup
+ \edef\@tempa{#1}%
+ \def\@tempb{c}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill\let\cap@right=\hfill}%
+ \else
+ \def\@tempb{l}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\relax\let\cap@right\hfill}%
+ \else
+ \def\@tempb{r}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill\let\cap@right=\relax}%
+ \else
+ \def\@tempb{i}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\relax
+ \let\cap@right=\hfill
+ \if@twoside
+ \ifthispageodd{}{%
+ \let\cap@left=\hfill
+ \let\cap@right=\relax
+ }%
+ \fi
+ }%
+ \else
+ \def\@tempb{o}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill
+ \let\cap@right=\relax
+ \if@twoside
+ \ifthispageodd{}{%
+ \let\cap@left=\relax
+ \let\cap@right=\hfill
+ }%
+ \fi
+ }%
+ \else
+ \ifx \@tempa\@empty\else
+ \ClassError{\KOMAClassName}{%
+ unknown optional position argument%
+ }{%
+ You've used `#1' as position argument at
+ \string\setcaptionwidth,\MessageBreak
+ but only ONE of `c', `l', `r', `i`, `o` ist
+ allowed.\MessageBreak
+ Argument will be ignored, if you'll continue.%
+ }%
+ \fi
+ \endgroup
+ \fi\fi\fi\fi\fi
+}
\newcommand*{\cap@margin}{}
\let\cap@margin=\relax%
-\newcommand*{\setcapmargin}{\@ifstar{\@setcapmargin}{\@@setcapmargin}}
+\newcommand*{\setcapmargin}{\kernel@ifstar{\@setcapmargin}{\@@setcapmargin}}
\newcommand*{\@setcapmargin}[2][\@tempdimb]{%
\def\cap@margin{%
\onelinecaptionsfalse
@@ -4609,15 +4822,19 @@
\newcommand*{\ext@figure}{lof}
\newcommand*{\fnum@figure}{\figureformat}
\newenvironment{figure}{%
- \if@figurecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@figurecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
- \if@figurecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@figurecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@dblfloat{figure}%
}{%
\end@dblfloat
@@ -4634,15 +4851,19 @@
\newcommand*{\ext@table}{lot}
\newcommand*{\fnum@table}{\tableformat}
\newenvironment{table}{%
- \if@tablecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@float{table}%
}{%
\end@float
}
\newenvironment{table*}{%
- \if@tablecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@dblfloat{table}%
}{%
\end@dblfloat
@@ -4784,18 +5005,11 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
-\renewcommand*{\numberline}[1]{%
- \numberline@box{%
- \numberline@prefix
- \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}%
- \numberline@postfix
- }%
-}
-\newcommand*{\numberline@prefix}{}
-\newcommand*{\numberline@postfix}{\hfil}
-\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}}
-\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
+%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
+\g@addto@macro{\numberline@numberpostfix}{\autodot}
+\usetocbasicnumberline[%
+ \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
+]
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
\newcommand*\@dotsep{4.5}
@@ -4811,7 +5025,7 @@
\setlength{\@tempdima}{\last@l@number}%
\fi%
}
-\newcommand*{\before@starttoc}[1]{
+\newcommand*{\before@starttoc}[1]{%
\let\scr@dottedtocline=\@dottedtocline
\renewcommand*{\@dottedtocline}[3]{%
\scr@dottedtocline{##1}{\z@}{\last@l@number}}%
@@ -4828,6 +5042,24 @@
\expandafter=\csname#1@l@number\endcsname
\fi
}%
+ \begingroup
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \scr@ifundefinedorrelax{scr@tso@##1@numwidth}{}{%
+ \typeout{Setting numwidth of `##1' to \last@l@number}%
+ \l@addto@macro\do@endgroup{%
+ \@namedef{scr@tso@##1@numwidth}{\last@l@number}%
+ }%
+ }%
+ \scr@ifundefinedorrelax{scr@tso@##1@indent}{}{%
+ \typeout{Setting indent of `##1' to \string\z@}%
+ \l@addto@macro\do@endgroup{%
+ \@namedef{scr@tso@##1@indent}{\z@}%
+ }%
+ }%
+ }%
+ \@nameuse{scr@dte@donumwidth}%
+ \do@endgroup
}
\newcommand*{\after@starttoc}[1]{%
\protected@write\@auxout{}{%
@@ -5047,7 +5279,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -5194,7 +5426,7 @@
}%
\item\is@thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\sffamily\bfseries}
+\newcommand*\descfont{\@gr@gsffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index dc854a97862..b8a5b21e7cf 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-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2016 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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,18 +66,18 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package (%
KOMA-Script-independent
basics and keyval usage)]
@@ -106,6 +106,7 @@
\fi
\expandafter\reserved@a\expandafter{\reserved@b}
\RequirePackage{keyval}
+\providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}}
\newcommand{\scr@ifundefinedorrelax}[1]{%
\ifcsname #1\endcsname
\expandafter\ifx\csname #1\endcsname\relax
@@ -167,7 +168,7 @@
}%
}
\newcommand*{\DefineFamilyKey}[3][.\@currname.\@currext]{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{%
\edef\reserved@a{#1}%
\expandafter\scr@define@family@key
@@ -228,12 +229,6 @@
\newcommand*{\FamilyOfKey}{}
\newcommand*{\FamilyMemberOfKey}{}
\newcommand*{\@globaloptionslist}{}
-\let\@globaloptionslist\@classoptionslist
-\scr@ifundefinedorrelax{XKV@classoptionslist}{}{%
- \ifx\XKV@classoptionslist\@empty\else
- \let\@globaloptionslist\XKV@classoptionslist
- \fi
-}
\newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{%
\ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions
\PackageError{scrbase}{nested \string\FamilyProcessOptions\space
@@ -259,6 +254,14 @@
\let\ds@\@empty
\edef\@curroptions{\@ptionlist{\@currname.\@currext}}%
\ifx\@currext\@clsextension\else
+ \let\@globaloptionslist\@classoptionslist
+ \scr@ifundefinedorrelax{XKV@classoptionslist}{%
+ }{%
+ \ifx\XKV@classoptionslist\@empty
+ \else
+ \let\@globaloptionslist\XKV@classoptionslist
+ \fi
+ }%
\scr@ifundefinedorrelax{@globaloptionslist}{}{%
\@for\CurrentOption:=\@globaloptionslist\do{%
\ifx\CurrentOption\@empty\else
@@ -387,12 +390,12 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% 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 $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $
\RequirePackage{scrlfile}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -500,229 +503,464 @@
\expandafter\@secondoftwo
\fi
}
+\newcommand*{\ifislengthprimitive}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifislengthprimitive#1\@nil}%
+}
+\newcommand*{\scr@ifislengthprimitive}[1]{%
+ \begingroup
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifislengthprimitive
+ }{%
+ \def\reserved@c{\aftergroup\scr@secondoftwoAfterNil}%
+ \@for\reserved@a:=\baselineskip,\dp,\hsize,\ht,\lineskip,%
+ \parindent,\parskip,\pdfpageheight,\pdfpagewidth,%
+ \wd,\vsize \do {%
+ \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{%
+ \meaning #1%
+ }{%
+ \def\reserved@c{\aftergroup\scr@TestDimenAssignTillNil}%
+ }%
+ }%
+ \reserved@c
+ }%
+ \endgroup
+ #1%
+}
\newcommand*{\ifisdimen}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimen#1\@nil}%
+}
+\newcommand*{\scr@ifisdimen}[1]{%
\begingroup
- \edef\reserved@a{#1}%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter\reserved@a
- \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
- \expandafter\def\expandafter\reserved@b\expandafter{\string\dimen}%
- \ifstrstart{\reserved@a}{\reserved@b}{%
- \afterassignment\scr@ifrelax@to@nnil
- \@tempdima=#1\relax\@nnil{%
- \aftergroup\@firstoftwo
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisdimen
+ }{%
+ \ifstrstart{\meaning #1}{\string\dimen}{%
+ \aftergroup\scr@TestDimenAssignTillNil
}{%
- \aftergroup\@secondoftwo
+ \aftergroup\scr@secondoftwoAfterNil
}%
- }{\aftergroup\@secondoftwo}%
+ }%
\endgroup
+ #1%
}
-\newcommand*{\scr@ifrelax@to@nnil}{}
-\def\scr@ifrelax@to@nnil#1\@nnil{%
+\newcommand*\scr@TestDimenAssignTillNil{}
+\def\scr@TestDimenAssignTillNil#1\@nil{%
\begingroup
- \def\reserved@a{#1}\def\reserved@b{\relax}%
- \ifx\reserved@a\reserved@b
- \aftergroup\@firstoftwo
- \else
- \aftergroup\@secondoftwo
- \fi
+ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil
+ \@tempdima=#1\relax\@nnil
+}
+\newcommand*\scr@AfterEndGroupIfArgIsRelaxTillNnil{}
+\def\scr@AfterEndGroupIfArgIsRelaxTillNnil#1\@nnil{%
\endgroup
+ \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{%
+ \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{%
+ \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil
+ }{\@secondoftwo}%
+ }%
}
-\newcommand*{\ifisdimexpr}[1]{%
+\newcommand*\scr@IfArgIsRelaxAfterRelaxTillNnil{}
+\def\scr@IfArgIsRelaxAfterRelaxTillNnil \relax#1\@nnil{%
+ \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{%
+ \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{%
+ \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil
+ }{\@secondoftwo}%
+ }%
+}
+\newcommand*{\scr@secondoftwoAfterNil}{\scr@@secondoftwoAfterNil\@empty}
+\newcommand*{\scr@@secondoftwoAfterNil}{}
+\def\scr@@secondoftwoAfterNil#1\@nil{\@secondoftwo}
+\newcommand*{\ifisskip}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisskip#1\@nil}%
+}
+\newcommand*{\scr@ifisskip}[1]{%
\begingroup
- \edef\reserved@a{#1}%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter\reserved@a
- \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
- \expandafter\def\expandafter\reserved@b\expandafter{\string\dimexpr}%
- \ifstrstart{\reserved@a}{\reserved@b}{%
- \afterassignment\scr@ifemptyorrelax@to@nnil
- \@tempdima=#1\relax\@nnil{%
- \aftergroup\@firstoftwo
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisskip
+ }{%
+ \ifstrstart{\meaning #1}{\string\skip}{%
+ \aftergroup\scr@TestSkipAssignTillNil
}{%
- \aftergroup\@secondoftwo
+ \aftergroup\scr@secondoftwoAfterNil
}%
- }{\aftergroup\@secondoftwo}%
+ }%
\endgroup
+ #1%
}
-\newcommand*{\scr@ifemptyorrelax@to@nnil}{}
-\def\scr@ifemptyorrelax@to@nnil#1\@nnil{%
+\newcommand*\scr@TestSkipAssignTillNil{}
+\def\scr@TestSkipAssignTillNil#1\@nil{%
\begingroup
- \def\reserved@a{#1}\def\reserved@b{\relax}%
- \ifx\reserved@a\reserved@b
- \aftergroup\@firstoftwo
- \else
- \ifx\reserved@a\@empty
- \aftergroup\@firstoftwo
- \else
- \aftergroup\@secondoftwo
- \fi
- \fi
- \endgroup
+ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil
+ \@tempskipa=#1\relax\@nnil
}
-\newcommand*{\ifisskip}[1]{%
+\newcommand*{\ifiscount}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifiscount#1\@nil}%
+}
+\newcommand*{\scr@ifiscount}[1]{%
\begingroup
- \edef\reserved@a{#1}%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter\reserved@a
- \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
- \expandafter\def\expandafter\reserved@b\expandafter{\string\skip}%
- \ifstrstart{\reserved@a}{\reserved@b}{%
- \afterassignment\scr@ifrelax@to@nnil
- \@tempskipa=#1\relax\@nnil{%
- \aftergroup\@firstoftwo
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifiscount
+ }{%
+ \ifstrstart{\meaning #1}{\string\count}{%
+ \aftergroup\scr@TestCountAssignTillNil
}{%
- \aftergroup\@secondoftwo
+ \aftergroup\scr@secondoftwoAfterNil
}%
+ }%
+ \endgroup
+ #1%
+}
+\newcommand*\scr@TestCountAssignTillNil{}
+\def\scr@TestCountAssignTillNil#1\@nil{%
+ \begingroup
+ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil
+ \@tempcnta=#1\relax\@nnil
+}
+\newcommand*{\ifisdimexpr}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimexpr#1\relax\@nil}%
+}
+\newcommand*{\scr@ifisdimexpr}[1]{%
+ \begingroup
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisdimexpr
}{%
- \ifstr{\reserved@a}{\string\baselineskip}{%
- \aftergroup\@firstoftwo
+ \ifstrstart{\meaning #1}{\string\dimexpr}{%
+ \aftergroup\scr@TestDimenAssignTillNil
}{%
- \ifstr{\reserved@a}{\string\parskip}{%
- \aftergroup\@firstoftwo
- }{%
- \aftergroup\@secondoftwo
- }%
+ \aftergroup\scr@secondoftwoAfterNil
}%
}%
\endgroup
+ #1%
}
\newcommand*{\ifisglueexpr}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglueexpr#1\relax\@nil}%
+}
+\newcommand*{\scr@ifisglueexpr}[1]{%
\begingroup
- \edef\reserved@a{#1}%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter\reserved@a
- \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
- \expandafter\def\expandafter\reserved@b\expandafter{\string\glueexpr}%
- \ifstrstart{\reserved@a}{\reserved@b}{%
- \afterassignment\scr@ifemptyorrelax@to@nnil
- \@tempskipa=#1\relax\@nnil{%
- \aftergroup\@firstoftwo
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisglueexpr
+ }{%
+ \ifstrstart{\meaning #1}{\string\glueexpr}{%
+ \aftergroup\scr@TestSkipAssignTillNil
}{%
- \aftergroup\@secondoftwo
+ \aftergroup\scr@secondoftwoAfterNil
}%
- }{\aftergroup\@secondoftwo}%
+ }%
\endgroup
+ #1%
}
-\newcommand*{\ifiscount}[1]{%
+\newcommand*{\ifisnumexpr}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisnumexpr#1\relax\@nil}%
+}
+\newcommand*{\scr@ifisnumexpr}[1]{%
\begingroup
- \edef\reserved@a{#1}%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter\reserved@a
- \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
- \expandafter\def\expandafter\reserved@b\expandafter{\string\count}%
- \ifstrstart{\reserved@a}{\reserved@b}{%
- \afterassignment\scr@ifrelax@to@nnil
- \@tempcnta=#1\relax\@nnil{%
- \aftergroup\@firstoftwo
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisnumexpr
+ }{%
+ \ifstrstart{\meaning #1}{\string\numexpr}{%
+ \aftergroup\scr@TestCountAssignTillNil
}{%
- \aftergroup\@secondoftwo
+ \aftergroup\scr@secondoftwoAfterNil
}%
- }{\aftergroup\@secondoftwo}%
+ }%
\endgroup
+ #1%
}
-\newcommand*{\ifisnumexpr}[1]{%
+\newcommand*{\ifisdefchar}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdefchar#1\@nil}%
+}
+\newcommand*{\scr@ifisdefchar}[1]{%
\begingroup
- \edef\reserved@a{#1}%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter\reserved@a
- \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
- \expandafter\def\expandafter\reserved@b\expandafter{\string\numexpr}%
- \ifstrstart{\reserved@a}{\reserved@b}{%
- \afterassignment\scr@ifemptyorrelax@to@nnil
- \@tempcnta=#1\relax\@nnil{%
- \aftergroup\@firstoftwo
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisdefchar
+ }{%
+ \ifstrstart{\meaning #1}{\string\char\string"}{%
+ \aftergroup\scr@TestCountAssignTillNil
}{%
- \aftergroup\@secondoftwo
+ \aftergroup\scr@secondoftwoAfterNil
}%
- }{\aftergroup\@secondoftwo}%
+ }%
\endgroup
+ #1%
}
\newcommand*{\ifiscounter}[1]{%
\begingroup
- \@ifundefined{c@#1}%
- {\aftergroup\@secondoftwo}%
- {\aftergroup\@firstoftwo}%
+ \scr@ifundefinedorrelax{c@#1}{%
+ \aftergroup\@secondoftwo
+ }{%
+ \aftergroup\@firstoftwo
+ }%
\endgroup
}
\newcommand*{\ifisinteger}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisinteger#1\@nil}%
+}
+\def\scr@ifisinteger#1{%
\begingroup
- \edef\reserved@a{#1}\expandafter
- \scr@ifintegerplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}%
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisinteger\aftergroup#1%
+ }{%
+ \ifstrstart{\meaning #1}{\detokenize{the character}}{%
+ \if #1-\aftergroup\scr@ifisinteger
+ \else
+ \if #1+\aftergroup\scr@ifisinteger
+ \else
+ \ifnum 0=0\if #10\else\if #11\else\if #12\else\if #13\else
+ \if #14\else\if #15\else\if #16\else\if #17\else
+ \if #18\else\if #19\else 1\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \relax
+ \aftergroup\scr@TestCountAssignTillNil
+ \aftergroup#1%
+ \else
+ \aftergroup\scr@secondoftwoAfterNil
+ \aftergroup#1%
+ \fi
+ \fi
+ \fi
+ }{%
+ \ifstrstart{\meaning #1}{\string\char\string"}{%
+ \aftergroup\scr@TestCountAssignTillNil
+ }{%
+ \def\reserved@c{%
+ \aftergroup\scr@secondoftwoAfterNil
+ }%
+ \@for\reserved@a:=\abovedisplayskip,\abovedisplayshortskip,%
+ \adjdemerits,%
+ \baselineskip,\belowdisplayskip,%
+ \belowdisplayshortskip,\binoppenalty,\boxmaxdepth,%
+ \brokenpenalty,%
+ \clubpenalty,\count,%
+ \dimen,\dimexpr,\doublehyphendemerits,\dp,%
+ \emergenystretch,\exhyphenpenalty,%
+ \finalhyphendemerits,%
+ \glueexpr,%
+ \hbadness,\hfuzz,\hsize,\ht,\hyphenpenalty,%
+ \lastskip,\lastpenalty,\linepenalty,%
+ \lineskip,\lineskiplimit,%
+ \maxdepth,\numexpr,%
+ \overfullrule,%
+ \parfillskip,\parindent,\parskip,%
+ \pdfpageheight,\pdfpagewidth,%
+ \predisplaypenalty,\pretolerance,%
+ \relpenalty,\widowpenalty,%
+ \skip,\splitmaxdepth,\splittopskip,%
+ \tolerance,\topskip,%
+ \wd,\vbadness,\vfuzz,\vsize
+ \do {%
+ \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{%
+ \meaning #1%
+ }{%
+ \def\reserved@c{\aftergroup\scr@TestCountAssignTillNil}%
+ }%
+ }%
+ \reserved@c
+ }%
+ \aftergroup#1%
+ }%
+ }%
\endgroup
}
-\newcommand*{\scr@ifintegerplusminus}{}
-\def\scr@ifintegerplusminus#1#2\@nil{%
- \def\scr@next{\scr@ifintegerplusminus #2\@nil}%
- \if #1-\relax
- \else \if #1+\relax
+\newcommand*{\scr@ifrelax@to@nnil}{}
+\def\scr@ifrelax@to@nnil#1\@nnil{%
+ \begingroup
+ \def\reserved@a{#1}\def\reserved@b{\relax}%
+ \ifx\reserved@a\reserved@b
+ \aftergroup\@firstoftwo
\else
- \def\scr@next{%
- \afterassignment\scr@ifrelax@to@nnil
- \@tempcnta=#1#2\relax\@nnil
- }%
- \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else
- \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else
- \let\scr@next\@secondoftwo
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \aftergroup\@secondoftwo
\fi
- \fi
- \scr@next
+ \endgroup
}
\newcommand*{\ifisdimension}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimension#1\@nil}%
+}
+\newcommand*{\scr@ifisdimension}[1]{%
\begingroup
- \edef\reserved@a{#1\relax}\expandafter
- \scr@ifdimensionplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}%
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisdimension\aftergroup#1%
+ }{%
+ \ifstrstart{\meaning #1}{\detokenize{the character}}{%
+ \if #1-\aftergroup\scr@ifisdimension
+ \else
+ \if #1-\aftergroup\scr@ifisdimension
+ \else
+ \if #1.%
+ \aftergroup\scr@TestDimensionAssignTillNil
+ \aftergroup#1%
+ \else
+ \if #1,%
+ \aftergroup\scr@TestDimensionAssignTillNil
+ \aftergroup#1%
+ \else
+ \ifnum 0=0\if #10\else\if #11\else\if #12\else\if #13\else
+ \if #14\else\if #15\else\if #16\else\if #17\else
+ \if #18\else\if #19\else 1\fi\fi
+ \fi\fi\fi\fi
+ \fi\fi\fi\fi
+ \relax
+ \aftergroup\scr@TestDimensionAssignTillNil
+ \aftergroup#1%
+ \else
+ \aftergroup\scr@secondoftwoAfterNil
+ \aftergroup#1%
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ }{%
+ \ifstrstart{\meaning #1}{\string\char\string"}{%
+ \aftergroup\scr@TestDimensionAssignTillNil
+ }{%
+ \def\reserved@c{%
+ \aftergroup\scr@secondoftwoAfterNil
+ \aftergroup\@empty
+ }%
+ \@for\reserved@a:=\abovedisplayskip,\abovedisplayshortskip,%
+ \adjdemerits,%
+ \baselineskip,\belowdisplayskip,%
+ \belowdisplayshortskip,\binoppenalty,\boxmaxdepth,%
+ \brokenpenalty,%
+ \clubpenalty,\count,%
+ \dimen,\dimexpr,\doublehyphendemerits,\dp,%
+ \emergenystretch,\exhyphenpenalty,%
+ \finalhyphendemerits,%
+ \glueexpr,%
+ \hbadness,\hfuzz,\hsize,\ht,\hyphenpenalty,%
+ \lastskip,\lastpenalty,\linepenalty,%
+ \lineskip,\lineskiplimit,%
+ \maxdepth,\numexpr,%
+ \overfullrule,%
+ \parfillskip,\parindent,\parskip,%
+ \pdfpageheight,\pdfpagewidth,%
+ \predisplaypenalty,\pretolerance,%
+ \relpenalty,\widowpenalty,%
+ \skip,\splitmaxdepth,\splittopskip,%
+ \tolerance,\topskip,%
+ \wd,\vbadness,\vfuzz,\vsize
+ \do {%
+ \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{%
+ \meaning #1%
+ }{%
+ \def\reserved@c{\aftergroup\scr@TestDimensionAssignTillNil}%
+ }%
+ }%
+ \reserved@c
+ }%
+ \aftergroup#1%
+ }%
+ }%
\endgroup
}
-\newcommand*{\scr@ifdimensionplusminus}{}
-\def\scr@ifdimensionplusminus#1#2\@nil{%
- \def\scr@next{\scr@ifdimensionplusminus #2\@nil}%
- \if #1-\relax
- \else \if #1+\relax
- \else
- \def\scr@next{%
- \afterassignment\scr@ifrelax@to@nnil
- \@tempdima=#1#2\@nnil
- }%
- \if #1,\else\if #1.\else
- \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else
- \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else
- \let\scr@next\@secondoftwo
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
- \fi\fi
- \fi
- \fi
- \scr@next
+\newcommand*\scr@TestDimensionAssignTillNil{}
+\def\scr@TestDimensionAssignTillNil#1\@nil{%
+ \begingroup
+ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillptNnil
+ \@tempdima=#1pt\@nnil
+}
+\newcommand*\scr@AfterEndGroupIfArgIsRelaxTillptNnil{}
+\def\scr@AfterEndGroupIfArgIsRelaxTillptNnil#1\@nnil{%
+ \endgroup
+ \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{%
+ \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{%
+ \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil
+ }{\@secondoftwo}%
+ }%
+}
+\newcommand*\scr@IfArgIsRelaxAfterRelaxTillptNnil{}
+\def\scr@IfArgIsRelaxAfterRelaxTillptNnil \relax#1pt\@nnil{%
+ \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{%
+ \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{%
+ \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil
+ }{\@secondoftwo}%
+ }%
}
\newcommand*{\ifisglue}[1]{%
+ \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglue#1\@nil}%
+}
+\newcommand*{\scr@ifisglue}[1]{%
\begingroup
- \edef\reserved@a{#1\relax}\expandafter
- \scr@ifglueplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}%
+ \ifstrstart{\meaning #1}{\detokenize{macro:}}{%
+ \aftergroup\expandafter\aftergroup\scr@ifisglue\aftergroup#1%
+ }{%
+ \ifstrstart{\meaning #1}{\detokenize{the character}}{%
+ \if #1-\aftergroup\scr@ifisglue
+ \else
+ \if #1-\aftergroup\scr@ifisdimension
+ \else
+ \if #1.%
+ \aftergroup\scr@TestGlueAssignTillNil
+ \aftergroup#1%
+ \else
+ \if #1,%
+ \aftergroup\scr@TestGlueAssignTillNil
+ \aftergroup#1%
+ \else
+ \ifnum 0=0\if #10\else\if #11\else\if #12\else\if #13\else
+ \if #14\else\if #15\else\if #16\else\if #17\else
+ \if #18\else\if #19\else 1\fi\fi
+ \fi\fi\fi\fi
+ \fi\fi\fi\fi
+ \relax
+ \aftergroup\scr@TestGlueAssignTillNil
+ \aftergroup#1%
+ \else
+ \aftergroup\scr@secondoftwoAfterNil
+ \aftergroup#1%
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ }{%
+ \ifstrstart{\meaning #1}{\string\char\string"}{%
+ \aftergroup\scr@TestGlueAssignTillNil
+ }{%
+ \def\reserved@c{%
+ \aftergroup\scr@secondoftwoAfterNil
+ \aftergroup\@empty
+ }%
+ \@for\reserved@a:=\abovedisplayskip,\abovedisplayshortskip,%
+ \adjdemerits,%
+ \baselineskip,\belowdisplayskip,%
+ \belowdisplayshortskip,\binoppenalty,\boxmaxdepth,%
+ \brokenpenalty,%
+ \clubpenalty,\count,%
+ \dimen,\dimexpr,\doublehyphendemerits,\dp,%
+ \emergenystretch,\exhyphenpenalty,%
+ \finalhyphendemerits,%
+ \glueexpr,%
+ \hbadness,\hfuzz,\hsize,\ht,\hyphenpenalty,%
+ \lastskip,\lastpenalty,\linepenalty,%
+ \lineskip,\lineskiplimit,%
+ \maxdepth,\numexpr,%
+ \overfullrule,%
+ \parfillskip,\parindent,\parskip,%
+ \pdfpageheight,\pdfpagewidth,%
+ \predisplaypenalty,\pretolerance,%
+ \relpenalty,\widowpenalty,%
+ \skip,\splitmaxdepth,\splittopskip,%
+ \tolerance,\topskip,%
+ \wd,\vbadness,\vfuzz,\vsize
+ \do {%
+ \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{%
+ \meaning #1%
+ }{%
+ \def\reserved@c{\aftergroup\scr@TestGlueAssignTillNil}%
+ }%
+ }%
+ \reserved@c
+ }%
+ \aftergroup#1%
+ }%
+ }%
\endgroup
}
-\newcommand*{\scr@ifglueplusminus}{}
-\def\scr@ifglueplusminus#1#2\@nil{%
- \def\scr@next{\scr@ifglueplusminus #2\@nil}%
- \if #1-\relax
- \else \if #1+\relax
- \else
- \def\scr@next{%
- \afterassignment\scr@ifrelax@to@nnil
- \@tempskipa=#1#2\@nnil
- }%
- \if #1,\else\if #1.\else
- \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else
- \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else
- \let\scr@next\@secondoftwo
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
- \fi\fi
- \fi
- \fi
- \scr@next
+\newcommand*\scr@TestGlueAssignTillNil{}
+\def\scr@TestGlueAssignTillNil#1\@nil{%
+ \begingroup
+ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillptNnil
+ \@tempskipa=#1pt\@nnil
}
\newcommand\ifnumber[1]{%
\begingroup\@tempswafalse\let\scr@next\test@number
@@ -937,17 +1175,35 @@
\ifx\scr@key@name\space\else
\scr@ifundefinedorrelax{KV@#2@\scr@key@name}{%
\scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{%
- \PackageError{scrbase}{%
- unknown option
- `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ \scr@ifundefinedorrelax{KV@#2#1@@else@}{%
+ \PackageError{scrbase}{%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ Member `#1' of family `#2'\MessageBreak
+ cannot handle option `\scr@key@name'.\MessageBreak
+ So it cannot be set%
+ \ifx\scr@key@value\@empty\else
+ \space to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.%
+ }%
}{%
- Member `#1' of family `#2'\MessageBreak
- cannot handle option `\scr@key@name'.\MessageBreak
- So it cannot be set%
- \ifx\scr@key@value\@empty\else
- \space to value
- `\expandafter\detokenize\expandafter{\scr@key@value}'%
- \fi.%
+ \scr@execute@elseoption{#2#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed\else
+ \PackageError{scrbase}{%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ Member `#1' of family `#2'\MessageBreak
+ cannot handle option `\scr@key@name'.\MessageBreak
+ So it cannot be set%
+ \ifx\scr@key@value\@empty\else
+ \space to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.%
+ }%
+ \fi
}%
}{%
\scr@execute@option{#2#1}%
@@ -955,7 +1211,11 @@
}{%
\scr@execute@option{#2}%
\ifstr{#1}{}{}{%
- \scr@ifundefinedorrelax{KV@#2#1\scr@key@name}{}{%
+ \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{%
+ \scr@ifundefinedorrelax{KV@#2#1@@else@}{}{%
+ \scr@execute@elseoption{#2#1}%
+ }%
+ }{%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\scr@execute@option{#2#1}%
\FamilyKeyStateProcessed
@@ -1087,7 +1347,7 @@
\noexpand\let\noexpand\KV@err\noexpand\scr@KV@err
\noexpand\setkeys{#1}{%
\unexpanded\expandafter{\scr@key@atlist}}%
- \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}}%
@@ -1132,6 +1392,22 @@
\FamilyKeyStateNeedValue
}
\newcommand*{\scr@key@run@errors}{}
+\newcommand*{\scr@execute@elseoption}[1]{%
+ \protected@edef\reserved@a{%
+ \noexpand\def\noexpand\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{
+ \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}}%
+ }\reserved@a
+}
\newif\ifscr@key@found@
\newcommand*{\scr@key@atlist}{}
\newcommand*{\scr@key@name}{}
@@ -1184,6 +1460,69 @@
\long\def\l@addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
+\begingroup
+ \catcode`\^^A=\catcode`\#
+ \@makeother\#
+ \gdef\l@addto@macro@a^^A1{%
+ \begingroup
+ \@makeother\#
+ \def\l@addto@macro@a@cmd{^^A1}%
+ \l@addto@macro@a@
+ }
+ \gdef\l@addto@macro@a@^^A1{%
+ \def\l@addto@macro@a@add{^^A1}%
+ \l@addto@macro@a@@
+ }
+\endgroup
+\begingroup
+ \@makeother\#
+ \gdef\l@addto@macro@a@@{%
+ \@makeother\#
+ \edef\reserved@a{%
+ \detokenize{\endgroup\def}%
+ \detokenize\expandafter{\l@addto@macro@a@cmd#1}%
+ {%
+ \expandafter\detokenize%
+ \expandafter\expandafter\expandafter{\l@addto@macro@a@cmd{#1}}%
+ \expandafter\detokenize\expandafter{\l@addto@macro@a@add}%
+ }%
+ }%
+ \expandafter\scantokens\expandafter{\reserved@a}%
+ }%
+\endgroup
+\newcommand\l@preto@macro[2]{%
+ \edef#1{\unexpanded{#2}\unexpanded\expandafter{#1}}%
+}%
+\begingroup
+ \catcode`\^^A=\catcode`\#
+ \@makeother\#
+ \gdef\l@preto@macro@a^^A1{%
+ \begingroup
+ \@makeother\#
+ \def\l@preto@macro@a@cmd{^^A1}%
+ \l@preto@macro@a@
+ }
+ \gdef\l@preto@macro@a@^^A1{%
+ \def\l@preto@macro@a@add{^^A1}%
+ \l@preto@macro@a@@
+ }
+\endgroup
+\begingroup
+ \@makeother\#
+ \gdef\l@preto@macro@a@@{%
+ \@makeother\#
+ \edef\reserved@a{%
+ \detokenize{\endgroup\def}%
+ \detokenize\expandafter{\l@preto@macro@a@cmd#1}%
+ {%
+ \expandafter\detokenize\expandafter{\l@preto@macro@a@add}%
+ \expandafter\detokenize%
+ \expandafter\expandafter\expandafter{\l@preto@macro@a@cmd{#1}}%
+ }%
+ }%
+ \expandafter\scantokens\expandafter{\reserved@a}%
+ }%
+\endgroup
\newcommand{\FamilyUnknownKeyValue}[4]{%
\FamilyKeyStateUnknownValue
\ifx\FamilyElseValues\@empty\else
@@ -1222,7 +1561,7 @@
\let\FamilyElseValues\@empty
}
\newcommand*{\FamilyCounterKey}[3][.\@currname.\@currext]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\Family@@Counter@@Key{#1}{#2}{#3}}%
{\Family@Counter@Key{#1}{#2}{#3}}%
}
@@ -1236,15 +1575,26 @@
\DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetCounter{#2}{#3}{#4}{##1}}%
}
\newcommand*{\FamilySetCounter}[4]{%
- \ifiscount{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
- \ifisdimen{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
- \ifisnumexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
- \ifisdimexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
- \ifisinteger{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
- \ifiscounter{#4}{\value{#3}=\value{#4}\FamilyKeyStateProcessed}{%
- \FamilyUnknownKeyValue{#1}{#2}{#4}{%
- integer numbers, counters, lengths, skips, dimens
+ \begingroup
+ \protected@edef\reserved@a{#4}%
+ \def\reserved@b{\endgroup\value{#3}=#4 \FamilyKeyStateProcessed}%
+ \expandafter\ifiscount\expandafter{\reserved@a}{}{%
+ \expandafter\ifisdimen\expandafter{\reserved@a}{}{%
+ \expandafter\ifisskip\expandafter{\reserved@a}{}{%
+ \expandafter\ifisnumexpr\expandafter{\reserved@a}{}{%
+ \expandafter\ifisdimexpr\expandafter{\reserved@a}{}{%
+ \expandafter\ifisinteger\expandafter{\reserved@a}{}{%
+ \expandafter\ifiscounter\expandafter{\reserved@a}{%
+ \def\reserved@b{%
+ \endgroup\value{#3}=\value{#4}\FamilyKeyStateProcessed
+ }%
+ }{%
+ \def\reserved@b{%
+ \endgroup
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ integer numbers, counters, lengths, skips, dimens
+ }%
+ }%
}%
}%
}%
@@ -1252,10 +1602,10 @@
}%
}%
}%
- }%
+ \reserved@b
}
\newcommand*{\FamilyCounterMacroKey}[3][.\@currname.\@currext]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\Family@@Counter@@Macro@@Key{#1}{#2}{#3}}%
{\Family@Counter@Macro@Key{#1}{#2}{#3}}%
}
@@ -1270,31 +1620,25 @@
}
\newcommand*{\FamilySetCounterMacro}[4]{%
\begingroup
- \ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisnumexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisdimexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisinteger{#4}{%
- \@tempcnta=#4\aftergroup\FamilyKeyStateProcessed
- }{%
- \ifiscounter{#4}{%
- \@tempcnta=\value{#4}\FamilyKeyStateProcessed}{%
- \FamilyUnknownKeyValue{#1}{#2}{#4}{%
- integer numbers, counters, lengths, skips, dimens
- }%
- }%
- }%
- }%
- }%
+ \FamilySetCounter{#1}{#2}{page}{#4}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \edef\reserved@a{%
+ \unexpanded{\endgroup\def#3}%
+ {\the\value{page}}%
+ \noexpand\FamilyKeyStateProcessed
+ }%
+ \else
+ \def\reserved@a{%
+ \endgroup
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ integer numbers, counters, lengths, skips, dimens
}%
}%
- }%
- \expandafter\expandafter\expandafter\endgroup
- \expandafter\def\expandafter#3\expandafter{\the\@tempcnta}%
+ \fi
+ \reserved@a
}
\newcommand*{\FamilyLengthKey}[3][.\@currname.\@currext]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\Family@@Length@@Key{#1}{#2}{#3}}%
{\Family@Length@Key{#1}{#2}{#3}}%
}
@@ -1308,16 +1652,30 @@
\DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetLength{#2}{#3}{#4}{##1}}%
}
\newcommand*{\FamilySetLength}[4]{%
- \ifiscount{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisdimen{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisglue{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \FamilyUnknownKeyValue{#1}{#2}{#4}{%
- length values, counters, lengths, skips, dimens
- }%
+ \begingroup
+ \protected@edef\reserved@a{#4}%
+ \expandafter\ifiscount\expandafter{\reserved@a}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifisdimen\expandafter{\reserved@a}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifisskip\expandafter{\reserved@a}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifisnumexpr\expandafter{\reserved@a}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifisdimexpr\expandafter{\reserved@a}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifisglueexpr\expandafter{\reserved@a}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifisglue\expandafter{\reserved@a}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
}%
}%
}%
@@ -1325,9 +1683,16 @@
}%
}%
}%
+ \endgroup
+ {#3=#4\FamilyKeyStateProcessed}%
+ {%
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ length values, counters, lengths, skips, dimens
+ }%
+ }%
}
\newcommand*{\FamilyLengthMacroKey}[3][.\@currname.\@currext]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\Family@@Length@@Macro@@Key{#1}{#2}{#3}}%
{\Family@Length@Macro@Key{#1}{#2}{#3}}%
}
@@ -1342,34 +1707,59 @@
}
\newcommand*{\FamilySetLengthMacro}[4]{%
\begingroup
- \ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisnumexpr{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
- \ifisdimexpr{#4}{%
- \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed
- }{%
- \ifisglueexpr{#4}{%
- \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed
- }{%
- \ifisglue{#4}{%
- \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed
- }{%
- \FamilyUnknownKeyValue{#1}{#2}{#4}{%
- length values, counters, lengths, skips, dimens
- }%
- }%
- }%
- }%
- }%
+ \FamilySetLength{#1}{#2}{\@tempskipa}{#4}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \edef\reserved@a{%
+ \unexpanded{\endgroup\def#3}%
+ {\the\@tempskipa}%
+ \noexpand\FamilyKeyStateProcessed
+ }%
+ \else
+ \def\reserved@a{%
+ \endgroup
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ length values, counters, lengths, skips, dimens
}%
}%
- }%
- \expandafter\expandafter\expandafter\endgroup
- \expandafter\def\expandafter#3\expandafter{\the\@tempskipa}%
+ \fi
+ \reserved@a
+}
+\newcommand*{\FamilyUseLengthMacroKey}[3][.\@currname.\@currext]{%
+ \kernel@ifnextchar [%]
+ {\Family@@UseLength@@Macro@@Key{#1}{#2}{#3}}%
+ {\Family@UseLength@Macro@Key{#1}{#2}{#3}}%
+}
+\newcommand*{\Family@@UseLength@@Macro@@Key}{}
+\def\Family@@UseLength@@Macro@@Key#1#2#3[#4]#5{%
+ \ifdefined#5\else\let#5\z@\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{%
+ \FamilySetUseLengthMacro{#2}{#3}{#5}{##1}%
+ }%
+}
+\newcommand*{\Family@UseLength@Macro@Key}[4]{%
+ \ifdefined#4\else\let#4\z@\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetUseLengthMacro{#2}{#3}{#4}{##1}}%
+}
+\newcommand*{\FamilySetUseLengthMacro}[4]{%
+ \begingroup
+ \FamilySetLength{#1}{#2}{\@tempskipa}{#4}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \def\reserved@a{%
+ \endgroup\def#3{#4}%
+ \FamilyKeyStateProcessed
+ }%
+ \else
+ \def\reserved@a{%
+ \endgroup
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ length values, counters, lengths, skips, dimens
+ }%
+ }%
+ \fi
+ \reserved@a
}
\newcommand*{\FamilyNumericalKey}[3][.\@currname.\@currext]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\Family@Numerical@Key{#1}{#2}{#3}}{\Family@Numerical@Key{#1}{#2}{#3}[]}%
}
\newcommand*{\Family@Numerical@Key}{}
@@ -1413,7 +1803,7 @@
\let\FamilyElseValues\@empty
}
\newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\Family@@String@@Key{#1}{#2}{#3}}{\Family@String@Key{#1}{#2}{#3}}%
}
\newcommand*{\Family@@String@@Key}{}
@@ -1423,9 +1813,9 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\defcaptionname}{%
- \@ifstar\scr@def@scaptionname\scr@def@captionname
+ \kernel@ifstar\scr@def@scaptionname\scr@def@captionname
}
\newcommand*{\scr@def@scaptionname}[3]{%
\if@atdocument \expandafter\@firstofone
@@ -1462,9 +1852,24 @@
\ifx\languagename\scr@reserved@a
\@tempswatrue
\else
- \ifcsname l@\scr@reserved@a\endcsname
- \expandafter\ifnum\csname l@\scr@reserved@a\endcsname=\language
- \@tempswatrue
+ \edef\scr@reserved@b{\detokenize{german}}%
+ \ifx\languagename\scr@reserved@b
+ \edef\scr@reserved@b{%
+ \expandafter\ifx\csname if@german@oldspelling\expandafter\endcsname
+ \csname iffalse\endcsname n\fi
+ \expandafter\ifx\csname if@austrian@locale\expandafter\endcsname
+ \csname iftrue\endcsname austrian\else
+ \expandafter\ifx\csname if@swiss@locale\expandafter\endcsname
+ \csname iftrue\endcsname swiss\else german\fi\fi
+ }%
+ \@onelevel@sanitize\scr@reserved@b
+ \ifx\scr@reserved@a\scr@reserved@b \@tempswatrue\fi
+ \fi
+ \if@tempswa\else
+ \ifcsname l@\scr@reserved@a\endcsname
+ \expandafter\ifnum\csname l@\scr@reserved@a\endcsname=\language
+ \@tempswatrue
+ \fi
\fi
\fi
\fi
@@ -1522,8 +1927,33 @@
\reserved@b
}%
}
+\AfterPackage*{polyglossia}{%
+ \scr@ifundefinedorrelax{init@extras@german}{%
+ \AfterFile{gloss-german.ldf}%
+ }{%
+ \@firstofone
+ }%
+ {%
+ \providecommand*\captionsngerman{}%
+ \providecommand*\captionsaustrian{}%
+ \providecommand*\captionsnaustrian{}%
+ \providecommand*\captionsswiss{}%
+ \providecommand*\captionsnswiss{}%
+ \csgappto{init@extras@german}{%
+ \if@austrian@locale
+ \csuse{captions\if@german@oldspelling\else n\fi austrian}%
+ \else
+ \if@swiss@locale
+ \csuse{captions\if@german@oldspelling\else n\fi swiss}%
+ \else
+ \if@german@oldspelling\else \csuse{captionsngerman}\fi
+ \fi
+ \fi
+ }%
+ }%
+}
\newcommand*{\providecaptionname}{%
- \@ifstar\scr@provide@scaptionname\scr@provide@captionname
+ \kernel@ifstar\scr@provide@scaptionname\scr@provide@captionname
}
\newcommand*{\scr@provide@scaptionname}[3]{%
\if@atdocument \expandafter\@firstofone
@@ -1608,7 +2038,7 @@
}%
}
\newcommand*{\newcaptionname}{%
- \@ifstar\scr@new@scaptionname\scr@new@captionname
+ \kernel@ifstar\scr@new@scaptionname\scr@new@captionname
}
\newcommand*{\scr@new@scaptionname}[3]{%
\if@atdocument \expandafter\@firstofone
@@ -1703,7 +2133,7 @@
}%
}
\newcommand*{\renewcaptionname}{%
- \@ifstar\scr@renew@scaptionname\scr@renew@captionname
+ \kernel@ifstar\scr@renew@scaptionname\scr@renew@captionname
}
\newcommand*{\scr@renew@scaptionname}[3]{%
\if@atdocument \expandafter\@firstofone
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index e47aee05a28..de602fd9f98 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -7,6 +7,7 @@
%% scrkernel-version.dtx (with options: `class,book')
%% scrkernel-basics.dtx (with options: `load')
%% tocbasic.dtx (with options: `class,load,chapter')
+%% scrkernel-tocstyle.dtx (with options: `class,book,prepare')
%% scrkernel-sections.dtx (with options: `class,book,prepare')
%% scrkernel-compatibility.dtx (with options: `class,book,option')
%% scrkernel-miscellaneous.dtx (with options: `class,book,option')
@@ -15,6 +16,7 @@
%% scrkernel-typearea.dtx (with options: `class,book,option')
%% scrkernel-paragraphs.dtx (with options: `class,book,option')
%% scrkernel-title.dtx (with options: `class,book,option')
+%% scrkernel-tocstyle.dtx (with options: `class,book,option')
%% scrkernel-sections.dtx (with options: `class,book,option')
%% scrkernel-pagestyles.dtx (with options: `class,book,option')
%% scrkernel-floats.dtx (with options: `class,book,option')
@@ -31,6 +33,11 @@
%% scrkernel-typearea.dtx (with options: `class,book,body')
%% scrkernel-paragraphs.dtx (with options: `class,book,body')
%% scrkernel-title.dtx (with options: `class,book,body')
+%% scrkernel-tocstyle.dtx (with options: `class,book,body')
+%% scrkernel-tocstyle.dtx (with options: `class,book,style,part')
+%% scrkernel-tocstyle.dtx (with options: `class,book,style,chapter')
+%% scrkernel-tocstyle.dtx (with options: `class,book,style,section')
+%% scrkernel-tocstyle.dtx (with options: `class,book,style,default')
%% scrkernel-sections.dtx (with options: `class,book,body')
%% scrkernel-miscellaneous.dtx (with options: `class,book,body')
%% scrkernel-pagestyles.dtx (with options: `class,book,body')
@@ -42,7 +49,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -74,7 +81,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -96,7 +103,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -111,21 +118,23 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
\RequirePackage{tocbasic}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: prepare)
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrighttrue
@@ -200,8 +209,8 @@
\newcommand*{\size@subsubsection}{}
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -324,6 +333,7 @@
\@namedef{scr@v@3.18a}{15}
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
+\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -337,7 +347,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -359,8 +369,12 @@
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
+\newcommand*{\@gr@gsffamily}{%
+ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi
+}
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -427,7 +441,25 @@
\KOMAClassFileName
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+\DeclareOption{enabledeprecatedfontcommands}{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ deprecated option `enabledeprecatedfontcommands'.\MessageBreak
+ Note, that this option was already depreacted when\MessageBreak
+ it has been defined. Support for old font commands\MessageBreak
+ has been removed from KOMA-Script more than one\MessageBreak
+ decade ago. It is not recommended to use them any\MessageBreak
+ longer. Therefore usage of this class option also\MessageBreak
+ is not recommended%
+ }%
+ \let\scr@defineobsoletefonts\@ne
+}
+\scr@ifundefinedorrelax{scr@defineobsoletefonts}{%
+ \let\scr@defineobsoletefonts\z@
+}{}
+\BeforePackage{tex4ht}{%
+ \let\scr@defineobsoletefonts\thr@@
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -493,12 +525,12 @@
}{%
\def\FamilyElseValue{, `semi'}%
\KOMA@set@ifkey{twoside}{%
- @tempswa%
+ @twoside%
}{#1}%
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@tempswa\flushbottom
+ \if@twoside\flushbottom
\else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
\fi
\KOMA@kav@xreplacevalue{.%
@@ -516,10 +548,13 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{twocolumn}{@twocolumn}%
- \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twocolumn\twocolumn\sloppy\flushbottom
\else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi
+ \fi}%
\fi
}
\AtEndOfClass{%
@@ -533,7 +568,8 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: option
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -568,6 +604,7 @@
\let\par@update\relax
\newcommand*{\default@par@update}{}
\let\default@par@update\relax
+\AtBeginDocument{\par@update}
\newcommand*{\scr@parindent}{1em}
\newcommand*{\scr@parskip}{\z@}
\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil}
@@ -697,7 +734,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -728,7 +765,9 @@
}{titlepage}{\if@titlepage true\else false\fi}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -990,33 +1029,11 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
-\newif\if@hsl
-\KOMA@key{headsepline}[true]{%
- \KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }{%
- \KOMAoptions{headinclude=#1}{}%
- }%
- \fi
-}
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
-\newif\if@fsl
-\KOMA@key{footsepline}[true]{%
- \KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }{%
- \KOMAoptions{footinclude=#1}%
- }%
- \fi
-}
+\KOMA@ifkey{footsepline}{@fsl}%
\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA@key{cleardoublepage}{%
@@ -1116,7 +1133,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1320,7 +1337,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1841,19 +1858,19 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2250,42 +2267,78 @@
}%
}
\newcommand*{\scr@DeclareOldFontCommand}[3]{%
- \DeclareRobustCommand #1{\@fontswitch {%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#2}'%
- }%
- #2%
- }{%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#3}'%
+ \ifnum\scr@defineobsoletefonts<\z@\else
+ \ifnum\scr@defineobsoletefonts>\tw@
+ \DeclareOldFontCommand{#1}{#2}{#3}%
+ \else
+ \DeclareOldFontCommand{#1}{%
+ \scr@ErrorWarningInfo{#1}{#2}#2%
+ }{%
+ \scr@ErrorWarningInfo{#1}{#3}#3%
}%
- #3%
+ \fi
+ \fi
+}
+\DeclareRobustCommand*{\scr@ErrorWarningInfo}[2]{%
+ \ifnum \scr@defineobsoletefonts=\z@
+ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{%
+ You should note that since 1994 LaTeX2e provides a new font selection
+ scheme\MessageBreak
+ called NFSS2 with several new, combinable font commands. New
+ KOMA-Script\MessageBreak
+ classes have defined the old font commands like `\string#1'
+ only for compatibility\MessageBreak
+ with old LaTeX 2.09 document styles of Script 2.0. Nevertheless,
+ these\MessageBreak
+ commands are deprecated and undocumented at least since
+ 2003. Since 2013\MessageBreak
+ KOMA-Script classes warn abouts soon removement of these deprecated
+ commands.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, these commands will not
+ work any\MessageBreak
+ more. If loading a package results in this error message, you should
+ contact\MessageBreak
+ the author of that package and ask him to replace the deprecated font
+ command\MessageBreak
+ `\string#1', e.g., by `\detokenize{#2}`. Otherwise you should
+ reconfigure\MessageBreak
+ or replace the package. If you have used the old font command
+ `\string#1' yourself,\MessageBreak
+ you should replace it, e.g., by `\detokenize{#2}'.\MessageBreak
+ To make it work for now, you can use the already also deprecated class
+ option\MessageBreak
+ `enabledeprecatedfontcommands'.%
}%
- }%
+ \else
+ \ifcase \scr@defineobsoletefonts
+ \or
+ \expandafter\ClassWarning
+ \or
+ \expandafter\ClassInfo
+ \else
+ \expandafter\@gobbletwo
+ \fi
+ {\KOMAClassName}{deprecated old font command `\string#1' used.\MessageBreak
+ You should note, that since 1994 LaTeX2e provides a\MessageBreak
+ new font selection scheme called NFSS2 with several\MessageBreak
+ new, combinable font commands. New KOMA-Script classes\MessageBreak
+ have defined the old font commands like `\string#1' only for\MessageBreak
+ compatibility with LaTeX 2.09 document styles of\MessageBreak
+ Script 2.0. These commands are deprecated and\MessageBreak
+ undocumented at least since 2003. Since 2013,\MessageBreak
+ KOMA-Script classes warn about soon removement of\MessageBreak
+ these deprecated commands. Now, after two decades of\MessageBreak
+ LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak
+ not work any longer. If loading a package results in\MessageBreak
+ this message you should contact the author of that\MessageBreak
+ package and ask him to replace the depracted font\MessageBreak
+ command `\string#1', e.g., by `\detokenize{#2}'.\MessageBreak
+ Otherwise you should reconfigure or replace the\MessageBreak
+ package. If you have used the old font command\MessageBreak
+ `\string #1' yourself you should replace it, e.g., by\MessageBreak
+ `\detokenize{#2}'%
+ }%
+ \fi
}
\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
@@ -2298,12 +2351,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2347,7 +2400,8 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: body
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -2475,7 +2529,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2512,6 +2566,7 @@
\@thanks\global\let\@thanks\@empty
\clearpage
\csname titlepage@restore\endcsname
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\thispagestyle{empty}%
\let\footnote\thanks
\setcounter{footnote}{0}%
@@ -2781,7 +2836,54 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: body)
+\let\numberline\scr@numberline
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,part)
+\CloneTOCEntryStyle{tocline}{part}
+\TOCEntryStyleStartInitCode{part}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{\hfill}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{\usekomafont{partentry}{##1}}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+ \usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,chapter)
+\CloneTOCEntryStyle{tocline}{chapter}
+\TOCEntryStyleStartInitCode{chapter}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{%
+ \if@chapterentrywithdots
+ \TOCLineLeaderFill\relax
+ \else
+ \hfill
+ \fi
+ }%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname{\usekomafont{chapterentry}}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+ \usekomafont{chapterentry}{\usekomafont{chapterentrypagenumber}{##1}}}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,section)
+\CloneTOCEntryStyle{tocline}{section}
+\TOCEntryStyleStartInitCode{section}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,default)
+\CloneTOCEntryStyle{section}{default}
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -2808,7 +2910,7 @@
}
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
- \string\global\string\@altsecnumformattrue}%
+ \string\global\string\csname\space @altsecnumformattrue\string\endcsname}%
\fi\fi}
\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup%
\expandafter\@@maybeautodot #1\@stop\endgroup\fi
@@ -2842,11 +2944,33 @@
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
+ \kernel@ifstar
+ {\@ssect{#3}{#4}{#5}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+}
+\def\reserved@a#1#2#3#4#5#6{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
\@ifstar
{\@ssect{#3}{#4}{#5}{#6}}%
{\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
}
-\ifx\@startsection\scr@saved@startsection
+\ifcase \ifx\@startsection\scr@saved@startsection 0
+ \else
+ \ifx\@startsection\reserved@a 0
+ \else 1
+ \fi
+ \fi
\newcommand*{\scr@startsection}[6]{%
\if@noskipsec \leavevmode \fi
\par
@@ -2861,7 +2985,7 @@
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
- \@ifstar {%
+ \kernel@ifstar {%
\csname scr@preto@ssect@hook\endcsname
\def\scr@s@ct@@nn@m@{#1}%
\@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
@@ -2892,7 +3016,7 @@
}%
\let\scr@saved@startsection\@startsection
\newcommand*{\scr@startsection}[6]{%
- \@ifstar {%
+ \kernel@ifstar {%
\scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*%
}{%
@@ -2933,7 +3057,7 @@
\expandafter\scr@startsection
\fi
}
-\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}}
+\newcommand*{\SecDef}[2]{\kernel@ifstar{#2}{\scr@section@dblarg{#1}}}
\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
\let\secdef\SecDef
\def\@tempa#1#2#3#4#5#6[#7]#8{%
@@ -3124,7 +3248,7 @@
Neither the then-code nor the else-code will be\MessageBreak
executed.\MessageBreak
You may change this and avoid the warning by LOCALLY\MessageBreak
- setting \string\IsUsePrefixLine\space to either
+ setting \string\IfUsePrefixLine\space to either
\string\@firstoftwo\space or\MessageBreak
\string\@secondoftwo\space before using it%
}%
@@ -3136,26 +3260,40 @@
\DefineFamily{KOMAarg}
\DefineFamilyMember[.dsc]{KOMAarg}
\newcommand*{\DeclareSectionCommandStyleOption}[3]{%
- \DeclareSectionCommandDummyOption{#2}%
+ \AddToSectionCommandOptionsDoList{#2}%
\expandafter\g@addto@macro\csname scr@dsc@style@#1@options\endcsname{%
\DefineFamilyKey[.dsc]{KOMAarg}{#2}{#3}%
}%
}
-\newcommand*{\DeclareSectionCommandDummyOption}[1]{%
- \@ifstar {%
- \g@addto@macro{\scr@dsc@dummyoptions}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{#1}[]{\FamilyKeyStateProcessed}%
+\newcommand*{\AddToSectionCommandOptionsDoList}[1]{%
+ \kernel@ifnextchar [%]
+ {\@AddToSectionCommandOptionListWithDefault{#1}}%
+ {\l@addto@macro\scr@dsc@doopts{\do{#1}}}%
+}
+\newcommand*{\@AddToSectionCommandOptionListWithDefault}{}
+\def\@AddToSectionCommandOptionListWithDefault#1[#2]{%
+ \l@addto@macro\scr@dsc@doopts{\do[{#2}]{#1}}
+}%
+\newcommand*{\scr@dsc@doopts}{}
+\newcommand*{\RelaxSectionCommandOptions}{%
+ \begingroup
+ \def\do@endgroup{\endgroup}%
+ \def\do{%
+ \kernel@ifnextchar [%]
+ {\@do}%
+ {\@do[]}%
}%
- }{%
- \g@addto@macro{\scr@dsc@dummyoptions}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{#1}{\FamilyKeyStateProcessed}%
+ \def\@do[##1]##2{%
+ \l@addto@macro\do@endgroup{\RelaxFamilyKey[.dsc]{KOMAarg}{##2}}%
}%
- }%
+ \scr@dsc@doopts
+ \do@endgroup
}
-\newcommand*{\scr@dsc@dummyoptions}{}
\newcommand*{\DeclareSectionCommandStyleLengthOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetLength{KOMAarg}{#2}{\noexpand\@tempskipa}{##1}%
+ }\reserved@a
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifscr@dsc@expandtopt
\expandafter\edef\csname #3\scr@dsc@current#4\endcsname{%
@@ -3168,9 +3306,11 @@
}
\newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
- \FamilySetCounter{KOMAarg}{#2}{\@tempcnta}{##1}%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{#2}{\noexpand\reserved@a}{##1}
+ }\reserved@a
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \expandafter\edef\csname #3\scr@dsc@current#4 \endcsname{\the\@tempcnta}%
+ \expandafter\let\csname #3\scr@dsc@current#4 \endcsname\reserved@a
\fi
}%
}
@@ -3184,13 +3324,6 @@
\FamilyKeyStateProcessed
}%
}
-\DeclareSectionCommandDummyOption{style}
-\DeclareSectionCommandDummyOption{expandtopt}*
-\DeclareSectionCommandDummyOption{increaselevel}
-\DeclareSectionCommandDummyOption{level}
-\DeclareSectionCommandDummyOption{toclevel}
-\DeclareSectionCommandDummyOption{tocindent}
-\DeclareSectionCommandDummyOption{tocnumwidth}
\newcommand*{\scr@dsc@style@section@options}{}
\DeclareSectionCommandStyleLengthOption{section}
{indent}{scr@}{@sectionindent}
@@ -3207,7 +3340,7 @@
{\csname scr@#1@beforeskip\endcsname}%
{\csname scr@#1@afterskip\endcsname}%
{%
- \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@
+ \ifdim\glueexpr\csname scr@#1@afterskip\endcsname >\z@
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}%
\fi
@@ -3329,11 +3462,10 @@
\newif\ifscr@dsc@parametersonly
\newcommand*{\DeclareSectionCommand}[2][]{%
\edef\scr@dsc@current{#2}%
- \scr@dsc@dummyoptions
\scr@dsc@parametersonlyfalse
\DefineFamilyKey[.dsc]{KOMAarg}{style}{%
- \ifstr{##1}{}{%
- \ifscr@dsc@parametersonlytrue
+ \IfArgIsEmpty{##1}{%
+ \scr@dsc@parametersonlytrue
\FamilyKeyStateProcessed
}{%
\scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{%
@@ -3344,7 +3476,27 @@
}%
}%
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{%
+ \IfArgIsEmpty{##1}{%
+ \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \relax
+ \FamilyKeyStateProcessed
+ }{%
+ \scr@ifundefinedorrelax{scr@dte@def@l@##1}{%
+ \FamilyKeyStateUnknownValue
+ }{%
+ \@namedef{scr@dte@\scr@dsc@current @style}{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{%
+ \FamilyKeyStateProcessed
+ }%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
\begingroup
\scr@ifundefinedorrelax{scr@\scr@dsc@current @style}{%
\scr@declaresectioncommanderror{\scr@dsc@current}
@@ -3352,8 +3504,54 @@
}{}%
\endgroup
\@firstofone{%
- \scr@dsc@dummyoptions
\@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
+ \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{%
+ \scr@ifundefinedorrelax{l@\scr@dsc@current}{%
+ \@namedef{scr@dte@\scr@dsc@current @style}{default}%
+ }{}%
+ }{}%
+ \let\scr@dsc@tocstyle@options\@empty
+ \let\scr@dsc@extra@relax@opts\@empty
+ \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{}{%
+ \begingroup
+ \def\scr@dte@current{#2}%
+ \edef\reserved@a{%
+ \noexpand\@ExecuteTOCEntryStyleInitCode{%
+ \@nameuse{scr@dte@\scr@dsc@current @style}%
+ }{\scr@dsc@current}%
+ }\reserved@a
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \l@addto@macro\do@endgroup{%
+ \l@addto@macro\scr@dsc@extra@relax@opts{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}%
+ }%
+ }%
+ \kernel@ifnextchar[%]
+ {\@dodefault{##1}}%
+ {\@donodefault{##1}}%
+ }%
+ \def\@donodefault##1{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \def\@dodefault##1[##2]{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}[##2]{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \scr@dte@doopts
+ \do@endgroup
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{\FamilyKeyStateProcessed}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{\FamilyKeyStateProcessed}%
\FamilyBoolKey[.dsc]{KOMAarg}{expandtopt}{scr@dsc@expandtopt}%
\scr@dsc@expandtoptfalse
\scr@ifundefinedorrelax{scr@local@levelincrease}{%
@@ -3386,64 +3584,38 @@
\let\scr@local@counterwithout\relax
\FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
\let\scr@local@counterwithin\relax
- \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@tocleveloffset\relax}%
- \edef\scr@local@tocleveloffset{%
- \the\numexpr\scr@local@tocleveloffset
- +\scr@local@levelincrease\relax
+ \scr@ifundefinedorrelax{scr@local@tocleveloffset}{}{%
+ \scr@ifundefinedorrelax{KV@KOMAarg.dsc@toclevel}{%
+ }{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \edef\reserved@a{%
+ \noexpand\l@addto@macro{\noexpand\scr@dsc@tocstyle@options}{%
+ level=\the\numexpr ##1+\scr@local@tocleveloffset\relax,%
}%
+ }\reserved@a
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
+ \FamilyKeyStateProcessed
}%
- }\reserved@a
- }%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifscr@dsc@expandtopt
- \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
- \the\@tempskipa}%
- \else
- \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
- ##1}%
- \fi
- \fi
- }%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifscr@dsc@expandtopt
- \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
- \the\@tempskipa}%
- \else
- \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
- ##1}%
- \fi
- \fi
+ }%
}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \scr@dsc@extra@relax@opts
+ \let\scr@dsc@extra@relax@opts\relax
+ \RelaxSectionCommandOptions
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{expandtopt}%
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
+ }%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{level}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}%
\begingroup
\scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
}{}%
- \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocindent}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry indent}
- {tocindent}%
- }{}%
- \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocnumwidth}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry number
- width}{tocnumwidth}%
- }{}%
\@nameuse{scr@dsc@style@%
\@nameuse{scr@\scr@dsc@current @style}%
@neededoptionstest}%
@@ -3463,7 +3635,7 @@
\else
\@removefromreset{#2}{\scr@local@counterwithin}%
\@addtoreset{#2}{\scr@local@counterwithin}%
- \expandafter\def\csname the#2\expandafter\endcsname{%
+ \expandafter\def\csname the#2\expandafter\endcsname\expandafter{%
\csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
\fi
\fi
@@ -3500,22 +3672,23 @@
}{%
\DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
}%
- \scr@ifundefinedorrelax{#2tocdepth}{%
- \expandafter\let\csname #2tocdepth\expandafter\endcsname
- \csname #2numdepth\endcsname
- }{}%
\expandafter\providecommand\expandafter*%
\csname add#2tocentry\endcsname[2]{%
\addtocentrydefault{#2}{##1}{##2}%
}%
+ \scr@ifundefinedorrelax{scr@dte@#2@style}{%
+ }{%
+ \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{%
+ \@nameuse{scr@dte@#2@style}%
+ }{#2}%
+ }%
\scr@ifundefinedorrelax{l@#2}{%
- \expandafter\edef\csname l@#2\endcsname{%
- \noexpand\bprot@dottedtocline
- \expandafter\noexpand\csname #2tocdepth\endcsname
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
- }%
+ \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{default}{#2}%
}{}%
+ \scr@ifundefinedorrelax{toclevel@part}{}{%
+ \expandafter\let\csname toclevel@#2\expandafter\endcsname
+ \csname #2tocdepth\endcsname
+ }%
}%
}%
\let\scr@dsc@current\relax
@@ -3575,9 +3748,9 @@
}
\newcommand*{\DeclareSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\edef\reserved@a{%
\unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
@@ -3590,9 +3763,9 @@
}
\newcommand*{\DeclareNewSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{}{%
\ClassError{\KOMAClassName}{%
@@ -3620,9 +3793,9 @@
}
\newcommand*{\RedeclareSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{%
\ClassError{\KOMAClassName}{%
@@ -3648,9 +3821,9 @@
}
\newcommand*{\ProvideSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{%
\edef\reserved@a{%
@@ -3658,7 +3831,7 @@
}%
\reserved@a
}{%
- \scr@dsc@dummyoptions
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
\FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
{\scr@local@levelincrease}%
\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
@@ -3666,11 +3839,18 @@
\edef\scr@local@leveloffset{%
\the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
}%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \FamilySetCounterMacro{KOMAarg}{toclevel}{\reserved@b}{##1}%
\edef\scr@local@tocleveloffset{%
\the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{toclevel}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{level}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
}%
}%
\let\scr@local@levelincrease\relax
@@ -3684,12 +3864,12 @@
}%
}
\newcommand*{\set@preamble}[1]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\set@@preamble{#1}}{\set@@@preamble{#1}[][\hsize]}%
}
\newcommand*{\set@@preamble}{}
\def\set@@preamble#1[#2]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\set@@@preamble{#1}[{#2}]}{\set@@@preamble{#1}[{#2}][\hsize]}%
}
\newcommand{\set@@@preamble}{}
@@ -3788,19 +3968,11 @@
\newcommand*{\bprot@dottedtocline}[5]{%
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\ifnum #1>\c@tocdepth \else
- \begingroup
- \@tempcnta 20010
- \advance \@tempcnta by -#1
- \ifnum \@tempcnta>\lastpenalty
- \endgroup
+ \ifnum \lastpenalty<\numexpr 20010-#1\relax
\addpenalty{\@lowpenalty}%
- \else
- \endgroup
\fi
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \@tempcnta 20009
- \advance \@tempcnta by -#1
- \penalty\@tempcnta
+ \penalty \numexpr 20009-#1\relax
\fi
\else
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
@@ -3979,34 +4151,6 @@
\part*{#1}%
\addpartmark{}%
}
-\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth <\parttocdepth \else
- \addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\p@}%
- \setlength{\@tempdima}{\scr@part@tocnumwidth}%
- \if@tocleft
- \ifx\toc@l@number\@empty\else
- \setlength\@tempdima{0\toc@l@number}%
- \fi
- \fi
- \begingroup
- \parindent \z@ \rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \leavevmode
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- \usekomafont{partentry}{#1\nobreak
- \usekomafont{partentrypagenumber}{\hfil\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \expandafter\ifnum\scr@v@is@gt{2.96}\relax
- \endgroup
- \penalty20010
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
-}
\newcounter{part}
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
@@ -4152,7 +4296,7 @@
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\def\IfUseNumber{\ifnumbered{#1}}%
\if@mainmatter\else\let\IfUseNumber\@secondoftwo\fi
\if@chapterprefix
@@ -4203,7 +4347,7 @@
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\let\IfUseNumber\secondoftwo
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
@@ -4324,49 +4468,6 @@
causing \string\addchap\space to behave strange.\MessageBreak%
Please update hyperref to at least version
6.71b}}}
-\newcommand*\l@chapter[2]{%
- \ifnum \c@tocdepth <\chaptertocdepth \else
- \ifnum \lastpenalty<20010
- \addpenalty{-\@highpenalty}%
- \fi
- \expandafter\ifnum\scr@v@is@lt{3.15}%
- \vskip 1.0em \@plus\p@
- \else
- \addvspace{1.0em \@plus\p@}%
- \fi
- \setlength\@tempdima{\scr@chapter@tocnumwidth}%
- \if@tocleft
- \ifx\toc@l@number\@empty\else
- \setlength\@tempdima{0\toc@l@number}%
- \fi
- \fi
- \begingroup
- \raggedchapterentry
- \parindent \z@ \advance\rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \interlinepenalty\@M
- \leavevmode
- \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
- \edef\@pnumwidth{\the\dimexpr\@pnumwidth\relax}%
- \usekomafont{chapterentry}{#1\nobreak
- \usekomafont{chapterentrypagenumber}{%
- {\usekomafont{chapterentrydots}{%
- \if@chapterentrywithdots
- \leaders\hbox{$\m@th
- \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}%
- \fi
- \hfill}}\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \expandafter\ifnum\scr@v@is@gt{2.96}\relax
- \endgroup
- \penalty20009
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
-}
\newcommand*{\raggedchapterentry}{}
\newcommand*{\l@chapteratlist}{\l@chapter}
\newcounter{chapter}
@@ -4512,16 +4613,18 @@
style=part,%
level=\m@ne,%
pagestyle=plain,%
+ tocstyle=part,%
toclevel=\m@ne,%
tocindent=\z@,%
- tocnumwidth=2em
+ tocnumwidth=2em%
]{part}
\DeclareSectionCommand[%
style=chapter,%
level=\z@,%
pagestyle=plain,%
+ tocstyle=chapter,%
tocindent=\z@,%
- tocnumwidth=1.5em
+ tocnumwidth=1.5em%
]{chapter}
\DeclareSectionCommand[%
style=section,%
@@ -4529,6 +4632,7 @@
indent=\z@,%
beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,%
afterskip=2.3ex \@plus.2ex,%
+ tocstyle=section,%
tocindent=1.5em,%
tocnumwidth=2.3em%
]{section}
@@ -4538,6 +4642,7 @@
indent=\z@,%
beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
afterskip=1.5ex \@plus .2ex,%
+ tocstyle=section,%
tocindent=3.8em,%
tocnumwidth=3.2em%
]{subsection}
@@ -4547,6 +4652,7 @@
indent=\z@,%
beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
afterskip=1.5ex \@plus .2ex,%
+ tocstyle=section,%
tocindent=7.0em,%
tocnumwidth=4.1em%
]{subsubsection}
@@ -4556,6 +4662,7 @@
indent=\z@,%
beforeskip=3.25ex \@plus1ex \@minus.2ex,%
afterskip=-1em,%
+ tocstyle=section,%
tocindent=10em,%
tocnumwidth=5em%
]{paragraph}
@@ -4565,6 +4672,7 @@
indent=\scr@parindent,%
beforeskip=3.25ex \@plus1ex \@minus .2ex,%
afterskip=-1em,%
+ tocstyle=section,%
tocindent=12em,%
tocnumwidth=6em%
]{subparagraph}
@@ -4575,7 +4683,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4596,7 +4704,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\sffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\setlength{\skip\@mpfootins}{\skip\footins}
@@ -4612,6 +4720,13 @@
\@arabic\c@equation
}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
+\AtBeginDocument{%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \string\providecommand*\string\new@tpo@label[2]{}%
+ }%
+ \fi
+}
\newcommand*{\scr@tpo}{0}
\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
@@ -4634,9 +4749,11 @@
\fi
\endgroup
\edef\is@thispageodd@setlabel{%
- \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
- \noexpand\string
- \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \if@filesw
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \fi
}%
#1%
\@esphack
@@ -4696,7 +4813,7 @@
\let\scr@ttl@saved@subparagraph\subparagraph
}
\AfterPackage{titlesec}{%
- \@ifpackagelater{titlesec}{2014/10/09}{%
+ \@ifpackagelater{titlesec}{2016/03/22}{%
\ClassInfo{\KOMAClassName}{%
Deactivating the `titlesec` workaround,\MessageBreak
because package is newer than expected%
@@ -4756,7 +4873,7 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -4856,7 +4973,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -4876,21 +4993,21 @@
\newif\ifscap@alt
\newcommand*{\@captionbeside}{}
\long\def\@captionbeside[#1]#2{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@captionbeside[{#1}]{#2}}
{\c@pti@nb@sid@[{#1}]{#2}}%
}
\newcommand*{\@@captionbeside}{}
\long\def\@@captionbeside[#1]#2[#3]{%
\def\scap@pos{#3}%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@captionbeside[{#1}]{#2}}
{\c@pti@nb@sid@[{#1}]{#2}}%
}
\newcommand*{\@@@captionbeside}{}
\long\def\@@@captionbeside[#1]#2[#3]{%
\def\scap@width{#3}%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@@captionbeside[{#1}]{#2}}
{\setlength{\@tempdima}{#3}%
\addtolength{\@tempdima}{-\linewidth}%
@@ -4901,7 +5018,7 @@
\newcommand*{\@@@@captionbeside}{}
\long\def\@@@@captionbeside[#1]#2[#3]{%
\def\scap@move{#3}%
- \@ifstar
+ \kernel@ifstar
{\scap@alttrue\c@pti@nb@sid@[{#1}]{#2}}
{\scap@altfalse\c@pti@nb@sid@[{#1}]{#2}}%
}
@@ -4982,7 +5099,7 @@
\newif\ifdofullc@p
\dofullc@ptrue
\newif\if@capbreak\@capbreakfalse
-\newcommand*{\setcapindent}{\@ifstar{\@@setcapindent}{\@setcapindent}}
+\newcommand*{\setcapindent}{\kernel@ifstar{\@@setcapindent}{\@setcapindent}}
\newcommand*{\@setcapindent}[1]{%
\setlength{\@tempdima}{#1}%
\ifdim\@tempdima>\hsize
@@ -5009,7 +5126,7 @@
`\string\setcapindent'%
}%
\captionstyle{indent}%
- \@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}%
+ \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}%
}%
}
\newcommand*{\setcaphanging}{\dofullc@ptrue\@capbreakfalse}
@@ -5118,9 +5235,103 @@
\setcaptionwidth{#2}%
}%
}%
+\newcommand*{\setcapdynwidth}[2][]{%
+ \def\cap@width{#2}%
+ \begingroup
+ \edef\@tempa{#1}%
+ \def\@tempb{c}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill\let\cap@right=\hfill}%
+ \else
+ \def\@tempb{l}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\relax\let\cap@right\hfill}%
+ \else
+ \def\@tempb{r}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill\let\cap@right=\relax}%
+ \else
+ \def\@tempb{i}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\relax
+ \let\cap@right=\hfill
+ \if@twoside
+ \ifthispageodd{}{%
+ \let\cap@left=\hfill
+ \let\cap@right=\relax
+ }%
+ \fi
+ }%
+ \else
+ \def\@tempb{o}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill
+ \let\cap@right=\relax
+ \if@twoside
+ \ifthispageodd{}{%
+ \let\cap@left=\relax
+ \let\cap@right=\hfill
+ }%
+ \fi
+ }%
+ \else
+ \ifx \@tempa\@empty\else
+ \ClassError{\KOMAClassName}{%
+ unknown optional position argument%
+ }{%
+ You've used `#1' as position argument at
+ \string\setcaptionwidth,\MessageBreak
+ but only ONE of `c', `l', `r', `i`, `o` ist
+ allowed.\MessageBreak
+ Argument will be ignored, if you'll continue.%
+ }%
+ \fi
+ \endgroup
+ \fi\fi\fi\fi\fi
+}
\newcommand*{\cap@margin}{}
\let\cap@margin=\relax%
-\newcommand*{\setcapmargin}{\@ifstar{\@setcapmargin}{\@@setcapmargin}}
+\newcommand*{\setcapmargin}{\kernel@ifstar{\@setcapmargin}{\@@setcapmargin}}
\newcommand*{\@setcapmargin}[2][\@tempdimb]{%
\def\cap@margin{%
\onelinecaptionsfalse
@@ -5368,15 +5579,19 @@
\newcommand*{\ext@figure}{lof}
\newcommand*{\fnum@figure}{\figureformat}
\newenvironment{figure}{%
- \if@figurecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@figurecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
- \if@figurecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@figurecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@dblfloat{figure}%
}{%
\end@dblfloat
@@ -5399,15 +5614,19 @@
\newcommand*{\ext@table}{lot}
\newcommand*{\fnum@table}{\tableformat}
\newenvironment{table}{%
- \if@tablecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@float{table}%
}{%
\end@float
}
\newenvironment{table*}{%
- \if@tablecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@dblfloat{table}%
}{%
\end@dblfloat
@@ -5550,24 +5769,17 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
+\g@addto@macro{\numberline@numberpostfix}{\autodot}
+\usetocbasicnumberline[%
+ \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
+]
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
\AtAddToTocList[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
-\renewcommand*{\numberline}[1]{%
- \numberline@box{%
- \numberline@prefix
- \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}%
- \numberline@postfix
- }%
-}
-\newcommand*{\numberline@prefix}{}
-\newcommand*{\numberline@postfix}{\hfil}
-\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}}
-\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
\newcommand*\@dotsep{4.5}
@@ -5583,7 +5795,7 @@
\setlength{\@tempdima}{\last@l@number}%
\fi%
}
-\newcommand*{\before@starttoc}[1]{
+\newcommand*{\before@starttoc}[1]{%
\let\scr@dottedtocline=\@dottedtocline
\renewcommand*{\@dottedtocline}[3]{%
\scr@dottedtocline{##1}{\z@}{\last@l@number}}%
@@ -5600,6 +5812,24 @@
\expandafter=\csname#1@l@number\endcsname
\fi
}%
+ \begingroup
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \scr@ifundefinedorrelax{scr@tso@##1@numwidth}{}{%
+ \typeout{Setting numwidth of `##1' to \last@l@number}%
+ \l@addto@macro\do@endgroup{%
+ \@namedef{scr@tso@##1@numwidth}{\last@l@number}%
+ }%
+ }%
+ \scr@ifundefinedorrelax{scr@tso@##1@indent}{}{%
+ \typeout{Setting indent of `##1' to \string\z@}%
+ \l@addto@macro\do@endgroup{%
+ \@namedef{scr@tso@##1@indent}{\z@}%
+ }%
+ }%
+ }%
+ \@nameuse{scr@dte@donumwidth}%
+ \do@endgroup
}
\newcommand*{\after@starttoc}[1]{%
\protected@write\@auxout{}{%
@@ -5821,7 +6051,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -5968,7 +6198,7 @@
}%
\item\is@thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\sffamily\bfseries}
+\newcommand*\descfont{\@gr@gsffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 25845c195d1..f3822546f01 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrdate,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,7 +43,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,23 +65,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
+%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
-%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
+%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
\newcommand*{\@GaussYear}[3]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
index 8ebda7724e0..a1592e35f5f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
@@ -1,6 +1,6 @@
% ======================================================================
% scrdoc.dtx
-% Copyright (c) Markus Kohm, 2002-2012
+% Copyright (c) Markus Kohm, 2002-2016
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrdoc.dtx
-% Copyright (c) Markus Kohm, 2002-2012
+% Copyright (c) Markus Kohm, 2002-2016
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -42,7 +42,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{scrdoc}[%
- 2003/01/19 v0.1d KOMA-Script source documentation class]
+ 2016/04/12 v0.1e KOMA-Script source documentation class]
% Load standard LaTeX documentation class, passing all options to it
% but use scrartcl instead of article.
@@ -141,7 +141,8 @@
\DoNotIndex{\if@tempswa,\ifcase,\or,\fi,\fi}
\DoNotIndex{\ifnum,\ifodd,\ifx,\fi,\fi,\fi}
\DoNotIndex{\include,\input,\InputIfFileExists,\item,\itshape}
-\DoNotIndex{\kern,\leavevmode,\leftmark,\leftskip,\let,\lineskip}
+\DoNotIndex{\kern,\kernel@ifnextchar}
+\DoNotIndex{\leavevmode,\leftmark,\leftskip,\let,\lineskip}
\DoNotIndex{\list,\long}
\DoNotIndex{\m@ne,\m@th,\marginpar,\markboth,\markright,\mathbf,\mathcal}
\DoNotIndex{\mathit,\mathnormal,\mathrm,\mathsf,\mathtt,\MessageBreak}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index ff0ea3e507a..839ff6faebd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -32,7 +32,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -76,7 +76,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -98,7 +98,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -106,7 +106,7 @@
}
%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $
\ProvidesPackage{scrextend}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr@ext@activate}[1]{%
@@ -130,11 +130,11 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: prepare)
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
+\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
@@ -158,7 +158,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -262,6 +262,7 @@
\@namedef{scr@v@3.18a}{15}
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
+\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -275,7 +276,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -298,7 +299,11 @@
\KOMA@DeclareStandardOption
[scrextend]
{final}{draft=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
+\newcommand*{\@gr@gsffamily}{%
+ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi
+}
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
@@ -334,7 +339,7 @@
scrextend.\scr@pkgextension
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
\expandafter\newif\csname if@titlepage\endcsname
@@ -377,9 +382,9 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -460,7 +465,7 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -531,13 +536,13 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: execoption)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -893,7 +898,7 @@
because I do not change it%
}%
}
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -931,6 +936,7 @@
\@thanks\global\let\@thanks\@empty
\clearpage
\csname titlepage@restore\endcsname
+ \parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil
\thispagestyle{empty}%
\let\footnote\thanks
\setcounter{footnote}{0}%
@@ -1203,11 +1209,11 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: body)
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
\@restonecolfalse
@@ -1231,10 +1237,17 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\sffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
+\AtBeginDocument{%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \string\providecommand*\string\new@tpo@label[2]{}%
+ }%
+ \fi
+}
\newcommand*{\scr@tpo}{0}
\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
@@ -1257,9 +1270,11 @@
\fi
\endgroup
\edef\is@thispageodd@setlabel{%
- \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
- \noexpand\string
- \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \if@filesw
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \fi
}%
#1%
\@esphack
@@ -1280,8 +1295,8 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -1396,7 +1411,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
\list{}{\settowidth{\labelwidth}{{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index d4051d0f359..8770c0a73a2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -10,7 +10,7 @@
%% scrkernel-fonts.dtx (with options: `package,generator,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,7 +42,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,19 +64,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesPackage{scrfontsizes}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package (font size file generator)]
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
\ifstr{#1}{scrsize}{%
@@ -94,7 +94,7 @@
class.}%
\@@@generatefontfile
}{%
- \@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}%
+ \kernel@ifnextchar [{\@generatefontfile{#1}}{\@@generatefontfile{#1}}%
}%
}
\newcommand*{\@generatefontfile}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 1462f84a0fc..bf2e9acbf9c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -11,7 +11,7 @@
%% scrhack.dtx (with options: `package,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,7 +43,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,21 +65,21 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
%%% using: package,option
\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
\KOMAExecuteOptions{hyperref=true}%
@@ -91,10 +91,11 @@
\KOMAExecuteOptions{listings=true}
\KOMA@ifkey{setspace}{@scrhack@setspace}
\KOMAExecuteOptions{setspace=true}
+\RequirePackage{xpatch}%
\KOMA@ifkey{lscape}{@scrhack@lscape}%
\KOMAExecuteOptions{lscape=true}%
\KOMAProcessOptions\relax
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
%%% using: package,body
\newcommand{\scr@ifexpected}[2]{%
\begingroup
@@ -111,7 +112,11 @@
\expandafter\ifx\csname ver@#2.#1\endcsname\relax
\expandafter\@secondoftwo
\else
- \expandafter\@firstoftwo
+ \expandafter\ifx\csname ver@#2.hak\endcsname\relax
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \else
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \fi
\fi
{%
\PackageInfo{scrhack}{loading #2 hack}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index 87d6f83823e..04221cbc8c3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -1,49 +1,51 @@
%%
%% This is file `scrjura.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
%% scrjura.dtx (with options: `package')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2013
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2007-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
%%
-%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3c of the license.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later and of this work.
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
%%
-%% The Current Maintainer and author of this work is Markus Kohm.
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
%%
-%% This file may only be distributed together with the files
-%% `scrlogo.dtx' and `scrjura.dtx'. You may however distribute the files
-%% `scrlogo.dtx' and `scrjura.dtx' without this file.
-%% See also `scrjura.dtx' for additional information.
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
%%
-%% If this file is a beta version, you are not allowed to distribute it.
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
%%
-%% Currently there is only a short german manual at `scrjura.dtx', that
-%% should also be found as `scrjura.pdf'.
+%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% 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/>.
%%
-%%% From File: $Id: scrjura.dtx 2098 2015-05-13 16:23:25Z kohm $
+%%% From File: $Id: scrjura.dtx 2448 2016-05-06 09:06:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\ProvidesPackage{scrjura}
- [2015/05/13 v0.9d KOMA-Script for jurists
- (package)%
- ]
+\ProvidesPackage{scrjura}[%
+ 2016/05/06 v0.9h KOMA-Script
+ for jurists
+ (package)%
+]
\@ifpackageloaded{hyperref}{%
\PackageError{scrjura}{Package hyperref already loaded}{%
If you want to use package scrjura with package hyperref, you have to
@@ -118,9 +120,9 @@
\KOMA@kav@add{.scrjura.sty}{parnumber}{true}
\KOMA@kav@add{.scrjura.sty}{parnumber}{auto}
\newcommand*{\Clausemark}[1]{}
-\KOMA@key{paragraphmark}{%
+\KOMA@key{clausemark}{%
\begingroup
- \KOMA@set@ncmdkey{paragraphmark}{@tempa}{%
+ \KOMA@set@ncmdkey{clausemark}{@tempa}{%
{false}{0},{off}{0},{no}{0},%
{forceright}{1},%
{forceboth}{2},%
@@ -161,11 +163,20 @@
\endgroup
\FamilyKeyStateUnknownValue
\fi
- \KOMA@kav@xreplacevalue{.scrjura.sty}{paragraphmark}{#1}%
+ \KOMA@kav@xreplacevalue{.scrjura.sty}{clausemark}{#1}%
+}
+\KOMA@kav@add{.scrjura.sty}{clausemark}{false}
+\KOMA@DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright}
+\KOMA@DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth}
+\KOMA@key{paragraphmark}{%
+ \PackageWarningNoLine{scrjura}{%
+ You've used obsolete option `paragraphmark'.\MessageBreak
+ Usage of this option is deprecated.\MessageBreak
+ You should simply replace `paragraphmark'\MessageBreak
+ by `clausemark'%
+ }%
+ \KOMAExecuteOptions[.scrjura.sty]{clausemark=#1}%
}
-\KOMA@kav@add{.scrjura.sty}{paragraphmark}{false}
-\KOMA@DeclareDeprecatedOption[scrjura]{markright}{paragraphmark=forceright}
-\KOMA@DeclareDeprecatedOption[scrjura]{markboth}{paragraphmark=forceboth}
\newcommand*{\parcite@format}{0}
\newcommand*{\sentencecite@format}{0}
\KOMA@key{ref}{%
@@ -304,11 +315,14 @@
\begingroup
\KOMAoptions{parnumber=manual}\parellipsis\par
\addtocounter{par}{#1}%
- \protected@write\@auxout{}{%
- \string\newmaxpar{\scrjura@env@type}%
- {\csname the\scrjura@env@type AbsoluteClause\endcsname}%
- {\thepar}%
- }%
+ \if@filesw
+ \protected@write\@auxout{}{%
+ \string\newmaxpar{\scrjura@env@type}%
+ {\csname the\scrjura@env@type
+ AbsoluteClause\endcsname}%
+ {\thepar}%
+ }%
+ \fi
\endgroup
\addtocounter{par}{-1}\refstepcounter{par}%
\ignorespaces
@@ -362,7 +376,7 @@
Declaration will be ignored}%
\long\def\reserved@defjuraenvironment##1[##2]##3##4{}%
}%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\reserved@defjuraenvironment{#1}}{\reserved@defjuraenvironment{#1}[]}%
}
\@onlypreamble\DeclareNewJuraEnvironment
@@ -399,7 +413,7 @@
\csname #1@Clauseformat\endcsname[1]{\Clauseformat{##1}}%
}{}%
\expandafter\renewcommand\expandafter*\csname the#1Clause\endcsname{%
- \csname #1@Clauseformat\endcsname{\arabic{#1Clause}}}%
+ \protect\@nameuse{#1@Clauseformat}{\arabic{#1Clause}}}%
\newenvironment{#1}{%
\par
\ifx\scrjura@env@type\@empty
@@ -514,7 +528,7 @@
\cl@Clause
\endgroup
\protected@edef\theClause{%
- \csname \scrjura@env@type @Clauseformat\endcsname{\contract@number}%
+ \protect\@nameuse{\scrjura@env@type @Clauseformat}{\contract@number}%
}%
\protected@edef\@currentlabel{\theClause}%
\fi
@@ -633,6 +647,45 @@
\AutoPar
}
\newcommand*{\scrjura@everypar}{}
+\providecommand*{\IncludeInRelease}[3]{%
+ \PackageInfo{scrjura}{temporary definition of \string\IncludeInRelease}%
+ \ifstr{#1}{0000/00/00}{%
+ \let\IncludeInRelease\@undefined
+ \def\EndIncludeInRelease{\let\EndIncludeInRelease\@undefined}%
+ }{%
+ \let\EndIncludeInRelease\relax
+ \long\def\@gobble@IncludeInRelease##1\EndIncludeInRelease{%
+ \let\@gobble@IncludeInRelease\@undefined
+ }%
+ \expandafter\@gobble@IncludeInRelease
+ }%
+}
+\IncludeInRelease{2015/01/01}{\@doendpe}{clubpenalty fix}
+\CheckCommand*\@doendpe{\@endpetrue
+ \def\par{\@restorepar
+ \clubpenalty\@clubpenalty
+ \everypar{}\par\@endpefalse}\everypar
+ {{\setbox\z@\lastbox}%
+ \everypar{}\@endpefalse}}
+\newcommand*{\scrjura@doendpe}{%
+ \@endpetrue
+ \def\par{%
+ \@restorepar
+ \clubpenalty\@clubpenalty
+ \everypar{%
+ \csname scrjura@everypar\endcsname
+ }%
+ \par\@endpefalse
+ }%
+ \everypar{%
+ {\setbox\z@\lastbox}\everypar{%
+ \csname scrjura@everypar\endcsname
+ }%
+ \@endpefalse
+ }%
+}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}{\@doendpe}{clubpenalty fix}
\CheckCommand*\@doendpe{\@endpetrue
\def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar
{{\setbox\z@\lastbox}\everypar{}\@endpefalse}}
@@ -651,6 +704,7 @@
\@endpefalse
}%
}
+\EndIncludeInRelease
\newcommand*{\l@cpar}[2]{%
\ifnum\value{juratoclevel}>\value{tocdepth}\else
\scr@ifundefinedorrelax{bprot@dottedtocline}{%
@@ -667,6 +721,7 @@
\renewcommand*{\thepar}{\arabic{par}}
\newcommand*{\theHpar}{\theH@AbsClause-\Roman{par}}
\newcommand*{\parformat}{(\thepar)}
+\newcommand*{\parformatseparation}{\nobreakspace}
\newkomafont{parnumber}{}
\renewcommand*\p@par{{\scrjura@usetype{\scrjura@env@type}\theSubClause\scrjura@separator{\nobreakspace}}}
\@addtoreset{par}{Clause}
@@ -689,26 +744,29 @@
\setcounter{sentence}{0}\refstepcounter{sentence}%
\fi
\begingroup
- \protected@write\@auxout{%
- \expandafter\let\csname \scrjura@env@type @Clauseformat\endcsname
- \@firstofone
- }{%
- \string\newmaxpar{\scrjura@env@type}%
- {\csname the\scrjura@env@type AbsoluteClause\endcsname}%
- {\thepar}%
- }%
+ \if@filesw
+ \protected@write\@auxout{%
+ \expandafter\let\csname \scrjura@env@type @Clauseformat\endcsname
+ \@firstofone
+ }{%
+ \string\newmaxpar{\scrjura@env@type}%
+ {\csname the\scrjura@env@type
+ AbsoluteClause\endcsname}%
+ {\thepar}%
+ }%
+ \fi
\getmaxpar\@tempa{\scrjura@env@type}%
{\csname the\scrjura@env@type AbsoluteClause\endcsname}%
\typeout{Stored max is \@tempa}%
\def\reserved@a##1\@nnil{\def\@tempa{##1}}%
\afterassignment\reserved@a\@tempcnta=0\@tempa\relax\@nnil
\ifnum \@tempcnta>\@ne
- {\usekomafont{parnumber}{\parformat\nobreakspace}}%
+ {\usekomafont{parnumber}{\parformat\parformatseparation}}%
\else
\def\reserved@a{\relax}%
\ifx\@tempa\reserved@a
\else
- {\usekomafont{parnumber}{\parformat\nobreakspace}}%
+ {\usekomafont{parnumber}{\parformat\parformatseparation}}%
\fi
\fi
\endgroup
@@ -723,7 +781,7 @@
\let\scrjura@special@par\relax
\newcommand*{\scrjura@special@reset@par}{}
\let\scrjura@special@reset@par\relax
-\newcommand*{\refL}{\@ifstar {\ref@L*}{\ref@L{}}}
+\newcommand*{\refL}{\kernel@ifstar {\ref@L*}{\ref@L{}}}
\newcommand*{\ref@L}[2]{%
\begingroup
\def\parcite@format{0}%
@@ -731,7 +789,7 @@
\ref#1{#2}%
\endgroup
}
-\newcommand*{\refS}{\@ifstar {\ref@S*}{\ref@S{}}}
+\newcommand*{\refS}{\kernel@ifstar {\ref@S*}{\ref@S{}}}
\newcommand*{\ref@S}[2]{%
\begingroup
\def\parcite@format{1}%
@@ -739,7 +797,7 @@
\ref#1{#2}%
\endgroup
}
-\newcommand*{\refN}{\@ifstar {\ref@N*}{\ref@N{}}}
+\newcommand*{\refN}{\kernel@ifstar {\ref@N*}{\ref@N{}}}
\newcommand*{\ref@N}[2]{%
\begingroup
\def\parcite@format{2}%
@@ -748,7 +806,7 @@
\endgroup
}
\newcommand*{\refClause}{%
- \@ifstar {\ref@Clause*}{\ref@Clause{}}
+ \kernel@ifstar {\ref@Clause*}{\ref@Clause{}}
}
\newcommand*{\ref@Clause}[2]{%
\expandafter\ifx\csname r@#2\endcsname\relax
@@ -777,7 +835,7 @@
\fi
}
\newcommand*{\refClauseN}{%
- \@ifstar {\ref@ClauseN*}{\ref@ClauseN{}}
+ \kernel@ifstar {\ref@ClauseN*}{\ref@ClauseN{}}
}
\newcommand*{\ref@ClauseN}[2]{%
\begingroup
@@ -786,7 +844,7 @@
\endgroup
}
\newcommand*{\refPar}{%
- \@ifstar {\ref@Par*}{\ref@Par{}}
+ \kernel@ifstar {\ref@Par*}{\ref@Par{}}
}
\newcommand*{\ref@Par}[2]{%
\expandafter\ifx\csname r@#2\endcsname\relax
@@ -821,7 +879,7 @@
\fi
}
\newcommand*{\refParL}{%
- \@ifstar {\ref@ParX0*}{\ref@ParX0{}}
+ \kernel@ifstar {\ref@ParX0*}{\ref@ParX0{}}
}
\newcommand*{\ref@ParX}[3]{%
\begingroup
@@ -831,13 +889,13 @@
\endgroup
}
\newcommand*{\refParS}{%
- \@ifstar {\ref@ParX1*}{\ref@ParX1{}}
+ \kernel@ifstar {\ref@ParX1*}{\ref@ParX1{}}
}
\newcommand*{\refParN}{%
- \@ifstar {\ref@ParN2*}{\ref@ParN2{}}
+ \kernel@ifstar {\ref@ParN2*}{\ref@ParN2{}}
}
\newcommand*{\ref@ParN}[2]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\ref@@ParN{#1}{#2}}%
{\ref@ParX{#1}{#2}}%
}
@@ -851,7 +909,7 @@
\endgroup
}
\newcommand*{\refSentence}{%
- \@ifstar {\ref@Sentence*}{\ref@Sentence{}}
+ \kernel@ifstar {\ref@Sentence*}{\ref@Sentence{}}
}
\newcommand*{\ref@Sentence}[2]{%
\expandafter\ifx\csname r@#2\endcsname\relax
@@ -886,7 +944,7 @@
\fi
}
\newcommand*{\refSentenceL}{%
- \@ifstar {\ref@SentenceX0*}{\ref@SentenceX0{}}
+ \kernel@ifstar {\ref@SentenceX0*}{\ref@SentenceX0{}}
}
\newcommand*{\ref@SentenceX}[3]{%
\begingroup
@@ -896,10 +954,10 @@
\endgroup
}
\newcommand*{\refSentenceS}{%
- \@ifstar {\ref@SentenceX1*}{\ref@SentenceX1{}}
+ \kernel@ifstar {\ref@SentenceX1*}{\ref@SentenceX1{}}
}
\newcommand*{\refSentenceN}{%
- \@ifstar {\ref@SentenceX2*}{\ref@SentenceX2{}}
+ \kernel@ifstar {\ref@SentenceX2*}{\ref@SentenceX2{}}
}
\newcounter{sentence}[par]
\renewcommand*{\thesentence}{\arabic{sentence}}
@@ -908,7 +966,15 @@
\newcommand*{\p@@sentence}[1]{\p@par{{\par@cite{\thepar}}%
\scrjura@separator{\nobreakspace}}{\sentence@cite{#1}}}
\newcommand*{\contract@sentence}{%
- \refstepcounter{sentence}%
+ \ifvmode
+ \if@endpe
+ \refstepcounter{sentence}%
+ \else
+ \leavevmode
+ \fi
+ \else
+ \refstepcounter{sentence}%
+ \fi
\textsuperscript{\thesentence}\nobreak\hskip\z@
}
\DeclareRobustCommand*{\par@cite}[1]{\parciteformat{#1}}
@@ -996,9 +1062,11 @@
\@tempa
}
\AtBeginDocument{%
- \immediate\write\@mainaux{%
- \string\providecommand*{\string\newmaxpar}[3]{}
- }%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \string\providecommand*\string\newmaxpar[3]{}
+ }%
+ \fi
}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 846b80ade99..69be06b9cda 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -12,7 +12,7 @@
%% scrkernel-fonts.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,18 +66,18 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package (%
KOMA-Script-dependent
basics and keyval usage)]
@@ -241,12 +241,12 @@
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
-%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
+%%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $
\RequirePackage{scrlfile}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
}
@@ -310,10 +310,10 @@
\expandafter\endgroup\reserved@a
}
\newcommand*{\KOMA@@ncmdkey}[2]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\KOMA@@@ncmdkey{#1}{#2}}{\KOMA@@@ncmdkey{#1}{#2}[]}
}
-\newcommand*{\KOMA@@@cmdkey}{}
+\newcommand*{\KOMA@@@ncmdkey}{}
\def\KOMA@@@ncmdkey#1#2[#3]#4#5{%
\@ifundefined{#4}{\@namedef{#4}{0}}{}%
\ifx\relax#3\relax
@@ -330,7 +330,7 @@
}
\newcommand*{\KOMA@set@ncmdkey}{\FamilySetNumerical{KOMA}}
\newcommand*{\KOMA@DeclareDeprecatedOption}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\KOMA@@DeclareDeprecatedOption}%
{\KOMA@@@DeclareDeprecatedOption{\ClassWarningNoLine{\KOMAClassName}}}%
}
@@ -359,18 +359,22 @@
You've used obsolete option `#2'.\noexpand\MessageBreak
Usage of this option indicates an old document\noexpand\MessageBreak
and changes compatibility level using\noexpand\MessageBreak
- `#3,version=first'.\noexpand\MessageBreak
+ `#3,version=first,\noexpand\MessageBreak
+ enabledeprecatedfontcommands' that may result\noexpand\MessageBreak
+ in further warnings.\noexpand\MessageBreak
If you don't want this, you should simply\noexpand\MessageBreak
replace option `#2' by `#3'%
}%
- \noexpand\KOMAExecuteOptions{#3,version=first}%
+ \noexpand\KOMAExecuteOptions{%
+ #3,version=first}%
+ \noexpand\ExecuteOptions{enabledeprecatedfontcommands}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}%
}%
}%
\reserved@a
}
\newcommand*{\KOMA@DeclareStandardOption}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\KOMA@@DeclareStandardOption}%
{\KOMA@@@DeclareStandardOption{\ClassInfoNoLine{\KOMAClassName}}}%
}
@@ -410,7 +414,7 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\IfExistskomafont}[1]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
index f0221481210..4d1496aaf06 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -14,7 +14,7 @@
%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2013-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2013-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -46,13 +46,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (identify)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 2014/06/03 v0.1.1760 KOMA-Script
+ 2016/03/25 v0.1.2398 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -63,19 +63,31 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (init)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
- \expandafter\@tempswafalse
+ \scr@ifundefinedorrelax{savepos}{%
+ \expandafter\@tempswafalse
+ }{%
+ \let\scr@savepos\savepos
+ }%
}{%
+ \let\scr@savepos\pdfsavepos
\scr@ifundefinedorrelax{pdflastypos}{%
- \expandafter\@tempswafalse
- }{}%
+ \scr@ifundefinedorrelax{lastypos}{%
+ \expandafter\@tempswafalse
+ }{%
+ \let\scr@lastypos\lastypos
+ }%
+ }{%
+ \let\scr@lastypos\pdflastypos
+ }%
}
\if@tempswa\else
- \PackageError{scrlayer-notecolumn}{missing pdfTeX features}{%
- This package needs \string\pdfsavepos\space and
- \string\pdflastypos.\MessageBreak
+ \PackageError{scrlayer-notecolumn}{missing pdfTeX/luaTeX features}{%
+ This package needs \string\pdfsavepos\space or \string\savepos\space
+ and\MessageBreak
+ \string\pdflastypos\space or \string\lastypos.\MessageBreak
This error is fatal, because usage of the package without these
features\MessageBreak
cannot work!\MessageBreak
@@ -83,7 +95,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -212,11 +224,11 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (options)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (options)
\KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns}
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default}
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body)
\KOMAProcessOptions\relax
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
@@ -287,7 +299,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (body)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
\@ifundefined{slnc@#2@box}{%
@@ -531,9 +543,11 @@
\scrlayerAddToInterface\tf@slnc{%
\newwrite\tf@slnc
\AtBeginDocument{%
- \immediate\write\@auxout{%
- \noexpand\csname slnc@initwrite\noexpand\endcsname
- }%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \noexpand\csname slnc@initwrite\noexpand\endcsname
+ }%
+ \fi
}%
\AtEndDocument{\let\slnc@initwrite\slnc@openwrite}%
}
@@ -582,11 +596,11 @@
\scrlayerAddToInterface\makenote{%
\newcommand{\makenote}[2][marginpar]{%
\@bsphack
- \pdfsavepos
+ \scr@savepos
\addtocontents{slnc}{%
\string\slnc@note{#1}%
{\noexpand\number\value{slncpage}}%
- {\noexpand\number\pdflastypos}%
+ {\noexpand\number\scr@lastypos}%
{#2}%
}%
\@esphack
@@ -646,7 +660,11 @@
}%
\fi
\scr@ifundefinedorrelax{pdfpageheight}{%
- \@tempdima=\paperheight
+ \scr@ifundefinedorrelax{pageheight}{%
+ \@tempdima=\paperheight
+ }{%
+ \@tempdima=\pageheight
+ }%
}{%
\@tempdima=\pdfpageheight
}%
@@ -703,11 +721,11 @@
\if@filesw
\expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
\expandafter\unvbox\csname slnc@#1@box\endcsname
- \pdfsavepos
+ \scr@savepos
\protected@write\@auxout{}{%
\string\newlabel{notecolumn.##1.##3.syncnote.label}{%
{%
- \noexpand\number\pdflastypos
+ \noexpand\number\scr@lastypos
}{\thepage}%
}%
}%
@@ -1097,12 +1115,12 @@
\fi
{%
\if@filesw
- \pdfsavepos
+ \scr@savepos
\protected@write\@auxout{}{%
\string\newlabel{notecolumn.\theslnc@syncpoint.synctext.label}{%
{%
\noexpand\number
- \numexpr \pdflastypos\slnc@voffset\relax
+ \numexpr \scr@lastypos\slnc@voffset\relax
}{\thepage}%
}%
}%
@@ -1159,7 +1177,11 @@
\edef\slnc@textpage{\the\numexpr\slnc@textpage+1\relax}%
}%
\scr@ifundefinedorrelax{pdfpageheight}{%
- \@tempdima=\paperheight
+ \scr@ifundefinedorrelax{pageheight}{%
+ \@tempdima=\paperheight
+ }{%
+ \@tempdima=\pageheight
+ }%
}{%
\@tempdima=\pdfpageheight
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
index d94ffdbe8ae..6e01eac85db 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -13,7 +13,7 @@
%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2012-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,13 +45,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (identify)
+%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -62,7 +62,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (init)
+%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
\AtEndOfPackage{%
\sls@auto@pagestyleset%
}
@@ -78,7 +78,7 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options)
\KOMA@key{markcase}{%
\scrlayer@AtEndOfPackage{%
\begingroup
@@ -209,7 +209,7 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (options)
+%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (options)
\KOMA@key{headwidth}{%
\begingroup
\sls@split@at@iicolons#1:::\@nil
@@ -694,7 +694,7 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}%
\scrlayer@AddCsToInterface{sls@leavevmode@linetrue}
\scrlayer@AddCsToInterface{sls@leavevmode@linefalse}
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body)
\KOMAProcessOptions\relax
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
@@ -765,7 +765,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (body)
+%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (body)
\scrlayerAddToInterface\setheadwidth{%
\newcommand*{\setheadwidth}[2][]{%
\KOMAoptions{headwidth=#2:#1}%
@@ -790,7 +790,7 @@
}
\scrlayerAddToInterface\sls@setline{%
\newcommand*\sls@setline[2]{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\sls@@setline{#1}{#2}}{\sls@@@setline{#1#2}}%
}%
}
@@ -842,7 +842,7 @@
`\string\setkomafont' or `\string\addtokomafont' to\MessageBreak
setup the colour%
}%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{%
\sls@@@@setline{#1}%
}{%
@@ -948,14 +948,14 @@
}
\scrlayerAddToInterface\sls@defhead{%
\newcommand*\sls@defhead[1]{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\sls@@defhead{#1}}%
{\sls@@defhead{#1}(\sls@headabove@linelength,\sls@headabove@linethickness)}%
}%
}
\scrlayerAddToInterface\sls@@defhead{%
\def\sls@@defhead#1(#2,#3)#4#5#6{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\sls@@@defhead{#1}({#2},{#3}){#4}{#5}{#6}}%
{\sls@@@defhead{#1}%
({#2},{#3})%
@@ -1020,14 +1020,14 @@
}
\scrlayerAddToInterface\sls@deffoot{%
\newcommand*\sls@deffoot[1]{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\sls@@deffoot{#1}}%
{\sls@@deffoot{#1}(\sls@footabove@linelength,\sls@footabove@linethickness)}%
}%
}
\scrlayerAddToInterface\sls@@deffoot{%
\def\sls@@deffoot#1(#2,#3)#4#5#6{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\sls@@@deffoot{#1}({#2},{#3}){#4}{#5}{#6}}%
{\sls@@@deffoot{#1}%
({#2},{#3})%
@@ -1301,14 +1301,14 @@
}
\scrlayerAddToInterface\scrlayer@triplestyle{%
\def\scrlayer@triplestyle#1{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\scrlayer@@triplestyle{#1}}%
{\scrlayer@@triplestyle{#1}[\z@]}%
}
}
\scrlayerAddToInterface\scrlayer@@triplestyle{%
\def\scrlayer@@triplestyle#1[#2]{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\scrlayer@@@triplestyle{#1}[#2]}%
{\scrlayer@@@triplestyle{#1}[\z@][#2]}%
}%
@@ -1475,8 +1475,8 @@
}
\scrlayerAddToInterface\sls@init@pair@page@style{%
\newcommand*{\sls@init@pair@page@style}{%
- \@ifstar {%
- \@ifstar {%
+ \kernel@ifstar {%
+ \kernel@ifstar {%
\sls@let@pair@page@style\relax
}{%
\sls@let@pair@page@style\@empty
@@ -1658,10 +1658,10 @@
\DeclarePageStyleAlias{scrplain}{plain.scrheadings}
\scrlayerOnAutoRemoveInterface{\DestroyPageStyleAlias{scrplain}}
\scrlayerAddToInterface\ihead{%
- \newcommand*{\ihead}{\@ifstar {\@dblarg\@@@ihead}{\@ihead}}%
+ \newcommand*{\ihead}{\kernel@ifstar {\@dblarg\@@@ihead}{\@ihead}}%
}
\scrlayerAddToInterface\@ihead{%
- \newcommand*{\@ihead}{\@ifnextchar[{\@@@ihead}{\@@ihead}}%
+ \newcommand*{\@ihead}{\kernel@ifnextchar[{\@@@ihead}{\@@ihead}}%
}
\scrlayerAddToInterface\@@ihead{%
\newcommand*{\@@ihead}[1]{\rehead{#1}\lohead{#1}}%
@@ -1670,10 +1670,10 @@
\newcommand*{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\ohead{%
- \newcommand*{\ohead}{\@ifstar {\@dblarg\@@@ohead}{\@ohead}}%
+ \newcommand*{\ohead}{\kernel@ifstar {\@dblarg\@@@ohead}{\@ohead}}%
}
\scrlayerAddToInterface\@ohead{%
- \newcommand*{\@ohead}{\@ifnextchar[{\@@@ohead}{\@@ohead}}%
+ \newcommand*{\@ohead}{\kernel@ifnextchar[{\@@@ohead}{\@@ohead}}%
}
\scrlayerAddToInterface\@@ohead{%
\newcommand*{\@@ohead}[1]{\lehead{#1}\rohead{#1}}%
@@ -1682,10 +1682,10 @@
\newcommand*{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\chead{%
- \newcommand*{\chead}{\@ifstar {\@dblarg\@@@chead}{\@chead}}%
+ \newcommand*{\chead}{\kernel@ifstar {\@dblarg\@@@chead}{\@chead}}%
}
\scrlayerAddToInterface\@chead{%
- \newcommand*{\@chead}{\@ifnextchar[{\@@@chead}{\@@chead}}%
+ \newcommand*{\@chead}{\kernel@ifnextchar[{\@@@chead}{\@@chead}}%
}
\scrlayerAddToInterface\@@chead{%
\newcommand*{\@@chead}[1]{\cehead{#1}\cohead{#1}}%
@@ -1712,10 +1712,10 @@
\newcommand*{\cohead}{\sls@renewelement{odd}{middle}{head}}%
}
\scrlayerAddToInterface\ifoot{%
- \newcommand*{\ifoot}{\@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}%
+ \newcommand*{\ifoot}{\kernel@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}%
}
\scrlayerAddToInterface\@ifoot{%
- \newcommand*{\@ifoot}{\@ifnextchar[{\@@@ifoot}{\@@ifoot}}%
+ \newcommand*{\@ifoot}{\kernel@ifnextchar[{\@@@ifoot}{\@@ifoot}}%
}
\scrlayerAddToInterface\@@ifoot{%
\newcommand*{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}%
@@ -1724,10 +1724,10 @@
\newcommand*{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\ofoot{%
- \newcommand*{\ofoot}{\@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}%
+ \newcommand*{\ofoot}{\kernel@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}%
}
\scrlayerAddToInterface\@ofoot{%
- \newcommand*{\@ofoot}{\@ifnextchar[{\@@@ofoot}{\@@ofoot}}%
+ \newcommand*{\@ofoot}{\kernel@ifnextchar[{\@@@ofoot}{\@@ofoot}}%
}
\scrlayerAddToInterface\@@ofoot{%
\newcommand*{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}%
@@ -1736,10 +1736,10 @@
\newcommand*{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\cfoot{%
- \newcommand*{\cfoot}{\@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}%
+ \newcommand*{\cfoot}{\kernel@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}%
}
\scrlayerAddToInterface\@cfoot{%
- \newcommand*{\@cfoot}{\@ifnextchar[{\@@@cfoot}{\@@cfoot}}%
+ \newcommand*{\@cfoot}{\kernel@ifnextchar[{\@@@cfoot}{\@@cfoot}}%
}
\scrlayerAddToInterface\@@cfoot{%
\newcommand*{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}%
@@ -1767,13 +1767,13 @@
}
\scrlayerAddToInterface\sls@renewelement{%
\newcommand*{\sls@renewelement}[3]{%
- \@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}%
- {\sls@@renewelement{#1}{#2}{#3}}%
+ \kernel@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}%
+ {\sls@@renewelement{#1}{#2}{#3}}%
}%
}
\scrlayerAddToInterface\sls@@renewelement{%
\newcommand*{\sls@@renewelement}[3]{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\sls@@@@renewelement{#1}{#2}{#3}}%
{\sls@@@renewelement{#1}{#2}{#3}}%
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index 6d863cf903d..f90d95a9e2e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -11,7 +11,7 @@
%% scrlayer.dtx (with options: `package,trace,scrlayer,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2012-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,13 +43,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (identify)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
\RequirePackage{scrkbase}[2013/03/05]
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -113,7 +113,7 @@
\setlength{\footheight}{\baselineskip}
\fi
}
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -265,7 +265,7 @@
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
\newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty}
@@ -386,7 +386,7 @@
\let\@mkboth\@gobbletwo
}
\newcommand*{\automark}{%
- \@ifstar{\@automark}{\manualmark\@automark}%
+ \kernel@ifstar{\@automark}{\manualmark\@automark}%
}
\newcommand*{\@automark}[2][]{%
\ifstr{#2}{}{%
@@ -1393,7 +1393,7 @@
}%
}
\newcommand*{\ForEachLayerOfPageStyle}{%
- \@ifstar {\@s@ForEachLayerOfPageStyle}{\@ForEachLayerOfPageStyle}%
+ \kernel@ifstar {\@s@ForEachLayerOfPageStyle}{\@ForEachLayerOfPageStyle}%
}
\newcommand*{\@ForEachLayerOfPageStyle}[2]{%
\begingroup
@@ -1449,7 +1449,7 @@
\endgroup
}
\def\scr@layerbox(#1,#2)(#3,#4){%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\scr@@layerbox(#1,#2)(#3,#4)}{\scr@@layerbox(#1,#2)(#3,#4)[]}%
}
\def\scr@@layerbox(#1,#2)(#3,#4)[#5]#6{%
@@ -2150,7 +2150,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (final)
+%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index c3ed63f8ba4..fa174e18ea0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -28,7 +28,7 @@
%% scrkernel-circularletters.dtx (with options: `package,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -60,7 +60,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -82,19 +82,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
Cannot detect any KOMA-Script class.\MessageBreak
@@ -107,8 +107,8 @@
}{}
\newcommand*{\scr@renewforletter}{%
- \@ifstar {\@renewforletter*}%
- {\@renewforletter{}}%
+ \kernel@ifstar {\@renewforletter*}%
+ {\@renewforletter{}}%
}
\newcommand*{\@renewforletter}[2]{%
\g@addto@macro\do@renewforletter@list{\do#2}%
@@ -129,8 +129,8 @@
\endgroup
\let\do@renewforletter@list\@empty
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter
@@ -147,7 +147,7 @@
}
\AtEndOfPackage
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
@@ -162,11 +162,11 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
-%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
@@ -665,11 +665,19 @@
\fi
\endgroup
\else
- \ifstr{\@currname.\@currext}{scrletter.\scr@pkgextension}{%
- \expandafter\AtEndOfPackage
- }{%
+ \ifx\@fileswith@pti@ns\@badrequireerror
+ \ifstr{\@currext}{\@clsextension}{%
+ \expandafter\AtEndOfClass
+ }{%
+ \ifstr{\@currext}{\@pksextension}{%
+ \expandafter\AtEndOfPackage
+ }{%
+ \expandafter\AtBeginDocument
+ }%
+ }%
+ \else
\expandafter\@firstofone
- }%
+ \fi
{\RequirePackage{marvosym}}%
\fi
\fi
@@ -678,11 +686,11 @@
scrletter.\scr@pkgextension
}{symbolicnames}{false}%
%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -845,7 +853,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\PackageInfo{scrletter%
@@ -1385,9 +1393,9 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\newkomavar}{%
- \@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
+ \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
\@ifundefined{scr@#2@name}{%
\@ifundefined{scr@#2@var}{%
@@ -1419,9 +1427,9 @@
}%
}
\newcommand*{\setkomavar}{%
- \@ifstar {\@setkomaname}{\@setkomavar}}
+ \kernel@ifstar {\@setkomaname}{\@setkomavar}}
\newcommand*{\@setkomavar}[1]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@setkomavar{#1}}{\@@setkomavar{#1}[\relax]}}
\newcommand*{\@setkomaname}[2]{%
\@ifundefined{scr@#1@var}{%
@@ -1459,7 +1467,7 @@
}%
}
\DeclareRobustCommand*{\usekomavar}{%
- \@ifstar {\@usekomaname}{\@usekomavar}}
+ \kernel@ifstar {\@usekomaname}{\@usekomavar}}
\newcommand*{\@usekomavar}[2][\@firstofone]{%
\@ifundefined{scr@#2@var}{%
\@komavar@err{use}{#2}%
@@ -1483,8 +1491,8 @@
}
\DeclareRobustCommand*{\ifkomavarempty}{%
\begingroup
- \@ifstar {\@tempswatrue\@ifkomavarempty}%
- {\@tempswafalse\@ifkomavarempty}%
+ \kernel@ifstar {\@tempswatrue\@ifkomavarempty}%
+ {\@tempswafalse\@ifkomavarempty}%
}
\newcommand{\@ifkomavarempty}[1]{%
\ifkomavar{#1}{%
@@ -1566,7 +1574,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
\newcommand*{%
\letterpagemark
}{%
@@ -1597,7 +1605,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
\newkomavar{firsthead}
\setkomavar{firsthead}{%
\parbox[b]{\useplength{firstheadwidth}}%
@@ -2701,11 +2709,11 @@
\def\par{\@@par\nobreak}\let\\=\@nobreakcr
\let\vspace\@nobreakvspace}
\newcommand*{\@nobreakvspace}{%
- \@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
+ \kernel@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
\newcommand*{\@nobreakvspacex}[1]{\ifvmode\nobreak\vskip #1\relax\else
\@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi}
\newcommand*{\@nobreakcr}{%
- \vadjust{\penalty\@M}\@ifstar{\@xnewline}{\@xnewline}}
+ \vadjust{\penalty\@M}\kernel@ifstar{\@xnewline}{\@xnewline}}
\newcommand*{\startbreaks}{\let\\=\@normalcr
\interlinepenalty 200\def\par{\@@par\penalty 200}}
\newcommand{\opening}[1]{%
@@ -2740,7 +2748,8 @@
\ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
\hspace{\useplength{sigindent}}%
\parbox{\@tempdima}{\raggedsignature\strut\ignorespaces
- #1\ifhmode\unskip\strut\fi\\[\useplength{sigbeforevskip}]
+ #1\ifhmode\unskip\strut\\[\useplength{sigbeforevskip}]
+ \else\vskip \useplength{sigbeforevskip}\fi
\strut\ignorespaces
\usekomavar{signature}\ifhmode\unskip\strut\fi}}\par
\nobreak\vskip\baselineskip
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 1c95f4ce3c7..61584d16d14 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -7,7 +7,7 @@
%% scrlfile.dtx (with options: `scrlfile')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2002-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,9 +39,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
+%%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $
\ProvidesPackage{scrlfile}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package (loading files)]
\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
^^J\@spaces\@spaces\@spaces\@spaces\space\space
@@ -155,9 +155,9 @@
\newcommand*{\BeforeClass}[1]{%
\scr@set@load@hook{before}{#1.\@clsextension}}
\newcommand*{\AfterClass}{%
- \@ifstar {\@sAfterClass}{%
- \@ifnextchar +\@@AfterClass{%
- \@ifnextchar !\@@@AfterClass\@AfterClass
+ \kernel@ifstar {\@sAfterClass}{%
+ \kernel@ifnextchar +\@@AfterClass{%
+ \kernel@ifnextchar !\@@@AfterClass\@AfterClass
}%
}%
}
@@ -195,9 +195,9 @@
\newcommand*{\BeforePackage}[1]{%
\scr@set@load@hook{before}{#1.\@pkgextension}}
\newcommand*{\AfterPackage}{%
- \@ifstar {\@sAfterPackage}{%
- \@ifnextchar +\@@AfterPackage{%
- \@ifnextchar !\@@@AfterPackage\@AfterPackage
+ \kernel@ifstar {\@sAfterPackage}{%
+ \kernel@ifnextchar +\@@AfterPackage{%
+ \kernel@ifnextchar !\@@@AfterPackage\@AfterPackage
}%
}%
}
@@ -236,11 +236,11 @@
\let\scrlfile@excludedpackages\@empty
\newcommand*{\scrlfile@saved@RequirePackage}{}
\newcommand*{\PreventPackageFromLoading}{%
- \@ifstar{\@PreventPackageFromLoading\PackageInfo}%
+ \kernel@ifstar{\@PreventPackageFromLoading\PackageInfo}%
{\@PreventPackageFromLoading\PackageWarning}%
}
\newcommand*{\@PreventPackageFromLoading}[1]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@PreventPackageFromLoading#1}{\@@PreventPackageFromLoading#1[]}%
}
\newcommand*{\@@PreventPackageFromLoading}{}
@@ -326,7 +326,7 @@
}
\@onlypreamble\StorePreventPackageFromLoading
\newcommand*{\UnPreventPackageFromLoading}{%
- \@ifstar {\@tempswatrue\@UnPreventPackageFromLoading}%
+ \kernel@ifstar {\@tempswatrue\@UnPreventPackageFromLoading}%
{\@tempswafalse\@UnPreventPackageFromLoading}%
}
\newcommand*{\@UnPreventPackageFromLoading}[1]{%
@@ -399,6 +399,7 @@
\reserved@a
}
\newcommand{\scr@gobbleopt}[1][]{}
+\providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}}
\AtEndDocument{%
\let\scr@saved@checkend=\@checkend
\renewcommand*{\@checkend}[1]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index f626587dfe1..9a9be159fa3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -39,7 +39,7 @@
%% scrkernel-circularletters.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -71,7 +71,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -108,12 +108,12 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -212,6 +212,7 @@
\@namedef{scr@v@3.18a}{15}
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
+\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -225,7 +226,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -245,7 +246,7 @@
\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter
@@ -262,7 +263,7 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
@@ -277,7 +278,7 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\@ptsize{%
12%
}
@@ -344,9 +345,27 @@
\KOMAClassFileName
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
+\DeclareOption{enabledeprecatedfontcommands}{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ deprecated option `enabledeprecatedfontcommands'.\MessageBreak
+ Note, that this option was already depreacted when\MessageBreak
+ it has been defined. Support for old font commands\MessageBreak
+ has been removed from KOMA-Script more than one\MessageBreak
+ decade ago. It is not recommended to use them any\MessageBreak
+ longer. Therefore usage of this class option also\MessageBreak
+ is not recommended%
+ }%
+ \let\scr@defineobsoletefonts\@ne
+}
+\scr@ifundefinedorrelax{scr@defineobsoletefonts}{%
+ \let\scr@defineobsoletefonts\z@
+}{}
+\BeforePackage{tex4ht}{%
+ \let\scr@defineobsoletefonts\thr@@
+}
+%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -412,7 +431,7 @@
}{%
\def\FamilyElseValue{, `semi'}%
\KOMA@set@ifkey{twoside}{%
- @tempswa%
+ @twoside%
}{#1}%
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -434,10 +453,13 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{twocolumn}{@twocolumn}%
- \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twocolumn\twocolumn\sloppy\flushbottom
\else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi
+ \fi}%
\fi
}
\AtEndOfClass{%
@@ -451,7 +473,8 @@
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: option
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -486,6 +509,7 @@
\let\par@update\relax
\newcommand*{\default@par@update}{}
\let\default@par@update\relax
+\AtBeginDocument{\par@update}
\newcommand*{\scr@parindent}{1em}
\newcommand*{\scr@parskip}{\z@}
\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil}
@@ -615,33 +639,11 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
-\newif\if@hsl
-\KOMA@key{headsepline}[true]{%
- \KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }{%
- \KOMAoptions{headinclude=#1}{}%
- }%
- \fi
-}
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
-\newif\if@fsl
-\KOMA@key{footsepline}[true]{%
- \KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }{%
- \KOMAoptions{footinclude=#1}%
- }%
- \fi
-}
+\KOMA@ifkey{footsepline}{@fsl}%
\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA@key{cleardoublepage}{%
@@ -741,7 +743,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -812,8 +814,8 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
@@ -1342,11 +1344,19 @@
\fi
\endgroup
\else
- \ifstr{\@currname.\@currext}{\KOMAClassFileName}{%
- \expandafter\AtEndOfClass
- }{%
+ \ifx\@fileswith@pti@ns\@badrequireerror
+ \ifstr{\@currext}{\@clsextension}{%
+ \expandafter\AtEndOfClass
+ }{%
+ \ifstr{\@currext}{\@pksextension}{%
+ \expandafter\AtEndOfPackage
+ }{%
+ \expandafter\AtBeginDocument
+ }%
+ }%
+ \else
\expandafter\@firstofone
- }%
+ \fi
{\RequirePackage{marvosym}}%
\fi
\fi
@@ -1355,12 +1365,12 @@
\KOMAClassFileName
}{symbolicnames}{false}%
%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1372,7 +1382,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -1762,42 +1772,78 @@
}%
}
\newcommand*{\scr@DeclareOldFontCommand}[3]{%
- \DeclareRobustCommand #1{\@fontswitch {%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#2}'%
- }%
- #2%
- }{%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#3}'%
+ \ifnum\scr@defineobsoletefonts<\z@\else
+ \ifnum\scr@defineobsoletefonts>\tw@
+ \DeclareOldFontCommand{#1}{#2}{#3}%
+ \else
+ \DeclareOldFontCommand{#1}{%
+ \scr@ErrorWarningInfo{#1}{#2}#2%
+ }{%
+ \scr@ErrorWarningInfo{#1}{#3}#3%
}%
- #3%
+ \fi
+ \fi
+}
+\DeclareRobustCommand*{\scr@ErrorWarningInfo}[2]{%
+ \ifnum \scr@defineobsoletefonts=\z@
+ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{%
+ You should note that since 1994 LaTeX2e provides a new font selection
+ scheme\MessageBreak
+ called NFSS2 with several new, combinable font commands. New
+ KOMA-Script\MessageBreak
+ classes have defined the old font commands like `\string#1'
+ only for compatibility\MessageBreak
+ with old LaTeX 2.09 document styles of Script 2.0. Nevertheless,
+ these\MessageBreak
+ commands are deprecated and undocumented at least since
+ 2003. Since 2013\MessageBreak
+ KOMA-Script classes warn abouts soon removement of these deprecated
+ commands.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, these commands will not
+ work any\MessageBreak
+ more. If loading a package results in this error message, you should
+ contact\MessageBreak
+ the author of that package and ask him to replace the deprecated font
+ command\MessageBreak
+ `\string#1', e.g., by `\detokenize{#2}`. Otherwise you should
+ reconfigure\MessageBreak
+ or replace the package. If you have used the old font command
+ `\string#1' yourself,\MessageBreak
+ you should replace it, e.g., by `\detokenize{#2}'.\MessageBreak
+ To make it work for now, you can use the already also deprecated class
+ option\MessageBreak
+ `enabledeprecatedfontcommands'.%
}%
- }%
+ \else
+ \ifcase \scr@defineobsoletefonts
+ \or
+ \expandafter\ClassWarning
+ \or
+ \expandafter\ClassInfo
+ \else
+ \expandafter\@gobbletwo
+ \fi
+ {\KOMAClassName}{deprecated old font command `\string#1' used.\MessageBreak
+ You should note, that since 1994 LaTeX2e provides a\MessageBreak
+ new font selection scheme called NFSS2 with several\MessageBreak
+ new, combinable font commands. New KOMA-Script classes\MessageBreak
+ have defined the old font commands like `\string#1' only for\MessageBreak
+ compatibility with LaTeX 2.09 document styles of\MessageBreak
+ Script 2.0. These commands are deprecated and\MessageBreak
+ undocumented at least since 2003. Since 2013,\MessageBreak
+ KOMA-Script classes warn about soon removement of\MessageBreak
+ these deprecated commands. Now, after two decades of\MessageBreak
+ LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak
+ not work any longer. If loading a package results in\MessageBreak
+ this message you should contact the author of that\MessageBreak
+ package and ask him to replace the depracted font\MessageBreak
+ command `\string#1', e.g., by `\detokenize{#2}'.\MessageBreak
+ Otherwise you should reconfigure or replace the\MessageBreak
+ package. If you have used the old font command\MessageBreak
+ `\string #1' yourself you should replace it, e.g., by\MessageBreak
+ `\detokenize{#2}'%
+ }%
+ \fi
}
\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
@@ -1810,11 +1856,18 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
+\AtBeginDocument{%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \string\providecommand*\string\new@tpo@label[2]{}%
+ }%
+ \fi
+}
\newcommand*{\scr@tpo}{0}
\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
@@ -1837,9 +1890,11 @@
\fi
\endgroup
\edef\is@thispageodd@setlabel{%
- \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
- \noexpand\string
- \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \if@filesw
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \fi
}%
#1%
\@esphack
@@ -1891,7 +1946,7 @@
commands}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage`}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -2054,7 +2109,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\ClassInfo{scrlttr2%
@@ -2594,9 +2649,9 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\newkomavar}{%
- \@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
+ \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
\@ifundefined{scr@#2@name}{%
\@ifundefined{scr@#2@var}{%
@@ -2628,9 +2683,9 @@
}%
}
\newcommand*{\setkomavar}{%
- \@ifstar {\@setkomaname}{\@setkomavar}}
+ \kernel@ifstar {\@setkomaname}{\@setkomavar}}
\newcommand*{\@setkomavar}[1]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@setkomavar{#1}}{\@@setkomavar{#1}[\relax]}}
\newcommand*{\@setkomaname}[2]{%
\@ifundefined{scr@#1@var}{%
@@ -2668,7 +2723,7 @@
}%
}
\DeclareRobustCommand*{\usekomavar}{%
- \@ifstar {\@usekomaname}{\@usekomavar}}
+ \kernel@ifstar {\@usekomaname}{\@usekomavar}}
\newcommand*{\@usekomavar}[2][\@firstofone]{%
\@ifundefined{scr@#2@var}{%
\@komavar@err{use}{#2}%
@@ -2692,8 +2747,8 @@
}
\DeclareRobustCommand*{\ifkomavarempty}{%
\begingroup
- \@ifstar {\@tempswatrue\@ifkomavarempty}%
- {\@tempswafalse\@ifkomavarempty}%
+ \kernel@ifstar {\@tempswatrue\@ifkomavarempty}%
+ {\@tempswafalse\@ifkomavarempty}%
}
\newcommand{\@ifkomavarempty}[1]{%
\ifkomavar{#1}{%
@@ -2775,7 +2830,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2786,7 +2841,8 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: body
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
@@ -2912,7 +2968,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3008,7 +3064,7 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -3149,7 +3205,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
\setlength{\leftmarginiii}{1.87em}
@@ -3287,11 +3343,11 @@
}%
\item\is@thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\sffamily\bfseries}
+\newcommand*\descfont{\@gr@gsffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -4457,11 +4513,11 @@
\def\par{\@@par\nobreak}\let\\=\@nobreakcr
\let\vspace\@nobreakvspace}
\newcommand*{\@nobreakvspace}{%
- \@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
+ \kernel@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
\newcommand*{\@nobreakvspacex}[1]{\ifvmode\nobreak\vskip #1\relax\else
\@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi}
\newcommand*{\@nobreakcr}{%
- \vadjust{\penalty\@M}\@ifstar{\@xnewline}{\@xnewline}}
+ \vadjust{\penalty\@M}\kernel@ifstar{\@xnewline}{\@xnewline}}
\newcommand*{\startbreaks}{\let\\=\@normalcr
\interlinepenalty 200\def\par{\@@par\penalty 200}}
\newcommand{\opening}[1]{%
@@ -4496,7 +4552,8 @@
\ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
\hspace{\useplength{sigindent}}%
\parbox{\@tempdima}{\raggedsignature\strut\ignorespaces
- #1\ifhmode\unskip\strut\fi\\[\useplength{sigbeforevskip}]
+ #1\ifhmode\unskip\strut\\[\useplength{sigbeforevskip}]
+ \else\vskip \useplength{sigbeforevskip}\fi
\strut\ignorespaces
\usekomavar{signature}\ifhmode\unskip\strut\fi}}\par
\nobreak\vskip\baselineskip
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index cc71f505f46..a9da5dc4a3f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -7,7 +7,7 @@
%% scrpage.dtx (with options: `scrpage,v2')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,10 +39,10 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $
+%%% From File: $Id: scrpage.dtx 2428 2016-04-12 10:31:07Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package (page head and foot)]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
@@ -185,12 +185,12 @@
}%
}
\def\def@head{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\def@@head}%
{\def@@head(\scr@headabove@linelength,%
\scr@headabove@linethickness)}}
\def\def@@head(#1,#2)#3#4#5{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\def@@@head({#1},{#2}){#3}{#4}{#5}}%
{\def@@@head({#1},{#2}){#3}{#4}{#5}%
(\scr@headbelow@linelength,%
@@ -222,12 +222,12 @@
}\hskip\@evenheadshift\hss}%
}
\def\def@foot{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\def@@foot}
{\def@@foot(\scr@footabove@linelength,%
\scr@footabove@linethickness)}}
\def\def@@foot(#1,#2)#3#4#5{%
- \@ifnextchar(%)
+ \kernel@ifnextchar(%)
{\def@@@foot({#1},{#2}){#3}{#4}{#5}}%
{\def@@@foot({#1},{#2}){#3}{#4}{#5}%
(\scr@footbelow@linelength,%
@@ -349,12 +349,12 @@
{\@deftripstyle[-]}%
{\@deftripstyle[+]}}
\def\@deftripstyle[#1]#2{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\@@deftripstyle[#1]{#2}}%
{\@@deftripstyle[#1]{#2}[\z@]}}
\def\@@deftripstyle[#1]#2[#3]{%
\def\@tempa{#1}%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\@@@deftripstyle#2[#3]}%
{\@@@deftripstyle#2[\z@][#3]}}
\def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{%
@@ -657,7 +657,7 @@
\newcommand*{\setfootsepline}{\scr@setline{foot}{above}}
\newcommand*{\setfootbotline}{\scr@setline{foot}{below}}
\def\scr@setline#1#2{%
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\@scr@setline{#1}{#2}}{\@@scr@setline{#1#2}}%
}
\def\@scr@setline#1#2[#3]{%
@@ -675,7 +675,7 @@
\expandafter\edef\csname scr@#1@linethickness\endcsname%
{\the\@tempdima}%
\fi\fi
- \@ifnextchar[%]
+ \kernel@ifnextchar[%]
{\@src@set@pre@line{#1}}{}%
}
\def\@src@set@pre@line#1[#2]{%
@@ -880,80 +880,80 @@
\newcommand*{\scrheadings@odd@left@foot}{}
\newcommand*{\scrheadings@odd@middle@foot}{}
\newcommand*{\scrheadings@odd@right@foot}{}
-\newcommand{\ihead}{\@ifnextchar[{\@@lhead}{\@lhead}}
+\newcommand{\ihead}{\kernel@ifnextchar[{\@@lhead}{\@lhead}}
\newcommand{\@lhead}[1]{\@rehead{#1}\@lohead{#1}}
\newcommand{\@@lhead}[2][]{\@@rehead[{#1}]{#2}\@@lohead[{#1}]{#2}}
-\newcommand{\ohead}{\@ifnextchar[{\@@rhead}{\@rhead}}
+\newcommand{\ohead}{\kernel@ifnextchar[{\@@rhead}{\@rhead}}
\newcommand{\@rhead}[1]{\@lehead{#1}\@rohead{#1}}
\newcommand{\@@rhead}[2][]{\@@lehead[{#1}]{#2}\@@rohead[{#1}]{#2}}
-\newcommand{\chead}{\@ifnextchar[{\@@chead}{\@chead}}
+\newcommand{\chead}{\kernel@ifnextchar[{\@@chead}{\@chead}}
\newcommand{\@chead}[1]{\@cehead{#1}\@cohead{#1}}
\newcommand{\@@chead}[2][]{\@@cehead[{#1}]{#2}\@@cohead[{#1}]{#2}}
-\newcommand{\lehead}{\@ifnextchar[{\@@lehead}{\@lehead}}
+\newcommand{\lehead}{\kernel@ifnextchar[{\@@lehead}{\@lehead}}
\newcommand{\@lehead}[1]{\renewcommand*{\scrheadings@even@left@head}{#1}}
\newcommand{\@@lehead}[2][]{%
\renewcommand*{\scrplain@even@left@head}{#1}%
\renewcommand*{\scrheadings@even@left@head}{#2}}
-\newcommand{\lohead}{\@ifnextchar[{\@@lohead}{\@lohead}}
+\newcommand{\lohead}{\kernel@ifnextchar[{\@@lohead}{\@lohead}}
\newcommand{\@lohead}[1]{\renewcommand*{\scrheadings@odd@left@head}{#1}}
\newcommand{\@@lohead}[2][]{%
\renewcommand*{\scrplain@odd@left@head}{#1}%
\renewcommand*{\scrheadings@odd@left@head}{#2}}
-\newcommand{\rehead}{\@ifnextchar[{\@@rehead}{\@rehead}}
+\newcommand{\rehead}{\kernel@ifnextchar[{\@@rehead}{\@rehead}}
\newcommand{\@rehead}[1]{\renewcommand*{\scrheadings@even@right@head}{#1}}
\newcommand{\@@rehead}[2][]{%
\renewcommand*{\scrplain@even@right@head}{#1}%
\renewcommand*{\scrheadings@even@right@head}{#2}}
-\newcommand{\rohead}{\@ifnextchar[{\@@rohead}{\@rohead}}
+\newcommand{\rohead}{\kernel@ifnextchar[{\@@rohead}{\@rohead}}
\newcommand{\@rohead}[1]{\renewcommand*{\scrheadings@odd@right@head}{#1}}
\newcommand{\@@rohead}[2][]{%
\renewcommand*{\scrplain@odd@right@head}{#1}%
\renewcommand*{\scrheadings@odd@right@head}{#2}}
-\newcommand{\cehead}{\@ifnextchar[{\@@cehead}{\@cehead}}
+\newcommand{\cehead}{\kernel@ifnextchar[{\@@cehead}{\@cehead}}
\newcommand{\@cehead}[1]{\renewcommand*{\scrheadings@even@middle@head}{#1}}
\newcommand{\@@cehead}[2][]{%
\renewcommand*{\scrplain@even@middle@head}{#1}%
\renewcommand*{\scrheadings@even@middle@head}{#2}}
-\newcommand{\cohead}{\@ifnextchar[{\@@cohead}{\@cohead}}
+\newcommand{\cohead}{\kernel@ifnextchar[{\@@cohead}{\@cohead}}
\newcommand{\@cohead}[1]{\renewcommand*{\scrheadings@odd@middle@head}{#1}}
\newcommand{\@@cohead}[2][]{%
\renewcommand*{\scrplain@odd@middle@head}{#1}%
\renewcommand*{\scrheadings@odd@middle@head}{#2}}
-\newcommand{\ifoot}{\@ifnextchar[{\@@lfoot}{\@lfoot}}
+\newcommand{\ifoot}{\kernel@ifnextchar[{\@@lfoot}{\@lfoot}}
\newcommand{\@lfoot}[1]{\@refoot{#1}\@lofoot{#1}}
\newcommand{\@@lfoot}[2][]{\@@refoot[{#1}]{#2}\@@lofoot[{#1}]{#2}}
-\newcommand{\ofoot}{\@ifnextchar[{\@@rfoot}{\@rfoot}}
+\newcommand{\ofoot}{\kernel@ifnextchar[{\@@rfoot}{\@rfoot}}
\newcommand{\@rfoot}[1]{\@lefoot{#1}\@rofoot{#1}}
\newcommand{\@@rfoot}[2][]{\@@lefoot[{#1}]{#2}\@@rofoot[{#1}]{#2}}
-\newcommand{\cfoot}{\@ifnextchar[{\@@cfoot}{\@cfoot}}
+\newcommand{\cfoot}{\kernel@ifnextchar[{\@@cfoot}{\@cfoot}}
\newcommand{\@cfoot}[1]{\@cefoot{#1}\@cofoot{#1}}
\newcommand{\@@cfoot}[2][]{\@@cefoot[{#1}]{#2}\@@cofoot[{#1}]{#2}}
-\newcommand{\lefoot}{\@ifnextchar[{\@@lefoot}{\@lefoot}}
+\newcommand{\lefoot}{\kernel@ifnextchar[{\@@lefoot}{\@lefoot}}
\newcommand{\@lefoot}[1]{\renewcommand*{\scrheadings@even@left@foot}{#1}}
\newcommand{\@@lefoot}[2][]{%
\renewcommand*{\scrplain@even@left@foot}{#1}%
\renewcommand*{\scrheadings@even@left@foot}{#2}}
-\newcommand{\lofoot}{\@ifnextchar[{\@@lofoot}{\@lofoot}}
+\newcommand{\lofoot}{\kernel@ifnextchar[{\@@lofoot}{\@lofoot}}
\newcommand{\@lofoot}[1]{\renewcommand*{\scrheadings@odd@left@foot}{#1}}
\newcommand{\@@lofoot}[2][]{%
\renewcommand*{\scrplain@odd@left@foot}{#1}%
\renewcommand*{\scrheadings@odd@left@foot}{#2}}
-\newcommand{\refoot}{\@ifnextchar[{\@@refoot}{\@refoot}}
+\newcommand{\refoot}{\kernel@ifnextchar[{\@@refoot}{\@refoot}}
\newcommand{\@refoot}[1]{\renewcommand*{\scrheadings@even@right@foot}{#1}}
\newcommand{\@@refoot}[2][]{%
\renewcommand*{\scrplain@even@right@foot}{#1}%
\renewcommand*{\scrheadings@even@right@foot}{#2}}
-\newcommand{\rofoot}{\@ifnextchar[{\@@rofoot}{\@rofoot}}
+\newcommand{\rofoot}{\kernel@ifnextchar[{\@@rofoot}{\@rofoot}}
\newcommand{\@rofoot}[1]{\renewcommand*{\scrheadings@odd@right@foot}{#1}}
\newcommand{\@@rofoot}[2][]{%
\renewcommand*{\scrplain@odd@right@foot}{#1}%
\renewcommand*{\scrheadings@odd@right@foot}{#2}}
-\newcommand{\cefoot}{\@ifnextchar[{\@@cefoot}{\@cefoot}}
+\newcommand{\cefoot}{\kernel@ifnextchar[{\@@cefoot}{\@cefoot}}
\newcommand{\@cefoot}[1]{\renewcommand*{\scrheadings@even@middle@foot}{#1}}
\newcommand{\@@cefoot}[2][]{%
\renewcommand*{\scrplain@even@middle@foot}{#1}%
\renewcommand*{\scrheadings@even@middle@foot}{#2}}
-\newcommand{\cofoot}{\@ifnextchar[{\@@cofoot}{\@cofoot}}
+\newcommand{\cofoot}{\kernel@ifnextchar[{\@@cofoot}{\@cofoot}}
\newcommand{\@cofoot}[1]{\renewcommand*{\scrheadings@odd@middle@foot}{#1}}
\newcommand{\@@cofoot}[2][]{%
\renewcommand*{\scrplain@odd@middle@foot}{#1}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 8c8126d8b04..c62a96922eb 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -7,6 +7,7 @@
%% scrkernel-version.dtx (with options: `class,report')
%% scrkernel-basics.dtx (with options: `load')
%% tocbasic.dtx (with options: `class,load,chapter')
+%% scrkernel-tocstyle.dtx (with options: `class,report,prepare')
%% scrkernel-sections.dtx (with options: `class,report,prepare')
%% scrkernel-compatibility.dtx (with options: `class,report,option')
%% scrkernel-miscellaneous.dtx (with options: `class,report,option')
@@ -15,6 +16,7 @@
%% scrkernel-typearea.dtx (with options: `class,report,option')
%% scrkernel-paragraphs.dtx (with options: `class,report,option')
%% scrkernel-title.dtx (with options: `class,report,option')
+%% scrkernel-tocstyle.dtx (with options: `class,report,option')
%% scrkernel-sections.dtx (with options: `class,report,option')
%% scrkernel-pagestyles.dtx (with options: `class,report,option')
%% scrkernel-floats.dtx (with options: `class,report,option')
@@ -31,6 +33,11 @@
%% scrkernel-typearea.dtx (with options: `class,report,body')
%% scrkernel-paragraphs.dtx (with options: `class,report,body')
%% scrkernel-title.dtx (with options: `class,report,body')
+%% scrkernel-tocstyle.dtx (with options: `class,report,body')
+%% scrkernel-tocstyle.dtx (with options: `class,report,style,part')
+%% scrkernel-tocstyle.dtx (with options: `class,report,style,chapter')
+%% scrkernel-tocstyle.dtx (with options: `class,report,style,section')
+%% scrkernel-tocstyle.dtx (with options: `class,report,style,default')
%% scrkernel-sections.dtx (with options: `class,report,body')
%% scrkernel-miscellaneous.dtx (with options: `class,report,body')
%% scrkernel-pagestyles.dtx (with options: `class,report,body')
@@ -42,7 +49,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,report,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -74,7 +81,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -96,7 +103,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -111,21 +118,23 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
\RequirePackage{tocbasic}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: prepare)
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrightfalse
@@ -200,8 +209,8 @@
\newcommand*{\size@subsubsection}{}
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -325,6 +334,7 @@
\@namedef{scr@v@3.18a}{15}
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
+\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -338,7 +348,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -360,8 +370,12 @@
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
+\newcommand*{\@gr@gsffamily}{%
+ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi
+}
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -428,7 +442,25 @@
\KOMAClassFileName
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+\DeclareOption{enabledeprecatedfontcommands}{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ deprecated option `enabledeprecatedfontcommands'.\MessageBreak
+ Note, that this option was already depreacted when\MessageBreak
+ it has been defined. Support for old font commands\MessageBreak
+ has been removed from KOMA-Script more than one\MessageBreak
+ decade ago. It is not recommended to use them any\MessageBreak
+ longer. Therefore usage of this class option also\MessageBreak
+ is not recommended%
+ }%
+ \let\scr@defineobsoletefonts\@ne
+}
+\scr@ifundefinedorrelax{scr@defineobsoletefonts}{%
+ \let\scr@defineobsoletefonts\z@
+}{}
+\BeforePackage{tex4ht}{%
+ \let\scr@defineobsoletefonts\thr@@
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -494,12 +526,12 @@
}{%
\def\FamilyElseValue{, `semi'}%
\KOMA@set@ifkey{twoside}{%
- @tempswa%
+ @twoside%
}{#1}%
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@tempswa\flushbottom
+ \if@twoside\flushbottom
\else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
\fi
\KOMA@kav@xreplacevalue{.%
@@ -517,10 +549,13 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{twocolumn}{@twocolumn}%
- \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twocolumn\twocolumn\sloppy\flushbottom
\else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi
+ \fi}%
\fi
}
\AtEndOfClass{%
@@ -534,7 +569,8 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: option
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -569,6 +605,7 @@
\let\par@update\relax
\newcommand*{\default@par@update}{}
\let\default@par@update\relax
+\AtBeginDocument{\par@update}
\newcommand*{\scr@parindent}{1em}
\newcommand*{\scr@parskip}{\z@}
\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil}
@@ -698,7 +735,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -732,7 +769,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -994,33 +1033,11 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
-\newif\if@hsl
-\KOMA@key{headsepline}[true]{%
- \KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }{%
- \KOMAoptions{headinclude=#1}{}%
- }%
- \fi
-}
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
-\newif\if@fsl
-\KOMA@key{footsepline}[true]{%
- \KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
- \@ifundefined{typearea}{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }{%
- \KOMAoptions{footinclude=#1}%
- }%
- \fi
-}
+\KOMA@ifkey{footsepline}{@fsl}%
\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\KOMA@key{cleardoublepage}{%
@@ -1120,7 +1137,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1324,7 +1341,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1845,19 +1862,19 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2247,42 +2264,78 @@
}%
}
\newcommand*{\scr@DeclareOldFontCommand}[3]{%
- \DeclareRobustCommand #1{\@fontswitch {%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#2}'%
- }%
- #2%
- }{%
- \ClassWarning{\KOMAClassName}{%
- Usage of deprecated font command `\string#1'!\MessageBreak
- You should note, that in 1994 font command `\string#1' has\MessageBreak
- been defined for compatiblitiy to Script 2.0 only.\MessageBreak
- Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
- shouldn't use such commands any longer and within\MessageBreak
- KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
- See `fntguide.pdf' for more information about\MessageBreak
- recommended font commands.\MessageBreak
- Note also, that KOMA-Script will remove the definition\MessageBreak
- of `\string#1' anytime until release of about version 3.20.\MessageBreak
- But for now, KOMA-Script will replace deprecated
- `\string#1'\MessageBreak
- by `\detokenize{#3}'%
+ \ifnum\scr@defineobsoletefonts<\z@\else
+ \ifnum\scr@defineobsoletefonts>\tw@
+ \DeclareOldFontCommand{#1}{#2}{#3}%
+ \else
+ \DeclareOldFontCommand{#1}{%
+ \scr@ErrorWarningInfo{#1}{#2}#2%
+ }{%
+ \scr@ErrorWarningInfo{#1}{#3}#3%
}%
- #3%
+ \fi
+ \fi
+}
+\DeclareRobustCommand*{\scr@ErrorWarningInfo}[2]{%
+ \ifnum \scr@defineobsoletefonts=\z@
+ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{%
+ You should note that since 1994 LaTeX2e provides a new font selection
+ scheme\MessageBreak
+ called NFSS2 with several new, combinable font commands. New
+ KOMA-Script\MessageBreak
+ classes have defined the old font commands like `\string#1'
+ only for compatibility\MessageBreak
+ with old LaTeX 2.09 document styles of Script 2.0. Nevertheless,
+ these\MessageBreak
+ commands are deprecated and undocumented at least since
+ 2003. Since 2013\MessageBreak
+ KOMA-Script classes warn abouts soon removement of these deprecated
+ commands.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, these commands will not
+ work any\MessageBreak
+ more. If loading a package results in this error message, you should
+ contact\MessageBreak
+ the author of that package and ask him to replace the deprecated font
+ command\MessageBreak
+ `\string#1', e.g., by `\detokenize{#2}`. Otherwise you should
+ reconfigure\MessageBreak
+ or replace the package. If you have used the old font command
+ `\string#1' yourself,\MessageBreak
+ you should replace it, e.g., by `\detokenize{#2}'.\MessageBreak
+ To make it work for now, you can use the already also deprecated class
+ option\MessageBreak
+ `enabledeprecatedfontcommands'.%
}%
- }%
+ \else
+ \ifcase \scr@defineobsoletefonts
+ \or
+ \expandafter\ClassWarning
+ \or
+ \expandafter\ClassInfo
+ \else
+ \expandafter\@gobbletwo
+ \fi
+ {\KOMAClassName}{deprecated old font command `\string#1' used.\MessageBreak
+ You should note, that since 1994 LaTeX2e provides a\MessageBreak
+ new font selection scheme called NFSS2 with several\MessageBreak
+ new, combinable font commands. New KOMA-Script classes\MessageBreak
+ have defined the old font commands like `\string#1' only for\MessageBreak
+ compatibility with LaTeX 2.09 document styles of\MessageBreak
+ Script 2.0. These commands are deprecated and\MessageBreak
+ undocumented at least since 2003. Since 2013,\MessageBreak
+ KOMA-Script classes warn about soon removement of\MessageBreak
+ these deprecated commands. Now, after two decades of\MessageBreak
+ LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak
+ not work any longer. If loading a package results in\MessageBreak
+ this message you should contact the author of that\MessageBreak
+ package and ask him to replace the depracted font\MessageBreak
+ command `\string#1', e.g., by `\detokenize{#2}'.\MessageBreak
+ Otherwise you should reconfigure or replace the\MessageBreak
+ package. If you have used the old font command\MessageBreak
+ `\string #1' yourself you should replace it, e.g., by\MessageBreak
+ `\detokenize{#2}'%
+ }%
+ \fi
}
\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
@@ -2295,12 +2348,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2344,7 +2397,8 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% run: body
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -2472,7 +2526,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2509,6 +2563,7 @@
\@thanks\global\let\@thanks\@empty
\clearpage
\csname titlepage@restore\endcsname
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\thispagestyle{empty}%
\let\footnote\thanks
\setcounter{footnote}{0}%
@@ -2812,7 +2867,54 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-sections.dtx 2212 2015-10-03 12:51:00Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: body)
+\let\numberline\scr@numberline
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,part)
+\CloneTOCEntryStyle{tocline}{part}
+\TOCEntryStyleStartInitCode{part}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{\hfill}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{\usekomafont{partentry}{##1}}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+ \usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,chapter)
+\CloneTOCEntryStyle{tocline}{chapter}
+\TOCEntryStyleStartInitCode{chapter}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{%
+ \if@chapterentrywithdots
+ \TOCLineLeaderFill\relax
+ \else
+ \hfill
+ \fi
+ }%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname{\usekomafont{chapterentry}}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+ \usekomafont{chapterentry}{\usekomafont{chapterentrypagenumber}{##1}}}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,section)
+\CloneTOCEntryStyle{tocline}{section}
+\TOCEntryStyleStartInitCode{section}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: class,style,default)
+\CloneTOCEntryStyle{section}{default}
+%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -2839,7 +2941,7 @@
}
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
- \string\global\string\@altsecnumformattrue}%
+ \string\global\string\csname\space @altsecnumformattrue\string\endcsname}%
\fi\fi}
\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup%
\expandafter\@@maybeautodot #1\@stop\endgroup\fi
@@ -2873,11 +2975,33 @@
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
+ \kernel@ifstar
+ {\@ssect{#3}{#4}{#5}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+}
+\def\reserved@a#1#2#3#4#5#6{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
\@ifstar
{\@ssect{#3}{#4}{#5}{#6}}%
{\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
}
-\ifx\@startsection\scr@saved@startsection
+\ifcase \ifx\@startsection\scr@saved@startsection 0
+ \else
+ \ifx\@startsection\reserved@a 0
+ \else 1
+ \fi
+ \fi
\newcommand*{\scr@startsection}[6]{%
\if@noskipsec \leavevmode \fi
\par
@@ -2892,7 +3016,7 @@
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
- \@ifstar {%
+ \kernel@ifstar {%
\csname scr@preto@ssect@hook\endcsname
\def\scr@s@ct@@nn@m@{#1}%
\@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
@@ -2923,7 +3047,7 @@
}%
\let\scr@saved@startsection\@startsection
\newcommand*{\scr@startsection}[6]{%
- \@ifstar {%
+ \kernel@ifstar {%
\scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*%
}{%
@@ -2964,7 +3088,7 @@
\expandafter\scr@startsection
\fi
}
-\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}}
+\newcommand*{\SecDef}[2]{\kernel@ifstar{#2}{\scr@section@dblarg{#1}}}
\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
\let\secdef\SecDef
\def\@tempa#1#2#3#4#5#6[#7]#8{%
@@ -3155,7 +3279,7 @@
Neither the then-code nor the else-code will be\MessageBreak
executed.\MessageBreak
You may change this and avoid the warning by LOCALLY\MessageBreak
- setting \string\IsUsePrefixLine\space to either
+ setting \string\IfUsePrefixLine\space to either
\string\@firstoftwo\space or\MessageBreak
\string\@secondoftwo\space before using it%
}%
@@ -3167,26 +3291,40 @@
\DefineFamily{KOMAarg}
\DefineFamilyMember[.dsc]{KOMAarg}
\newcommand*{\DeclareSectionCommandStyleOption}[3]{%
- \DeclareSectionCommandDummyOption{#2}%
+ \AddToSectionCommandOptionsDoList{#2}%
\expandafter\g@addto@macro\csname scr@dsc@style@#1@options\endcsname{%
\DefineFamilyKey[.dsc]{KOMAarg}{#2}{#3}%
}%
}
-\newcommand*{\DeclareSectionCommandDummyOption}[1]{%
- \@ifstar {%
- \g@addto@macro{\scr@dsc@dummyoptions}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{#1}[]{\FamilyKeyStateProcessed}%
+\newcommand*{\AddToSectionCommandOptionsDoList}[1]{%
+ \kernel@ifnextchar [%]
+ {\@AddToSectionCommandOptionListWithDefault{#1}}%
+ {\l@addto@macro\scr@dsc@doopts{\do{#1}}}%
+}
+\newcommand*{\@AddToSectionCommandOptionListWithDefault}{}
+\def\@AddToSectionCommandOptionListWithDefault#1[#2]{%
+ \l@addto@macro\scr@dsc@doopts{\do[{#2}]{#1}}
+}%
+\newcommand*{\scr@dsc@doopts}{}
+\newcommand*{\RelaxSectionCommandOptions}{%
+ \begingroup
+ \def\do@endgroup{\endgroup}%
+ \def\do{%
+ \kernel@ifnextchar [%]
+ {\@do}%
+ {\@do[]}%
}%
- }{%
- \g@addto@macro{\scr@dsc@dummyoptions}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{#1}{\FamilyKeyStateProcessed}%
+ \def\@do[##1]##2{%
+ \l@addto@macro\do@endgroup{\RelaxFamilyKey[.dsc]{KOMAarg}{##2}}%
}%
- }%
+ \scr@dsc@doopts
+ \do@endgroup
}
-\newcommand*{\scr@dsc@dummyoptions}{}
\newcommand*{\DeclareSectionCommandStyleLengthOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetLength{KOMAarg}{#2}{\noexpand\@tempskipa}{##1}%
+ }\reserved@a
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifscr@dsc@expandtopt
\expandafter\edef\csname #3\scr@dsc@current#4\endcsname{%
@@ -3199,9 +3337,11 @@
}
\newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
- \FamilySetCounter{KOMAarg}{#2}{\@tempcnta}{##1}%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{#2}{\noexpand\reserved@a}{##1}
+ }\reserved@a
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \expandafter\edef\csname #3\scr@dsc@current#4 \endcsname{\the\@tempcnta}%
+ \expandafter\let\csname #3\scr@dsc@current#4 \endcsname\reserved@a
\fi
}%
}
@@ -3215,13 +3355,6 @@
\FamilyKeyStateProcessed
}%
}
-\DeclareSectionCommandDummyOption{style}
-\DeclareSectionCommandDummyOption{expandtopt}*
-\DeclareSectionCommandDummyOption{increaselevel}
-\DeclareSectionCommandDummyOption{level}
-\DeclareSectionCommandDummyOption{toclevel}
-\DeclareSectionCommandDummyOption{tocindent}
-\DeclareSectionCommandDummyOption{tocnumwidth}
\newcommand*{\scr@dsc@style@section@options}{}
\DeclareSectionCommandStyleLengthOption{section}
{indent}{scr@}{@sectionindent}
@@ -3238,7 +3371,7 @@
{\csname scr@#1@beforeskip\endcsname}%
{\csname scr@#1@afterskip\endcsname}%
{%
- \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@
+ \ifdim\glueexpr\csname scr@#1@afterskip\endcsname >\z@
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}%
\fi
@@ -3360,11 +3493,10 @@
\newif\ifscr@dsc@parametersonly
\newcommand*{\DeclareSectionCommand}[2][]{%
\edef\scr@dsc@current{#2}%
- \scr@dsc@dummyoptions
\scr@dsc@parametersonlyfalse
\DefineFamilyKey[.dsc]{KOMAarg}{style}{%
- \ifstr{##1}{}{%
- \ifscr@dsc@parametersonlytrue
+ \IfArgIsEmpty{##1}{%
+ \scr@dsc@parametersonlytrue
\FamilyKeyStateProcessed
}{%
\scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{%
@@ -3375,7 +3507,27 @@
}%
}%
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{%
+ \IfArgIsEmpty{##1}{%
+ \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \relax
+ \FamilyKeyStateProcessed
+ }{%
+ \scr@ifundefinedorrelax{scr@dte@def@l@##1}{%
+ \FamilyKeyStateUnknownValue
+ }{%
+ \@namedef{scr@dte@\scr@dsc@current @style}{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{%
+ \FamilyKeyStateProcessed
+ }%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
\begingroup
\scr@ifundefinedorrelax{scr@\scr@dsc@current @style}{%
\scr@declaresectioncommanderror{\scr@dsc@current}
@@ -3383,8 +3535,54 @@
}{}%
\endgroup
\@firstofone{%
- \scr@dsc@dummyoptions
\@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
+ \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{%
+ \scr@ifundefinedorrelax{l@\scr@dsc@current}{%
+ \@namedef{scr@dte@\scr@dsc@current @style}{default}%
+ }{}%
+ }{}%
+ \let\scr@dsc@tocstyle@options\@empty
+ \let\scr@dsc@extra@relax@opts\@empty
+ \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{}{%
+ \begingroup
+ \def\scr@dte@current{#2}%
+ \edef\reserved@a{%
+ \noexpand\@ExecuteTOCEntryStyleInitCode{%
+ \@nameuse{scr@dte@\scr@dsc@current @style}%
+ }{\scr@dsc@current}%
+ }\reserved@a
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \l@addto@macro\do@endgroup{%
+ \l@addto@macro\scr@dsc@extra@relax@opts{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}%
+ }%
+ }%
+ \kernel@ifnextchar[%]
+ {\@dodefault{##1}}%
+ {\@donodefault{##1}}%
+ }%
+ \def\@donodefault##1{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \def\@dodefault##1[##2]{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toc##1}[##2]{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \scr@dte@doopts
+ \do@endgroup
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{\FamilyKeyStateProcessed}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{\FamilyKeyStateProcessed}%
\FamilyBoolKey[.dsc]{KOMAarg}{expandtopt}{scr@dsc@expandtopt}%
\scr@dsc@expandtoptfalse
\scr@ifundefinedorrelax{scr@local@levelincrease}{%
@@ -3417,64 +3615,38 @@
\let\scr@local@counterwithout\relax
\FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
\let\scr@local@counterwithin\relax
- \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@tocleveloffset\relax}%
- \edef\scr@local@tocleveloffset{%
- \the\numexpr\scr@local@tocleveloffset
- +\scr@local@levelincrease\relax
+ \scr@ifundefinedorrelax{scr@local@tocleveloffset}{}{%
+ \scr@ifundefinedorrelax{KV@KOMAarg.dsc@toclevel}{%
+ }{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \edef\reserved@a{%
+ \noexpand\l@addto@macro{\noexpand\scr@dsc@tocstyle@options}{%
+ level=\the\numexpr ##1+\scr@local@tocleveloffset\relax,%
}%
+ }\reserved@a
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
+ \FamilyKeyStateProcessed
}%
- }\reserved@a
- }%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifscr@dsc@expandtopt
- \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
- \the\@tempskipa}%
- \else
- \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
- ##1}%
- \fi
- \fi
- }%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{%
- \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifscr@dsc@expandtopt
- \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
- \the\@tempskipa}%
- \else
- \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
- ##1}%
- \fi
- \fi
+ }%
}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \scr@dsc@extra@relax@opts
+ \let\scr@dsc@extra@relax@opts\relax
+ \RelaxSectionCommandOptions
+ \RelaxFamilyKey[.dsc]{KOMAarg}{style}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocstyle}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{expandtopt}%
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
+ }%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{level}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}%
\begingroup
\scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
}{}%
- \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocindent}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry indent}
- {tocindent}%
- }{}%
- \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocnumwidth}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry number
- width}{tocnumwidth}%
- }{}%
\@nameuse{scr@dsc@style@%
\@nameuse{scr@\scr@dsc@current @style}%
@neededoptionstest}%
@@ -3494,7 +3666,7 @@
\else
\@removefromreset{#2}{\scr@local@counterwithin}%
\@addtoreset{#2}{\scr@local@counterwithin}%
- \expandafter\def\csname the#2\expandafter\endcsname{%
+ \expandafter\def\csname the#2\expandafter\endcsname\expandafter{%
\csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
\fi
\fi
@@ -3531,22 +3703,23 @@
}{%
\DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
}%
- \scr@ifundefinedorrelax{#2tocdepth}{%
- \expandafter\let\csname #2tocdepth\expandafter\endcsname
- \csname #2numdepth\endcsname
- }{}%
\expandafter\providecommand\expandafter*%
\csname add#2tocentry\endcsname[2]{%
\addtocentrydefault{#2}{##1}{##2}%
}%
+ \scr@ifundefinedorrelax{scr@dte@#2@style}{%
+ }{%
+ \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{%
+ \@nameuse{scr@dte@#2@style}%
+ }{#2}%
+ }%
\scr@ifundefinedorrelax{l@#2}{%
- \expandafter\edef\csname l@#2\endcsname{%
- \noexpand\bprot@dottedtocline
- \expandafter\noexpand\csname #2tocdepth\endcsname
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
- }%
+ \DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{default}{#2}%
}{}%
+ \scr@ifundefinedorrelax{toclevel@part}{}{%
+ \expandafter\let\csname toclevel@#2\expandafter\endcsname
+ \csname #2tocdepth\endcsname
+ }%
}%
}%
\let\scr@dsc@current\relax
@@ -3606,9 +3779,9 @@
}
\newcommand*{\DeclareSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\edef\reserved@a{%
\unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
@@ -3621,9 +3794,9 @@
}
\newcommand*{\DeclareNewSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{}{%
\ClassError{\KOMAClassName}{%
@@ -3651,9 +3824,9 @@
}
\newcommand*{\RedeclareSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{%
\ClassError{\KOMAClassName}{%
@@ -3679,9 +3852,9 @@
}
\newcommand*{\ProvideSectionCommands}[2][]{%
\edef\reserved@a{#2}%
- \let\scr@local@levelincrease\z@
- \let\scr@local@leveloffset\z@
- \let\scr@local@tocleveloffset\z@
+ \def\scr@local@levelincrease{\z@}%
+ \def\scr@local@leveloffset{\z@}%
+ \def\scr@local@tocleveloffset{\z@}%
\@for\reserved@a:=\reserved@a\do{%
\@ifundefined{\reserved@a}{%
\edef\reserved@a{%
@@ -3689,7 +3862,7 @@
}%
\reserved@a
}{%
- \scr@dsc@dummyoptions
+ \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
\FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
{\scr@local@levelincrease}%
\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
@@ -3697,11 +3870,18 @@
\edef\scr@local@leveloffset{%
\the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
}%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \FamilySetCounterMacro{KOMAarg}{toclevel}{\reserved@b}{##1}%
\edef\scr@local@tocleveloffset{%
\the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{toclevel}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{level}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}%
}%
}%
\let\scr@local@levelincrease\relax
@@ -3715,12 +3895,12 @@
}%
}
\newcommand*{\set@preamble}[1]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\set@@preamble{#1}}{\set@@@preamble{#1}[][\hsize]}%
}
\newcommand*{\set@@preamble}{}
\def\set@@preamble#1[#2]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\set@@@preamble{#1}[{#2}]}{\set@@@preamble{#1}[{#2}][\hsize]}%
}
\newcommand{\set@@@preamble}{}
@@ -3819,19 +3999,11 @@
\newcommand*{\bprot@dottedtocline}[5]{%
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\ifnum #1>\c@tocdepth \else
- \begingroup
- \@tempcnta 20010
- \advance \@tempcnta by -#1
- \ifnum \@tempcnta>\lastpenalty
- \endgroup
+ \ifnum \lastpenalty<\numexpr 20010-#1\relax
\addpenalty{\@lowpenalty}%
- \else
- \endgroup
\fi
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \@tempcnta 20009
- \advance \@tempcnta by -#1
- \penalty\@tempcnta
+ \penalty \numexpr 20009-#1\relax
\fi
\else
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
@@ -3998,34 +4170,6 @@
\part*{#1}%
\addpartmark{}%
}
-\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth <\parttocdepth \else
- \addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\p@}%
- \setlength{\@tempdima}{\scr@part@tocnumwidth}%
- \if@tocleft
- \ifx\toc@l@number\@empty\else
- \setlength\@tempdima{0\toc@l@number}%
- \fi
- \fi
- \begingroup
- \parindent \z@ \rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \leavevmode
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- \usekomafont{partentry}{#1\nobreak
- \usekomafont{partentrypagenumber}{\hfil\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \expandafter\ifnum\scr@v@is@gt{2.96}\relax
- \endgroup
- \penalty20010
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
-}
\newcounter{part}
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
@@ -4169,7 +4313,7 @@
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\def\IfUseNumber{\ifnumbered{#1}}%
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
@@ -4219,7 +4363,7 @@
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\let\IfUseNumber\secondoftwo
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
@@ -4332,49 +4476,6 @@
\chapter*{#1}%
\addchapmark{}%
}%
-\newcommand*\l@chapter[2]{%
- \ifnum \c@tocdepth <\chaptertocdepth \else
- \ifnum \lastpenalty<20010
- \addpenalty{-\@highpenalty}%
- \fi
- \expandafter\ifnum\scr@v@is@lt{3.15}%
- \vskip 1.0em \@plus\p@
- \else
- \addvspace{1.0em \@plus\p@}%
- \fi
- \setlength\@tempdima{\scr@chapter@tocnumwidth}%
- \if@tocleft
- \ifx\toc@l@number\@empty\else
- \setlength\@tempdima{0\toc@l@number}%
- \fi
- \fi
- \begingroup
- \raggedchapterentry
- \parindent \z@ \advance\rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \interlinepenalty\@M
- \leavevmode
- \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
- \edef\@pnumwidth{\the\dimexpr\@pnumwidth\relax}%
- \usekomafont{chapterentry}{#1\nobreak
- \usekomafont{chapterentrypagenumber}{%
- {\usekomafont{chapterentrydots}{%
- \if@chapterentrywithdots
- \leaders\hbox{$\m@th
- \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}%
- \fi
- \hfill}}\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \expandafter\ifnum\scr@v@is@gt{2.96}\relax
- \endgroup
- \penalty20009
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
-}
\newcommand*{\raggedchapterentry}{}
\newcommand*{\l@chapteratlist}{\l@chapter}
\newcounter{chapter}
@@ -4514,16 +4615,18 @@
style=part,%
level=\m@ne,%
pagestyle=plain,%
+ tocstyle=part,%
toclevel=\m@ne,%
tocindent=\z@,%
- tocnumwidth=2em
+ tocnumwidth=2em%
]{part}
\DeclareSectionCommand[%
style=chapter,%
level=\z@,%
pagestyle=plain,%
+ tocstyle=chapter,%
tocindent=\z@,%
- tocnumwidth=1.5em
+ tocnumwidth=1.5em%
]{chapter}
\DeclareSectionCommand[%
style=section,%
@@ -4531,6 +4634,7 @@
indent=\z@,%
beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,%
afterskip=2.3ex \@plus.2ex,%
+ tocstyle=section,%
tocindent=1.5em,%
tocnumwidth=2.3em%
]{section}
@@ -4540,6 +4644,7 @@
indent=\z@,%
beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
afterskip=1.5ex \@plus .2ex,%
+ tocstyle=section,%
tocindent=3.8em,%
tocnumwidth=3.2em%
]{subsection}
@@ -4549,6 +4654,7 @@
indent=\z@,%
beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
afterskip=1.5ex \@plus .2ex,%
+ tocstyle=section,%
tocindent=7.0em,%
tocnumwidth=4.1em%
]{subsubsection}
@@ -4558,6 +4664,7 @@
indent=\z@,%
beforeskip=3.25ex \@plus1ex \@minus.2ex,%
afterskip=-1em,%
+ tocstyle=section,%
tocindent=10em,%
tocnumwidth=5em%
]{paragraph}
@@ -4567,6 +4674,7 @@
indent=\scr@parindent,%
beforeskip=3.25ex \@plus1ex \@minus .2ex,%
afterskip=-1em,%
+ tocstyle=section,%
tocindent=12em,%
tocnumwidth=6em%
]{subparagraph}
@@ -4577,7 +4685,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4598,7 +4706,7 @@
\newcommand*{\dictumauthorformat}[1]{(#1)}
\newcommand*{\raggeddictumtext}{\raggedright}
\newcommand*{\raggeddictumauthor}{\raggedleft}
-\newkomafont{dictum}{\normalfont\normalcolor\sffamily\small}
+\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small}
\newkomafont{dictumauthor}{\itshape}
\aliaskomafont{dictumtext}{dictum}
\setlength{\skip\@mpfootins}{\skip\footins}
@@ -4610,6 +4718,13 @@
\@arabic\c@equation
}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
+\AtBeginDocument{%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \string\providecommand*\string\new@tpo@label[2]{}%
+ }%
+ \fi
+}
\newcommand*{\scr@tpo}{0}
\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
@@ -4632,9 +4747,11 @@
\fi
\endgroup
\edef\is@thispageodd@setlabel{%
- \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
- \noexpand\string
- \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \if@filesw
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ \fi
}%
#1%
\@esphack
@@ -4694,7 +4811,7 @@
\let\scr@ttl@saved@subparagraph\subparagraph
}
\AfterPackage{titlesec}{%
- \@ifpackagelater{titlesec}{2014/10/09}{%
+ \@ifpackagelater{titlesec}{2016/03/22}{%
\ClassInfo{\KOMAClassName}{%
Deactivating the `titlesec` workaround,\MessageBreak
because package is newer than expected%
@@ -4754,7 +4871,7 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -4852,7 +4969,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -4872,21 +4989,21 @@
\newif\ifscap@alt
\newcommand*{\@captionbeside}{}
\long\def\@captionbeside[#1]#2{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@captionbeside[{#1}]{#2}}
{\c@pti@nb@sid@[{#1}]{#2}}%
}
\newcommand*{\@@captionbeside}{}
\long\def\@@captionbeside[#1]#2[#3]{%
\def\scap@pos{#3}%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@captionbeside[{#1}]{#2}}
{\c@pti@nb@sid@[{#1}]{#2}}%
}
\newcommand*{\@@@captionbeside}{}
\long\def\@@@captionbeside[#1]#2[#3]{%
\def\scap@width{#3}%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@@captionbeside[{#1}]{#2}}
{\setlength{\@tempdima}{#3}%
\addtolength{\@tempdima}{-\linewidth}%
@@ -4897,7 +5014,7 @@
\newcommand*{\@@@@captionbeside}{}
\long\def\@@@@captionbeside[#1]#2[#3]{%
\def\scap@move{#3}%
- \@ifstar
+ \kernel@ifstar
{\scap@alttrue\c@pti@nb@sid@[{#1}]{#2}}
{\scap@altfalse\c@pti@nb@sid@[{#1}]{#2}}%
}
@@ -4978,7 +5095,7 @@
\newif\ifdofullc@p
\dofullc@ptrue
\newif\if@capbreak\@capbreakfalse
-\newcommand*{\setcapindent}{\@ifstar{\@@setcapindent}{\@setcapindent}}
+\newcommand*{\setcapindent}{\kernel@ifstar{\@@setcapindent}{\@setcapindent}}
\newcommand*{\@setcapindent}[1]{%
\setlength{\@tempdima}{#1}%
\ifdim\@tempdima>\hsize
@@ -5005,7 +5122,7 @@
`\string\setcapindent'%
}%
\captionstyle{indent}%
- \@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}%
+ \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}%
}%
}
\newcommand*{\setcaphanging}{\dofullc@ptrue\@capbreakfalse}
@@ -5114,9 +5231,103 @@
\setcaptionwidth{#2}%
}%
}%
+\newcommand*{\setcapdynwidth}[2][]{%
+ \def\cap@width{#2}%
+ \begingroup
+ \edef\@tempa{#1}%
+ \def\@tempb{c}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill\let\cap@right=\hfill}%
+ \else
+ \def\@tempb{l}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\relax\let\cap@right\hfill}%
+ \else
+ \def\@tempb{r}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill\let\cap@right=\relax}%
+ \else
+ \def\@tempb{i}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\relax
+ \let\cap@right=\hfill
+ \if@twoside
+ \ifthispageodd{}{%
+ \let\cap@left=\hfill
+ \let\cap@right=\relax
+ }%
+ \fi
+ }%
+ \else
+ \def\@tempb{o}\ifx\@tempa\@tempb
+ \endgroup
+ \def\cap@margin{%
+ \ifdim \cap@width<\z@
+ \ClassWarning{\KOMAClassName}{%
+ caption width less than 0pt not allowed.\MessageBreak
+ Setting caption width to 0pt%
+ }%
+ \let\cap@width\z@
+ \fi
+ \let\cap@left=\hfill
+ \let\cap@right=\relax
+ \if@twoside
+ \ifthispageodd{}{%
+ \let\cap@left=\relax
+ \let\cap@right=\hfill
+ }%
+ \fi
+ }%
+ \else
+ \ifx \@tempa\@empty\else
+ \ClassError{\KOMAClassName}{%
+ unknown optional position argument%
+ }{%
+ You've used `#1' as position argument at
+ \string\setcaptionwidth,\MessageBreak
+ but only ONE of `c', `l', `r', `i`, `o` ist
+ allowed.\MessageBreak
+ Argument will be ignored, if you'll continue.%
+ }%
+ \fi
+ \endgroup
+ \fi\fi\fi\fi\fi
+}
\newcommand*{\cap@margin}{}
\let\cap@margin=\relax%
-\newcommand*{\setcapmargin}{\@ifstar{\@setcapmargin}{\@@setcapmargin}}
+\newcommand*{\setcapmargin}{\kernel@ifstar{\@setcapmargin}{\@@setcapmargin}}
\newcommand*{\@setcapmargin}[2][\@tempdimb]{%
\def\cap@margin{%
\onelinecaptionsfalse
@@ -5360,15 +5571,19 @@
\newcommand*{\ext@figure}{lof}
\newcommand*{\fnum@figure}{\figureformat}
\newenvironment{figure}{%
- \if@figurecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@figurecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
- \if@figurecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@figurecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@dblfloat{figure}%
}{%
\end@dblfloat
@@ -5387,15 +5602,19 @@
\newcommand*{\ext@table}{lot}
\newcommand*{\fnum@table}{\tableformat}
\newenvironment{table}{%
- \if@tablecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@float{table}%
}{%
\end@float
}
\newenvironment{table*}{%
- \if@tablecaptionabove\let\caption\captionabove
- \else\let\caption\captionbelow\fi
+ \def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }%
\@dblfloat{table}%
}{%
\end@dblfloat
@@ -5538,24 +5757,17 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
+\g@addto@macro{\numberline@numberpostfix}{\autodot}
+\usetocbasicnumberline[%
+ \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
+]
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
\AtAddToTocList[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
-\renewcommand*{\numberline}[1]{%
- \numberline@box{%
- \numberline@prefix
- \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}%
- \numberline@postfix
- }%
-}
-\newcommand*{\numberline@prefix}{}
-\newcommand*{\numberline@postfix}{\hfil}
-\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}}
-\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
\newcommand*\@dotsep{4.5}
@@ -5571,7 +5783,7 @@
\setlength{\@tempdima}{\last@l@number}%
\fi%
}
-\newcommand*{\before@starttoc}[1]{
+\newcommand*{\before@starttoc}[1]{%
\let\scr@dottedtocline=\@dottedtocline
\renewcommand*{\@dottedtocline}[3]{%
\scr@dottedtocline{##1}{\z@}{\last@l@number}}%
@@ -5588,6 +5800,24 @@
\expandafter=\csname#1@l@number\endcsname
\fi
}%
+ \begingroup
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \scr@ifundefinedorrelax{scr@tso@##1@numwidth}{}{%
+ \typeout{Setting numwidth of `##1' to \last@l@number}%
+ \l@addto@macro\do@endgroup{%
+ \@namedef{scr@tso@##1@numwidth}{\last@l@number}%
+ }%
+ }%
+ \scr@ifundefinedorrelax{scr@tso@##1@indent}{}{%
+ \typeout{Setting indent of `##1' to \string\z@}%
+ \l@addto@macro\do@endgroup{%
+ \@namedef{scr@tso@##1@indent}{\z@}%
+ }%
+ }%
+ }%
+ \@nameuse{scr@dte@donumwidth}%
+ \do@endgroup
}
\newcommand*{\after@starttoc}[1]{%
\protected@write\@auxout{}{%
@@ -5809,7 +6039,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -5956,7 +6186,7 @@
}%
\item\is@thispageodd@setlabel\nobreak\ignorespaces
}
-\newcommand*\descfont{\sffamily\bfseries}
+\newcommand*\descfont{\@gr@gsffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 7900d29edcb..9efc4a7a90d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,10pt')
%% scrkernel-paragraphs.dtx (with options: `clo,10pt')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
scrsize10pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index 91194f04910..d8c20dfb464 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,11pt')
%% scrkernel-paragraphs.dtx (with options: `clo,11pt')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
scrsize11pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index a03ba1985af..fb261ad1876 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,12pt')
%% scrkernel-paragraphs.dtx (with options: `clo,12pt')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
scrsize12pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index abf4f5a6a08..161236d1e6b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrtime,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,7 +43,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,29 +65,29 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
+%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
+%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@Hxii
\KOMA@ifkey{12h}{@Hxii}
\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
+%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\def\thistime{%
- \@ifstar
+ \kernel@ifstar
{\let\@tempif\iffalse\@thistime}
{\let\@tempif\iftrue\@thistime}}
\newcommand*{\@thistime}[1][:]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
index 56e910487bf..9076c8a5037 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
@@ -7,7 +7,7 @@
%% scrwfile.dtx (with options: `package,trace,scrwfile,identify,option,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2010-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2010-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
index 05ba52e94b4..37db6ea6571 100644
--- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,setspace,identify')
%% scrhack.dtx (with options: `hack,setspace,body')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{setspace.hak}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(hacking package
setspace)%
]
-%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $
+%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\scr@ifexpected{\onehalfspacing}{%
\long\def\onehalfspacing{%
\setstretch{1.25}% default
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index c6dfcc98510..390d986e9af 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -4,10 +4,23 @@
%%
%% The original source files were:
%%
-%% tocbasic.dtx (with options: `package')
+%% tocbasic.dtx (with options: `package,identify')
+%% tocbasic.dtx (with options: `package,prepare')
+%% scrkernel-tocstyle.dtx (with options: `package,prepare')
+%% tocbasic.dtx (with options: `package,option')
+%% scrkernel-tocstyle.dtx (with options: `package,option')
+%% tocbasic.dtx (with options: `package,body')
+%% scrkernel-tocstyle.dtx (with options: `package,body')
+%% scrkernel-tocstyle.dtx (with options: `package,style,gobble')
+%% scrkernel-tocstyle.dtx (with options: `package,style,dottedtocline')
+%% scrkernel-tocstyle.dtx (with options: `package,style,undottedtocline')
+%% scrkernel-tocstyle.dtx (with options: `package,style,largetocline')
+%% scrkernel-tocstyle.dtx (with options: `package,style,tocline')
+%% scrkernel-tocstyle.dtx (with options: `package,style,default')
+%% tocbasic.dtx (with options: `package,exit')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,15 +52,26 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package
(handling toc-files)%
]
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% (run: prepare)
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: prepare)
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% (run: option)
\ProcessOptions\relax
-\RequirePackage{keyval}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: option)
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% (run: body)
+\RequirePackage{scrbase}
\newcommand*{\tb@listoftocs}{}
\newcommand{\ifattoclist}[1]{%
\begingroup
@@ -60,7 +84,7 @@
\endgroup
}
\newcommand*{\addtotoclist}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\scr@@addtotoclist\scr@addtotoclist
}
\newcommand*{\scr@addtotoclist}{%
@@ -106,7 +130,7 @@
}%
}
\newcommand*{\AtAddToTocList}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\@@AtAddToTocList\@AtAddToTocList
}
\newcommand*{\@AtAddToTocList}{%
@@ -122,11 +146,10 @@
\expandafter\g@addto@macro\csname tb@#1@add@hook\endcsname
}
\newcommand*{\tocbasic@extend@babel}[1]{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \ifx\csname bbl@set@language\endcsname\relax
+ \scr@ifundefinedorrelax{bbl@set@language}{%
\PackageInfo{tocbasic}{babel extension for `#1' omitted\MessageBreak
because of missing \string\bbl@set@language}%
- \else
+ }{%
\iftocfeature{#1}{nobabel}{%
\PackageInfo{tocbasic}{omitting babel extension for `#1'\MessageBreak
because of feature `nobabel' available\MessageBreak
@@ -139,11 +162,11 @@
\addtocontents{#1}{\xstring\select@language{\languagename}}%
}%
}%
- \fi
+ }%
}
\AtAddToTocList[]{\expandafter\tocbasic@extend@babel\expandafter{\@currext}}
\newcommand*{\removefromtoclist}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\@removefromtoclist\@@removefromtoclist
}
\newcommand*{\@removefromtoclist}[2][]{%
@@ -181,7 +204,7 @@
\endgroup
}
\newcommand{\doforeachtocfile}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\@doforeachtocfile\@@doforeachtocfile
}
\newcommand{\@doforeachtocfile}[2][]{%
@@ -207,7 +230,7 @@
\let\do\relax
}
\newcommand{\addtoeachtocfile}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\@addtoeachtocfile\@@addtoeachtocfile
}
\newcommand{\@addtoeachtocfile}[2][]{%
@@ -217,7 +240,7 @@
\doforeachtocfile{\addtocontents{\@currext}{#1}}%
}
\newcommand{\addcontentslinetoeachtocfile}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\@addcontentslinetoeachtocfile\@@addcontentslinetoeachtocfile
}
\newcommand{\@addcontentslinetoeachtocfile}[3][]{%
@@ -227,18 +250,17 @@
\doforeachtocfile{\addcontentsline{\@currext}{#1}{#2}}%
}
\newcommand*{\addxcontentsline}[2]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@addxcontentsline{#1}{#2}}%
{\@addxcontentsline{#1}{#2}[]}%
}
\newcommand*{\@addxcontentsline}{}
\def\@addxcontentsline#1#2[#3]#4{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname add#2#1entry\endcsname\relax
+ \scr@ifundefinedorrelax{add#2#1entry}{%
\tocbasic@addxcontentsline{#1}{#2}{#3}{#4}%
- \else
+ }{%
\@nameuse{add#2#1entry}{#3}{#4}%
- \fi
+ }%
}
\newcommand*{\nonumberline}{}%
\newcommand*{\tocbasic@addxcontentsline}[4]{%
@@ -249,11 +271,11 @@
\fi
}
\newcommand{\addxcontentslinetoeachtocfile}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\@addxcontentslinetoeachtocfile\@@addxcontentslinetoeachtocfile
}
\newcommand{\@addxcontentslinetoeachtocfile}[2][]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@addxcontentslinetoeachtocfile[{#1}]{#2}}%
{\@@@addxcontentslinetoeachtocfile[{#1}]{#2}[]}
}
@@ -262,7 +284,7 @@
\doforeachtocfile[{#1}]{\addxcontentsline{\@currext}{#2}[#3]{#4}}%
}
\newcommand{\@@addxcontentslinetoeachtocfile}[1]{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@@@addxcontentslinetoeachtocfile{#1}}%
{\@@@@addxcontentslinetoeachtocfile{#1}[]}%
}
@@ -318,7 +340,7 @@
\fi
}
\newcommand*{\listoftoc}{%
- \@ifstar \tocbasic@starttoc\@listoftoc
+ \kernel@ifstar \tocbasic@starttoc\@listoftoc
}
\newcommand*{\@listoftoc}[2][\list@fname]{%
\begingroup
@@ -346,20 +368,19 @@
}{}%
\iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}%
\tocbasic@listhead{#1}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname microtypesetup\endcsname\relax
- \else
+ \scr@ifundefinedorrelax{microtypesetup}{}{%
\iftocfeature{\@currext}{noprotrusion}{}{%
\microtypesetup{protrusion=false}%
- \PackageInfo{tocbasic}{character protrusion at \@currext\space deactivated}%
+ \PackageInfo{tocbasic}{%
+ character protrusion at \@currext\space deactivated}%
}%
- \fi
+ }%
\tocbasic@starttoc{#2}%
\endgroup
}
\newcommand*{\listofname}{List of}
\newcommand*{\listofeachtoc}{%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
\@listofeachtoc\@@listofeachtoc
}
\newcommand{\@listofeachtoc}[1][]{%
@@ -370,8 +391,7 @@
}
\newcommand*{\tocbasic@listhead}[1]{%
\@ifundefined{tocbasic@listhead@\@currext}{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname chapter\endcsname\relax
+ \scr@ifundefinedorrelax{chapter}{%
\expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{%
\iftocfeature{\@currext}{leveldown}{%
\iftocfeature{\@currext}{numbered}{%
@@ -411,7 +431,7 @@
}%
}%
}%
- \else
+ }{%
\expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{%
\iftocfeature{\@currext}{leveldown}{%
\iftocfeature{\@currext}{numbered}{%
@@ -470,7 +490,7 @@
}%
}%
}%
- \fi
+ }%
}{}%
\csname tb@@beforehead@hook\endcsname
\csname tb@\@currext @beforehead@hook\endcsname
@@ -494,16 +514,6 @@
}{}%
\expandafter\g@addto@macro\csname tb@#1@afterhead@hook\endcsname{#2}%
}
-\AtBeginDocument{%
- \@ifundefined{MakeMarkcase}{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname KOMAClassName\endcsname\relax
- \let\MakeMarkcase\MakeUppercase
- \else
- \let\MakeMarkcase\@firstofone
- \fi
- }{}%
-}
\newcommand*{\deftocheading}[1]{%
\@namedef{tocbasic@listhead@#1}##1}
\newcommand*{\setuptoc}[2]{%
@@ -535,12 +545,11 @@
\setuptoc{lof}{nobabel}
\setuptoc{lot}{nobabel}
\newcommand*{\iftocfeature}[2]{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname tocbasic@#1@feature@#2\endcsname\relax
+ \scr@ifundefinedorrelax{tocbasic@#1@feature@#2}{%
\expandafter\@secondoftwo
- \else
+ }{%
\expandafter\@firstoftwo
- \fi
+ }%
}
\newcommand*{\tocbasicautomode}{%
\let\tb@saved@starttoc\@starttoc
@@ -552,79 +561,212 @@
}%
}%
}
-\define@key{tocbasic}{type}{%
- \tb@ifvalueisnotempty{type}{#1}{\edef\tb@nt@type{#1}}%
-}
-\define@key{tocbasic}{counterwithin}{%
- \edef\tb@nt@counterwithin{#1}%
-}
-\define@key{tocbasic}{types}{%
- \tb@ifvalueisnotempty{types}{#1}{\edef\tb@nt@types{#1}}%
-}
-\define@key{tocbasic}{extension}{%
- \tb@ifvalueisnotempty{extension}{#1}{\edef\tb@nt@ext{#1}}%
-}
-\define@key{tocbasic}{owner}{%
- \tb@ifvalueisnotempty{owner}{#1}{\edef\tb@nt@owner{#1}}%
-}
-\define@key{tocbasic}{name}{%
- \tb@ifvalueisnotempty{name}{#1}{\edef\tb@nt@name{#1}}%
-}
-\define@key{tocbasic}{listname}{%
- \tb@ifvalueisnotempty{listname}{#1}{\def\tb@nt@listname{#1}}%
-}
-\newif\iftb@forcenames
-\define@key{tocbasic}{forcenames}[true]{%
- \lowercase{\tb@boolkey{#1}}{forcenames}%
-}
-\define@key{tocbasic}{level}{%
- \tb@ifvalueisnotempty{level}{#1}{\tb@numkey\tb@nt@level{#1}}%
-}
-\define@key{tocbasic}{indent}{%
- \tb@ifvalueisnotempty{indent}{#1}{\tb@dimkey\tb@nt@indent{#1}}%
-}
-\define@key{tocbasic}{hang}{%
- \tb@ifvalueisnotempty{hang}{#1}{\tb@dimkey\tb@nt@hang{#1}}%
-}
-\newif\iftb@float
-\define@key{tocbasic}{float}[true]{%
- \lowercase{\tb@boolkey{#1}}{float}%
-}
-\newif\iftb@nonfloat
-\define@key{tocbasic}{nonfloat}[true]{%
- \lowercase{\tb@boolkey{#1}}{nonfloat}%
-}
-\define@key{tocbasic}{floattype}{%
- \tb@ifvalueisnotempty{floattype}{#1}{\tb@numkey\tb@nt@floattype{#1}}%
-}
-\define@key{tocbasic}{floatpos}{%
- \tb@ifvalueisnotempty{floatpos}{#1}{\edef\tb@nt@floatpos{#1}}%
-}
-\define@key{tocbasic}{atbegin}{%
- \def\tb@nt@atbegin{#1}%
-}
-\define@key{tocbasic}{atend}{%
- \def\tb@nt@atend{#1}%
-}
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.toc]{KOMAarg}
\newcommand*{\DeclareNewTOC}[2][]{%
- \tb@floatfalse
- \tb@nonfloatfalse
- \tb@forcenamesfalse
+ \newif\iftb@nt@float
+ \newif\iftb@nt@nonfloat
+ \newif\iftb@nt@forcenames
\def\tb@nt@floattype{\tb@nt@autofloattype}%
\def\tb@nt@floatpos{tbp}%
\def\tb@nt@ext{#2}%
- \def\tb@nt@type{#2}%
+ \edef\tb@nt@type{#2}%
\let\tb@nt@types\relax
\def\tb@nt@owner{float}%
\def\tb@nt@name{\expandafter\protect\expandafter\MakeUppercase\tb@nt@type}%
\let\tb@nt@listname\relax
- \def\tb@nt@level{1}%
- \def\tb@nt@indent{1em}%
- \def\tb@nt@hang{1.5em}%
\let\tb@nt@counterwithin\@empty
\let\tb@nt@atbegin\@empty
\let\tb@nt@atend\@empty
- \setkeys{tocbasic}{#1}%
+ \def\tb@nt@tocentrystyle{default}%
+ \def\tb@nt@tocstyle@options{level=1}%
+ \IfArgIsEmpty{#1}{%
+ \begingroup
+ \let\scr@dte@current\tb@nt@type
+ \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}%
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \ifstr{##1}{numwidth}{%
+ \l@addto@macro\do@endgroup{%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,numwidth=1.5em}%
+ }%
+ }{%
+ \ifstr{##1}{indent}{%
+ \l@addto@macro\do@endgroup{%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,indent=1em}%
+ }%
+ }{}%
+ }%
+ \kernel@ifnextchar[%]
+ {\@dodefault}%
+ {}%
+ }%
+ \def\@dodefault[##1]{}%
+ \scr@dte@doopts
+ \do@endgroup
+ }{%
+ \let\tb@nt@extra@relax@opts\@empty
+ \DefineFamilyKey[.toc]{KOMAarg}{type}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@type{##1}}%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}[default]{%
+ \IfArgIsEmpty{##1}{%
+ \edef\tb@nt@tocentrystyle{##1}%
+ \FamilyKeyStateProcessed
+ }{%
+ \scr@ifundefinedorrelax{scr@dte@def@l@##1}{%
+ \FamilyKeyStateUnknownValue
+ }{%
+ \edef\tb@nt@tocentrystyle{##1}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
+ \FamilyExecuteOptions[.toc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{@else@}%
+ \DefineFamilyKey[.toc]{KOMAarg}{type}{\FamilyKeyStateProcessed}%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}%
+ \ifstr{\tb@nt@tocentrystyle}{}{}{%
+ \begingroup
+ \let\scr@dte@current\tb@nt@type
+ \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}%
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \l@addto@macro\do@endgroup{%
+ \l@addto@macro\tb@nt@extra@relax@opts{%
+ \RelaxFamilyKey[.toc]{KOMAarg}{toc##1}%
+ }%
+ }%
+ \kernel@ifnextchar[%]
+ {\@dodefault{##1}}%
+ {\@donodefault{##1}}%
+ }%
+ \def\@donodefault##1{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.toc]{KOMAarg}{toc##1}{%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \def\@dodefault##1[##2]{%
+ \l@addto@macro\do@endgroup{%
+ \DefineFamilyKey[.toc]{KOMAarg}{toc##1}[##2]{%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ }%
+ \scr@dte@doopts
+ \do@endgroup
+ }%
+ \FamilyStringKey[.toc]{KOMAarg}{atbegin}{\tb@nt@atbegin}%
+ \FamilyStringKey[.toc]{KOMAarg}{atend}{\tb@nt@atend}%
+ \DefineFamilyKey[.toc]{KOMAarg}{counterwithin}{%
+ \edef\tb@nt@counterwithin{##1}\FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{extension}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@ext{##1}}%
+ }%
+ \FamilyBoolKey[.toc]{KOMAarg}{float}{tb@nt@float}%
+ \DefineFamilyKey[.toc]{KOMAarg}{floatpos}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@floatpos{##1}}%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{floattype}{%
+ \FamilySetCounterMacro{KOMAarg}{floattype}{\reserved@d}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifnum 0=
+ \ifnum\reserved@d<1 0 \else\ifnum\reserved@d>31 0 \else 1 \fi\fi
+ \FamilyKeyStateUnknownValue
+ \else
+ \let\tb@nt@floattype\reserved@d
+ \fi
+ \fi
+ }%
+ \FamilyBoolKey[.toc]{KOMAarg}{forcenames}{tb@nt@forcenames}%
+ \DefineFamilyKey[.toc]{KOMAarg}{hang}{%
+ \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocnumwidth}{%
+ \PackageWarning{tocbasic}{%
+ deprecated option `hang'.\MessageBreak
+ Option will be ignored, because toc entry style\MessageBreak
+ `\tb@nt@tocentrystyle' does not provide option `numwidth'%
+ }%
+ }{%
+ \PackageWarning{tocbasic}{%
+ deprecated option `hang'.\MessageBreak
+ You should replace option `hang' by option\MessageBreak
+ `tocnumwidth'%
+ }%
+ \l@addto@macro\tb@nt@tocstyle@options{,numwidth={##1}}%
+ }%
+ \FamilyKeyStateProcessed
+ }%
+ \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocnumwidth}{}{%
+ \l@addto@macro\tb@nt@tocstyle@options{,numwidth=1.5em}%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{indent}{%
+ \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocindent}{%
+ \PackageWarning{tocbasic}{%
+ deprecated option `indent'.\MessageBreak
+ Option will be ignored, because toc entry style\MessageBreak
+ `\tb@nt@tocentrystyle' does not provide option `indent'%
+ }%
+ }{%
+ \PackageWarning{tocbasic}{%
+ deprecated option `indent'.\MessageBreak
+ You should replace option `indent' by option\MessageBreak
+ `tocindent'%
+ }%
+ \l@addto@macro\tb@nt@tocstyle@options{,indent={##1}}%
+ }%
+ \FamilyKeyStateProcessed
+ }%
+ \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocindent}{}{%
+ \l@addto@macro\tb@nt@tocstyle@options{,indent=1em}%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{level}{%
+ \PackageWarning{tocbasic}{%
+ deprecated option `level'.\MessageBreak
+ You should replace option `level' by option\MessageBreak
+ `toclevel'
+ }%
+ \l@addto@macro\tb@nt@tocstyle@options{,level={##1}}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{listname}{%
+ \tb@ifvalueisnotempty{##1}{\def\tb@nt@listname{##1}}%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{name}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@name{##1}}%
+ }%
+ \FamilyBoolKey[.toc]{KOMAarg}{nonfloat}{tb@nt@nonfloat}%
+ \DefineFamilyKey[.toc]{KOMAarg}{owner}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@owner{##1}}%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{types}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@types{##1}}%
+ }%
+ \FamilyExecuteOptions[.toc]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{types}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{owner}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{nonfload}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{name}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{listname}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{level}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{indent}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{hang}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{forcenames}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{floatpos}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{float}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{extension}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{counterwithin}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{atend}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{atbegin}%
+ \tb@nt@extra@relax@opts
+ \RelaxFamilyKey[.toc]{KOMAarg}{tocentrystyle}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{type}%
+ }%
\expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}%
\expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext
\addtotoclist[\tb@nt@owner]{\csname ext@\tb@nt@type\endcsname}%
@@ -637,7 +779,7 @@
\@ifundefined{\tb@nt@type name}{%
\expandafter\protected@edef\csname \tb@nt@type name\endcsname{\tb@nt@name}%
}{%
- \iftb@forcenames
+ \iftb@nt@forcenames
\expandafter\protected@edef\csname \tb@nt@type name\endcsname
{\tb@nt@name}%
\fi
@@ -645,7 +787,7 @@
\@ifundefined{list\tb@nt@type name}{%
\expandafter\let\csname list\tb@nt@type name\endcsname\tb@nt@listname
}{%
- \iftb@forcenames
+ \iftb@nt@forcenames
\expandafter\let\csname list\tb@nt@type name\endcsname\tb@nt@listname
\fi
}%
@@ -656,11 +798,24 @@
\noexpand\listoftoc{\tb@nt@ext}%
}%
}\@tempa
- \begingroup\edef\@tempa{\endgroup
- \noexpand\newcommand*\csname l@\tb@nt@type\endcsname{%
- \noexpand\@dottedtocline{\tb@nt@level}{\tb@nt@indent}{\tb@nt@hang}%
+ \ifstr{\tb@nt@tocentrystyle}{}{%
+ \@ifundefined{l@\tb@nt@type}{%
+ \PackageWarning{tocbasic}{%
+ \expandafter\string\csname l@\tb@nt@type\endcsname\space
+ undefined!\MessageBreak
+ I hope you know, what you are doing, but\MessageBreak
+ maybe it would be better to use proper\MessageBreak
+ `tocentrystyle` settings%
+ }%
+ }{}%
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DeclareTOCStyleEntry[%
+ {\unexpanded\expandafter{\tb@nt@tocstyle@options}}%
+ ]{\tb@nt@tocentrystyle}{\tb@nt@type}%
}%
- }\@tempa
+ \reserved@a
+ }%
\@ifundefined{listof\tb@nt@ext entryname}{%
\expandafter\let\csname listof\tb@nt@ext entryname\endcsname\tb@nt@name
}{}%
@@ -670,7 +825,7 @@
}%
}\@tempa
\@tempswafalse
- \iftb@float
+ \iftb@nt@float
\expandafter\newcommand\expandafter*\csname fps@\tb@nt@type\expandafter
\endcsname\expandafter{\tb@nt@floatpos}%
\expandafter\newcommand\expandafter*\csname ftype@\tb@nt@type\expandafter
@@ -679,7 +834,7 @@
\edef\@tempa{%
\noexpand\endgroup
\noexpand\newenvironment{\tb@nt@type}{%
- \noexpand\@ifnextchar[%]
+ \noexpand\kernel@ifnextchar[%]
{\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}}%
{\noexpand\edef\noexpand\reserved@a{%
\noexpand\noexpand\noexpand\tb@atbegin@after
@@ -691,7 +846,7 @@
\noexpand\end@float
}%
\noexpand\newenvironment{\tb@nt@type*}{%
- \noexpand\@ifnextchar[%]
+ \noexpand\kernel@ifnextchar[%]
{\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}}%
{\noexpand\edef\noexpand\reserved@a{%
\noexpand\noexpand\noexpand\tb@atbegin@after
@@ -706,7 +861,7 @@
\@tempa
\@tempswatrue
\fi
- \iftb@nonfloat
+ \iftb@nt@nonfloat
\begingroup
\edef\@tempa{%
\noexpand\endgroup
@@ -769,33 +924,1206 @@
#1{#2}[#3]%
\csname #2@atbegin\endcsname
}
-\newcommand*{\tb@ifvalueisnotempty}[2]{%
+\newcommand*{\tb@ifvalueisnotempty}[1]{%
+ \ifstr{#1}{}{%
+ \FamilyKeyStateUnknownValue
+ \expandafter\@gobble
+ }{%
+ \FamilyKeyStateProcessed
+ \expandafter\@firstofone
+ }%
+}
+\newcommand*{\tb@nt@autofloattype}{16}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: body)
+\newcommand*{\scr@numberline}[1]{%
+ \numberline@box{%
+ \numberline@prefix
+ \ifstr{#1}{}{#1}{%
+ \numberline@numberformat{#1}%
+ }%
+ \numberline@postfix
+ }%
+}
+\newcommand*{\usetocbasicnumberline}[1][%
+ \PackageInfo{tocbasic}{Using my definition of `\string\numberline'}%
+]{%
+ \@tempswatrue
\begingroup
- \edef\@tempa{#2}\ifx\@tempa\@empty
- \PackageError{tocbasic}{empty value for key `#1'}{%
- The argument of key `#1' may not by empty!}%
- \aftergroup\@gobble
- \else
- \aftergroup\@firstofone
- \fi
+ \def\scr@numberline##1{\global\@tempswafalse}%
+ \@tempdima\maxdimen
+ \sbox\@tempboxa{\numberline{0}}%
\endgroup
+ \if@tempswa #1\renewcommand*{\numberline}[1]{\scr@numberline{##1}}\fi
+}
+\newcommand*{\numberline@prefix}{}
+\newcommand*{\numberline@postfix}{\hfil}
+\newcommand*{\numberline@numberformat}[1]{%
+ \ifstr{#1}{}{}{\numberline@numberprefix#1\numberline@numberpostfix}%
+}
+\newcommand*{\numberline@numberprefix}{}
+\newcommand*{\numberline@numberpostfix}{}
+\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.dte]{KOMAarg}
+\newcommand*{\@DefineTOCEntryOption}[2]{%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2}%
+ }%
+ \kernel@ifnextchar [%]
+ {\@DefineTOCEntryOptionWithDefault{#1}{#2}}%
+ {\@DefineTOCEntryOptionWithoutDefault{#1}{#2}}%
}
-\newcommand*{\tb@boolkey}[2]{%
- \csname tb@#2\ifx\relax#1\relax true\else#1\fi\endcsname
+\newcommand*{\@DefineTOCEntryOptionWithoutDefault}[3]{%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2}{#3}%
}
-\newcommand*{\tb@dimkey}[2]{%
- \begingroup
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \edef\@tempa{\noexpand\endgroup\noexpand\def\noexpand#1{\the\@tempdima}}
- \@tempa
+\newcommand*{\@DefineTOCEntryOptionWithDefault}{}
+\def\@DefineTOCEntryOptionWithDefault#1#2[#3]#4{%
+ \l@addto@macro\scr@dte@doopts{[{#3}]}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2}[{#3}]{#4}%
}
-\newcommand*{\tb@numkey}[2]{%
+\newcommand*{\@RelaxTOCEntryOptions}{%
\begingroup
- \afterassignment\remove@to@nnil\@tempcnta#2\relax\@nnil
- \edef\@tempa{\noexpand\endgroup\noexpand\def\noexpand#1{\the\@tempcnta}}
- \@tempa
+ \def\do@endgroup{\endgroup}%
+ \def\do##1{%
+ \l@addto@macro\do@endgroup{\RelaxFamilyKey[.dte]{KOMAarg}{##1}}%
+ \scr@dte@gobbleopt
+ }%
+ \scr@dte@doopts
+ \do@endgroup
+}
+\newcommand{\scr@dte@gobbleopt}[1][]{}
+\newcommand*{\@DefineTOCEntryLengthOption}[2]{%
+ \kernel@ifnextchar [%]
+ {\@DefineTOCEntryLengthOptionWithDefault{#1}{#2}}
+ {\@DefineTOCEntryLengthOptionWithoutDefault{#1}{#2}}%
+}
+\newcommand*{\@DefineTOCEntryLengthOptionWithoutDefault}[5]{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#5}%
+ \@DefineTOCEntryOption{#1}{#2}{%
+ \@DefineTOCEntryLengthOptionMacro{#2}{#3}{#4}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryLengthOptionWithDefault}{}
+\def\@DefineTOCEntryLengthOptionWithDefault#1#2[#3]#4#5#6{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#6}%
+ \@DefineTOCEntryOption{#1}{#2}[{#3}]{%
+ \@DefineTOCEntryLengthOptionMacro{#2}{#4}{#5}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryLengthOptionMacro}[4]{%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetLength{KOMAarg}{#1}{\noexpand\@tempskipa}{#4}%
+ }\reserved@a
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dte@expandtopt
+ \expandafter\edef\csname #2\scr@dte@current#3\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\protected@edef\csname #2\scr@dte@current#3\endcsname{#4}%
+ \fi
+ \fi
+}
+\newcommand*{\@DefineTOCEntryNumberOption}[2]{%
+ \kernel@ifnextchar [%]
+ {\@DefineTOCEntryNumberOptionWithDefault{#1}{#2}}
+ {\@DefineTOCEntryNumberOptionWithoutDefault{#1}{#2}}%
+}
+\newcommand*{\@DefineTOCEntryNumberOptionWithoutDefault}[5]{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#5}%
+ \@DefineTOCEntryOption{#1}{#2}{%
+ \@DefineTOCEntryNumberOptionMacro{#2}{#3}{#4}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryNumberOptionWithDefault}{}
+\def\@DefineTOCEntryNumberOptionWithDefault#1#2[#3]#4#5#6{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#6}%
+ \@DefineTOCEntryOption{#1}{#2}[{#3}]{%
+ \@DefineTOCEntryNumberOptionMacro{#2}{#4}{#5}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryNumberOptionMacro}[4]{%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{#1}{%
+ \expandafter\noexpand\csname #2\scr@dte@current#3\endcsname
+ }{#4}%
+ }\reserved@a
+}
+\newcommand*{\@DefineTOCEntryBooleanOption}[2]{%
+ \kernel@ifnextchar [%]
+ {\@DefineTOCEntryBoolOptionWithDefault{#1}{#2}}
+ {\@DefineTOCEntryBoolOptionWithoutDefault{#1}{#2}}%
+}
+\newcommand*{\@DefineTOCEntryBoolOptionWithoutDefault}[5]{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{if#3}{#4}{#2}{#5}%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4false}{#2}{#5}%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4false}{#2}{#5}%
+ \@DefineTOCEntryOption{#1}{#2}[true]{%
+ \@DefineTOCEntryBoolOptionMacro{#2}{#3}{#4}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryBoolOptionWithDefault}{}
+\def\@DefineTOCEntryBoolOptionWithDefault#1#2[#3]#4#5#6{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{if#4}{#5}{#2}{#6}%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5true}{#2}{#6}%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5false}{#2}{#6}%
+ \@DefineTOCEntryOption{#1}{#2}[{#3}]{%
+ \@DefineTOCEntryBoolOptionMacro{#2}{#4}{#5}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryBoolOptionMacro}[4]{%
+ \@ifundefined{if#2\scr@dte@current#3}{%
+ \expandafter\newif\csname if#2\scr@dte@current#3\endcsname
+ }{}%
+ \FamilySetBool{KOMAarg}{#1}{#2\scr@dte@current#3}{#4}%
+}
+\newcommand*{\@DefineTOCEntryIfOption}[2]{%
+ \kernel@ifnextchar [%]
+ {\@DefineTOCEntryIfOptionWithDefault{#1}{#2}}
+ {\@DefineTOCEntryIfOptionWithoutDefault{#1}{#2}}%
+}
+\newcommand*{\@DefineTOCEntryIfOptionWithoutDefault}[5]{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{If#3}{#4}{#2}{#5}%
+ \@DefineTOCEntryOption{#1}{#2}[true]{%
+ \@DefineTOCEntryIfOptionMacro{#2}{#3}{#4}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryIfOptionWithDefault}{}
+\def\@DefineTOCEntryIfOptionWithDefault#1#2[#3]#4#5#6{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{If#4}{#5}{#2}{#6}%
+ \@DefineTOCEntryOption{#1}{#2}[{#3}]{%
+ \@DefineTOCEntryIfOptionMacro{#2}{#4}{#5}{##1}%
+ }%
+}
+\newcommand*{\@DefineTOCEntryIfOptionMacro}[4]{%
+ \FamilySetBool{KOMAarg}{#1}{@tempswa}{#4}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \expandafter\let\csname If#2\scr@dte@current#3\endcsname\@firstoftwo
+ \else
+ \expandafter\let\csname If#2\scr@dte@current#3\endcsname\@secondoftwo
+ \fi
+ \fi
+}
+\newcommand*{\@DefineTOCEntryCommandOption}[2]{%
+ \kernel@ifnextchar [%]
+ {\@DefineTOCEntryCommandOptionWithDefault{#1}{#2}}
+ {\@DefineTOCEntryCommandOptionWithoutDefault{#1}{#2}}%
+}
+\newcommand*{\@DefineTOCEntryCommandOptionWithoutDefault}[4]{%
+ \@testopt{\@@DefineTOCEntryCommandOptionWithoutDefault{#1}{#2}{#3}{#4}}0%
+}
+\newcommand*{\@@DefineTOCEntryCommandOptionWithoutDefault}{}%
+\def\@@DefineTOCEntryCommandOptionWithoutDefault#1#2#3#4[#5]#6{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#6}%
+ \ifcase #5
+ \@DefineTOCEntryOption{#1}{#2}{%
+ \@DefineTOCEntryCommandOptionMacro{#2}{#3}{#4}[#5]{##1}%
+ }%
+ \or
+ \@DefineTOCEntryOption{#1}{#2}{%
+ \@DefineTOCEntryCommandOptionMacro{#2}{#3}{#4}[#5]{##1{####1}}%
+ }%
+ \else
+ \PackageError{tocbasic%
+ }{only one argument supported}{%
+ \string\DefineTOCEntryCommandOption\space currently supports only
+ commands with\MessageBreak
+ at most one argument not #5}%
+ \fi
+}
+\newcommand*{\@DefineTOCEntryCommandOptionWithDefault}{}
+\def\@DefineTOCEntryCommandOptionWithDefault#1#2[#3]#4#5{%
+ \@testopt{\@@DefineTOCEntryCommandOptionWithDefault{#1}{#2}{#3}{#4}{#5}}0%
+}
+\def\@@DefineTOCEntryCommandOptionWithDefault#1#2#3#4#5[#6]#7{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#7}%
+ \ifcase #6
+ \@DefineTOCEntryOption{#1}{#2}[{#3}]{%
+ \@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1}%
+ }%
+ \or
+ \@DefineTOCEntryOption{#1}{#2}[{#3}]{%
+ \@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1{####1}}%
+ }%
+ \or
+ \@DefineTOCEntryOption{#1}{#2}[{#3}]{%
+ \@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1{####1}{####2}}%
+ }%
+ \else
+ \PackageError{tocbasic%
+ }{only one argument supported}{%
+ \string\DefineTOCEntryCommandOption\space currently supports only
+ commands with\MessageBreak
+ at most two argument not #6}%
+ \fi
+}
+\newcommand*{\@DefineTOCEntryCommandOptionMacro}[3]{%
+ \@testopt{\@@DefineTOCEntryCommandOptionMacro{#1}{#2}{#3}}0%
+}
+\newcommand*{\@@DefineTOCEntryCommandOptionMacro}{}
+\long\def\@@DefineTOCEntryCommandOptionMacro#1#2#3[#4]#5{%
+ \let\l@ngrel@x\long
+ \expandafter\@yargdef\csname #2\scr@dte@current#3\endcsname\@ne{#4}{#5}%
+ \FamilyKeyStateProcessed
+}
+\newcommand{\@AddToDeclareTOCEntryStylePreCheckNeeds}[1]{%
+ \expandafter\providecommand\csname scr@dte@precheck\endcsname[1]{}%
+ \expandafter\l@addto@macro@a\csname scr@dte@precheck\endcsname
+}
+\newcommand{\@PreToDeclareTOCEntryStylePreCheckNeeds}[1]{%
+ \expandafter\providecommand\csname scr@dte@precheck\endcsname[1]{}%
+ \expandafter\l@preto@macro@a\csname scr@dte@precheck\endcsname
+}
+\newcommand*{\@TOCEntryStyleNeedsCommandByOption}[5]{%
+ \expandafter\providecommand\expandafter*\csname scr@dte@#1@needs\endcsname{}%
+ \expandafter\l@addto@macro\csname scr@dte@#1@needs\endcsname{%
+ \do{#2}{#3}{#4}{#5}%
+ }%
+}
+\newcommand{\TOCEntryStyleInitCode}[1]{%
+ \scr@ifundefinedorrelax{scr@dte@#1@init}{%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@dte@#1@init\endcsname[1]%
+ }{%
+ \expandafter\l@addto@macro@a\csname scr@dte@#1@init\endcsname
+ }%
+}
+\newcommand{\TOCEntryStyleStartInitCode}[1]{%
+ \scr@ifundefinedorrelax{scr@dte@#1@init}{%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@dte@#1@init\endcsname[1]%
+ }{%
+ \expandafter\l@preto@macro@a\csname scr@dte@#1@init\endcsname
+ }%
+}
+\newcommand*{\@ExecuteTOCEntryStyleInitCode}[2]{%
+ \let\scr@dte@doopts\@empty
+ \scr@ifundefinedorrelax{scr@dte@#1@init}{}{%
+ \def\DefineTOCEntryBooleanOption{\@DefineTOCEntryBooleanOption{#1}}%
+ \def\DefineTOCEntryCommandOption{\@DefineTOCEntryCommandOption{#1}}%
+ \def\DefineTOCEntryIfOption{\@DefineTOCEntryIfOption{#1}}%
+ \def\DefineTOCEntryLengthOption{\@DefineTOCEntryLengthOption{#1}}%
+ \def\DefineTOCEntryNumberOption{\@DefineTOCEntryNumberOption{#1}}%
+ \def\DefineTOCEntryOption{\@DefineTOCEntryOption{#1}}%
+ \def\AddToDeclareTOCEntryStylePreCheckNeeds{%
+ \@AddToDeclareTOCEntryStylePreCheckNeeds{#1}}%
+ \def\PreToDeclareTOCEntryStylePreCheckNeeds{%
+ \@PreToDeclareTOCEntryStylePreCheckNeeds{#1}}%
+ \def\TOCEntryStyleNeedsCommandByOption{%
+ \@TOCEntryStyleNeedsCommandByOption{#1}}%
+ \@nameuse{scr@dte@#1@init}{#2}%
+ \let\TOCEntryStyleNeedsCommandByOption\relax
+ \let\PreToDeclareTOCEntryStylePreCheckNeeds\relax
+ \let\AddToDeclareTOCEntryStylePreCheckNeeds\relax
+ \let\DefineTOCEntryOption\relax
+ \let\DefineTOCEntryNumberOption\relax
+ \let\DefineTOCEntryLengthOption\relax
+ \let\DefineTOCEntryIfOption\relax
+ \let\DefineTOCEntryCommandOption\relax
+ \let\DefineTOCEntryBooleanOption\relax
+ }%
+}
+\newcommand*{\DeclareTOCStyleEntry}[3][]{%
+ \scr@ifundefinedorrelax{scr@dte@def@l@#2}{%
+ \PackageError{tocbasic%
+ }{toc entry style `#2' undefined}{%
+ Somebody told me to define toc entry `#3' with style `#2',\MessageBreak
+ but I do not know style `#2'.\MessageBreak
+ You should first define the style then define the entry.\MessageBreak
+ If you'll continue, I'll ignore the command. This could result
+ in\MessageBreak
+ further error messages.%
+ }%
+ }{%
+ \let\scr@dte@precheck\@gobble
+ \def\scr@dte@current{#3}%
+ \@ExecuteTOCEntryStyleInitCode{#2}{#3}%
+ \IfArgIsEmpty{#1}{}{%
+ \FamilyBoolKey[.dte]{KOMAarg}{expandtopt}{scr@dte@expandtopt}%
+ \scr@dte@expandtoptfalse
+ \FamilyExecuteOptions[.dte]{KOMAarg}{#1}%
+ \RelaxFamilyKey[.dte]{KOMAarg}{expandtopt}%
+ }%
+ \@RelaxTOCEntryOptions
+ \let\scr@dte@doopts\relax
+ \let\scr@dte@current\relax
+ \scr@ifundefinedorrelax{#3tocdepth}{%
+ \expandafter\let\csname #3tocdepth\expandafter\endcsname
+ \csname #3numdepth\endcsname
+ }{}%
+ \scr@dte@precheck{#3}%
+ \let\scr@dte@precheck\relax
+ \begingroup
+ \aftergroup\@tempswatrue
+ \def\do##1##2##3##4{%
+ \scr@ifundefinedorrelax{##1#3##2}{%
+ \PackageError{tocbasic%
+ }{toc style `#2' needs ##4}{%
+ Usually the ##4 is defined using option `##3'.\MessageBreak
+ In some cases it may be set defining command
+ `\expandafter\string\csname ##1#3##2\endcsname'.\MessageBreak
+ If you'll continue, I'll ignore the command. This could result
+ in\MessageBreak
+ further error messages.%
+ }%
+ \aftergroup\@tempswafalse
+ }{}%
+ }%
+ \do{}{tocdepth}{level}{toc style level}%
+ \@nameuse{scr@dte@#2@needs}%
+ \endgroup
+ \if@tempswa
+ \@nameuse{scr@dte@def@l@#2}{#3}%
+ \expandafter\edef\csname scr@dte@#3@style\endcsname{#2}%
+ \fi
+ }%
+}
+\newcommand*{\DeclareTOCEntryStyle}[1]{%
+ \kernel@ifnextchar [%]
+ {\@DeclareTOCEntryStyle{#1}}%
+ {\@DeclareTOCEntryStyle{#1}[]}%
+}
+\newcommand{\@DeclareTOCEntryStyle}{}
+\long\def\@DeclareTOCEntryStyle#1[#2]#3{%
+ \@namedef{scr@dte@def@l@#1}##1{%
+ \@namedef{l@##1}####1####2{%
+ \TOC@EntryStartHook{##1}%
+ #3%
+ \TOC@EntryEndHook{##1}%
+ }%
+ }%
+ \TOCEntryStyleInitCode{#1}{%
+ \DefineTOCEntryNumberOption{level}{}{tocdepth}{toc entry level}%
+ #2%
+ }%
+}
+\newcommand*{\TOC@EntryStartHook}[1]{}
+\newcommand*{\TOC@EntryEndHook}[1]{}
+\newcommand*{\CloneTOCEntryStyle}[2]{%
+ \expandafter\let\csname scr@dte@def@l@#2\expandafter\endcsname
+ \csname scr@dte@def@l@#1\endcsname
+ \expandafter\let\csname scr@dte@#2@init\expandafter\endcsname
+ \csname scr@dte@#1@init\endcsname
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: style,gobble)
+\DeclareTOCEntryStyle{gobble}{}%
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: style,dottedtocline)
+\DeclareTOCEntryStyle{dottedtocline}[{%
+ \DefineTOCEntryLengthOption{indent}%
+ {scr@tso@}{@indent}{entry indent}%
+ \DefineTOCEntryLengthOption{numwidth}%
+ {scr@tso@}{@numwidth}{entry number width}%
+ \@ifundefined{#1tocdepth}{%
+ \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{%
+ \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{%
+ \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{%
+ \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{%
+ \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{%
+ \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
+ \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@indent}{%
+ \@ifundefined{scr@#1@tocindent}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{3.8em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{7em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{7.0em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{12em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@numwidth}{%
+ \@ifundefined{scr@#1@tocnumwidth}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{%
+ \scr@ifundefinedorrelax{chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@numwidth}{3.2em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@numwidth}{4.1em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@numwidth}{5m}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@numwidth}{3.1em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@numwidth}{5em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@numwidth}{6em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \@namedef{scr@tso@#1@numwidth}{\@nameuse{scr@#1@tocnumwidth}}%
+ }%
+ }{}%
+}]{%
+ \@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}%
+ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: style,undottedtocline)
+\DeclareTOCEntryStyle{undottedtocline}[{%
+ \DefineTOCEntryLengthOption{indent}%
+ {scr@tso@}{@indent}{entry indent}%
+ \DefineTOCEntryLengthOption{numwidth}%
+ {scr@tso@}{@numwidth}{entry number width}%
+ \@ifundefined{#1tocdepth}{%
+ \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{%
+ \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{%
+ \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{%
+ \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{%
+ \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{%
+ \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
+ \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@indent}{%
+ \@ifundefined{scr@#1@tocindent}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{3.8em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{7em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{7.0em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{12em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@numwidth}{%
+ \@ifundefined{scr@#1@tocnumwidth}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{%
+ \scr@ifundefinedorrelax{chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@numwidth}{3.2em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@numwidth}{4.1em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@numwidth}{5m}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@numwidth}{3.1em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@numwidth}{5em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@numwidth}{6em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \@namedef{scr@tso@#1@numwidth}{\@nameuse{scr@#1@tocnumwidth}}%
+ }%
+ }{}%
+}]{%
+ \ifnum \c@tocdepth >\numexpr \@nameuse{#1tocdepth}-\@ne\relax
+ \ifnum \@nameuse{#1tocdepth}<\@ne
+ \scr@ifundefinedorrelax{chapter}{%
+ \addpenalty\@secpenalty
+ \addvspace{1.0em \@plus\p@}%
+ }{%
+ \addpenalty{-\@highpenalty}%
+ \vskip 1.0em \@plus\p@
+ }%
+ \else
+ \addpenalty\@secpenalty
+ \addvspace{1.0em \@plus\p@}%
+ \fi
+ \setlength\@tempdima{\@nameuse{scr@tso@#1@numwidth}}%
+ \begingroup
+ \parindent \z@ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode
+ \bfseries
+ \advance\leftskip\@tempdima
+ \advance\leftskip\@nameuse{scr@tso@#1@indent}%
+ \hskip -\dimexpr \leftskip-\@nameuse{scr@tso@#1@indent}\relax
+ ##1%
+ \nobreak
+ \hfil \nobreak\hb@xt@\@pnumwidth{\hss ##2}%
+ \par
+ \penalty\@highpenalty
+ \endgroup
+ \fi
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: style, largetocline)
+\DeclareTOCEntryStyle{largetocline}[{%
+ \DefineTOCEntryLengthOption{indent}%
+ {scr@tso@}{@indent}{entry indent}%
+ \@ifundefined{#1tocdepth}{%
+ \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{%
+ \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{%
+ \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{%
+ \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{%
+ \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{%
+ \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
+ \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@indent}{%
+ \@ifundefined{scr@#1@tocindent}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{3.8em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{7em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{7.0em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{12em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}%
+ }%
+ }{}%
+}]{%
+ \ifnum \c@tocdepth >\numexpr \@nameuse{#1tocdepth}-\@ne\relax
+ \ifnum \@nameuse{#1tocdepth}<\@ne
+ \scr@ifundefinedorrelax{chapter}{%
+ \addpenalty\@secpenalty
+ \addvspace{2.25em \@plus\p@}%
+ }{%
+ \addpenalty{-\@highpenalty}%
+ \addvspace{2.25em \@plus\p@}%
+ }%
+ \else
+ \addpenalty\@secpenalty
+ \addvspace{2.25em \@plus\p@}%
+ \fi
+ \setlength\@tempdima{3em}%
+ \begingroup
+ \parindent \z@ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode
+ \large
+ \bfseries
+ \advance\leftskip\@nameuse{scr@tso@#1@indent}%
+ ##1%
+ \hfil \nobreak\hb@xt@\@pnumwidth{\hss ##2}%
+ \par
+ \nobreak
+ \ifnum 0=
+ \scr@ifundefinedorrelax{chapter}{\if@compatibility 1\else 0\fi}{1}\relax
+ \global\@nobreaktrue
+ \everypar{\global\@nobreakfalse\everypar{}}%
+ \fi
+ \endgroup
+ \fi
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: style,tocline)
+\DeclareTOCEntryStyle{tocline}[{%
+ \DefineTOCEntryIfOption{raggedpagenumber}%
+ {scr@tso@}{@raggedpage}{page number ragged flag}%
+ \DefineTOCEntryIfOption{breakafternumber}%
+ {scr@tso@}{@breakafternumber}{line break after number flag}%
+ \DefineTOCEntryIfOption{dynnumwidth}%
+ {scr@tso@}{@dynnumwidth}{dynamic number width flag}%
+ \DefineTOCEntryCommandOption{onstarthigherlevel}%
+ {scr@tso@}{@LastTOCLevelWasLower}{start higher level entry hook}%
+ \DefineTOCEntryCommandOption{onstartsamelevel}%
+ {scr@tso@}{@LastTOCLevelWasSame}{start same level entry hook}%
+ \DefineTOCEntryCommandOption{onstartlowerlevel}%
+ {scr@tso@}{@LastTOCLevelWasHigher}{start lower level entry hook}%
+ \DefineTOCEntryCommandOption{entryformat}%
+ {scr@tso@}{@entryformat}[1]{entry format}%
+ \DefineTOCEntryCommandOption{entrynumberformat}%
+ {scr@tso@}{@numberformat}[1]{entry number format}%
+ \DefineTOCEntryCommandOption{pagenumberformat}%
+ {scr@tso@}{@pagenumberformat}[1]{page number format}%
+ \DefineTOCEntryCommandOption{pagenumberbox}%
+ {scr@tso@}{@pagenumberbox}[1]{page number box}%
+ \DefineTOCEntryCommandOption{linefill}[\TOCLineLeaderFill]%
+ {scr@tso@}{@linefill}{filling between text and page number}%
+ \DefineTOCEntryLengthOption{beforeskip}%
+ {scr@tso@}{@beforeskip}{vertical skip before the entry}%
+ \DefineTOCEntryLengthOption{numsep}%
+ {scr@tso@}{@numsep}{entry number separation}%
+ \DefineTOCEntryLengthOption{indent}%
+ {scr@tso@}{@indent}{entry indent}%
+ \DefineTOCEntryLengthOption{numwidth}%
+ {scr@tso@}{@numwidth}{entry number width}%
+ \scr@ifundefinedorrelax{#1tocdepth}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{%
+ \expandafter\edef\csname #1tocdepth\endcsname{%
+ \numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax
+ }%
+ }%
+ }{}%
+ }{}%
+ \@ifundefined{#1tocdepth}{%
+ \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{%
+ \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{%
+ \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{%
+ \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{%
+ \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{%
+ \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
+ \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#1@indent}{%
+ \@ifundefined{scr@#1@tocindent}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@indent}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{%
+ \expandafter\edef\csname scr@tso@#1@indent\endcsname{%
+ \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}%
+ \relax
+ }%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{%
+ \expandafter\edef\csname scr@tso@#1@indent\endcsname{%
+ \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@indent}%
+ \relax
+ }%
+ }{%
+ \expandafter\edef\csname scr@tso@#1@indent\endcsname{%
+ \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@indent}%
+ +\noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}%
+ \relax
+ }%
+ }%
+ }%
+ }{}%
+ }{%
+ \@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@indent}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{3.8em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{7em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{7.0em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{12em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#1@numwidth}{%
+ \scr@ifundefinedorrelax{scr@#1@tocnumwidth}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{%
+ \expandafter\edef\csname scr@tso@#1@numwidth\endcsname{%
+ \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}%
+ +.9em%
+ \relax
+ }%
+ }%
+ }{}%
+ }{%
+ \@namedef{scr@tso@#1@numwidth}{\@nameuse{scr@#1@tocnumwidth}}%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@numwidth}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{%
+ \scr@ifundefinedorrelax{chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@numwidth}{3.2em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@numwidth}{4.1em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@numwidth}{5m}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@numwidth}{3.1em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@numwidth}{5em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@numwidth}{6em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@LastTOCLevelWasLower\endcsname{\LastTOCLevelWasLower}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@LastTOCLevelWasSame\endcsname{\LastTOCLevelWasSame}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@LastTOCLevelWasHigher\endcsname{\LastTOCLevelWasHigher}%
+ \@ifundefined{scr@tso@#1@beforeskip}{%
+ \ifstr{#1}{part}{%
+ \@namedef{scr@tso@#1@beforeskip}{\glueexpr 2.25em \@plus\p@\relax}%
+ }{%
+ \ifstr{#1}{chapter}{%
+ \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}%
+ }{%
+ \ifstr{#1}{section}{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}%
+ }{}%
+ }{}%
+ }%
+ }%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@beforeskip\endcsname{\glueexpr \z@ plus .2\p@\relax}%
+ }{}%
+ \@ifundefined{scr@dte@#1@maxnumwidth}{%
+ \expandafter\newlength\csname scr@dte@#1@maxnumwidth\endcsname
+ \setlength{\@nameuse{scr@dte@#1@maxnumwidth}}{\z@}%
+ }{}%
+ \providecommand*{\scr@dte@donumwidth}{}%
+ \g@addto@macro{\scr@dte@donumwidth}{\do{#1}}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@numsep\endcsname{.4em}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@numberformat\endcsname[1]{##1}%
+ \ifstr{#1}{part}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{\large\bfseries ##1}%
+ }{%
+ \ifstr{#1}{chapter}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}%
+ }{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}%
+ }{}%
+ }{}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{##1}%
+ }%
+ }%
+ \expandafter\providecommand
+ \csname Ifscr@tso@#1@breakafternumber\endcsname[2]{##2}%
+ \@ifundefined{scr@tso@#1@linefill}{%
+ \ifstr{#1}{part}{%
+ \@namedef{scr@tso@#1@linefill}{\hfill}%
+ }{%
+ \ifstr{#1}{chapter}{%
+ \@namedef{scr@tso@#1@linefill}{\hfill}%
+ }{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{%
+ \@namedef{scr@tso@#1@linefill}{\hfill}%
+ }{}
+ }{}
+ \expandafter\providecommand%
+ \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
+ }%
+ }%
+ }{}%
+ \expandafter\providecommand\csname Ifscr@tso@#1@raggedpage\endcsname[2]{##2}%
+ \ifstr{#1}{part}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{\large\bfseries ##1}%
+ }{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+ \normalfont\normalcolor ##1}%
+ }%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberbox\endcsname[1]{%
+ \hb@xt@\@pnumwidth{\hfil ##1}}%
+ \expandafter\providecommand\csname Ifscr@tso@#1@dynnumwidth\endcsname[2]{##2}%
+}]{%
+ \scr@dte@tocline{#1}{##1}{##2}%
+}
+\AtBeginDocument{%
+ \BeforeClosingMainAux{%
+ \begingroup
+ \def\do#1{%
+ \relax
+ \scr@ifundefinedorrelax{scr@dte@#1@maxnumwidth}{}{%
+ \ifdim \@nameuse{scr@dte@#1@maxnumwidth}>\z@
+ \if@filesw
+ \protected@write\@mainaux{}{%
+ \string\global\string\@namedef{scr@dte@#1@lastmaxnumwidth}%
+ {\the\@nameuse{scr@dte@#1@maxnumwidth}}%
+ }%
+ \fi
+ \@nameuse{scr@dte@#1@maxnumwidth}\z@
+ \fi
+ }%
+ }%
+ \@nameuse{scr@dte@donumwidth}%
+ \endgroup
+ }%
+}
+\newcommand*{\scr@dte@nosub}[1]{\@scr@dte@nosub #1\relax}
+\newcommand*{\@scr@dte@nosub}{}
+\def\@scr@dte@nosub sub#1\relax{#1}
+\newlength\scr@dte@tocline@numberwidth
+\newcommand*{\scr@dte@tocline}[3]{%
+ \ifnum \@nameuse{#1tocdepth}>\c@tocdepth
+ \else
+ \tocbasic@DependOnPenaltyAndTOCLevel{#1}%
+ \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax
+ {%
+ \leftskip \@nameuse{scr@tso@#1@indent}\relax
+ \rightskip \@tocrmarg
+ \parfillskip -\rightskip
+ \@nameuse{Ifscr@tso@#1@raggedpage}{%
+ \addtolength{\parfillskip}{\z@ \@plus 1fil}%
+ }{}%
+ \parindent \@nameuse{scr@tso@#1@indent}\relax
+ \@afterindenttrue
+ \interlinepenalty\@M
+ \leavevmode
+ \@tempdima \@nameuse{scr@tso@#1@numwidth}\relax
+ \@nameuse{Ifscr@tso@#1@dynnumwidth}{%
+ \scr@ifundefinedorrelax{scr@dte@#1@lastmaxnumwidth}{}{%
+ \ifdim \@nameuse{scr@dte@#1@lastmaxnumwidth}>\@tempdima
+ \@tempdima\@nameuse{scr@dte@#1@lastmaxnumwidth}\relax
+ \fi
+ }%
+ }{}%
+ \advance\leftskip \@tempdima
+ \null\nobreak\hskip -\leftskip
+ {%
+ \usetocbasicnumberline
+ \let\scr@dte@numberline@box\numberline@box
+ \def\numberline@box##1{%
+ \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}%
+ \global\scr@dte@tocline@numberwidth
+ \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax
+ \ifdim \scr@dte@tocline@numberwidth
+ >\@nameuse{scr@dte@#1@maxnumwidth}\relax
+ \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth
+ \fi
+ \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{%
+ \ifdim \scr@dte@tocline@numberwidth
+ >\dimexpr \@nameuse{scr@tso@#1@numwidth}%
+ +\@nameuse{scr@tso@#1@numsep}\relax
+ \PackageWarning{tocbasic%
+ }{%
+ number width of #1 toc entries should be
+ increased!\MessageBreak
+ Currently used number width =
+ \the\wd\scr@dte@tocline@numbox,\MessageBreak
+ Wanted number separation
+ \space\space\space =
+ \the\dimexpr\@nameuse{scr@tso@#1@numsep}\relax,\MessageBreak
+ Reserved number width \space\space\space\space\space\space =
+ \the\dimexpr\@nameuse{scr@tso@#1@numwidth}\relax%
+ }%
+ \fi
+ }%
+ \scr@dte@numberline@box{\@nameuse{scr@tso@#1@numberformat}{##1}}%
+ \@nameuse{Ifscr@tso@#1@breakafternumber}{%
+ {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip
+ }{}%
+ }%
+ \@nameuse{scr@tso@#1@entryformat}{%
+ #2%
+ \nobreak
+ {%
+ \normalfont\normalsize\@nameuse{scr@tso@#1@linefill}%
+ \nobreak
+ \@nameuse{scr@tso@#1@pagenumberbox}{%
+ \@nameuse{scr@tso@#1@pagenumberformat}{#3}%
+ }%
+ }%
+ \@par
+ }%
+ }%
+ }%
+ \tocbasic@SetPenaltyByTOCLevel{#1}%
+ \fi
+}
+\newsavebox\scr@dte@tocline@numbox
+\newcommand*{\tocbasic@DependOnPenaltyAndTOCLevel}[1]{%
+ \ifnum \lastpenalty<\numexpr 20009-\@nameuse{#1tocdepth}\relax
+ \@nameuse{scr@tso@#1@LastTOCLevelWasHigher}%
+ \else\ifnum \lastpenalty=\numexpr 20009-\@nameuse{#1tocdepth}\relax
+ \@nameuse{scr@tso@#1@LastTOCLevelWasSame}%
+ \else
+ \@nameuse{scr@tso@#1@LastTOCLevelWasLower}%
+ \fi
+ \fi
+}
+\newcommand*{\tocbasic@SetPenaltyByTOCLevel}[1]{%
+ \penalty \numexpr 20009-\@nameuse{#1tocdepth}\relax
+}
+\newcommand*{\LastTOCLevelWasHigher}{\ifvmode\addpenalty{\@lowpenalty}\fi}
+\newcommand*{\LastTOCLevelWasSame}{\ifvmode\addpenalty{\@lowpenalty}\fi}
+\newcommand*{\LastTOCLevelWasLower}{}
+\newcommand*{\TOCLineLeaderFill}[1][.]{%
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
+ mu$}\hfill
+}
+%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% (run: style,dottedtocline)
+\CloneTOCEntryStyle{dottedtocline}{default}
+%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% (run: exit)
+\AtBeginDocument{%
+ \@ifundefined{MakeMarkcase}{%
+ \scr@ifundefinedorrelax{KOMAClassName}{%
+ \let\MakeMarkcase\MakeUppercase
+ }{%
+ \let\MakeMarkcase\@firstofone
+ }%
+ }{}%
}
-\newcommand*{\tb@nt@autofloattype}{16}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 72d056c0e73..a5cb17da24e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -7,10 +7,7 @@
%% tocstyle.dtx (with options: `package,trace,tocstyle')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2013 by Markus Kohm <komascript(at)gmx.info>
-%%
-%% Copyright (c) 1994-2007
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2007-2016 by Markus Kohm <komascript(at)gmx.info>
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -35,7 +32,7 @@
%% English and German manuals are part of KOMA-Script bundle.
%% ----------------------------------------------------------
%%
-%% The english manual is at `tocstyle.dtx', too.
+%% The english manual is in `tocstyle.dtx', too.
%%
%% The KOMA-Script bundle (but not this file) was based upon the LaTeX2.09
%% Script family created by Frank Neukam 1993 and the LaTeX2e standard
@@ -47,10 +44,10 @@
%% EVERYTHING MAY CHANGE IN FUTURE!
%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
%%
-%%% From File: $Id: tocstyle.dtx 1977 2015-03-09 08:17:29Z kohm $
+%%% From File: $Id: tocstyle.dtx 2428 2016-04-12 10:31:07Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
- [2013/08/11 v0.2e-alpha KOMA-Script package (versatile toc styles)]
+ [2016/04/12 v0.2h-alpha KOMA-Script package (versatile toc styles)]
\PackageWarningNoLine{tocstyle}{%
THIS IS AN ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
@@ -312,42 +309,138 @@
#1\csname autodot\endcsname
}
\AtBeginDocument{%
- \ifcsname l@part\endcsname
- \setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@part{\tocstyle@l@define{part}{-1}}{}}%
- \fi
- \ifcsname l@chapter\endcsname
- \setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@chapter{\tocstyle@l@define{chapter}{0}}{}}%
- \fi
- \ifcsname l@section\endcsname
+ \@ifpackageloaded{tocbasic}{%
+ \@ifpackagelater{tocbasic}{2016/03/01}{%
+ \PackageWarningNoLine{tocstyle}{%
+ Usage of `tocstyle' with new `tocbasic' detected.\MessageBreak
+ This is not an error! You can do this.\MessageBreak
+ Nevertheless, you should note, combining `tocstyle'\MessageBreak
+ with this version of `tocbasic' will break several\MessageBreak
+ features of `tocbasic'. You should use `tocstyle'\MessageBreak
+ features instead of `tocbasic' attributes for all\MessageBreak
+ entry changes you want.\MessageBreak
+ You may also get additional warnings because of\MessageBreak
+ redefined `\string\numberline'. Ignore them}%
+ }{}%
+ }{}%
+ \@ifpackageloaded{etoc}{%
+ \PackageWarningNoLine{tocstyle}{%
+ Usage of `tocstyle' with `etoc' detected.\MessageBreak
+ I suggest to use either `tocstyle' or `etoc'\MessageBreak
+ but not both of them together}%
+ }{}%
+ \@ifpackageloaded{titletoc}{%
+ \PackageWarningNoLine{tocstyle}{%
+ Usage of `tocstyle' with `titletoc' detected.\MessageBreak
+ I suggest to use either `tocstyle' or `titletoc'\MessageBreak
+ but not both of them together. I expect even\MessageBreak
+ error messages because of this combination}%
+ }{}%
+ \def\tocstyle@test@level{-1}%
+ \def\tocstyle@test@levelname{part}%
+ \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{%
\setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@section{\tocstyle@l@define{section}{1}}{}}%
- \fi
- \ifcsname l@subsection\endcsname
- \setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@subsection{\tocstyle@l@define{subsection}{2}}{}}%
+ \let\normalcolor\relax
+ \let\color\@gobble
+ \edef\reserved@a{%
+ \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{%
+ \noexpand\tocstyle@l@define{\tocstyle@test@levelname}%
+ {\tocstyle@test@level}%
+ }{}%
+ }%
+ \reserved@a
+ }%
+ \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}%
+ \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}%
+ }%
+ \ifnum\tocstyle@test@level<\z@
+ \def\tocstyle@test@level{0}%
\fi
- \ifcsname l@subsubsection\endcsname
+ \def\tocstyle@test@levelname{chapter}%
+ \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{%
\setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@subsubsection{\tocstyle@l@define{subsubsection}{3}}{}}%
+ \let\normalcolor\relax
+ \let\color\@gobble
+ \edef\reserved@a{%
+ \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{%
+ \noexpand\tocstyle@l@define{\tocstyle@test@levelname}%
+ {\tocstyle@test@level}%
+ }{}%
+ }%
+ \reserved@a
+ }%
+ \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}%
+ \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}%
+ }%
+ \ifnum\tocstyle@test@level<\@ne
+ \def\tocstyle@test@level{1}%
\fi
- \ifcsname l@paragraph\endcsname
+ \def\tocstyle@test@levelname{section}%
+ \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{%
\setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@paragraph{\tocstyle@l@define{paragraph}{4}}{}}%
- \fi
- \ifcsname l@subparagraph\endcsname
+ \let\normalcolor\relax
+ \let\color\@gobble
+ \edef\reserved@a{%
+ \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{%
+ \noexpand\tocstyle@l@define{\tocstyle@test@levelname}%
+ {\tocstyle@test@level}%
+ }{}%
+ }%
+ \reserved@a
+ }%
+ \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}%
+ \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}%
+ }%
+ \def\tocstyle@test@levelname{paragraph}%
+ \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{%
\setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@subparagraph{\tocstyle@l@define{subparagraph}{5}}{}}%
- \fi
- \ifcsname l@table\endcsname
+ \let\normalcolor\relax
+ \let\color\@gobble
+ \edef\reserved@a{%
+ \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{%
+ \noexpand\tocstyle@l@define{\tocstyle@test@levelname}%
+ {\tocstyle@test@level}%
+ }{}%
+ }%
+ \reserved@a
+ }%
+ \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}%
+ \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}%
+ }%
+ \def\tocstyle@test@level{1}%
+ \def\tocstyle@test@levelname{table}%
+ \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{%
\setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@table{\tocstyle@l@define{table}{1}}{}}%
- \fi
- \ifcsname l@figure\endcsname
+ \let\normalcolor\relax
+ \let\color\@gobble
+ \edef\reserved@a{%
+ \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{%
+ \noexpand\tocstyle@l@define{\tocstyle@test@levelname}%
+ {\tocstyle@test@level}%
+ }{}%
+ }%
+ \reserved@a
+ }%
+ \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}%
+ \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}%
+ }%
+ \def\tocstyle@test@level{1}%
+ \def\tocstyle@test@levelname{figure}%
+ \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{%
\setbox\@tempboxa\vbox{\hsize\maxdimen
- \l@figure{\tocstyle@l@define{figure}{1}}{}}%
- \fi
+ \let\normalcolor\relax
+ \let\color\@gobble
+ \edef\reserved@a{%
+ \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{%
+ \noexpand\tocstyle@l@define{\tocstyle@test@levelname}%
+ {\tocstyle@test@level}%
+ }{}%
+ }%
+ \reserved@a
+ }%
+ \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}%
+ \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}%
+ }%
\def\@tempa#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip \z@ \@plus.2\p@
@@ -526,6 +619,13 @@
\fi
\fi
}
+\AtBeginDocument{%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \string\providecommand*\string\tocstyle@set@width[4]{}%
+ }%
+ \fi
+}
\newcommand*{\tocstyleTOC}{}
\newcommand*{\tocstyleAliasTOC}{}
\newcommand*{\tocstyledepth}{}
@@ -535,7 +635,7 @@
\newcommand*{\reactivatetocstyle}[1][]{%
\expandafter\let\csname tocstyle@deactivated@#1\endcsname\relax}
\newcommand*{\@settocfeature}[1][]{%
- \@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}
+ \kernel@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}
}
\def\@@settocfeature[#1][#2]#3#4{%
\typeout{exclude: \tocstyle@feature@excludelist}%
@@ -576,7 +676,7 @@
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
\newcommand*{\@settocstylefeature}{%
- \@ifnextchar[ {\@settocfeature[]}{\@settocfeature[][]}%
+ \kernel@ifnextchar[ {\@settocfeature[]}{\@settocfeature[][]}%
}
\newcommand*{\settocstylefeature}{}
\let\settocstylefeature\@settocstylefeature
@@ -624,10 +724,10 @@
}%
}
\newcommand*{\newtocstyle}{%
- \@ifnextchar [{\@newtocstyle}{\@newtocstyle[]}}
+ \kernel@ifnextchar [{\@newtocstyle}{\@newtocstyle[]}}
\newcommand*{\@newtocstyle}{}
\def\@newtocstyle[#1]{%
- \@ifnextchar [{\@@newtocstyle[{#1}]}{\@newtocstyle[{#1}][]}}
+ \kernel@ifnextchar [{\@@newtocstyle[{#1}]}{\@newtocstyle[{#1}][]}}
\newcommand*{\@@newtocstyle}{}
\def\@@newtocstyle[#1][#2]#3#4{%
\@ifundefined{tocstyle@style@#3}{%
@@ -664,7 +764,7 @@
but there's no TOC style `#2' defined.}%
}{%
\def\settocfeature{%
- \@ifnextchar[ %]
+ \kernel@ifnextchar[ %]
{\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}%
}%
\let\settocstylefeature\settocfeature
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 791da4bfdd2..17033952446 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -13,7 +13,7 @@
%% scrkernel-compatibility.dtx (with options: `package,typearea,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,7 +45,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,16 +67,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2015/10/03 v3.19a KOMA-Script
+ 2016/05/10 v3.20 KOMA-Script
package (type area)]
\typeout{%
Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J%
@@ -85,9 +85,9 @@
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -265,9 +265,21 @@
\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
\KOMA@ifkey{headinclude}{@hincl}
\KOMA@DeclareDeprecatedOption[typearea]{headexclude}{headinclude=false}
+\KOMA@key{headsepline}[true]{%
+ \KOMA@set@ifkey{headinclude}{@hincl}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{headinclude}{@hincl}%
+ \fi
+}
\newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl}
\KOMA@ifkey{footinclude}{@fincl}
\KOMA@DeclareDeprecatedOption[typearea]{footexclude}{footinclude=false}
+\KOMA@key{footsepline}[true]{%
+ \KOMA@set@ifkey{footinclude}{@hincl}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{footinclude}{@hincl}%
+ \fi
+}
\KOMA@ifkey{mpinclude}{@mincl}
\KOMA@DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false}
\KOMA@key{BCOR}{%
@@ -363,7 +375,7 @@
\KOMA@key{pagesize}[auto]{%
\KOMA@set@ncmdkey{pagesize}{@pagesizelast}{%
{off}{-1},{no}{-1},{false}{-1},%
- {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{dvipdfmx}{4}%
+ {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{luatex}{3},{dvipdfmx}{4}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase\number\@pagesizelast\relax
@@ -463,8 +475,12 @@
}%
}
\newcommand{\set@pdftexpagesize}{%
- \ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}%
- \ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}%
+ \scr@ifundefinedorrelax{pdfpagewidth}{%
+ \scr@ifundefinedorrelax{pagewidth}{}{pagewidth=\paperwidth}%
+ }{\pdfpagewidth=\paperwidth}%
+ \scr@ifundefinedorrelax{pdfpageheight}{%
+ \scr@ifundefinedorrelax{pageheight}{}{pageheight=\paperheight}%
+ }{\pdfpageheight=\paperheight}%
}
\newcommand{\set@dvipspagesize}{%
\begingroup
@@ -673,7 +689,7 @@
\KOMA@ifkey{usegeometry}{@ta@usegeometry}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -778,6 +794,7 @@
\@namedef{scr@v@3.18a}{15}
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
+\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@ta@v@is@lt}[1]{%
\scr@ta@compatibility<\@nameuse{scr@v@#1}
@@ -791,7 +808,7 @@
\newcommand*{\scr@ta@v@is@ge}[1]{%
\numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -945,11 +962,11 @@
\fi
}
\newcommand*{\AfterCalculatingTypearea}{%
- \@ifstar \l@addto@macro \g@addto@macro \@typearea@end
+ \kernel@ifstar \l@addto@macro \g@addto@macro \@typearea@end
}
\newcommand*{\@typearea@end}{}
\newcommand*{\AfterSettingArea}{%
- \@ifstar \l@addto@macro \g@addto@macro \@areaset@end
+ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end
}
\newcommand*{\@areaset@end}{}
\newcommand*{\activateareas}{%
@@ -1092,10 +1109,12 @@
\reserved@a
}
\newcommand*{\BeforeRestoreareas}{%
- \@ifstar{\scr@storeareashook{before@current}}{\scr@storeareashook{before}}%
+ \kernel@ifstar{\scr@storeareashook{before@current}}%
+ {\scr@storeareashook{before}}%
}
\newcommand*{\AfterRestoreareas}{%
- \@ifstar{\scr@storeareashook{after@current}}{\scr@storeareashook{after}}%
+ \kernel@ifstar{\scr@storeareashook{after@current}}%
+ {\scr@storeareashook{after}}%
}
\newcommand*{\scr@storeareashook}[2]{%
\expandafter\l@addto@macro\csname scr@storeareas@#1@hook\endcsname{#2}%
@@ -1507,7 +1526,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index fd78dee1b8d..2c7c8496e00 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -9,7 +9,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,visualize,body')
%% scrkernel-notepaper.dtx (with options: `lco,visualize,body')
%%
-%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,7 +41,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 2213 2015-10-03 12:59:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/10/03 v3.19a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
visualize%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\RequirePackage{eso-pic}
\newcommand*{\showfields}[1]{%
\AtBeginLetter{%
@@ -299,7 +299,7 @@
\newcommand*{\@@showenvelope}{}
\newcommand*{\@@@showenvelope}{}
\def\showenvelope(#1,#2){%
- \@ifnextchar (%)
+ \kernel@ifnextchar (%)
{\@showenvelope({#1},{#2})}%
{\@@@showenvelope({#1},{#2})}%
}
@@ -342,7 +342,7 @@
\@tempa
}
\def\@showenvelope(#1,#2)(#3,#4){%
- \@ifnextchar [%]
+ \kernel@ifnextchar [%]
{\@@showenvelope({#1},{#2})({#3},{#4})}%
{\@@showenvelope({#1},{#2})({#3},{#4})[]}%
}
@@ -574,7 +574,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
\endinput
%%
%% End of file `visualize.lco'.