summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-19 23:43:25 +0000
committerKarl Berry <karl@freefriends.org>2015-01-19 23:43:25 +0000
commit83b4f07dfc662cf6c2632a34e88a1aad0009e35a (patch)
treed6c61dbd9ba41e2c7353bdcf23acb151b52601ff /Master/texmf-dist/tex/latex/koma-script
parent3fef13606c698d4e277aaad8662b082f8f5c6fab (diff)
koma-script (19jan15)
git-svn-id: svn://tug.org/texlive/trunk@36095 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls916
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty124
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls1442
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty22
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty29
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty397
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty23
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty26
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty49
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty2583
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls1406
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty49
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty13
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco4
43 files changed, 5761 insertions, 1520 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 7b44105a3a5..f1a63d73e42 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index ff505c80898..be5c282ba52 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 7695e54b3fd..1469339b3cd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index 60da6c2a71d..332ee6352a2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 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 d83996be61b..daec807daf8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index f97f4259bc5..ef9ae6f32d2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 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 64a50eb834b..d04ef554691 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 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 2e3a752fa75..42caceb358d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 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 609dec06f2b..6946048eea4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 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 ac51b27995b..bd0f8241b6e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 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 e54512e5843..357d76b451f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index f3144261cf7..59a0b6647aa 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index a3cafd59409..c930bdf21c6 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index e2466bb3235..8871dfcf0d0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index 6976622e707..8024e0cad23 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{float.hak}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(hacking package
float)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index 269a1b4c677..7ede4f40b3f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{floatrow.hak}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(hacking package
floatrow)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index cfb7dd37076..1555ea0aa76 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{hyperref.hak}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(hacking package
hyperref)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index 60577093a29..1292815dfbc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{listings.hak}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(hacking package
listings)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 32a5b3a8b58..bcd6de7667a 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-sections.dtx (with options: `class,article,prepare')
%% scrkernel-compatibility.dtx (with options: `class,article,option')
%% scrkernel-miscellaneous.dtx (with options: `class,article,option')
%% scrkernel-language.dtx (with options: `class,article,option')
@@ -72,7 +73,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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -94,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -103,19 +104,54 @@
article%
}
\ProvidesClass{\KOMAClassName}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
+%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
\RequirePackage{tocbasic}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
]
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+\newcommand*{\scr@dotchangeatdocument}[1]{%
+ \ClassError{\KOMAClassName}{%
+ change of end dot feature after \string\begin{document}%
+ }{%
+ You've tried to set `numbers=#1' after \string\begin{document},\MessageBreak
+ but this option is only allowed at the document preamble.\MessageBreak
+ See KOMA-Script manual for more information about.%
+ }%
+}
+\newcommand*{\scr@osectarg}{0}
+\newcommand*{\scr@activate@xsection}[1]{%
+ \renewcommand*{\scr@osectarg}{#1}%
+}
+\newif\if@altsecnumformat\@altsecnumformatfalse
+\newif\if@autodot
+\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
+\renewcommand*{\@autodotfalse}{\global\let\if@autodot\iffalse}
+\@autodotfalse
+\newcommand*{\scr@altsecnumhook}{}
+\AtBeginDocument{\scr@altsecnumhook}
+\newcommand*{\scr@altsecnumhooktrue}{%
+ \@altsecnumformattrue\global\let\@altsecnumformatfalse\@altsecnumformattrue
+}
+\newcommand*{\scr@altsecnumhookfalse}{%
+ \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse
+}
+\newcommand*{\size@part}{}
+\newcommand*{\size@partnumber}{}
+\newcommand*{\size@section}{}
+\newcommand*{\size@subsection}{}
+\newcommand*{\size@subsubsection}{}
+\newcommand*{\size@paragraph}{}
+\newcommand*{\size@subparagraph}{}
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -221,6 +257,7 @@
\@namedef{scr@v@3.13}{12}
\@namedef{scr@v@3.13a}{13}
\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@last}{14}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
@@ -238,7 +275,7 @@
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -374,7 +411,7 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -507,7 +544,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\newif\if@titlepage
\@titlepagefalse
\newif\if@titlepageiscoverpage
@@ -530,16 +567,7 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
-\newcommand*{\scr@dotchangeatdocument}[1]{%
- \ClassError{\KOMAClassName}{%
- change of end dot feature after \string\begin{document}%
- }{%
- You've tried to set `numbers=#1' after \string\begin{document},\MessageBreak
- but this option is only allowed at the document preamble.\MessageBreak
- See KOMA-Script manual for more information about.%
- }%
-}
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
{autoendperiod}{0},{autoenddot}{0},{auto}{0},%
@@ -564,24 +592,9 @@
\fi
\fi
}
-\newcommand*{\scr@altsecnumhook}{}
-\AtBeginDocument{\scr@altsecnumhook}
-\newcommand*{\scr@altsecnumhooktrue}{%
- \@altsecnumformattrue\global\let\@altsecnumformatfalse\@altsecnumformattrue
-}
-\newcommand*{\scr@altsecnumhookfalse}{%
- \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse
-}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-\newcommand*{\size@part}{}
-\newcommand*{\size@partnumber}{}
-\newcommand*{\size@section}{}
-\newcommand*{\size@subsection}{}
-\newcommand*{\size@subsubsection}{}
-\newcommand*{\size@paragraph}{}
-\newcommand*{\size@subparagraph}{}
+\KOMA@ifkey{sectionentrydots}{@sectionentrywithdots}
\KOMA@key{headings}{%
\KOMA@set@ncmdkey{headings}{@tempa}{%
{big}{0},%
@@ -645,10 +658,6 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-\newcommand*{\scr@osectarg}{0}
-\newcommand*{\scr@activate@xsection}[1]{%
- \renewcommand*{\scr@osectarg}{#1}%
-}
%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
@@ -864,7 +873,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -880,7 +889,9 @@
{flat}{8},{left}{8},%
{graduated}{9},{indent}{9},{indented}{9},%
{indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
- {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11}%
+ {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11},%
+ {sectionentrywithdots}{12},{sectionentrydotfill}{12},
+ {sectionentrywithoutdots}{13},{sectionentryfill}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
@@ -907,6 +918,10 @@
\setuptoc{toc}{numberline}%
\or
\unsettoc{toc}{numberline}%
+ \or
+ \KOMAoptions{sectionentrydots=true}%
+ \or
+ \KOMAoptions{sectionentrydots=false}%
\fi
\fi
}
@@ -1165,8 +1180,8 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -1644,7 +1659,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1772,7 +1787,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2109,24 +2124,31 @@
\if@twocolumn\else\endquotation\fi
\fi
}
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
-\newcommand*\appendix{\par%
- \setcounter{section}{0}%
- \setcounter{subsection}{0}%
- \gdef\thesection{\@Alph\c@section}%
- \csname appendixmore\endcsname
+\newcommand*\abstractname{Abstract}
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+\setcounter{secnumdepth}{3}
+\newcommand*{\ifnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@secondoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }%
}
-\newcommand*\addsecmark[1]{%
- \begingroup
- \c@secnumdepth=\m@ne
- \sectionmark{#1}%
- \endgroup
+\newcommand*{\ifunnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@firstoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
}
-\newif\if@altsecnumformat\@altsecnumformatfalse
-\newif\if@autodot
-\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
-\renewcommand*{\@autodotfalse}{\global\let\if@autodot\iffalse}
-\@autodotfalse
\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup%
\expandafter\@@maybeautodot #1\@stop\endgroup\fi
}
@@ -2145,6 +2167,7 @@
\fi
\@@maybeautodot
}
+\newcommand*\autodot{\if@altsecnumformat.\fi}
\newcommand*{\scr@saved@startsection}[6]{%
\if@noskipsec \leavevmode \fi
\par
@@ -2367,75 +2390,425 @@
\if@autodot\if@filesw\immediate\write\@mainaux{%
\string\global\string\@altsecnumformattrue}%
\fi\fi}
-\newcommand*\autodot{\if@altsecnumformat.\fi}
-\setcounter{secnumdepth}{3}
-\newcommand*{\partnumdepth}{%
- \z@
-}
-\newcommand*{\sectionnumdepth}{\@ne}
-\newcommand*{\subsectionnumdepth}{\tw@}
-\newcommand*{\subsubsectionnumdepth}{\thr@@}
-\newcommand*{\paragraphnumdepth}{4}
-\newcommand*{\subparagraphnumdepth}{5}
-\newcommand*{\ifnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@secondoftwo
+\newcommand*{\raggedsection}{}
+\let\raggedsection\raggedright
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.dsc]{KOMAarg}
+\newcommand*{\DeclareSectionCommand}[2][]{%
+ \edef\reserved@a{%
+ \noexpand\FamilyStringKey[.dsc]{KOMAarg}{style}{%
+ \expandafter\noexpand\csname scr@#2@style\endcsname
+ }%
+ }\reserved@a
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ }%
+ \scr@ifundefinedorrelax{scr@local@leveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
+ \expandafter\noexpand\csname #2numdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@leveloffset\relax}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
+ }%
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{indent}{%
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{beforeskip}{%
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{afterskip}{%
+ \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{font}{%
+ \noexpand\IfExistskomafont{#2}{%
+ \noexpand\setkomafont
+ }{%
+ \noexpand\newkomafont
+ }{#2}{####1}%
+ \noexpand\FamilyKeyStateProcessed
+ }%
+ }\reserved@a
+ \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 #2tocdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname #2tocdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@tocleveloffset\relax}%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
+ }%
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocindent}{%
+ \expandafter\noexpand\csname scr@#2@tocindent\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocnumwidth}{%
+ \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname}%
+ }\reserved@a
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \begingroup
+ \scr@ifundefinedorrelax{#2numdepth}{%
+ \scr@declaresectioncommanderror{#2}{section level}{level}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionindent}{%
+ \scr@declaresectioncommanderror{#2}{section indent}{indent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionbeforeskip}{%
+ \scr@declaresectioncommanderror{#2}{before section skip}{beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionafterskip}{%
+ \scr@declaresectioncommanderror{#2}{after section skip}{afterskip}%
+ }{}%
+ \IfExistskomafont{#2}{}{%
+ \scr@declaresectioncommanderror{#2}{font}{font}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@tocindent}{%
+ \scr@declaresectioncommanderror{#2}{toc entry indent}{tocindent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@tocnumwidth}{%
+ \scr@declaresectioncommanderror{#2}{toc entry number
+ width}{tocnumwidth}%
+ }{}%
+ \endgroup
+ \@firstofone{%
+ \@ifundefined{c@#2}{\newcounter{#2}}{}%
+ \ifx\scr@local@counterwithin\relax
+ \else\ifx\scr@local@counterwithin\@empty
+ \@namedef{the#2}{\arabic{#2}}%
+ \else
+ \@removefromreset{#2}{\scr@local@counterwithin}%
+ \@addtoreset{#2}{\scr@local@counterwithin}%
+ \expandafter\def\csname the#2\expandafter\endcsname{%
+ \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
+ \fi
\fi
+ \@ifundefined{#2format}{%
+ \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \ifstr{\csname scr@#2@style\endcsname}{}{%
+ \ClassInfo{\KOMAClassName}{%
+ not defining `\string\csname #2\endcsname' due to\MessageBreak
+ empty section style%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{scr@#2@style}{%
+ \ClassWarning{\KOMAClassName}{using default section style}%
+ \@namedef{scr@#2@style}{section}%
+ }{}%
+ \expandafter\edef\csname #2\endcsname{%
+ \noexpand\scr@ifundefinedorrelax{%
+ scr@start\csname scr@#2@style\endcsname}{%
+ \noexpand\ClassError{\noexpand\KOMAClassName}{%
+ section style `\csname scr@#2@style\endcsname' not defined}{%
+ A not yet defined section style `\csname scr@#2@style\endcsname'
+ has been setup for\MessageBreak
+ `\expandafter\string\csname #2\endcsname'. You should either setup
+ another style\MessageBreak
+ or define the style.\MessageBreak
+ If you'll continue, style `section' will be used as an emergency
+ fallback.%
+ }%
+ \noexpand\def\expandafter\noexpand\csname scr@#2@style\endcsname
+ {section}%
+ }{}%
+ \expandafter\noexpand
+ \csname scr@start\csname scr@#2@style\endcsname\endcsname
+ {#2}%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname{%
+ \noexpand\ifdim\noexpand\glueexpr
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
+ <\noexpand\z@
+ \unexpanded{%
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
+ }%
+ \noexpand\fi
+ \unexpanded{%
+ \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ }%
+ }%
+ }%
+ }%
+ \@ifundefined{DeclareSectionNumberDepth}{%
+ \@ifundefined{#2markformat}{%
+ \@namedef{#2markformat}{\csname the#2\endcsname\autodot\endskip}%
+ }{}%
+ \@ifundefined{#2mark}{%
+ \expandafter\let\csname #2mark\endcsname\@gobble
+ }{}%
+ }{%
+ \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{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
+ }%
+ }{}%
}%
}
-\newcommand*{\ifunnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@firstoftwo
+\newcommand*{\scr@declaresectioncommanderror}[3]{%
+ \ClassError{\KOMAClassName}{%
+ #2 of \expandafter\string\csname #1\endcsname\space unknown%
}{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
+ Please use option `#3' to declare the #2.\MessageBreak
+ If you'll continue, declaration will be ignored%
}%
+ \aftergroup\@gobbletwo
}
-\newcounter{part}
-\renewcommand*{\thepart}{\@Roman\c@part}
-\newcommand*{\partformat}{\partname~\thepart\autodot}
-\newcounter{section}
-\renewcommand*{\thesection}{\@arabic\c@section}
-\newcommand*\sectionmarkformat{\thesection\autodot\enskip}
-\newcounter{subsection}[section]
-\renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection}
-\newcommand*\subsectionmarkformat{\thesubsection\autodot\enskip}
-\newcounter{subsubsection}[subsection]
-\renewcommand*{\thesubsubsection}{%
- \thesubsection.\@arabic\c@subsubsection
+\newcommand*{\DeclareNewSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname #1\endcsname` already defined%
+ }{%
+ You've tried to define the section command `\expandafter\string\csname
+ #1\endcsname` newly,\MessageBreak
+ but a command, token, box or length with this name already
+ exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be irgnored.%
+ }%
+ }%
}
-\newcounter{paragraph}[subsubsection]
-\renewcommand*{\theparagraph}{\thesubsubsection.\@arabic\c@paragraph}
-\newcounter{subparagraph}[paragraph]
-\renewcommand*{\thesubparagraph}{%
- \theparagraph.\@arabic\c@subparagraph
+\newcommand*{\RedeclareSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname #1\endcsname` not defined%
+ }{%
+ You've tried to re-define the section command `\expandafter\string\csname
+ #1\endcsname`,\MessageBreak
+ but a command with this name does not exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\DeclareNewSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be irgnored.%
+ }%
+ }{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }%
}
-\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
-\renewcommand*{\@seccntformat}[1]{%
- \protect\othersectionlevelsformat{#1}{%
- \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+\newcommand*{\ProvideSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }{%
+ \ClassInfo{\KOMAClassName}{%
+ \string\ProvideSectionCommand{#1} ignored%
+ }%
+ }%
+}
+\newcommand*{\DeclareSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\DeclareNewSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname\reserved@a\endcsname` already
+ defined%
+ }{%
+ You've tried to define the section command
+ `\expandafter\string\csname\reserved@a\endcsname` newly,\MessageBreak
+ but a command, token, box or length with this name already
+ exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ Nevertheless, if you'll continue, the command will be defined.%
+ }%
+ }%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\RedeclareSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname\reserved@a\endcsname` not defined%
+ }{%
+ You've tried to re-define the section command
+ `\expandafter\string\csname\reserved@a\endcsname`,\MessageBreak
+ but a command with this name does not exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\DeclareNewSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ Nevertheless, if you'll continue, the command will be defined.%
+ }%
+ }{}%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\ProvideSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{}%
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \FamilySetCounterMacro{KOMAarg}{level}{\reserved@b}{##1}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{indent}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{beforeskip}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{afterskip}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{font}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{counterwidthin}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{}%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ }%
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\bprot@dottedtocline}[5]{%
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \ifnum #1>\c@tocdepth \else
+ \begingroup
+ \@tempcnta 20010
+ \advance \@tempcnta by -#1
+ \ifnum \@tempcnta>\lastpenalty
+ \endgroup
+ \addpenalty{\@lowpenalty}%
+ \else
+ \endgroup
+ \fi
+ \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
+ \@tempcnta 20009
+ \advance \@tempcnta by -#1
+ \penalty\@tempcnta
+ \fi
+ \else
+ \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
+ \fi
+}
+\newcommand*\appendix{\par%
+ \setcounter{section}{0}%
+ \setcounter{subsection}{0}%
+ \gdef\thesection{\@Alph\c@section}%
+ \csname appendixmore\endcsname
+}
+\newcommand*{\partnumdepth}{%
+ \z@
+}
+\newcommand*{\scr@part@sectionbeforeskip}{%
+ 4ex
}
-\newcommand*\partname{Part}
-\newcommand*\abstractname{Abstract}
-\newcommand*\appendixname{Appendix}
\newcommand*{\partheadstartvskip}{%
- \addvspace{4ex}%
+ \addvspace{\@tempskipa}%
}
\newcommand*{\partheadmidvskip}{%
\par\nobreak
}
+\newcommand*{\scr@part@sectionafterskip}{%
+ 3ex
+}
\newcommand*{\partheadendvskip}{%
- \vskip 3ex
+ \vskip\@tempskipa
}
+\newcommand*{\scr@part@sectionindent}{\z@}
+\newcommand*{\scr@part@style}{}
\newcommand\part{\par
+ \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip%
\@afterindentfalse
\SecDef\@part\@spart
@@ -2488,6 +2861,8 @@
\fi
\endgroup
\nobreak
+ \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\@afterheading
}
@@ -2500,6 +2875,8 @@
\sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par
\endgroup
\nobreak
+ \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\@afterheading
}
@@ -2548,126 +2925,16 @@
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
-\newcommand*\addsec{\SecDef\@addsec\@saddsec}
-\newcommand*{\@addsec}{}
-\def\@addsec[#1]#2{\section*{#2}%
- \ifnum \scr@osectarg=\z@
- \@scr@tempswafalse
- \else
- \scr@istest#1=\@nil
- \fi
- \if@scr@tempswa
- \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
- \else
- \ifcase \scr@osectarg\relax
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \fi
- \fi
- \ifx\scr@ds@tocentry\@empty\else
- \addsectiontocentry{}{\scr@ds@tocentry}%
- \fi
- \addsecmark{\scr@ds@head}%
-}
-\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
-\newcommand*{\addsectiontocentry}[2]{%
- \addtocentrydefault{section}{#1}{#2}%
-}
-\newcommand*{\addsubsectiontocentry}[2]{%
- \addtocentrydefault{subsection}{#1}{#2}%
-}
-\newcommand*{\addparagraphtocentry}[2]{%
- \addtocentrydefault{paragraph}{#1}{#2}%
-}
-\newcommand*{\addsubparagraphtocentry}[2]{%
- \addtocentrydefault{subparagraph}{#1}{#2}%
-}
-\newcommand\section{%
- \scr@startsection{section}{\sectionnumdepth}{\z@}%
- {-3.5ex \@plus -1ex \@minus -.2ex}%
- {2.3ex \@plus.2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@section}%
-}
-\newcommand\subsection{%
- \scr@startsection{subsection}{\subsectionnumdepth}{\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@subsection
- }%
-}
-\newcommand\subsubsection{%
- \scr@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@subsubsection
- }%
-}
-\newcommand\paragraph{%
- \scr@startsection{paragraph}{\paragraphnumdepth}{\z@}%
- {3.25ex \@plus1ex \@minus.2ex}%
- {-1em}%
- {\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
-}
-\newcommand\subparagraph{%
- \scr@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
- {3.25ex \@plus1ex \@minus .2ex}%
- {-1em}%
- {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
-}
-\newkomafont{minisec}{}
-\newcommand\minisec[1]{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
- \@afterindentfalse \vskip 1.5ex
- \else
- \if@noskipsec \leavevmode \fi
- \par
- \@afterindentfalse
- \if@nobreak
- \everypar{}%
- \else
- \addpenalty\@secpenalty\addvspace{1.5ex}%
- \fi
- \fi
- {\parindent \z@
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak
- \usekomafont{minisec}#1\par\nobreak}\nobreak%
- \@afterheading
-}
-\newcommand*{\raggedsection}{}
-\let\raggedsection\raggedright
-\newcommand*{\raggedpart}{}
-\let\raggedpart\raggedsection
-\newkomafont{partentry}{\usekomafont{disposition}\large}
-\newkomafont{partentrypagenumber}{}
-\newkomafont{sectionentry}{\usekomafont{disposition}}
-\newkomafont{sectionentrypagenumber}{}
-\newcommand*{\scr@fnt@disposition}{\sectfont}
-\aliaskomafont{sectioning}{disposition}
-\newcommand*{\scr@fnt@part}{\size@part}
-\newcommand*{\scr@fnt@partnumber}{\size@partnumber}
-\newcommand*{\scr@fnt@section}{\size@section}
-\newcommand*{\scr@fnt@subsection}{\size@subsection}
-\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection}
-\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
-\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
+\newcommand*{\parttocdepth}{\m@ne}
+\let\parttocdepth\m@ne
+\newcommand*{\scr@part@tocindent}{\z@}
+\let\scr@part@tocindent\z@
+\newcommand*{\scr@part@tocnumwidth}{2em}
\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth >-2\relax
+ \ifnum \c@tocdepth <\parttocdepth \else
\addpenalty{\@secpenalty}%
\addvspace{2.25em \@plus\p@}%
- \setlength{\@tempdima}{2em}%
+ \setlength{\@tempdima}{\scr@part@tocnumwidth}%
\if@tocleft
\ifx\toc@l@number\@empty\else
\setlength\@tempdima{0\toc@l@number}%
@@ -2696,13 +2963,23 @@
\fi
\fi
}
+\newcounter{part}
+\renewcommand*{\thepart}{\@Roman\c@part}
+\newcommand*{\partformat}{\partname~\thepart\autodot}
+\newcommand*\partname{Part}
+\newcommand*{\raggedpart}{}
+\let\raggedpart\raggedsection
+\newcommand*{\scr@fnt@part}{\size@part}
+\newcommand*{\scr@fnt@partnumber}{\size@partnumber}
+\newkomafont{partentry}{\usekomafont{disposition}\large}
+\newkomafont{partentrypagenumber}{}
\newcommand*\l@section[2]{%
- \ifnum \c@tocdepth >\z@
+ \ifnum \c@tocdepth <\sectiontocdepth\else
\ifnum \lastpenalty<20009
\addpenalty{\@secpenalty}%
\fi
\addvspace{1.0em \@plus\p@}%
- \setlength\@tempdima{1.5em}%
+ \setlength\@tempdima{\dimexpr\scr@section@tocnumwidth}%
\if@tocleft
\ifx\toc@l@number\@empty\else
\setlength\@tempdima{0\toc@l@number}%
@@ -2715,9 +2992,16 @@
\interlinepenalty\@M
\leavevmode
\advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+ \edef\@pnumwidth{\the\dimexpr\@pnumwidth\relax}%
\usekomafont{sectionentry}{#1\nobreak
\usekomafont{sectionentrypagenumber}{%
- \hfill\nobreak
+ {\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
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2726,31 +3010,153 @@
\fi
}
\newcommand*{\raggedsectionentry}{}
-\newcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{2.3em}}
-\newcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{3.2em}}
-\newcommand*\l@paragraph{\bprot@dottedtocline{4}{7.0em}{4.1em}}
-\newcommand*\l@subparagraph{\bprot@dottedtocline{5}{10em}{5em}}
-\newcommand*{\bprot@dottedtocline}[5]{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \ifnum #1>\c@tocdepth \else
- \begingroup
- \@tempcnta 20010
- \advance \@tempcnta by -#1
- \ifnum \@tempcnta>\lastpenalty
- \endgroup
- \addpenalty{\@lowpenalty}%
- \else
- \endgroup
- \fi
- \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \@tempcnta 20009
- \advance \@tempcnta by -#1
- \penalty\@tempcnta
+\newcommand*\addsec{\SecDef\@addsec\@saddsec}
+\newcommand*{\@addsec}{}
+\def\@addsec[#1]#2{\section*{#2}%
+ \ifnum \scr@osectarg=\z@
+ \@scr@tempswafalse
+ \else
+ \scr@istest#1=\@nil
+ \fi
+ \if@scr@tempswa
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \else
+ \ifcase \scr@osectarg\relax
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \or
+ \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
+ \fi
+ \ifx\scr@ds@tocentry\@empty\else
+ \addsectiontocentry{}{\scr@ds@tocentry}%
+ \fi
+ \addsecmark{\scr@ds@head}%
+}
+\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
+\newkomafont{minisec}{}
+\newcommand\minisec[1]{%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
+ \@afterindentfalse \vskip 1.5ex
\else
- \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@afterindentfalse
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace{1.5ex}%
+ \fi
\fi
+ {\parindent \z@
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}\fi
+ \raggedsection\normalfont\sectfont\nobreak
+ \usekomafont{minisec}#1\par\nobreak}\nobreak%
+ \@afterheading
+}
+\newcommand*{\addsectiontocentry}[2]{%
+ \addtocentrydefault{section}{#1}{#2}%
+}
+\newcommand*{\addsubsectiontocentry}[2]{%
+ \addtocentrydefault{subsection}{#1}{#2}%
+}
+\newcommand*{\addparagraphtocentry}[2]{%
+ \addtocentrydefault{paragraph}{#1}{#2}%
+}
+\newcommand*{\addsubparagraphtocentry}[2]{%
+ \addtocentrydefault{subparagraph}{#1}{#2}%
+}
+\newcounter{section}
+\renewcommand*{\thesection}{\@arabic\c@section}
+\newcommand*\sectionmarkformat{\thesection\autodot\enskip}
+\newcounter{subsection}[section]
+\renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection}
+\newcommand*\subsectionmarkformat{\thesubsection\autodot\enskip}
+\newcounter{subsubsection}[subsection]
+\renewcommand*{\thesubsubsection}{%
+ \thesubsection.\@arabic\c@subsubsection
+}
+\newcounter{paragraph}[subsubsection]
+\renewcommand*{\theparagraph}{\thesubsubsection.\@arabic\c@paragraph}
+\newcounter{subparagraph}[paragraph]
+\renewcommand*{\thesubparagraph}{%
+ \theparagraph.\@arabic\c@subparagraph
+}
+\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
+\renewcommand*{\@seccntformat}[1]{%
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+}
+\newcommand*\addsecmark[1]{%
+ \begingroup
+ \c@secnumdepth=\m@ne
+ \sectionmark{#1}%
+ \endgroup
}
+\newcommand*{\scr@fnt@section}{\size@section}
+\newcommand*{\scr@fnt@subsection}{\size@subsection}
+\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection}
+\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
+\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
+\newkomafont{sectionentry}{\usekomafont{disposition}}
+\newkomafont{sectionentrypagenumber}{}
+\newkomafont{sectionentrydots}{\normalfont}
+\DeclareSectionCommand[%
+ style=section,%
+ level=1,%
+ indent=\z@,%
+ beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,%
+ afterskip=2.3ex \@plus.2ex,%
+ tocindent=0pt,%
+ tocnumwidth=1.5em%
+]{section}
+\DeclareSectionCommand[%
+ style=section,%
+ level=2,%
+ indent=\z@,%
+ beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
+ afterskip=1.5ex \@plus .2ex,%
+ tocindent=1.5em,%
+ tocnumwidth=2.3em%
+]{subsection}
+\DeclareSectionCommand[%
+ style=section,%
+ level=3,%
+ indent=\z@,%
+ beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
+ afterskip=1.5ex \@plus .2ex,%
+ tocindent=3.8em,%
+ tocnumwidth=3.2em%
+]{subsubsection}
+\DeclareSectionCommand[%
+ style=section,%
+ level=4,%
+ indent=\z@,%
+ beforeskip=3.25ex \@plus1ex \@minus.2ex,%
+ afterskip=-1em,%
+ tocindent=7.0em,%
+ tocnumwidth=4.1em%
+]{paragraph}
+\DeclareSectionCommand[%
+ style=section,%
+ level=5,%
+ indent=\scr@parindent,%
+ beforeskip=3.25ex \@plus1ex \@minus .2ex,%
+ afterskip=-1em,%
+ tocindent=10em,%
+ tocnumwidth=5em%
+]{subparagraph}
+\ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\relax
+ \let\scr@subparagraph@sectionindent\parindent
+\else
+ \def\scr@subparagraph@sectionindent{\scr@parindent}%
+\fi
+\newcommand*{\scr@fnt@disposition}{\sectfont}
+\aliaskomafont{sectioning}{disposition}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -3706,7 +4112,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
\renewcommand*{\numberline}[1]{%
\numberline@box{%
\numberline@prefix
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index f5a22cd2751..365de75f479 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,14 +66,14 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package (%
KOMA-Script-independent
basics and keyval usage)]
@@ -199,6 +199,14 @@
}%
}%
}
+\newcommand*{\RelaxFamilyKey}[3][.\@currname.\@currext]{%
+ \scr@ifundefinedorrelax{KV@#2#1@#3}{}{%
+ \expandafter\let\csname KV@#2#1@#3\endcsname\relax
+ }%
+ \scr@ifundefinedorrelax{KV@#2#1@#3@default}{}{%
+ \expandafter\let\csname KV@#2#1@#3@default\endcsname\relax
+ }%
+}
\newcommand*{\FamilyKeyState}{}
\newcommand*{\FamilyKeyStateUnknown}{%
\let\FamilyKeyState\FamilyKeyStateUnknown
@@ -360,9 +368,9 @@
%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -868,6 +876,16 @@
\providecommand*{\ClassInfoNoLine}[2]{%
\ClassInfo{#1}{#2\@gobble}%
}
+\providecommand*\@removefromreset[2]{%
+ {%
+ \expandafter\let\csname c@#1\endcsname\@removefromreset
+ \def\@elt##1{%
+ \expandafter\ifx\csname c@##1\endcsname\@removefromreset
+ \else\noexpand\@elt{##1}\fi
+ }%
+ \expandafter\xdef\csname cl@#2\endcsname{\csname cl@#2\endcsname}%
+ }%
+}
\newcommand*{\FamilyExecuteOptions}[2][.\@currname.\@currext]{%
\@FamilyExecuteOptions[{#1}]{#2}%
}
@@ -1163,7 +1181,17 @@
}%
\let\FamilyElseValues\@empty
}
-\newcommand*{\FamilyCounterKey}[4][.\@currname.\@currext]{%
+\newcommand*{\FamilyCounterKey}[3][.\@currname.\@currext]{%
+ \@ifnextchar [%]
+ {\Family@@Counter@@Key{#1}{#2}{#3}}%
+ {\Family@Counter@Key{#1}{#2}{#3}}%
+}
+\newcommand*{\Family@@Counter@@Key}{}
+\def\Family@@Counter@@Key#1#2#3[#4]#5{%
+ \@ifundefined{c@#5}{\newcounter{#5}}{}%
+ \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetCounter{#2}{#3}{#5}{##1}}%
+}
+\newcommand*{\Family@Counter@Key}[4]{%
\@ifundefined{c@#4}{\newcounter{#4}}{}%
\DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetCounter{#2}{#3}{#4}{##1}}%
}
@@ -1186,18 +1214,30 @@
}%
}%
}
-\newcommand*{\FamilyCounterMacroKey}[4][.\@currname.\@currext]{%
+\newcommand*{\FamilyCounterMacroKey}[3][.\@currname.\@currext]{%
+ \@ifnextchar [%]
+ {\Family@@Counter@@Macro@@Key{#1}{#2}{#3}}%
+ {\Family@Counter@Macro@Key{#1}{#2}{#3}}%
+}
+\newcommand*{\Family@@Counter@@Macro@@Key}{}
+\def\Family@@Counter@@Macro@@Key#1#2#3[#4]#5{%
+ \ifdefined#4\else\let#4\z@\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetCounterMacro{#2}{#3}{#5}{##1}}%
+}
+\newcommand*{\Family@Counter@Macro@Key}[4]{%
\ifdefined#4\else\let#4\z@\fi
\DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetCounterMacro{#2}{#3}{#4}{##1}}%
}
\newcommand*{\FamilySetCounterMacro}[4]{%
\begingroup
- \ifiscount{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
- \ifisdimen{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\@tempcnta=#4\FamilyKeyState\Processed}{%
- \ifisnumexpr{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
- \ifisdimexpr{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
- \ifisinteger{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
+ \ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
+ \ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{%
+ \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyState\Processed}{%
+ \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}{%
@@ -1213,7 +1253,17 @@
\expandafter\expandafter\expandafter\endgroup
\expandafter\def\expandafter#3\expandafter{\the\@tempcnta}%
}
-\newcommand*{\FamilyLengthKey}[4][.\@currname.\@currext]{%
+\newcommand*{\FamilyLengthKey}[3][.\@currname.\@currext]{%
+ \@ifnextchar [%]
+ {\Family@@Length@@Key{#1}{#2}{#3}}%
+ {\Family@Length@Key{#1}{#2}{#3}}%
+}
+\newcommand*{\Family@@Length@@Key}{}
+\def\Family@@Length@@Key#1#2#3[#4]#5{%
+ \ifdefined#5\else\newlength{#5}\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetLength{#2}{#3}{#5}{##1}}%
+}
+\newcommand*{\Family@Length@Key}[4]{%
\ifdefined#4\else\newlength{#4}\fi
\DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetLength{#2}{#3}{#4}{##1}}%
}
@@ -1223,9 +1273,11 @@
\ifisskip{#4}{#3=#4\FamilyKeyState\Processed}{%
\ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
\ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \ifisglue{#4}{#3=#4\FamilyKeyStateProcessed}{%
- \FamilyUnknownKeyValue{#1}{#2}{#4}{%
- length values, counters, lengths, skips, dimens
+ \ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
+ \ifisglue{#4}{#3=#4\FamilyKeyStateProcessed}{%
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ length values, counters, lengths, skips, dimens
+ }%
}%
}%
}%
@@ -1234,20 +1286,38 @@
}%
}%
}
-\newcommand*{\FamilyLengthMacroKey}[4][.\@currname.\@currext]{%
+\newcommand*{\FamilyLengthMacroKey}[3][.\@currname.\@currext]{%
+ \@ifnextchar [%]
+ {\Family@@Length@@Macro@@Key{#1}{#2}{#3}}%
+ {\Family@Length@Macro@Key{#1}{#2}{#3}}%
+}
+\newcommand*{\Family@@Length@@Macro@@Key}{}
+\def\Family@@Length@@Macro@@Key#1#2#3[#4]#5{%
+ \ifdefined#5\else\let#5\z@\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetLengthMacro{#2}{#3}{#5}{##1}}%
+}
+\newcommand*{\Family@Length@Macro@Key}[4]{%
\ifdefined#4\else\let#4\z@\fi
\DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetLengthMacro{#2}{#3}{#4}{##1}}%
}
\newcommand*{\FamilySetLengthMacro}[4]{%
\begingroup
- \ifiscount{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
- \ifisdimen{#4}{\@temskipa=#4\FamilyKeyStateProcessed}{%
- \ifisskip{#4}{\@tempkipa=#4\FamilyKeyState\Processed}{%
- \ifisnumexpr{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
- \ifisdimexpr{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
- \ifisglue{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
- \FamilyUnknownKeyValue{#1}{#2}{#4}{%
- length values, counters, lengths, skips, dimens
+ \ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
+ \ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{%
+ \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyState\Processed}{%
+ \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
+ }%
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index dac9d2fd0a2..448dba47626 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-sections.dtx (with options: `class,book,prepare')
%% scrkernel-compatibility.dtx (with options: `class,book,option')
%% scrkernel-miscellaneous.dtx (with options: `class,book,option')
%% scrkernel-language.dtx (with options: `class,book,option')
@@ -72,7 +73,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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -94,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -103,21 +104,70 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
+%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
\RequirePackage{tocbasic}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 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-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+\newif\if@openright
+\@openrighttrue
+\newcommand*{\scr@dotchangeatdocument}[1]{%
+ \ClassError{\KOMAClassName}{%
+ change of end dot feature after \string\begin{document}%
+ }{%
+ You've tried to set `numbers=#1' after \string\begin{document},\MessageBreak
+ but this option is only allowed at the document preamble.\MessageBreak
+ See KOMA-Script manual for more information about.%
+ }%
+}
+\newcommand*{\scr@osectarg}{0}
+\newcommand*{\scr@activate@xsection}[1]{%
+ \renewcommand*{\scr@osectarg}{#1}%
+}
+\newif\if@altsecnumformat\@altsecnumformatfalse
+\newif\if@autodot
+\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
+\renewcommand*{\@autodotfalse}{\global\let\if@autodot\iffalse}
+\@autodotfalse
+\newcommand*{\scr@altsecnumhook}{}
+\AtBeginDocument{\scr@altsecnumhook}
+\newcommand*{\scr@altsecnumhooktrue}{%
+ \@altsecnumformattrue\global\let\@altsecnumformatfalse\@altsecnumformattrue
+}
+\newcommand*{\scr@altsecnumhookfalse}{%
+ \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse
+}
+\newcommand*{\size@part}{}
+\newcommand*{\size@partnumber}{}
+\newcommand*{\size@chapter}{}
+\newcommand*{\size@chapterprefix}{\size@chapter}
+\newcommand*{\scr@chapter@sectionbeforeskip}{\z@}
+\let\scr@chapter@sectionbeforeskip\z@
+\newcommand*{\scr@chapter@sectionafterskip}{\z@}
+\let\scr@chapter@sectionafterskip\z@
+\newcommand*{\scr@chapter@sectionindent}{\z@}
+\let\scr@chapter@sectionindent\z@
+\newcommand*{\scr@chapter@style}{}
+\newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}
+\newcommand*{\chapterheadendvskip}{\vskip\@tempskipa}
+\newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}
+\newcommand*{\size@section}{}
+\newcommand*{\size@subsection}{}
+\newcommand*{\size@subsubsection}{}
+\newcommand*{\size@paragraph}{}
+\newcommand*{\size@subparagraph}{}
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -223,6 +273,7 @@
\@namedef{scr@v@3.13}{12}
\@namedef{scr@v@3.13a}{13}
\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@last}{14}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
@@ -240,7 +291,7 @@
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -376,7 +427,7 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -509,7 +560,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -528,9 +579,7 @@
}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
-\newif\if@openright
-\@openrighttrue
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
{any}{0},%
@@ -552,15 +601,6 @@
}
\KOMA@DeclareStandardOption{openright}{open=right}
\KOMA@DeclareStandardOption{openany}{open=any}
-\newcommand*{\scr@dotchangeatdocument}[1]{%
- \ClassError{\KOMAClassName}{%
- change of end dot feature after \string\begin{document}%
- }{%
- You've tried to set `numbers=#1' after \string\begin{document},\MessageBreak
- but this option is only allowed at the document preamble.\MessageBreak
- See KOMA-Script manual for more information about.%
- }%
-}
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
{autoendperiod}{0},{autoenddot}{0},{auto}{0},%
@@ -585,42 +625,30 @@
\fi
\fi
}
-\newcommand*{\scr@altsecnumhook}{}
-\AtBeginDocument{\scr@altsecnumhook}
-\newcommand*{\scr@altsecnumhooktrue}{%
- \@altsecnumformattrue\global\let\@altsecnumformatfalse\@altsecnumformattrue
-}
-\newcommand*{\scr@altsecnumhookfalse}{%
- \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse
-}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
-\newif\if@chapterprefix\@chapterprefixfalse
\KOMA@ifkey{chapterprefix}{@chapterprefix}
\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
\KOMA@key{appendixprefix}[true]{%
\KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
- \def\appendixmore{\@chapterprefixtrue}%
+ \@ifundefined{appendixmore}{%
+ \def\appendixmore{\@chapterprefixtrue}%
+ }{%
+ \l@addto@macro\appendixmore{\@chapterprefixtrue}%
+ }%
\else
- \def\appendixmore{\@chapterprefixfalse}%
+ \@ifundefined{appendixmore}{%
+ \def\appendixmore{\@chapterprefixfalse}%
+ }{%
+ \l@addto@macro\appendixmore{\@chapterprefixfalse}%
+ }%
\fi
\fi
}
\KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false}
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-\newcommand*{\size@part}{}
-\newcommand*{\size@partnumber}{}
-\newcommand*{\size@chapter}{}
-\newcommand*{\size@chapterprefix}{\size@chapter}
-\newcommand*{\size@section}{}
-\newcommand*{\size@subsection}{}
-\newcommand*{\size@subsubsection}{}
-\newcommand*{\size@paragraph}{}
-\newcommand*{\size@subparagraph}{}
-\newcommand*{\chapterheadstartvskip}{}
-\newcommand*{\chapterheadendvskip}{}
+\KOMA@ifkey{chapterentrydots}{@chapterentrywithdots}
\KOMA@key{headings}{%
\KOMA@set@ncmdkey{headings}{@tempa}{%
{big}{0},%
@@ -644,13 +672,16 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2.3\baselineskip}%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{3.3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{%
+ 1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip
}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \vspace{1.725\baselineskip
- \@plus .115\baselineskip \@minus .192\baselineskip}%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \else\vskip\@tempskipa\fi
}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\huge}%
@@ -661,13 +692,16 @@
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
\or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2\baselineskip}%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{%
+ 1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip
}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \vspace{1.5\baselineskip
- \@plus .1\baselineskip \@minus .167\baselineskip}%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \else\vskip\@tempskipa\fi
}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
\renewcommand*{\size@part}{\huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\LARGE}%
@@ -678,13 +712,16 @@
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
\or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{1.8\baselineskip}%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{2.8\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{%
+ 1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip
}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \vspace{1.35\baselineskip
- \@plus 0.09\baselineskip \@minus .15\baselineskip}%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \else\vskip\@tempskipa\fi
}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
\renewcommand*{\size@part}{\LARGE}%
\renewcommand*{\size@partnumber}{\LARGE}%
\renewcommand*{\size@chapter}{\Large}%
@@ -715,12 +752,11 @@
\or
\scr@activate@xsection{1}%
\or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{50\p@}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{40\p@}%
- }%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{50\p@}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{40\p@}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
+ \renewcommand*{\chapterheadendvskip}{\vskip\@tempskipa}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip 20\p@}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\Huge}%
@@ -738,10 +774,6 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-\newcommand*{\scr@osectarg}{0}
-\newcommand*{\scr@activate@xsection}[1]{%
- \renewcommand*{\scr@osectarg}{#1}%
-}
%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
@@ -957,7 +989,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -973,7 +1005,9 @@
{flat}{8},{left}{8},%
{graduated}{9},{indent}{9},{indented}{9},%
{indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
- {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11}%
+ {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11},%
+ {chapterentrywithdots}{12},{chapterentrydotfill}{12},
+ {chapterentrywithoutdots}{13},{chapterentryfill}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
@@ -1000,6 +1034,10 @@
\setuptoc{toc}{numberline}%
\or
\unsettoc{toc}{numberline}%
+ \or
+ \KOMAoptions{chapterentrydots=true}%
+ \or
+ \KOMAoptions{chapterentrydots=false}%
\fi
\fi
}
@@ -1285,8 +1323,8 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -1769,7 +1807,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1897,7 +1935,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2202,46 +2240,30 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
-\newif\if@mainmatter\@mainmattertrue
-\newcommand*\frontmatter{%
- \if@twoside\cleardoubleoddpage\else\clearpage\fi
- \@mainmatterfalse\pagenumbering{roman}%
-}
-\newcommand*\mainmatter{%
- \if@twoside\cleardoubleoddpage\else\clearpage\fi
- \@mainmattertrue\pagenumbering{arabic}%
-}
-\newcommand*\backmatter{%
- \if@openright\cleardoubleoddpage\else\clearpage\fi\@mainmatterfalse
-}
-\newcommand*\appendix{\par%
- \setcounter{chapter}{0}%
- \setcounter{section}{0}%
- \gdef\@chapapp{\appendixname}%
- \gdef\thechapter{\@Alph\c@chapter}%
- \csname appendixmore\endcsname
-}
-\newcommand*\chaptermark[1]{}
-\newcommand*\addchapmark[1]{%
- \begingroup
- \expandafter\let\csname if@mainmatter\expandafter\endcsname
- \csname iffalse\endcsname
- \c@secnumdepth=\m@ne
- \chaptermark{#1}%
- \endgroup
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+\setcounter{secnumdepth}{2}
+\newcommand*{\ifnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@secondoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }%
}
-\newcommand*\addsecmark[1]{%
- \begingroup
- \c@secnumdepth=\m@ne
- \sectionmark{#1}%
- \endgroup
+\newcommand*{\ifunnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@firstoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
}
-\newif\if@altsecnumformat\@altsecnumformatfalse
-\newif\if@autodot
-\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
-\renewcommand*{\@autodotfalse}{\global\let\if@autodot\iffalse}
-\@autodotfalse
\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup%
\expandafter\@@maybeautodot #1\@stop\endgroup\fi
}
@@ -2260,6 +2282,7 @@
\fi
\@@maybeautodot
}
+\newcommand*\autodot{\if@altsecnumformat.\fi}
\newcommand*{\scr@saved@startsection}[6]{%
\if@noskipsec \leavevmode \fi
\par
@@ -2482,107 +2505,544 @@
\if@autodot\if@filesw\immediate\write\@mainaux{%
\string\global\string\@altsecnumformattrue}%
\fi\fi}
-\newcommand*\autodot{\if@altsecnumformat.\fi}
-\setcounter{secnumdepth}{2}
-\newcommand*{\partnumdepth}{%
- \m@ne
+\newcommand*{\raggedsection}{}
+\let\raggedsection\raggedright
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.dsc]{KOMAarg}
+\newcommand*{\DeclareSectionCommand}[2][]{%
+ \edef\reserved@a{%
+ \noexpand\FamilyStringKey[.dsc]{KOMAarg}{style}{%
+ \expandafter\noexpand\csname scr@#2@style\endcsname
+ }%
+ }\reserved@a
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
+ }{%
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ }%
+ \scr@ifundefinedorrelax{scr@local@leveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
+ \expandafter\noexpand\csname #2numdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@leveloffset\relax}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
+ }%
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{indent}{%
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{beforeskip}{%
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{afterskip}{%
+ \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{font}{%
+ \noexpand\IfExistskomafont{#2}{%
+ \noexpand\setkomafont
+ }{%
+ \noexpand\newkomafont
+ }{#2}{####1}%
+ \noexpand\FamilyKeyStateProcessed
+ }%
+ }\reserved@a
+ \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 #2tocdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname #2tocdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@tocleveloffset\relax}%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
+ }%
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocindent}{%
+ \expandafter\noexpand\csname scr@#2@tocindent\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocnumwidth}{%
+ \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname}%
+ }\reserved@a
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \begingroup
+ \scr@ifundefinedorrelax{#2numdepth}{%
+ \scr@declaresectioncommanderror{#2}{section level}{level}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionindent}{%
+ \scr@declaresectioncommanderror{#2}{section indent}{indent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionbeforeskip}{%
+ \scr@declaresectioncommanderror{#2}{before section skip}{beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionafterskip}{%
+ \scr@declaresectioncommanderror{#2}{after section skip}{afterskip}%
+ }{}%
+ \IfExistskomafont{#2}{}{%
+ \scr@declaresectioncommanderror{#2}{font}{font}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@tocindent}{%
+ \scr@declaresectioncommanderror{#2}{toc entry indent}{tocindent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@tocnumwidth}{%
+ \scr@declaresectioncommanderror{#2}{toc entry number
+ width}{tocnumwidth}%
+ }{}%
+ \endgroup
+ \@firstofone{%
+ \@ifundefined{c@#2}{\newcounter{#2}}{}%
+ \ifx\scr@local@counterwithin\relax
+ \else\ifx\scr@local@counterwithin\@empty
+ \@namedef{the#2}{\arabic{#2}}%
+ \else
+ \@removefromreset{#2}{\scr@local@counterwithin}%
+ \@addtoreset{#2}{\scr@local@counterwithin}%
+ \expandafter\def\csname the#2\expandafter\endcsname{%
+ \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
+ \fi
+ \fi
+ \@ifundefined{#2format}{%
+ \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \ifstr{\csname scr@#2@style\endcsname}{}{%
+ \ClassInfo{\KOMAClassName}{%
+ not defining `\string\csname #2\endcsname' due to\MessageBreak
+ empty section style%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{scr@#2@style}{%
+ \ClassWarning{\KOMAClassName}{using default section style}%
+ \@namedef{scr@#2@style}{section}%
+ }{}%
+ \expandafter\edef\csname #2\endcsname{%
+ \noexpand\scr@ifundefinedorrelax{%
+ scr@start\csname scr@#2@style\endcsname}{%
+ \noexpand\ClassError{\noexpand\KOMAClassName}{%
+ section style `\csname scr@#2@style\endcsname' not defined}{%
+ A not yet defined section style `\csname scr@#2@style\endcsname'
+ has been setup for\MessageBreak
+ `\expandafter\string\csname #2\endcsname'. You should either setup
+ another style\MessageBreak
+ or define the style.\MessageBreak
+ If you'll continue, style `section' will be used as an emergency
+ fallback.%
+ }%
+ \noexpand\def\expandafter\noexpand\csname scr@#2@style\endcsname
+ {section}%
+ }{}%
+ \expandafter\noexpand
+ \csname scr@start\csname scr@#2@style\endcsname\endcsname
+ {#2}%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname{%
+ \noexpand\ifdim\noexpand\glueexpr
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
+ <\noexpand\z@
+ \unexpanded{%
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
+ }%
+ \noexpand\fi
+ \unexpanded{%
+ \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ }%
+ }%
+ }%
+ }%
+ \@ifundefined{DeclareSectionNumberDepth}{%
+ \@ifundefined{#2markformat}{%
+ \@namedef{#2markformat}{\csname the#2\endcsname\autodot\endskip}%
+ }{}%
+ \@ifundefined{#2mark}{%
+ \expandafter\let\csname #2mark\endcsname\@gobble
+ }{}%
+ }{%
+ \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{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
+ }%
+ }{}%
+ }%
}
-\newcommand*{\chapternumdepth}{\z@}
-\newcommand*{\sectionnumdepth}{\@ne}
-\newcommand*{\subsectionnumdepth}{\tw@}
-\newcommand*{\subsubsectionnumdepth}{\thr@@}
-\newcommand*{\paragraphnumdepth}{4}
-\newcommand*{\subparagraphnumdepth}{5}
-\newcommand*{\ifnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@secondoftwo
+\newcommand*{\scr@declaresectioncommanderror}[3]{%
+ \ClassError{\KOMAClassName}{%
+ #2 of \expandafter\string\csname #1\endcsname\space unknown%
}{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@secondoftwo
+ Please use option `#3' to declare the #2.\MessageBreak
+ If you'll continue, declaration will be ignored%
+ }%
+ \aftergroup\@gobbletwo
+}
+\newcommand*{\DeclareNewSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname #1\endcsname` already defined%
+ }{%
+ You've tried to define the section command `\expandafter\string\csname
+ #1\endcsname` newly,\MessageBreak
+ but a command, token, box or length with this name already
+ exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be irgnored.%
+ }%
+ }%
+}
+\newcommand*{\RedeclareSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname #1\endcsname` not defined%
+ }{%
+ You've tried to re-define the section command `\expandafter\string\csname
+ #1\endcsname`,\MessageBreak
+ but a command with this name does not exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\DeclareNewSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be irgnored.%
+ }%
+ }{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }%
+}
+\newcommand*{\ProvideSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }{%
+ \ClassInfo{\KOMAClassName}{%
+ \string\ProvideSectionCommand{#1} ignored%
+ }%
+ }%
+}
+\newcommand*{\DeclareSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\DeclareNewSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname\reserved@a\endcsname` already
+ defined%
+ }{%
+ You've tried to define the section command
+ `\expandafter\string\csname\reserved@a\endcsname` newly,\MessageBreak
+ but a command, token, box or length with this name already
+ exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ Nevertheless, if you'll continue, the command will be defined.%
+ }%
+ }%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\RedeclareSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname\reserved@a\endcsname` not defined%
+ }{%
+ You've tried to re-define the section command
+ `\expandafter\string\csname\reserved@a\endcsname`,\MessageBreak
+ but a command with this name does not exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\DeclareNewSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ Nevertheless, if you'll continue, the command will be defined.%
+ }%
+ }{}%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\ProvideSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{}%
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \FamilySetCounterMacro{KOMAarg}{level}{\reserved@b}{##1}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{indent}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{beforeskip}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{afterskip}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{font}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{counterwidthin}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{}%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ }%
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\use@preamble}[1]{%
+ \@ifundefined{#1@preamble}{}{%
+ \@nameuse{#1@preamble}%
+ \global\expandafter\let\csname#1@preamble\endcsname=\relax
+ }%
+}
+\newcommand*{\set@preamble}[1]{%
+ \@ifnextchar [%]
+ {\set@@preamble{#1}}{\set@@@preamble{#1}[][\hsize]}%
+}
+\newcommand*{\set@@preamble}{}
+\def\set@@preamble#1[#2]{%
+ \@ifnextchar [%]
+ {\set@@@preamble{#1}[{#2}]}{\set@@@preamble{#1}[{#2}][\hsize]}%
+}
+\newcommand{\set@@@preamble}{}
+\long\def\set@@@preamble#1[#2][#3]#4{%
+ \begingroup
+ \def\prmbl@pos{#2}\let\prmbl@hpos\relax\let\prmbl@vpos\relax
+ \expandafter \@tfor \expandafter \@tempa
+ \expandafter :\expandafter =\prmbl@pos
+ \do{%
+ \if \@tempa l%
+ \set@preamble@hpos{0}{#2}%
+ \fi%
+ \if \@tempa c%
+ \set@preamble@hpos{1}{#2}%
+ \fi%
+ \if \@tempa r%
+ \set@preamble@hpos{2}{#2}%
+ \fi%
+ \if \@tempa u%
+ \set@preamble@vpos{0}{#2}%
+ \fi%
+ \if \@tempa b%
+ \set@preamble@vpos{0}{#2}%
+ \fi
+ \if \@tempa o%
+ \set@preamble@vpos{1}{#2}%
+ \fi%
+ \if \@tempa t%
+ \set@preamble@vpos{1}{#2}%
+ \fi
+ }%
+ \@ifundefined{prmbl@hpos}{\def\prmbl@hpos{0}}{}%
+ \@ifundefined{prmbl@vpos}{\def\prmbl@vpos{0}}{}%
+ \ifcase\prmbl@hpos
+ \ifcase\prmbl@vpos
+ \set@@@@preamble{#1@u}{t}{#3}{}{\hfil}{#4}%
+ \else
+ \set@@@@preamble{#1@o}{b}{#3}{}{\hfil}{#4}%
+ \fi
+ \or
+ \ifcase\prmbl@vpos
+ \set@@@@preamble{#1@u}{t}{#3}{\hfil}{\hfil}{#4}%
+ \else
+ \set@@@@preamble{#1@o}{b}{#3}{\hfil}{\hfil}{#4}%
+ \fi
\else
- \expandafter\@firstoftwo
+ \ifcase\prmbl@vpos
+ \set@@@@preamble{#1@u}{t}{#3}{\hfil}{}{#4}%
+ \else
+ \set@@@@preamble{#1@o}{b}{#3}{\hfil}{}{#4}%
+ \fi
\fi
+ \endgroup
+}
+\newcommand{\set@@@@preamble}[6]{%
+ \expandafter\gdef\csname #1@preamble\endcsname{%
+ \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
}%
}
-\newcommand*{\ifunnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@firstoftwo
+\newcommand*{\set@preamble@hpos}[2]{%
+ \@ifundefined{prbml@hpos}{%
+ \def\prmbl@hpos{#1}%
}{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
+ \ifnum \prmbl@hpos=0\relax\else%
+ \ClassError{\KOMAClassName}{%
+ inconsistent hpos options%
+ }{%
+ You've said `#2' as position option. But you have
+ to\MessageBreak
+ use only one of `l', `r', or `c' not two of
+ these.\MessageBreak
+ If you'll continue only first hpos option will be
+ used%
+ }%
\fi
}%
}
-\newcounter{part}
-\renewcommand*{\thepart}{\@Roman\c@part}
-\newcommand*{\partformat}{\partname~\thepart\autodot}
-\newcounter{chapter}
-\renewcommand*{\thechapter}{\@arabic\c@chapter}
-\newcommand*{\chapterformat}{%
- \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot\enskip}%
+\newcommand*{\set@preamble@vpos}[2]{%
+ \@ifundefined{prbml@vpos}{%
+ \def\prmbl@vpos{#1}%
+ }{%
+ \ifnum \prmbl@vpos=0\relax\else%
+ \ClassError{\KOMAClassName}{%
+ inconsistent vpos options%
+ }{%
+ You've said `#2' as position option. But you have
+ to\MessageBreak
+ use only one of `t', `o', `b', or `u' not two of
+ these.\MessageBreak
+ If you'll continue only first vpos option will be
+ used%
+ }%
+ \fi
+ }%
}
-\newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }%
- \thechapter\autodot\enskip}
-\newcounter{section}[chapter]
-\renewcommand*\thesection{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d} % the space before this
- % comment should be \relax but hyperref has a
- % not documented problem with \relax
- \if@mainmatter\thechapter.\fi
+\newcommand*{\bprot@dottedtocline}[5]{%
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \ifnum #1>\c@tocdepth \else
+ \begingroup
+ \@tempcnta 20010
+ \advance \@tempcnta by -#1
+ \ifnum \@tempcnta>\lastpenalty
+ \endgroup
+ \addpenalty{\@lowpenalty}%
+ \else
+ \endgroup
+ \fi
+ \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
+ \@tempcnta 20009
+ \advance \@tempcnta by -#1
+ \penalty\@tempcnta
+ \fi
\else
- \thechapter.%
+ \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
- \@arabic\c@section
}
-\newcommand*\sectionmarkformat{\thesection\autodot\enskip}
-\newcounter{subsection}[section]
-\renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection}
-\newcounter{subsubsection}[subsection]
-\renewcommand*{\thesubsubsection}{%
- \thesubsection.\@arabic\c@subsubsection
+\newif\if@mainmatter\@mainmattertrue
+\newcommand*\frontmatter{%
+ \if@twoside\cleardoubleoddpage\else\clearpage\fi
+ \@mainmatterfalse\pagenumbering{roman}%
}
-\newcounter{paragraph}[subsubsection]
-\renewcommand*{\theparagraph}{\thesubsubsection.\@arabic\c@paragraph}
-\newcounter{subparagraph}[paragraph]
-\renewcommand*{\thesubparagraph}{%
- \theparagraph.\@arabic\c@subparagraph
+\newcommand*\mainmatter{%
+ \if@twoside\cleardoubleoddpage\else\clearpage\fi
+ \@mainmattertrue\pagenumbering{arabic}%
}
-\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
-\renewcommand*{\@seccntformat}[1]{%
- \protect\othersectionlevelsformat{#1}{%
- \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+\newcommand*\backmatter{%
+ \if@openright\cleardoubleoddpage\else\clearpage\fi\@mainmatterfalse
}
-\newcommand*\partname{Part}
-\newcommand*\chaptername{Chapter}
-\newcommand*\appendixname{Appendix}
-\newcommand*{\chapappifprefix}[1][]{%
- \ClassWarning{\KOMAClassName}{%
- Please don't use obsolete command
- \string\chapappifprefix.\MessageBreak
- The new command \string\chapappifchapterprefix\space has
- an\MessageBreak
- obligatory instead of an optional argument. Use that\MessageBreak
- new command%
- }%
- \if@chapterprefix\chapapp#1\fi
+\newcommand*\appendix{\par%
+ \setcounter{chapter}{0}%
+ \setcounter{section}{0}%
+ \gdef\@chapapp{\appendixname}%
+ \gdef\thechapter{\@Alph\c@chapter}%
+ \csname appendixmore\endcsname
}
-\newcommand*{\chapappifchapterprefix}[1]{%
- \if@chapterprefix\chapapp#1\fi
+\newcommand*{\partnumdepth}{%
+ \m@ne
+}
+\newcommand*{\scr@part@sectionbeforeskip}{%
+ \z@ \@plus 1fil + \baselineskip
}
-\newcommand*{\chapapp}{\@chapapp}
-\newcommand*\@chapapp{\chaptername}
\newcommand*{\partheadstartvskip}{%
- \null\vfil
+ \null\vskip-\baselineskip\vskip\@tempskipa
}
\newcommand*{\partheadmidvskip}{%
\par\nobreak
\vskip 20\p@
}
+\newcommand*{\scr@part@sectionafterskip}{%
+ \z@ \@plus 1fil
+}
\newcommand*{\partheadendvskip}{%
- \vfil\newpage
+ \vskip\@tempskipa\newpage
}
+\newcommand*{\scr@part@sectionindent}{\z@}
+\newcommand*{\scr@part@style}{}
\newcommand*{\partheademptypage}{%
\if@twoside\if@openright
\null%
@@ -2598,6 +3058,8 @@
\else
\@tempswafalse
\fi
+ \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
@@ -2663,12 +3125,19 @@
\@endpart
}
\newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}%
+ \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\partheademptypage
\if@tempswa
\twocolumn
\fi
}
+\newcommand*{\setpartpreamble}{\set@preamble{part}}
+\newcommand*{\part@u@preamble}{}
+\let\part@u@preamble\relax
+\newcommand*{\part@o@preamble}{}
+\let\part@o@preamble\relax
\newcommand*{\addparttocentry}[2]{%
\addtocentrydefault{part}{#1}{#2}%
}
@@ -2722,6 +3191,50 @@
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
+\newcommand*{\parttocdepth}{\m@ne}
+\let\parttocdepth\m@ne
+\newcommand*{\scr@part@tocindent}{\z@}
+\let\scr@part@tocindent\z@
+\newcommand*{\scr@part@tocnumwidth}{2em}
+\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
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \endgroup
+ \penalty20010
+ \else
+ \penalty\@highpenalty
+ \endgroup
+ \fi
+ \fi
+}
+\newcounter{part}
+\renewcommand*{\thepart}{\@Roman\c@part}
+\newcommand*{\partformat}{\partname~\thepart\autodot}
+\newcommand*\partname{Part}
+\newcommand*{\raggedpart}{}
+\let\raggedpart\centering
+\newcommand*{\scr@fnt@part}{\size@part}
+\newcommand*{\scr@fnt@partnumber}{\size@partnumber}
+\newkomafont{partentry}{\usekomafont{disposition}\large}
+\newkomafont{partentrypagenumber}{}
+\newcommand*{\chapternumdepth}{\z@}
\newif\if@at@twocolumn
\newcommand*\scr@topnewpage{}
\let\scr@topnewpage\@topnewpage
@@ -2729,17 +3242,32 @@
\@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse
}
\newcommand*{\use@chapter@o@preamble}{%
- {\settoheight{\@tempdima}{\vbox{\chapterheadstartvskip}}%
- \settodepth{\@tempdimb}{\vbox{\chapterheadstartvskip}}%
+ {%
+ \settoheight{\@tempdima}{%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \vbox{\chapterheadstartvskip}%
+ }%
+ \settodepth{\@tempdimb}{%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \vbox{\chapterheadstartvskip}%
+ }%
\addtolength{\@tempdima}{\@tempdimb}%
- \setbox0\vbox{\use@preamble{chapter@o}%
- \vskip-\parskip}%
+ \setbox0\vbox{%
+ \vskip-\ht\strutbox
+ \use@preamble{chapter@o}%
+ \vskip\baselineskip
+ }%
\setlength{\@tempdimb}{\ht0}%
\addtolength{\@tempdimb}{\dp0}%
\vbox to \z@{%
- \vbox to \@tempdima{\vfill\box0}%
- \vskip-\@tempdima%
+ \vbox to \@tempdima{%
+ \vfill
+ \unvbox0
}%
+ \vss
+ }\vskip-\parskip\vskip-\baselineskip
\ifdim \@tempdimb>\@tempdima%
\addtolength{\@tempdimb}{-\@tempdima}%
\ClassWarning{\KOMAClassName}{%
@@ -2793,6 +3321,12 @@
\addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
\fi
\else
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.15}\relax\else
+ \begingroup
+ \let\@elt\@stpelt
+ \csname cl@chapter\endcsname
+ \endgroup
+ \fi
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{}{\scr@ds@tocentry}%
\fi
@@ -2828,35 +3362,55 @@
\newcommand*{\@makechapterhead}[1]{%
\use@chapter@o@preamble
\@@makechapterhead{#1}%
- \use@preamble{chapter@u}\nobreak
+ \use@preamble{chapter@u}%
}
-\newcommand*{\@@makechapterhead}[1]{\chapterheadstartvskip
+\newcommand*{\@@makechapterhead}[1]{%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \normalfont\sectfont\nobreak\size@chapter{}%
+ \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}%
+ \if@mainmatter
+ \def\IfUseNumber{\ifnumbered{chapter}}%
+ \else\let\IfUseNumber\@secondoftwo\fi
\if@chapterprefix
- \let\@tempa\raggedsection
+ \raggedchapter
+ \let\IfUsePrefixLine\@firstoftwo
+ \let\@tempa\@firstofone
\else
+ \let\IfUsePrefixLine\@secondoftwo
\let\@tempa\@hangfrom
\fi
\@tempa{%
- \ifnumbered{chapter}{%
- \if@mainmatter
- \if@chapterprefix
- \expandafter\size@chapterprefix
- \else
- \expandafter\size@chapter
- \fi
- {\chapterformat}%
- \if@chapterprefix
- \size@chapterprefix{}\endgraf\nobreak\vskip.5\baselineskip
- \fi
- \fi
+ \IfUseNumber{%
+ \usekomafont{chapter}{%
+ \IfUsePrefixLine{%
+ {\usekomafont{chapterprefix}{%
+ \chapterformat\chapterheadmidvskip
+ }}%
+ }{%
+ \chapterformat
+ }%
+ }%
}{}%
}%
- {\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}%
- \nobreak\chapterheadendvskip
+ {%
+ \IfUsePrefixLine{}{\raggedchapter}%
+ \interlinepenalty \@M
+ \usekomafont{chapter}{#1}\par
+ }%
+ }%
+ \nobreak\par\nobreak
+ \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadendvskip
}
+\newcommand*{\setchapterpreamble}{\set@preamble{chapter}}
+\newcommand*{\chapter@u@preamble}{}
+\let\chapter@u@preamble\relax
+\newcommand*{\chapter@o@preamble}{}
+\let\chapter@o@preamble\relax
\newcommand*{\addchaptertocentry}[2]{%
\addtocentrydefault{chapter}{#1}{#2}%
\if@chaptertolists
@@ -2881,16 +3435,23 @@
\fi
}
\newcommand*{\@@makeschapterhead}[1]{%
- \chapterheadstartvskip%
- {\normalfont\sectfont\nobreak\size@chapter{}%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadstartvskip
+ {%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \raggedsection \interlinepenalty \@M \size@chapter{#1}\par}%
- \nobreak\chapterheadendvskip%
+ \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}%
+ \raggedchapter \interlinepenalty \@M \usekomafont{chapter}{#1}\par
+ }%
+ \nobreak\par\nobreak
+ \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadendvskip%
}
\newcommand*{\@makeschapterhead}[1]{%
\use@chapter@o@preamble
\@@makeschapterhead{#1}%
- \use@preamble{chapter@u}\nobreak
+ \use@preamble{chapter@u}%
}
\newcommand\addchap{%
\if@openright\cleardoublepage\else\clearpage\fi
@@ -2947,6 +3508,96 @@
causing \string\addchap\space to behave strange.\MessageBreak%
Please update hyperref to at least version
6.71b}}}
+\newcommand*{\chaptertocdepth}{\z@}
+\let\chaptertocdepth\z@
+\newcommand*{\scr@chapter@tocindent}{\z@}
+\let\scr@chapter@tocindent\z@
+\newcommand*{\scr@chapter@tocnumwidth}{1.5em}
+\newcommand*\l@chapter[2]{%
+ \ifnum \c@tocdepth <\chaptertocdepth \else
+ \ifnum \lastpenalty<20010
+ \addpenalty{-\@highpenalty}%
+ \fi
+ \ifnum \scr@compatibility<\@nameuse{scr@v@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
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \endgroup
+ \penalty20009
+ \else
+ \penalty\@highpenalty
+ \endgroup
+ \fi
+ \fi
+}
+\newcommand*{\raggedchapterentry}{}
+\newcommand*{\l@chapteratlist}{\l@chapter}
+\newcounter{chapter}
+\renewcommand*{\thechapter}{\@arabic\c@chapter}
+\newcommand*{\chapterformat}{%
+ \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot\enskip}%
+}
+\newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }%
+ \thechapter\autodot\enskip}
+\newcommand*\chaptername{Chapter}
+\newcommand*\appendixname{Appendix}
+\newcommand*{\chapappifprefix}[1][]{%
+ \ClassWarning{\KOMAClassName}{%
+ Please don't use obsolete command
+ \string\chapappifprefix.\MessageBreak
+ The new command \string\chapappifchapterprefix\space has
+ an\MessageBreak
+ obligatory instead of an optional argument. Use that\MessageBreak
+ new command%
+ }%
+ \if@chapterprefix\chapapp#1\fi
+}
+\newcommand*{\chapappifchapterprefix}[1]{%
+ \if@chapterprefix\chapapp#1\fi
+}
+\newcommand*{\chapapp}{\@chapapp}
+\newcommand*\@chapapp{\chaptername}
+\newcommand*\chaptermark[1]{}
+\newcommand*\addchapmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=\m@ne
+ \chaptermark{#1}%
+ \endgroup
+}
+\newcommand*{\raggedchapter}{\raggedsection}
+\newcommand*{\scr@fnt@chapter}{\size@chapter}
+\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix}
+\newkomafont{chapterentry}{\usekomafont{disposition}}
+\newkomafont{chapterentrypagenumber}{}
+\newkomafont{chapterentrydots}{\normalfont}
\newcommand*\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
\def\@addsec[#1]#2{\section*{#2}%
@@ -2974,56 +3625,6 @@
\addsecmark{\scr@ds@head}%
}
\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
-\newcommand*{\addsectiontocentry}[2]{%
- \addtocentrydefault{section}{#1}{#2}%
-}
-\newcommand*{\addsubsectiontocentry}[2]{%
- \addtocentrydefault{subsection}{#1}{#2}%
-}
-\newcommand*{\addparagraphtocentry}[2]{%
- \addtocentrydefault{paragraph}{#1}{#2}%
-}
-\newcommand*{\addsubparagraphtocentry}[2]{%
- \addtocentrydefault{subparagraph}{#1}{#2}%
-}
-\newcommand\section{%
- \scr@startsection{section}{\sectionnumdepth}{\z@}%
- {-3.5ex \@plus -1ex \@minus -.2ex}%
- {2.3ex \@plus.2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@section}%
-}
-\newcommand\subsection{%
- \scr@startsection{subsection}{\subsectionnumdepth}{\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@subsection
- }%
-}
-\newcommand\subsubsection{%
- \scr@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@subsubsection
- }%
-}
-\newcommand\paragraph{%
- \scr@startsection{paragraph}{\paragraphnumdepth}{\z@}%
- {3.25ex \@plus1ex \@minus.2ex}%
- {-1em}%
- {\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
-}
-\newcommand\subparagraph{%
- \scr@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
- {3.25ex \@plus1ex \@minus .2ex}%
- {-1em}%
- {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
-}
\newkomafont{minisec}{}
\newcommand\minisec[1]{%
\ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
@@ -3045,231 +3646,110 @@
\usekomafont{minisec}#1\par\nobreak}\nobreak%
\@afterheading
}
-\newcommand*{\raggedsection}{}
-\let\raggedsection\raggedright
-\newcommand*{\raggedpart}{}
-\let\raggedpart\centering
-\newkomafont{partentry}{\usekomafont{disposition}\large}
-\newkomafont{partentrypagenumber}{}
-\newkomafont{chapterentry}{\usekomafont{disposition}}
-\newkomafont{chapterentrypagenumber}{}
-\newcommand*{\scr@fnt@disposition}{\sectfont}
-\aliaskomafont{sectioning}{disposition}
-\newcommand*{\scr@fnt@part}{\size@part}
-\newcommand*{\scr@fnt@partnumber}{\size@partnumber}
-\newcommand*{\scr@fnt@chapter}{\size@chapter}
-\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix}
-\newcommand*{\scr@fnt@section}{\size@section}
-\newcommand*{\scr@fnt@subsection}{\size@subsection}
-\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection}
-\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
-\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
-\newcommand*{\use@preamble}[1]{%
- \@ifundefined{#1@preamble}{}{%
- \@nameuse{#1@preamble}%
- \global\expandafter\let\csname#1@preamble\endcsname=\relax
- }%
-}
-\newcommand*{\set@preamble}[1]{%
- \@ifnextchar [%]
- {\set@@preamble{#1}}{\set@@@preamble{#1}[][\hsize]}%
+\newcommand*{\addsectiontocentry}[2]{%
+ \addtocentrydefault{section}{#1}{#2}%
}
-\newcommand*{\set@@preamble}{}
-\def\set@@preamble#1[#2]{%
- \@ifnextchar [%]
- {\set@@@preamble{#1}[{#2}]}{\set@@@preamble{#1}[{#2}][\hsize]}%
+\newcommand*{\addsubsectiontocentry}[2]{%
+ \addtocentrydefault{subsection}{#1}{#2}%
}
-\newcommand{\set@@@preamble}{}
-\long\def\set@@@preamble#1[#2][#3]#4{%
- \begingroup
- \def\prmbl@pos{#2}\let\prmbl@hpos\relax\let\prmbl@vpos\relax
- \expandafter \@tfor \expandafter \@tempa
- \expandafter :\expandafter =\prmbl@pos
- \do{%
- \if \@tempa l%
- \set@preamble@hpos{0}{#2}%
- \fi%
- \if \@tempa c%
- \set@preamble@hpos{1}{#2}%
- \fi%
- \if \@tempa r%
- \set@preamble@hpos{2}{#2}%
- \fi%
- \if \@tempa u%
- \set@preamble@vpos{0}{#2}%
- \fi%
- \if \@tempa b%
- \set@preamble@vpos{0}{#2}%
- \fi
- \if \@tempa o%
- \set@preamble@vpos{1}{#2}%
- \fi%
- \if \@tempa t%
- \set@preamble@vpos{1}{#2}%
- \fi
- }%
- \@ifundefined{prmbl@hpos}{\def\prmbl@hpos{0}}{}%
- \@ifundefined{prmbl@vpos}{\def\prmbl@vpos{0}}{}%
- \ifcase\prmbl@hpos
- \ifcase\prmbl@vpos
- \set@@@@preamble{#1@u}{t}{#3}{}{\hfil}{#4}%
- \else
- \set@@@@preamble{#1@o}{b}{#3}{}{\hfil}{#4}%
- \fi
- \or
- \ifcase\prmbl@vpos
- \set@@@@preamble{#1@u}{t}{#3}{\hfil}{\hfil}{#4}%
- \else
- \set@@@@preamble{#1@o}{b}{#3}{\hfil}{\hfil}{#4}%
- \fi
- \else
- \ifcase\prmbl@vpos
- \set@@@@preamble{#1@u}{t}{#3}{\hfil}{}{#4}%
- \else
- \set@@@@preamble{#1@o}{b}{#3}{\hfil}{}{#4}%
- \fi
- \fi
- \endgroup
+\newcommand*{\addparagraphtocentry}[2]{%
+ \addtocentrydefault{paragraph}{#1}{#2}%
}
-\newcommand{\set@@@@preamble}[6]{%
- \expandafter\gdef\csname #1@preamble\endcsname{%
- \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
- }%
+\newcommand*{\addsubparagraphtocentry}[2]{%
+ \addtocentrydefault{subparagraph}{#1}{#2}%
}
-\newcommand*{\set@preamble@hpos}[2]{%
- \@ifundefined{prbml@hpos}{%
- \def\prmbl@hpos{#1}%
- }{%
- \ifnum \prmbl@hpos=0\relax\else%
- \ClassError{\KOMAClassName}{%
- inconsistent hpos options%
- }{%
- You've said `#2' as position option. But you have
- to\MessageBreak
- use only one of `l', `r', or `c' not two of
- these.\MessageBreak
- If you'll continue only first hpos option will be
- used%
- }%
- \fi
- }%
+\newcounter{section}[chapter]
+\renewcommand*\thesection{%
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d} % the space before this
+ % comment should be \relax but hyperref has a
+ % not documented problem with \relax
+ \if@mainmatter\thechapter.\fi
+ \else
+ \thechapter.%
+ \fi
+ \@arabic\c@section
}
-\newcommand*{\set@preamble@vpos}[2]{%
- \@ifundefined{prbml@vpos}{%
- \def\prmbl@vpos{#1}%
- }{%
- \ifnum \prmbl@vpos=0\relax\else%
- \ClassError{\KOMAClassName}{%
- inconsistent vpos options%
- }{%
- You've said `#2' as position option. But you have
- to\MessageBreak
- use only one of `t', `o', `b', or `u' not two of
- these.\MessageBreak
- If you'll continue only first vpos option will be
- used%
- }%
- \fi
- }%
+\newcommand*\sectionmarkformat{\thesection\autodot\enskip}
+\newcounter{subsection}[section]
+\renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection}
+\newcounter{subsubsection}[subsection]
+\renewcommand*{\thesubsubsection}{%
+ \thesubsection.\@arabic\c@subsubsection
}
-\newcommand*{\setchapterpreamble}{\set@preamble{chapter}}
-\newcommand*{\chapter@u@preamble}{}
-\let\chapter@u@preamble\relax
-\newcommand*{\chapter@o@preamble}{}
-\let\chapter@o@preamble\relax
-\newcommand*{\setpartpreamble}{\set@preamble{part}}
-\newcommand*{\part@u@preamble}{}
-\let\part@u@preamble\relax
-\newcommand*{\part@o@preamble}{}
-\let\part@o@preamble\relax
-\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth >-2\relax
- \addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\p@}%
- \setlength{\@tempdima}{2em}%
- \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
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \endgroup
- \penalty20010
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
+\newcounter{paragraph}[subsubsection]
+\renewcommand*{\theparagraph}{\thesubsubsection.\@arabic\c@paragraph}
+\newcounter{subparagraph}[paragraph]
+\renewcommand*{\thesubparagraph}{%
+ \theparagraph.\@arabic\c@subparagraph
}
-\newcommand*\l@chapter[2]{%
- \ifnum \c@tocdepth >\m@ne
- \ifnum \lastpenalty<20010
- \addpenalty{-\@highpenalty}%
- \fi
- \vskip 1.0em \@plus\p@
- \setlength\@tempdima{1.5em}%
- \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
- \usekomafont{chapterentry}{#1\nobreak
- \usekomafont{chapterentrypagenumber}{%
- \hfill\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \endgroup
- \penalty20009
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
+\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
+\renewcommand*{\@seccntformat}[1]{%
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
}
-\newcommand*{\raggedchapterentry}{}
-\newcommand*{\l@chapteratlist}{\l@chapter}
-\newcommand*\l@section{\bprot@dottedtocline{1}{1.5em}{2.3em}}
-\newcommand*\l@subsection{\bprot@dottedtocline{2}{3.8em}{3.2em}}
-\newcommand*\l@subsubsection{\bprot@dottedtocline{3}{7.0em}{4.1em}}
-\newcommand*\l@paragraph{\bprot@dottedtocline{4}{10em}{5em}}
-\newcommand*\l@subparagraph{\bprot@dottedtocline{5}{12em}{6em}}
-\newcommand*{\bprot@dottedtocline}[5]{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \ifnum #1>\c@tocdepth \else
- \begingroup
- \@tempcnta 20010
- \advance \@tempcnta by -#1
- \ifnum \@tempcnta>\lastpenalty
- \endgroup
- \addpenalty{\@lowpenalty}%
- \else
- \endgroup
- \fi
- \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \@tempcnta 20009
- \advance \@tempcnta by -#1
- \penalty\@tempcnta
- \fi
- \else
- \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \fi
+\newcommand*\addsecmark[1]{%
+ \begingroup
+ \c@secnumdepth=\m@ne
+ \sectionmark{#1}%
+ \endgroup
}
+\newcommand*{\scr@fnt@section}{\size@section}
+\newcommand*{\scr@fnt@subsection}{\size@subsection}
+\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection}
+\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
+\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
+\DeclareSectionCommand[%
+ style=section,%
+ level=1,%
+ indent=\z@,%
+ beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,%
+ afterskip=2.3ex \@plus.2ex,%
+ tocindent=1.5em,%
+ tocnumwidth=2.3em%
+]{section}
+\DeclareSectionCommand[%
+ style=section,%
+ level=2,%
+ indent=\z@,%
+ beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
+ afterskip=1.5ex \@plus .2ex,%
+ tocindent=3.8em,%
+ tocnumwidth=3.2em%
+]{subsection}
+\DeclareSectionCommand[%
+ style=section,%
+ level=3,%
+ indent=\z@,%
+ beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
+ afterskip=1.5ex \@plus .2ex,%
+ tocindent=7.0em,%
+ tocnumwidth=4.1em%
+]{subsubsection}
+\DeclareSectionCommand[%
+ style=section,%
+ level=4,%
+ indent=\z@,%
+ beforeskip=3.25ex \@plus1ex \@minus.2ex,%
+ afterskip=-1em,%
+ tocindent=10em,%
+ tocnumwidth=5em%
+]{paragraph}
+\DeclareSectionCommand[%
+ style=section,%
+ level=5,%
+ indent=\scr@parindent,%
+ beforeskip=3.25ex \@plus1ex \@minus .2ex,%
+ afterskip=-1em,%
+ tocindent=12em,%
+ tocnumwidth=6em%
+]{subparagraph}
+\ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\relax
+ \let\scr@subparagraph@sectionindent\parindent
+\else
+ \def\scr@subparagraph@sectionindent{\scr@parindent}%
+\fi
+\newcommand*{\scr@fnt@disposition}{\sectfont}
+\aliaskomafont{sectioning}{disposition}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -4251,7 +4731,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index b8ce5f44b45..66f139e7379 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,19 +65,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
+%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
-%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
+%%% 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 $
\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
\newcommand*{\@GaussYear}[3]{%
@@ -146,7 +146,7 @@
\protect\dayname@#1\space skipped}%
}{%
\@namedef{dayname@#1}##1{%
- \ifcase ##1
+ \ifcase\numexpr \XmodY{##1}{7}\relax
#8\or #2\or #3\or #4\or #5\or #6\or #7\fi%
}%
\AtBeginDocument{%
@@ -233,11 +233,7 @@
{\v{C}tvrtek}{P\'atek}{Sobota}{Ned\v{e}le}
\newdaylanguage{slovak}{Pondelok}{Utorok}{Streda}
{\v{S}tvrtok}{Piatok}{Sobota}{Nede\v{l}a}
-\def\@dayname#1{%
- \ifcase #1
- Monday\or Tuesday\or Wednesday\or Thursday\or
- Friday\or Saturday\or Sunday\fi%
-}
+\let\@dayname\dayname@english
\InputIfFileExists{scrdate.cfg}
{\typeout{*************************************^^J%
* Local config file scrdate.cfg used^^J%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 9409f23e397..39597bc4342 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -8,6 +8,7 @@
%% scrkernel-version.dtx (with options: `package,extend')
%% scrextend.dtx (with options: `package,extend,identify,prepare')
%% scrkernel-basics.dtx (with options: `load')
+%% scrkernel-sections.dtx (with options: `package,extend,prepare')
%% scrextend.dtx (with options: `package,extend,option')
%% scrkernel-compatibility.dtx (with options: `package,extend,option')
%% scrkernel-miscellaneous.dtx (with options: `package,extend,option')
@@ -74,7 +75,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -96,11 +97,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
\ProvidesPackage{scrextend}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr@ext@activate}[1]{%
@@ -124,8 +125,10 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
@@ -147,7 +150,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -235,6 +238,7 @@
\@namedef{scr@v@3.13}{12}
\@namedef{scr@v@3.13a}{13}
\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@last}{14}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
@@ -250,7 +254,7 @@
\KOMA@DeclareStandardOption
[scrextend]
{final}{draft=false}
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
@@ -283,7 +287,7 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
\expandafter\newif\csname if@titlepage\endcsname
@@ -314,8 +318,7 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\KOMA@key{cleardoublepage}{%
\begingroup%
@@ -437,8 +440,8 @@
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -795,7 +798,7 @@
\fi
}%
}
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -1104,7 +1107,7 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index b4ce05af397..ac383e346cb 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,15 +64,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\ProvidesPackage{scrfontsizes}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package (font size file generator)]
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
\ifstr{#1}{scrsize}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 1cbb082866e..9d8af38e70b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,15 +65,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
%%% using: package,option
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index 0247fc29322..4df8e05580c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -38,10 +38,10 @@
%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
-%%% From File: $Id: scrjura.dtx 1716 2014-03-01 15:38:49Z kohm $
+%%% From File: $Id: scrjura.dtx 1849 2014-11-25 07:56:28Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}
- [2014/01/28 v0.7a KOMA-Script for jurists
+ [2014/11/22 v0.9 KOMA-Script for jurists
(package)%
]
\@ifpackageloaded{hyperref}{%
@@ -96,7 +96,7 @@
}%
}%
}
-\newcommand*{\Paragraphmark}[1]{}
+\newcommand*{\Clausemark}[1]{}
\KOMA@key{paragraphmark}{%
\begingroup
\KOMA@set@ncmdkey{paragraphmark}{@tempa}{%
@@ -109,19 +109,19 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase\number\@tempa
\endgroup
- \let\Paragraphmark\@gobble
+ \let\Clausemark\@gobble
\or
\endgroup
- \renewcommand*{\Paragraphmark}[1]{%
+ \renewcommand*{\Clausemark}[1]{%
\markright{\csname MakeMarkcase\endcsname{##1}}}%
\or
\endgroup
- \renewcommand*{\Paragraphmark}[1]{%
+ \renewcommand*{\Clausemark}[1]{%
\markboth{\csname MakeMarkcase\endcsname{##1}}%
{\csname MakeMarkcase\endcsname{##1}}}%
\or
\endgroup
- \renewcommand*{\Paragraphmark}[1]{%
+ \renewcommand*{\Clausemark}[1]{%
\ifx
\@mkboth\@gobbletwo
\else
@@ -129,7 +129,7 @@
\fi}%
\or
\endgroup
- \renewcommand*{\Paragraphmark}[1]{%
+ \renewcommand*{\Clausemark}[1]{%
\@mkboth{\csname MakeMarkcase\endcsname{##1}}%
{\csname MakeMarkcase\endcsname{##1}}}%
\else
@@ -201,14 +201,61 @@
\KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
\KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
\KOMAProcessOptions\relax
-\newcommand*{\jura@env@type}{}
+\providecommand*{\DeprecatedParagraph}{%
+ \PackageError{scrjura}{modification of old document needed}{%
+ It seem that this document was made for scrjura up to version
+ 0.7a.\MessageBreak
+ Since scrjura version 0.9 \string\Paragraph, \string\SubParagraph, and all
+ depending\MessageBreak
+ commands, options, and counters have been renamed.\MessageBreak
+ You should replace the terms `Paragraph' and `paragraph` by `Clause`
+ and\MessageBreak
+ `clause` if they are part of the name of a scrjura feature, otherwise
+ this\MessageBreak
+ document may produce severall additional error messages and maybe the
+ wrong\MessageBreak
+ result. Sorry for the inconvenience.%
+ }%
+ \ParagraphCompatibilityHacks
+}
+\newcommand*{\ParagraphCompatibilityHacks}{%
+ \PackageWarning{scrjura}{compatibility hacks for `\string\Paragraph'
+ executed.\MessageBreak
+ There is no support for documents using these hacks!\MessageBreak
+ There is no warranty for real compatibility!\MessageBreak
+ Even if the LaTeX run of the document doesn't report\MessageBreak
+ any error, the result may be completely wrong.\MessageBreak
+ Therefore it is recommended to solve the problem,\MessageBreak
+ instead of trying to work around using the\MessageBreak
+ compatibility hacks%
+ }%
+ \gdef\Paragraph{\Clause}%
+ \gdef\SubParagraph{\SubClause}%
+ \gdef\c@Paragraph{\c@Clause}%
+ \gdef\cl@Paragraph{\cl@Clause}%
+ \gdef\c@SubParagraph{\c@SubClause}%
+ \gdef\cl@SubParagraph{\cl@SubClause}%
+ \gdef\theParagraph{\theClause}%
+ \gdef\theSubParagraph{\theSubClause}%
+ \gdef\refParagraph{\refClause}%
+ \gdef\refParagraphN{\refClauseN}%
+ \aliaskomafont{Paragraph}{Clause}%
+ \scr@ifundefinedorrelax{Paragraphmark}{}{%
+ \global\let\Clausemark\Paragraphmark
+ }%
+}
+\providecommand*{\Paragraph}{\DeprecatedParagraph\Paragraph}
+\providecommand*{\SubParagraph}{\DeprecatedParagraph\SubParagraph}
+\providecommand*{\refParagraph}{\DeprecatedParagraph\refParagraph}
+\providecommand*{\refParagraphN}{\DeprecatedParagraph\refParagraphN}
+\newcommand*{\scrjura@env@type}{}
\newcommand*{\ellipsispar}[1][1]{%
\begingroup
\KOMAoptions{parnumber=manual}\parellipsis\par
\addtocounter{par}{#1}%
\protected@write\@auxout{}{%
- \string\newmaxpar{\jura@env@type}%
- {\thecontractAbsoluteParagraph}%
+ \string\newmaxpar{\scrjura@env@type}%
+ {\csname the\scrjura@env@type AbsoluteClause\endcsname}%
{\thepar}%
}%
\endgroup
@@ -219,38 +266,141 @@
\scr@ifundefinedorrelax{textellipsis}{\dots}{\textellipsis}%
}
\newcommand*{\contract}{%
- \ifx\jura@env@type\@empty
- \let\@doendpe\contract@doendpe
- \let\Paragraph\contract@paragraph
- \let\c@Paragraph\c@contractParagraph
- \edef\cl@Paragraph{\cl@Paragraph\cl@contractParagraph}%
- \let\SubParagraph\contract@subparagraph
- \let\c@SubParagraph\c@contractSubParagraph
- \edef\cl@SubParagraph{\cl@SubParagraph\cl@contractSubParagraph}%
- \let\Par\contract@everypar
+ \ifx\scrjura@env@type\@empty
+ \let\@doendpe\scrjura@doendpe
+ \let\Clause\contract@paragraph
+ \let\c@Clause\c@contractClause
+ \edef\cl@Clause{\cl@Clause\cl@contractClause}%
+ \let\SubClause\contract@subparagraph
+ \let\c@SubClause\c@contractSubClause
+ \edef\cl@SubClause{\cl@SubClause\cl@contractSubClause}%
\let\Sentence\contract@sentence
- \renewcommand*{\jura@env@type}{contract}%
- \aliaskomafont{Paragraph}{contract.Paragraph}%
+ \renewcommand*{\scrjura@env@type}{contract}%
+ \aliaskomafont{Clause}{contract.Clause}%
\else
- \PackageError{contract}{nested `contract' detected}{%
+ \PackageError{scrjura}{nested `contract` detected}{%
You may not use a `contract' environment inside\MessageBreak
- a `\jura@env@type' environment or after loading\MessageBreak
- package `scrjura' with option `\jura@env@type'!}%
+ a `\scrjura@env@type' environment or after loading\MessageBreak
+ package `scrjura' with option `\scrjura@env@type'!}%
\fi
}
-\let\if@jura@skiphyperref\iftrue
-\let\cl@Paragraph\@empty
-\let\cl@SubParagraph\@empty
-\newcounter{contractParagraph}
-\renewcommand*{\thecontractParagraph}{%
- {\contract@Paragraphformat{\arabic{contractParagraph}}}}
-\DeclareRobustCommand*{\contract@Paragraphformat}[1]{\Paragraphformat{#1}}
-\newcommand*{\Paragraphformat}[1]{\S~#1}
-\newcounter{contractSubParagraph}
-\@addtoreset{SubParagraph}{Paragraph}
-\renewcommand*{\thecontractSubParagraph}{%
- {\theParagraph\alph{contractSubParagraph}}}
-\newcounter{contractAbsoluteParagraph}
+\let\if@scrjura@skiphyperref\iftrue
+\let\cl@Clause\@empty
+\let\cl@SubClause\@empty
+\newcounter{contractClause}
+\renewcommand*{\thecontractClause}{%
+ {\contract@Clauseformat{\arabic{contractClause}}}}
+\DeclareRobustCommand*{\contract@Clauseformat}[1]{\Clauseformat{#1}}
+\newcommand*{\Clauseformat}[1]{\S~#1}
+\newcounter{contractSubClause}
+\@addtoreset{SubClause}{Clause}
+\renewcommand*{\thecontractSubClause}{%
+ {\theClause\alph{contractSubClause}}}
+\newcounter{contractAbsoluteClause}
+\newcommand*{\DeclareNewJuraEnvironment}[1]{%
+ \@ifundefined{#1}{\expandafter\let\csname #1\expandafter\endcsname
+ \csname end#1\endcsname}{}%
+ \@ifundefined{#1}{\let\reserved@defjuraenvironment\@defjuraenvironment}{%
+ \PackageError{scrjura}{ignorring declaration of `#1'}{%
+ You've tried to declare jura environment `#1', but
+ environment\MessageBreak
+ `#1' or command
+ \expandafter\string\csname #1\endcsname\space or
+ \expandafter\string\csname end#1\endcsname\MessageBreak
+ already exists.\MessageBreak
+ Declaration will be ignored}%
+ \long\def\reserved@defjuraenvironment##1[##2]##3##4{}%
+ }%
+ \@ifnextchar [%]
+ {\reserved@defjuraenvironment{#1}}{\reserved@defjuraenvironment{#1}[]}%
+}
+\@onlypreamble\DeclareNewJuraEnvironment
+\DefineFamily{KOMAarg}
+\DefineFamilyMember{KOMAarg}
+\DefineFamilyKey{KOMAarg}{Clause}{%
+ \expandafter\gdef\csname \scrjura@env@type @Clause\endcsname{#1}%
+}
+\DefineFamilyKey{KOMAarg}{SubClause}{%
+ \expandafter\gdef\csname \scrjura@env@type @SubClause\endcsname{#1}%
+}
+\DefineFamilyKey{KOMAarg}{Sentence}{%
+ \expandafter\gdef\csname \scrjura@env@type @Sentence\endcsname{#1}%
+}
+\DefineFamilyKey{KOMAarg}{ClauseNumberFormat}{%
+ \expandafter\gdef\csname \scrjura@env@type @Clauseformat \endcsname
+ ##1{#1{##1}}
+ \expandafter\xdef\csname \scrjura@env@type @Clauseformat\endcsname{%
+ \noexpand\protect\expandafter\noexpand
+ \csname \scrjura@env@type @Clauseformat \endcsname
+ }%
+}
+\newcommand{\@defjuraenvironment}{}
+\long\def\@defjuraenvironment#1[#2]#3#4{%
+ \newcounter{#1Clause}%
+ \newcounter{#1AbsoluteClause}%
+ \newcounter{#1SubClause}%
+ \begingroup
+ \edef\scrjura@env@type{#1}%
+ \FamilyExecuteOptions[.scrjura.sty]{KOMAarg}{#2}%
+ \endgroup
+ \@ifundefined{#1@Clauseformat}{%
+ \expandafter\DeclareRobustCommand\expandafter*%
+ \csname #1@Clauseformat\endcsname[1]{\Clauseformat{##1}}%
+ }{}%
+ \newenvironment{#1}{%
+ \par
+ \ifx\scrjura@env@type\@empty
+ \edef\scrjura@env@type{#1}%
+ \let\@doendpe\scrjura@doendpe
+ \expandafter\let\expandafter\c@Clause\csname c@#1Clause\endcsname
+ \edef\cl@Clause{\cl@Clause\csname cl@#1Clause\endcsname}%
+ \expandafter\let\expandafter\c@SubClause
+ \csname c@#1SubClause\endcsname
+ \edef\cl@SubClause{\cl@SubClause
+ \csname cl@#1SubClause\endcsname}%
+ \@ifundefined{#1@Clause}{%
+ \let\Clause\contract@paragraph
+ }{%
+ \expandafter\let\expandafter\Clause
+ \csname #1@Clause\endcsname
+ }%
+ \@ifundefined{#1@SubClause}{%
+ \let\SubClause\contract@subparagraph
+ }{%
+ \expandafter\let\expandafter\SubClause
+ \csname #1@SubClause\endcsname
+ }%
+ \@ifundefined{#1@Sentence}{%
+ \let\Sentence\contract@sentence
+ }{%
+ \expandafter\let\expandafter\Sentence\csname #1@Sentence\endcsname
+ }%
+ \@ifundefined{\scrjura@env@type @everypar}{%
+ \expandafter\let
+ \csname \scrjura@env@type @everypar\endcsname
+ \contract@everypar
+ }{}%
+ \@ifundefined{scr@fnt@#1}{%
+ \@ifundefined{scr@fnt@instead@#1}{%
+ \aliaskomafont{Clause}{contract.Clause}%
+ }{%
+ \aliaskomafont{Clause}{\csname scr@fnt@instead@#1\endcsname}%
+ }%
+ }{%
+ \aliaskomafont{Clause}{contract.Clause}%
+ }%
+ #3%
+ \else
+ \PackageError{scrjura}{nested scrjura environments detected}{%
+ You must not use a `#1' environment inside\MessageBreak
+ a `\scrjura@env@type' environment or after loading\MessageBreak
+ package `scrjura' with option `\scrjura@env@type'!}%
+ \fi
+ }{%
+ #4%
+ \par
+ }%
+}
\define@key{contract}{title}{%
\def\contract@title{#1}%
\ifx\contract@entry\relax\def\contract@entry{\contract@title}\fi
@@ -279,15 +429,15 @@
\define@key{contract}{postskip}{\def\contract@postskip{#1}}
\newif\ifcontract@dummy
\define@key{contract}{dummy}[true]{\csname contract@dummy#1\endcsname}
-\newkomafont{contract.Paragraph}{\sffamily\bfseries\large}
-\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Paragraph}%
+\newkomafont{contract.Clause}{\sffamily\bfseries\large}
+\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Clause}%
\@hangfrom}
-\newcounter{@AbsParagraph}
-\newcommand*{\theH@AbsParagraph}{P-\arabic{@AbsParagraph}}
-\newcommand*{\theHParagraph}{\theH@AbsParagraph}
-\newcommand*{\theHSubParagraph}{\theH@AbsParagraph}
+\newcounter{@AbsClause}
+\newcommand*{\theH@AbsClause}{P-\arabic{@AbsClause}}
+\newcommand*{\theHClause}{\theH@AbsClause}
+\newcommand*{\theHSubClause}{\theH@AbsClause}
\newcommand*{\contract@paragraph}[1]{%
- \stepcounter{contractAbsoluteParagraph}%
+ \stepcounter{\scrjura@env@type AbsoluteClause}%
\ManualPar\parnumbertrue
\let\contract@title\relax
\let\contract@entry\relax
@@ -301,50 +451,52 @@
\addvspace{\contract@preskip}%
\fi
\ifx\contract@number\relax
- \let\p@Paragraph\@empty
- \let\theParagraph\thecontractParagraph
- \refstepcounter{Paragraph}%
+ \let\p@Clause\@empty
+ \let\theClause\thecontractClause
+ \refstepcounter{Clause}%
\else
\begingroup
\let\@elt\@stpelt
- \cl@Paragraph
+ \cl@Clause
\endgroup
- \protected@edef\theParagraph{\contract@Paragraphformat{\contract@number}}%
- \protected@edef\@currentlabel{\theParagraph}%
+ \protected@edef\theClause{%
+ \csname \scrjura@env@type @Clauseformat\endcsname{\contract@number}%
+ }%
+ \protected@edef\@currentlabel{\theClause}%
\fi
- \stepcounter{@AbsParagraph}%
+ \stepcounter{@AbsClause}%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname if@skiphyperref\endcsname\relax
\else
- \expandafter\let\csname if@jura@skiphyperref\expandafter\endcsname
+ \expandafter\let\csname if@scrjura@skiphyperref\expandafter\endcsname
\csname if@skiphyperref\endcsname
\fi
- \if@jura@skiphyperref\else
- \hyper@refstepcounter{@AbsParagraph}%
- \typeout{absolute Nummer: \the@AbsParagraph^^JLabel: `\@currentHref'}%
+ \if@scrjura@skiphyperref\else
+ \hyper@refstepcounter{@AbsClause}%
+ \typeout{absolute Nummer: \the@AbsClause^^JLabel: `\@currentHref'}%
\fi
- \let\theSubParagraph\theParagraph
+ \let\theSubClause\theClause
\ifcontract@dummy\else
\begingroup
\if@juratitlepagebreak\else\interlinepenalty\@M\fi
- \contract@paragraph@font{\theParagraph
+ \contract@paragraph@font{\theClause
\ifx\contract@title\relax\else\enskip\fi}%
\contract@title
\ifx\contract@entry\relax\else
- \addxcontentsline{toc}{cpar}[\theParagraph]\contract@entry
- \addxcontentsline{cpa}{cpar}[\theParagraph]\contract@entry
+ \addxcontentsline{toc}{cpar}[\theClause]\contract@entry
+ \addxcontentsline{cpa}{cpar}[\theClause]\contract@entry
\fi
\ifx\contract@head\relax\else
- \expandafter\Paragraphmark\expandafter{%
- \expandafter\theSubParagraph\expandafter\enskip\contract@head}%
+ \expandafter\Clausemark\expandafter{%
+ \expandafter\theSubClause\expandafter\enskip\contract@head}%
\fi
\par
\endgroup\nobreak\vskip\contract@postskip
- \jura@afterheading{contract}%
+ \scrjura@afterheading
\fi
}
\newcommand*{\contract@subparagraph}[1]{%
- \stepcounter{contractAbsoluteParagraph}%
+ \stepcounter{\scrjura@env@type AbsoluteClause}%
\ManualPar\parnumbertrue
\let\contract@title\relax
\let\contract@entry\relax
@@ -358,56 +510,56 @@
\vskip\contract@preskip
\fi
\ifx\contract@number\relax
- \let\p@SubParagraph\@empty
- \let\theSubParagraph\thecontractSubParagraph
- \refstepcounter{SubParagraph}%
+ \let\p@SubClause\@empty
+ \let\theSubClause\thecontractSubClause
+ \refstepcounter{SubClause}%
\else
\begingroup
\let\@elt\@stpelt
- \cl@SubParagraph
+ \cl@SubClause
\endgroup
- \protected@edef\theSubParagraph{\theParagraph\contract@number}%
- \protected@edef\@currentlabel{\theSubParagraph}%
+ \protected@edef\theSubClause{\theClause\contract@number}%
+ \protected@edef\@currentlabel{\theSubClause}%
\fi
- \stepcounter{@AbsParagraph}%
+ \stepcounter{@AbsClause}%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname if@skiphyperref\endcsname\relax
\else
- \expandafter\let\csname if@jura@skiphyperref\expandafter\endcsname
+ \expandafter\let\csname if@scrjura@skiphyperref\expandafter\endcsname
\csname if@skiphyperref\endcsname
\fi
- \if@jura@skiphyperref\else
- \hyper@refstepcounter{@AbsParagraph}%
- \typeout{absolute Nummer: \the@AbsParagraph^^JLabel: `\@currentHref'}%
+ \if@scrjura@skiphyperref\else
+ \hyper@refstepcounter{@AbsClause}%
+ \typeout{absolute Nummer: \the@AbsClause^^JLabel: `\@currentHref'}%
\fi
\ifcontract@dummy\else
\begingroup
\if@juratitlepagebreak\else\interlinepenalty\@M\fi
- \contract@paragraph@font{\theSubParagraph
+ \contract@paragraph@font{\theSubClause
\ifx\contract@title\relax\else\enskip\fi}%
\contract@title
\ifx\contract@entry\relax\else
- \addxcontentsline{toc}{cpar}[\theSubParagraph]\contract@entry
- \addxcontentsline{cpa}{cpar}[\theSubParagraph]\contract@entry
+ \addxcontentsline{toc}{cpar}[\theSubClause]\contract@entry
+ \addxcontentsline{cpa}{cpar}[\theSubClause]\contract@entry
\fi
\ifx\contract@head\relax\else
- \expandafter\Paragraphmark\expandafter{%
- \expandafter\theSubParagraph\expandafter\enskip\contract@head}%
+ \expandafter\Clausemark\expandafter{%
+ \expandafter\theSubClause\expandafter\enskip\contract@head}%
\fi
\par
\endgroup
\nobreak\vskip\contract@postskip
- \jura@afterheading{contract}%
+ \scrjura@afterheading
\fi
}
\newcommand*{\AutoPar}{%
- \expandafter\let\expandafter\jura@everypar
- \csname \jura@type @everypar\endcsname
+ \expandafter\let\expandafter\scrjura@everypar
+ \csname \scrjura@env@type @everypar\endcsname
}
\newcommand*{\ManualPar}{%
- \let\jura@everypar\relax
+ \let\scrjura@everypar\relax
}
-\newcommand*{\jura@afterheading}[1]{%
+\newcommand*{\scrjura@afterheading}{%
\@nobreaktrue
\everypar{%
\if@nobreak
@@ -419,29 +571,28 @@
\else
\clubpenalty \@clubpenalty
\everypar{%
- \jura@everypar
+ \scrjura@everypar
}%
\fi
- \jura@everypar
+ \scrjura@everypar
}%
- \def\jura@type{#1}%
\AutoPar
}
-\newcommand*{\jura@everypar}{}
+\newcommand*{\scrjura@everypar}{}
\CheckCommand*\@doendpe{\@endpetrue
\def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar
{{\setbox\z@\lastbox}\everypar{}\@endpefalse}}
-\newcommand*{\contract@doendpe}{%
+\newcommand*{\scrjura@doendpe}{%
\@endpetrue
\def\par{%
\@restorepar\everypar{%
- \csname jura@everypar\endcsname
+ \csname scrjura@everypar\endcsname
}%
\par\@endpefalse
}%
\everypar{%
{\setbox\z@\lastbox}\everypar{%
- \csname jura@everypar\endcsname
+ \csname scrjura@everypar\endcsname
}%
\@endpefalse
}%
@@ -455,17 +606,17 @@
}{\value{juratoclevel}}{\cpar@indent}{\cpar@numberwidth}{#1}{#2}%
\fi
}
-\DeclareRobustCommand*{\jura@separator}[1]{#1}
-\DeclareRobustCommand*{\jura@usetype}[1]{\jura@@usetype{#1}}
-\newcommand*{\jura@@usetype}[1]{}
+\DeclareRobustCommand*{\scrjura@separator}[1]{#1}
+\DeclareRobustCommand*{\scrjura@usetype}[1]{\scrjura@@usetype{#1}}
+\newcommand*{\scrjura@@usetype}[1]{}
\newcounter{par}
\renewcommand*{\thepar}{\arabic{par}}
-\newcommand*{\theHpar}{\theH@AbsParagraph-\Roman{par}}
+\newcommand*{\theHpar}{\theH@AbsClause-\Roman{par}}
\newcommand*{\parformat}{(\thepar)}
\newkomafont{parnumber}{}
-\renewcommand*\p@par{{\jura@usetype{\jura@env@type}\theSubParagraph\jura@separator{\nobreakspace}}}
-\@addtoreset{par}{Paragraph}
-\@addtoreset{par}{SubParagraph}
+\renewcommand*\p@par{{\scrjura@usetype{\scrjura@env@type}\theSubClause\scrjura@separator{\nobreakspace}}}
+\@addtoreset{par}{Clause}
+\@addtoreset{par}{SubClause}
\newcommand*{\contract@everypar}{%
\ifparnumber
\ifx\scrjura@special@par\relax
@@ -484,11 +635,16 @@
\setcounter{sentence}{0}\refstepcounter{sentence}%
\fi
\begingroup
- \protected@write\@auxout{\let\contract@Paragraphformat\@firstofone}{%
- \string\newmaxpar{contract}%
- {\thecontractAbsoluteParagraph}%
- {\thepar}}%
- \getmaxpar\@tempa{contract}{\thecontractAbsoluteParagraph}%
+ \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}%
+ }%
+ \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
@@ -537,10 +693,10 @@
\ref#1{#2}%
\endgroup
}
-\newcommand*{\refParagraph}{%
- \@ifstar {\ref@Paragraph*}{\ref@Paragraph{}}
+\newcommand*{\refClause}{%
+ \@ifstar {\ref@Clause*}{\ref@Clause{}}
}
-\newcommand*{\ref@Paragraph}[2]{%
+\newcommand*{\ref@Clause}[2]{%
\expandafter\ifx\csname r@#2\endcsname\relax
\ref#1{#2}%
\else
@@ -553,7 +709,7 @@
\expandafter\expandafter\expandafter{%
\expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}%
\def\@tempc##1##2\@nil{##1}%
- \let\jura@separator\@gobble
+ \let\scrjura@separator\@gobble
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
\csname r@#2\endcsname\noexpand\@nil}%
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
@@ -566,13 +722,13 @@
\endgroup
\fi
}
-\newcommand*{\refParagraphN}{%
- \@ifstar {\ref@ParagraphN*}{\ref@ParagraphN{}}
+\newcommand*{\refClauseN}{%
+ \@ifstar {\ref@ClauseN*}{\ref@ClauseN{}}
}
-\newcommand*{\ref@ParagraphN}[2]{%
+\newcommand*{\ref@ClauseN}[2]{%
\begingroup
- \let\Paragraphformat\relax
- \ref@Paragraph{#1}{#2}%
+ \let\Clauseformat\relax
+ \ref@Clause{#1}{#2}%
\endgroup
}
\newcommand*{\refPar}{%
@@ -591,7 +747,7 @@
\expandafter\expandafter\expandafter{%
\expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}%
\def\@tempc##1##2\@nil{##1}%
- \let\jura@separator\@gobble
+ \let\scrjura@separator\@gobble
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
\csname r@#2\endcsname\noexpand\@nil}%
\def\@tempc##1##2##3\@nil{##2}%
@@ -656,7 +812,7 @@
\expandafter\expandafter\expandafter{%
\expandafter\expandafter\expandafter\@gobble\csname r@#2\endcsname}%
\def\@tempc##1##2\@nil{##1}%
- \let\jura@separator\@gobble
+ \let\scrjura@separator\@gobble
\protected@edef\@tempa{\expandafter\expandafter\expandafter\@tempc
\csname r@#2\endcsname\noexpand\@nil}%
\def\@tempc##1##2##3##4\@nil{##3}%
@@ -696,7 +852,7 @@
\newcommand*{\theHsentence}{\theHpar-\arabic{sentence}}
\renewcommand*{\p@sentence}{\expandafter\p@@sentence}
\newcommand*{\p@@sentence}[1]{\p@par{{\par@cite{\thepar}}%
- \jura@separator{\nobreakspace}}{\sentence@cite{#1}}}
+ \scrjura@separator{\nobreakspace}}{\sentence@cite{#1}}}
\newcommand*{\contract@sentence}{%
\refstepcounter{sentence}%
\textsuperscript{\thesentence}\nobreak\hskip\z@
@@ -767,14 +923,14 @@
}
\newcommand*{\newmaxpar}[3]{%
\begingroup
- \expandafter\let\csname #1@Paragraphformat\endcsname\@firstofone
+ \expandafter\let\csname #1@Clauseformat\endcsname\@firstofone
\protected@edef\@tempa{#2}\@onelevel@sanitize\@tempa
\expandafter\xdef\csname max@#1@\@tempa\endcsname{#3}%
\endgroup
}
\newcommand*{\getmaxpar}[3]{%
\begingroup
- \expandafter\let\csname #2@Paragraphformat\endcsname\@firstofone
+ \expandafter\let\csname #2@Clauseformat\endcsname\@firstofone
\protected@edef\@tempa{#3}%
\@onelevel@sanitize\@tempa
\expandafter\ifx \csname max@#2@\@tempa\endcsname\relax
@@ -785,6 +941,11 @@
\fi
\@tempa
}
+\AtBeginDocument{%
+ \immediate\write\@mainaux{%
+ \string\providecommand*{\string\newmaxpar}[3]{}
+ }%
+}
%%% 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/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 7dacb8ea32a..4af0edfb17f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,14 +66,14 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package (%
KOMA-Script-dependent
basics and keyval usage)]
@@ -85,12 +85,12 @@
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
}
@@ -190,7 +190,14 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+\newcommand*{\IfExistskomafont}[1]{%
+ \@ifundefined{scr@fnt@#1}{%
+ \@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
+ }{%
+ \@firstoftwo
+ }%
+}
\newcommand*{\setkomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
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 1845f9b7470..ee8aa7aa713 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -52,7 +52,7 @@
2014/06/03 v0.1.1760 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -83,7 +83,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -219,7 +219,7 @@
\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 1810 2014-10-20 07:35:25Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (body)
\KOMAProcessOptions\relax
%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (body)
\scrlayerAddToInterface\DeclareNoteColumn{%
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 06ed5304056..362c5f83bed 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -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 1806 2014-10-16 06:41:25Z kohm $ (identify)
+%%% From File: $Id: scrlayer-scrpage.dtx 1899 2015-01-08 08:57:02Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z 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 1806 2014-10-16 06:41:25Z kohm $ (init)
+%%% From File: $Id: scrlayer-scrpage.dtx 1899 2015-01-08 08:57:02Z kohm $ (init)
\AtEndOfPackage{%
\sls@auto@pagestyleset%
}
@@ -78,7 +78,7 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (options)
\KOMA@key{markcase}{%
\scrlayer@AtEndOfPackage{%
\begingroup
@@ -212,7 +212,7 @@
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoremoveinterfaces}
\scrlayer@AddCsToInterface{%
KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default}
-%%% From File: $Id: scrlayer-scrpage.dtx 1806 2014-10-16 06:41:25Z kohm $ (options)
+%%% From File: $Id: scrlayer-scrpage.dtx 1899 2015-01-08 08:57:02Z kohm $ (options)
\KOMA@key{headwidth}{%
\begingroup
\sls@split@at@iicolons#1:::\@nil
@@ -228,7 +228,7 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth@default}
\KOMA@key{footwidth}{%
\begingroup
- \sls@split@at@iicolons#1::\@nil
+ \sls@split@at@iicolons#1:::\@nil
\ifx\reserved@a\@empty \let\reserved@a\sls@footwidth\fi
\edef\reserved@a{%
\noexpand\endgroup
@@ -640,9 +640,9 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}%
\scrlayer@AddCsToInterface{sls@leavevmode@linetrue}
\scrlayer@AddCsToInterface{sls@leavevmode@linefalse}
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (body)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 1806 2014-10-16 06:41:25Z kohm $ (body)
+%%% From File: $Id: scrlayer-scrpage.dtx 1899 2015-01-08 08:57:02Z kohm $ (body)
\scrlayerAddToInterface\setheadwidth{%
\newcommand*{\setheadwidth}[2][]{%
\KOMAoptions{headwidth=#2:#1}%
@@ -1284,8 +1284,8 @@
\sls@def@pair@page@style@member{#2}%
\AddToLayerPageStyleOptions{#2}{%
onselect={%
- \expandafter\let\expandafter\ps@plain\csname ps@plain.#2\endcsname
- \expandafter\let\expandafter\ps@headings\csname ps@#2\endcsname
+ \DeclarePageStyleAlias{plain}{plain.#2}%
+ \DeclarePageStyleAlias{headings}{#2}%
\def\sls@currentheadings{#2}%
\def\sls@currentplain{plain.#2}%
#3%
@@ -1294,8 +1294,8 @@
\sls@def@pair@page@style@member{plain.#2}%
\AddToLayerPageStyleOptions{plain.#2}{%
onselect={%
- \expandafter\let\expandafter\ps@plain\csname ps@plain.#2\endcsname
- \expandafter\let\expandafter\ps@headings\csname ps@#2\endcsname
+ \DeclarePageStyleAlias{plain}{plain.#2}%
+ \DeclarePageStyleAlias{headings}{#2}%
\def\sls@currentheadings{#2}%
\def\sls@currentplain{plain.#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 3867be8f5d3..f34763b02a0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -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 1810 2014-10-20 07:35:25Z kohm $ (identify)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z 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 1810 2014-10-20 07:35:25Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -225,7 +225,7 @@
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (body)
\KOMAProcessOptions\relax
\@ifundefined{headmark}{}{%
\PackageWarningNoLine{scrlayer}{%
@@ -377,7 +377,7 @@
\if@tempswa
\@mkright{%
\MakeMarkcase{%
- \ifnum \c@secnumdepth<\numexpr \csname #1level\endcsname +0\relax
+ \ifnum \c@secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
\else\if@mainmatter \csname #1markformat\endcsname\fi\fi
##1%
}%
@@ -396,7 +396,7 @@
\fi
{%
\MakeMarkcase{%
- \ifnum \c@secnumdepth<\numexpr \csname #1level\endcsname +0\relax
+ \ifnum \c@secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
\else\if@mainmatter \csname #1markformat\endcsname\fi\fi
##1%
}%
@@ -407,17 +407,17 @@
\newcommand*{\automark@both}[2]{%
\ifscrlayer@level@prepared{#1}{%
\ifscrlayer@level@prepared{#2}{%
- \ifnum \numexpr \csname #1level\endcsname +0\relax
- > \numexpr \csname #2level\endcsname +0\relax
+ \ifnum \numexpr \csname #1numdepth\endcsname +0\relax
+ > \numexpr \csname #2numdepth\endcsname +0\relax
\automark@leftlow{#2}%
\automark@righthigh{#1}%
- \else \ifnum \numexpr \csname #1level\endcsname +0\relax
- = \numexpr \csname #2level\endcsname +0\relax
+ \else \ifnum \numexpr \csname #1numdepth\endcsname +0\relax
+ = \numexpr \csname #2numdepth\endcsname +0\relax
\expandafter\def\csname #2mark\endcsname##1{%
\@mkdouble{%
\MakeMarkcase{%
\ifnum \c@secnumdepth<\numexpr
- \csname #2level\endcsname +0\relax
+ \csname #2numdepth\endcsname +0\relax
\else
\if@mainmatter \csname #2markformat\endcsname\fi
\fi
@@ -436,7 +436,7 @@
\@mkleft{%
\MakeMarkcase{%
\ifnum \c@secnumdepth
- < \numexpr\csname #1level\endcsname +0\relax
+ < \numexpr\csname #1numdepth\endcsname +0\relax
\else
\if@mainmatter \csname #1markformat\endcsname\fi
\fi
@@ -449,7 +449,7 @@
\@mkboth{}{%
\MakeMarkcase{%
\ifnum \c@secnumdepth
- < \numexpr \csname #2level\endcsname +0\relax
+ < \numexpr \csname #2numdepth\endcsname +0\relax
\else\if@mainmatter \csname #2markformat\endcsname\fi\fi
##1%
}%
@@ -462,7 +462,7 @@
}
\newcommand*{\ifscrlayer@level@prepared}[1]{%
\typeout{1: \detokenize{#1}}%
- \scr@ifundefinedorrelax{#1level}{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
\PackageError{scrlayer}{numbering depth of `#1' unknown}{%
Someone told me to use a section mark for level `#1',\MessageBreak
but the numbering depth hasn't been declared before. You may solve this
@@ -475,7 +475,7 @@
}%
}
\newcommand*{\DeclareSectionNumberDepth}[2]{%
- \expandafter\edef\csname #1level\endcsname{\the\numexpr #2\relax}%
+ \expandafter\edef\csname #1numdepth\endcsname{\the\numexpr #2\relax}%
\@ifundefined{#1mark}{%
\expandafter\let\csname #1mark\endcsname\@gobble
}{}%
@@ -512,10 +512,13 @@
\scr@ifundefinedorrelax{\reserved@a}{%
\@tempswafalse
}{%
- \@ifundefined{\reserved@a level}{%
+ \@ifundefined{\reserved@a numdepth}{%
\expandafter\DeclareSectionNumberDepth
\expandafter{\reserved@a}{\@tempcnta}%
- }{}%
+ }{%
+ \expandafter\DeclareSectionNumberDepth
+ \expandafter{\reserved@a}{\csname \reserved@a numdepth\endcsname}%
+ }%
\advance \@tempcnta by \@ne
\edef\reserved@a{sub\reserved@a}%
}%
@@ -1082,7 +1085,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@backgroundhook}%
\@nameuse{@ps@#1@backgroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\ht\strutbox\relax
@@ -1113,7 +1116,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@backgroundhook}%
\@nameuse{@ps@#1@backgroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\ht\strutbox\relax
@@ -1144,7 +1147,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@foregroundhook}%
\@nameuse{@ps@#1@foregroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\headsep
@@ -1178,7 +1181,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@foregroundhook}%
\@nameuse{@ps@#1@foregroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\headsep
@@ -1922,7 +1925,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (final)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z 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
new file mode 100644
index 00000000000..bf74b20b1bf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -0,0 +1,2583 @@
+%%
+%% This is file `scrletter.sty',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `package,letter')
+%% scrkernel-basics.dtx (with options: `load')
+%% scrkernel-miscellaneous.dtx (with options: `package,letter,init')
+%% scrkernel-miscellaneous.dtx (with options: `package,letter,option')
+%% scrkernel-letterclassoptions.dtx (with options: `package,letter,option')
+%% scrkernel-language.dtx (with options: `package,letter,option')
+%% scrkernel-fonts.dtx (with options: `package,letter,option')
+%% scrkernel-variables.dtx (with options: `package,letter,option')
+%% scrkernel-pseudolengths.dtx (with options: `package,letter,option')
+%% scrkernel-pagestyles.dtx (with options: `package,letter,option')
+%% scrkernel-notepaper.dtx (with options: `package,letter,option')
+%% scrkernel-circularletters.dtx (with options: `package,letter,option')
+%% scrkernel-miscellaneous.dtx (with options: `package,letter,execoption')
+%% scrkernel-fonts.dtx (with options: `package,letter,body')
+%% scrkernel-miscellaneous.dtx (with options: `package,letter,body')
+%% scrkernel-letterclassoptions.dtx (with options: `package,letter,body')
+%% scrkernel-language.dtx (with options: `package,letter,body')
+%% scrkernel-variables.dtx (with options: `package,letter,body')
+%% scrkernel-pseudolengths.dtx (with options: `package,letter,body')
+%% scrkernel-pagestyles.dtx (with options: `package,letter,body')
+%% scrkernel-notepaper.dtx (with options: `package,letter,body')
+%% scrkernel-circularletters.dtx (with options: `package,letter,body')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% 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 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 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.
+%%
+%% 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.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% 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: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
+\endgroup
+\ProvidesPackage{scrletter}[%
+ 2015/01/14 v3.15 KOMA-Script
+ letter package extending any KOMA-Script class%
+]
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+\RequirePackage{scrkbase}[\KOMAScriptVersion]
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
+\scr@ifundefinedorrelax{KOMAClassName}{%
+ \PackageWarningNoLine{scrletter}{%
+ Cannot detect any KOMA-Script class.\MessageBreak
+ Package `scrletter' is an extension to\MessageBreak
+ KOMA-Script classes.\MessageBreak
+ Usage with another class is not supported.\MessageBreak
+ Expect several errors while using it with\MessageBreak
+ another class.%
+ }%
+}{}
+
+\newcommand*{\scr@renewforletter}{%
+ \@ifstar {\@renewforletter*}%
+ {\@renewforletter{}}%
+}
+\newcommand*{\@renewforletter}[2]{%
+ \g@addto@macro\do@renewforletter@list{\do#2}%
+ \edef\reserved@a{%
+ \noexpand\newcommand\noexpand#1\expandafter\noexpand
+ \csname scrletter@extra@\string#2\endcsname
+ }%
+ \expandafter\reserved@a
+}
+\newcommand*{\do@renewforletter@list}{}
+\newcommand*{\do@renewforletter}{%
+ \begingroup
+ \def\do##1{%
+ \aftergroup\let\aftergroup##1
+ \expandafter\aftergroup\csname scrletter@extra@\string##1\endcsname
+ }%
+ \do@renewforletter@list
+ \endgroup
+ \let\do@renewforletter@list\@empty
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+\newcommand*{\lco@test}{%
+ \IfFileExists{\CurrentOption.lco}{%
+ \expandafter
+ \AtEndOfPackage
+ \expandafter{%
+ \expandafter\LoadLetterOption\expandafter{\CurrentOption}%
+ }%
+ \expandafter\def\expandafter\scr@pti@nerr@r\expandafter{%
+ \expandafter\def\expandafter\scr@pti@nerr@r\expandafter{%
+ \scr@pti@nerr@r
+ }%
+ }%
+ }{}%
+}
+\AtEndOfPackage
+ {\LoadLetterOption{DIN}}
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+\newif\if@orgdate\@orgdatetrue
+\KOMA@key{numericaldate}[true]{%
+ \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
+ \KOMA@set@ifkey{numericaldate}{@orgdate}{#1}%
+ \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
+}
+\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
+\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
+\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue
+\newcommand*{\@alignfrom}{0}
+\KOMA@key{fromalign}{%
+ \KOMA@set@ncmdkey{fromalign}{@alignfrom}{%
+ {left}{0},%
+ {center}{1},{centered}{1},{middle}{1},%
+ {right}{2},%
+ {locationleft}{3},{leftlocation}{3},%
+ {locationright}{4},{rightlocation}{4},{location}{4},%
+ {no}{10000},{false}{10000},{off}{10000}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
+ \fi
+}
+\newcommand*{\@rulefrom}{0}
+\KOMA@ncmdkey{fromrule}[below]{@rulefrom}{%
+ {false}{0},{no}{0},{off}{0},{aftername}{1},%
+ {below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
+}
+\KOMA@ifkey{fromphone}{@phone}
+\KOMA@ifkey{frommobilephone}{@mobilephone}
+\KOMA@ifkey{fromfax}{@fax}
+\KOMA@ifkey{fromemail}{@email}
+\KOMA@ifkey{fromurl}{@www}
+\KOMA@ifkey{fromlogo}{@logo}
+\newcommand*{\@afieldmode}{\@ne}
+\KOMA@ncmdkey{addrfield}[true]{@afieldmode}{%
+ {false}{0},{off}{0},{no}{0},%
+ {true}{1},{on}{1},{yes}{1},%
+ {PP}{2},{pp}{2},%
+ {PPexplicite}{2},{PPExplicite}{2},%
+ {ppexplicite}{2},{ppExplicite}{2},%
+ {backgroundimage}{3},%
+ {PPbackgroundimage}{3},{PPBackgroundImage}{3},{PPBackGroundImage}{3},%
+ {ppbackgroundimage}{3},{ppBackgroundImage}{3},{ppBackGroundImage}{3},%
+ {image}{4},{Image}{4},%
+ {PPimage}{4},{PPImage}{4},%
+ {ppimage}{4},{ppImage}{4}%
+}
+\newcommand*{\ltr@priority}{0}%
+\KOMA@ncmdkey{priority}[A]{ltr@priority}{%
+ {no}{0},{off}{0},{false}{0},{manual}{1},%
+ {B}{1},{b}{1},%
+ {economy}{1},{Economy}{1},{ECONOMY}{1},%
+ {B-ECONOMY}{1},{B-Economy}{1},{b-economy}{1},%
+ {A}{2},{a}{2},%
+ {priority}{2},{Priority}{2},{PRIORITY}{2},%
+ {A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
+}%
+\newcommand{\backaddr@format}[1]{}
+\let\backaddr@format\underline
+\newif\if@baddr\@baddrtrue
+\KOMA@key{backaddress}[true]{%
+ \begingroup
+ \KOMA@set@ncmdkey{backaddress}{@tempa}{%
+ {false}{0},{off}{0},{no}{0},%
+ {true}{1},{on}{1},{yes}{1},%
+ {underlined}{2},%
+ {plain}{3}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \endgroup
+ \@baddrfalse
+ \or
+ \endgroup
+ \@baddrtrue
+ \or
+ \endgroup
+ \@baddrtrue
+ \let\backaddr@format\underline
+ \or
+ \endgroup
+ \@baddrtrue
+ \let\backaddr@format\@firstofone
+ \else
+ \endgroup
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnknownValue
+ \fi
+}
+\newif\if@bigloc
+\KOMA@key{locfield}[wide]{%
+ \begingroup
+ \KOMA@set@ncmdkey{locfield}{@tempa}{{wide}{0},{narrow}{1}}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \endgroup
+ \@bigloctrue
+ \else
+ \endgroup
+ \@biglocfalse
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnknownValue
+ \fi
+}
+\KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide}
+\KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow}
+\newif\if@fold\@foldtrue
+\newcommand*{\@usefolds}{TMBPL}
+\KOMA@key{foldmarks}[true]{%
+ \begingroup
+ \KOMA@set@ifkey\@empty{@fold}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@fold\aftergroup\@foldtrue\else\aftergroup\@foldfalse\fi
+ \aftergroup\FamilyKeyStateProcessed
+ \else
+ \aftergroup\FamilyKeyStateProcessed
+ \def\sc@nf@ldch@rs##1{%
+ \ifx ##1\@nil\else
+ \if ##1T\g@addto@macro\@usefolds{##1}\else
+ \if ##1M\g@addto@macro\@usefolds{##1}\else
+ \if ##1B\g@addto@macro\@usefolds{##1}\else
+ \if ##1P\g@addto@macro\@usefolds{##1}\else
+ \if ##1L\g@addto@macro\@usefolds{##1}\else
+ \if ##1V\g@addto@macro\@usefolds{L}\else
+ \if ##1H\g@addto@macro\@usefolds{TMBP}\else
+ \if ##1t\scr@removechar\@usefolds{T}\else
+ \if ##1m\scr@removechar\@usefolds{M}\else
+ \if ##1b\scr@removechar\@usefolds{B}\else
+ \if ##1p\scr@removechar\@usefolds{P}\else
+ \if ##1l\scr@removechar\@usefolds{L}\else
+ \if ##1v%
+ \scr@removechar\@usefolds{L}%
+ \else
+ \if ##1h%
+ \scr@removechar\@usefolds{T}%
+ \scr@removechar\@usefolds{M}%
+ \scr@removechar\@usefolds{B}%
+ \else
+ \aftergroup\FamilyKeyStateUnknownValue
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \expandafter\sc@nf@ldch@rs
+ \fi
+ }%
+ \expandafter\sc@nf@ldch@rs#1\@nil
+ \fi
+ \endgroup
+}
+\newcommand*{\scr@removechar}[2]{%
+ \def\in@@##1#2##2##3\in@@{%
+ \ifx\in@##2\else
+ \def\in@@####1#2\in@{\gdef#1{##1####1}}%
+ \in@@##2##3%
+ \fi}%
+ \expandafter\in@@#1#2\in@\in@@
+}
+\newif\if@refwide
+\newcommand*{\@datepos}{1}
+\KOMA@key{refline}[wide]{%
+ \begingroup
+ \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1},%
+ {dateleft}{2},{leftdate}{2},%
+ {dateright}{3},{rightdate}{3},%
+ {nodate}{4}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \endgroup
+ \@refwidetrue
+ \or
+ \endgroup
+ \@refwidefalse
+ \or
+ \endgroup
+ \def\@datepos{2}%
+ \or
+ \endgroup
+ \def\@datepos{1}%
+ \or
+ \endgroup
+ \def\@datepos{0}%
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnknownValue
+ \fi
+}
+\newcommand{\subject@format}[1]{#1}
+\newcommand*{\raggedsubject}{}
+\newif\if@subj
+\newif\if@subjafter
+\KOMA@key{subject}{%
+ \begingroup
+ \KOMA@set@ncmdkey{subject}{@tempa}{%
+ {titled}{0},%
+ {untitled}{1},%
+ {afteropening}{2},%
+ {beforeopening}{3},%
+ {underlined}{4},%
+ {left}{5},%
+ {right}{6},%
+ {centered}{7}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \aftergroup\@subjtrue
+ \or
+ \aftergroup\@subjfalse
+ \or
+ \aftergroup\@subjaftertrue
+ \or
+ \aftergroup\@subjafterfalse
+ \or
+ \aftergroup\let\aftergroup\subject@format\aftergroup\underline
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedright
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedleft
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\centering
+ \fi
+ \else
+ \aftergroup\FamilyKeyStateUnknownValue
+ \fi
+ \endgroup
+}
+\KOMA@ifkey{enlargefirstpage}{@enlargefp}
+\KOMA@ifkey{firstfoot}{@firstfoot}\@firstfoottrue
+\newcommand*{\@pageat}{4}
+\KOMA@key{pagenumber}{%
+ \begingroup
+ \KOMA@set@ncmdkey{pagenumber}{@tempa}{%
+ {no}{-1},{off}{-1},{false}{-1},%
+ {topleft}{0},{headleft}{0},%
+ {topmiddle}{1},{topcenter}{1},{topcentered}{1},%
+ {headmiddle}{1},{headcenter}{1},{headcentered}{1},%
+ {topright}{2},{headright}{2},%
+ {botleft}{3},{footleft}{3},%
+ {botmiddle}{4},{botcenter}{4},{botcentered}{4},%
+ {footmiddle}{4},{footcenter}{4},{footcentered}{4},%
+ {botright}{5},{footright}{5},%
+ {top}{10},{head}{10},{bot}{11},{foot}{11},%
+ {left}{20},{middle}{21},{center}{21},{centered}{21},{right}{22}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifnum\@tempa<10
+ \edef\@tempa{\endgroup\edef\noexpand\@pageat{\@tempa}}%
+ \else
+ \ifnum\@tempa<20
+ \@tempcnta\@pageat\relax
+ \ifnum\@tempcnta>2
+ \advance\@tempcnta by -3
+ \fi
+ \ifnum\@tempa=11
+ \advance\@tempcnta by 3
+ \fi
+ \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}%
+ \else
+ \ifnum\@pageat>2
+ \edef\@pageat{3}%
+ \else
+ \edef\@pageat{0}%
+ \fi
+ \@tempcnta\@tempa
+ \advance\@tempcnta by -20
+ \advance\@tempcnta by\@pageat
+ \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}%
+ \fi
+ \fi
+ \else
+ \def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
+ \fi
+ \@tempa
+}
+\newif\if@scrsymbols
+\KOMA@key{symbolicnames}[true]{%
+ \KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
+ \if@scrsymbols
+ \if@atdocument
+ \begingroup
+ \@tempswafalse
+ \scr@ifundefinedorrelax{Telefon}{\@tempswatrue}{%
+ \scr@ifundefinedorrelax{FAX}{\@tempswatrue}{%
+ \scr@ifundefinedorrelax{Email}{\@tempswatrue}{%
+ \scr@ifundefinedorrelax{Mobilefone}{\@tempswatrue}{%
+ }%
+ }%
+ }%
+ }%
+ \if@tempswa
+ \aftergroup\@scrsymbolsfalse
+ \PackageWarning{scrletter}{%
+ Option `symbolicnames'
+ ignorred.\MessageBreak
+ You've tried to set option `symbolicnames'\MessageBreak
+ after \string\begin{document}, but without\MessageBreak
+ loading package `marvosym' before.\MessageBreak
+ You should either switch on option\MessageBreak
+ `symbolicnames' before \string\begin{document}\MessageBreak
+ or load package `marvosym' in the document\MessageBreak
+ preamble to avoid this warning%
+ }%
+ \fi
+ \endgroup
+ \else
+ \ifstr{\@currname.\@currext}{scrletter.sty}{%
+ \expandafter\AtEndOfPackage
+ }{%
+ \expandafter\@firstofone
+ }%
+ {\RequirePackage{marvosym}}%
+ \fi
+ \fi
+}
+%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
+\KOMAProcessOptions\relax
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+\newcommand*{\LoadLetterOption}[1]{%
+ \@ifundefined{@restore@catcode@level}%
+ {\let\@restore@catcode@level=\z@}{}%
+ \ifnum\@restore@catcode@level =\z@
+ \ifnum\catcode`\@=11
+ \let\@restore@catcode\relax
+ \else
+ \@tempcnta=\catcode`\@
+ \edef\@restore@catcode{%
+ \noexpand\catcode`\noexpand\@=\the\@tempcnta}%
+ \makeatletter
+ \fi
+ \fi
+ \@tempcnta=\@restore@catcode@level\relax
+ \advance\@tempcnta by \@ne\relax
+ \edef\@restore@catcode@level{\the\@tempcnta}%
+ \KV@@sp@def\reserved@a{#1}%
+ \edef\reserved@a{\noexpand\InputIfFileExists{\reserved@a.lco}{%
+ \noexpand\PackageInfo{scrletter%
+ }{Letter-Class-Option `#1' loaded}%
+ }{%
+ \noexpand\PackageError{scrletter%
+ }{%
+ Letter-Class-Option file `#1.lco' not found%
+ }{%
+ You've told me to load the Letter-Class-Option `#1'. So I have
+ to load\noexpand\MessageBreak
+ the file `#1.lco'. But the file isn't available.}%
+ }%
+ }%
+ \reserved@a
+ \@tempcnta=\@restore@catcode@level\relax
+ \advance\@tempcnta by \m@ne\relax
+ \edef\@restore@catcode@level{\the\@tempcnta}%
+ \ifnum\@tempcnta =\z@
+ \@restore@catcode
+ \fi
+}
+\newcommand*{\LoadLetterOptions}[1]{%
+ \begingroup
+ \def\reserved@a{\endgroup}%
+ \@for\reserved@b:=#1\do{%
+ \ifx\reserved@b\@empty\else
+ \ifx\reserved@b\space\else
+ \edef\reserved@a{\expandafter\unexpanded\expandafter{\reserved@a
+ \LoadLetterOption}{\reserved@b}\relax}%
+ \fi
+ \fi
+ }%
+ \reserved@a
+}
+\newcommand*{\LOPNP@option}{}
+\newcommand*{\LOPNP@size}{}
+\newcommand*{\@PapersizeWarning}{%
+ \begingroup%
+ \edef\@tempc{\noexpand\@tempswafalse
+ \noexpand\ifdim\paperwidth<\the\dimexpr\paperwidth-.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\ifdim\paperwidth>\the\dimexpr\paperwidth+.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\ifdim\paperheight<\the\dimexpr\paperheight-.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\ifdim\paperheight>\the\dimexpr\paperheight+.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\@tempswatrue
+ \noexpand\fi
+ \noexpand\fi
+ \noexpand\fi
+ \noexpand\fi
+ \noexpand\@@PapersizeWarning
+ }%
+ \def\@tempb{letter}\ifx\LOPNP@size\@tempb%
+ \setlength{\paperheight}{11in}\setlength{\paperwidth}{8.5in}%
+ \else\def\@tempb{legal}\ifx\LOPNP@size\@tempb%
+ \setlength{\paperheight}{14in}\setlength{\paperwidth}{8.5in}%
+ \else\def\@tempb{executive}\ifx\LOPNP@size\@tempb%
+ \setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}%
+ \else%
+ \def\ta@opt@err{%
+ \PackageError{scrletter%
+ }{papersize `\LOPNP@size' undefined}{%
+ You've told me to check for paper size
+ `\LOPNP@size'\MessageBreak
+ at letter option file `\LOPNP@option.lco',\MessageBreak
+ but this paper size is not supported.\MessageBreak
+ See the KOMA-Script manual for informations about known
+ paper sizes.}%
+ }%
+ \let\@headlines\ta@opt@err%
+ \expandafter\x@@paper\LOPNP@size paperpaper\x@@paper%
+ \fi\fi\fi
+ \@tempc
+ \endgroup%
+}
+\newcommand*{\@@PapersizeWarning}{%
+ \if@tempswa\else%
+ \PackageWarningNoLine{scrletter%
+ }{%
+ Letter option file `\LOPNP@option.lco'\MessageBreak
+ needs paper size `\LOPNP@size'.\MessageBreak
+ Current paper size is not `\LOPNP@size'!\MessageBreak
+ You should add `paper=\LOPNP@size' at the\MessageBreak
+ option list of \string\documentclass!\MessageBreak
+ Maybe you know what you are doing,\MessageBreak
+ so I do not change this myself}%
+ \fi
+ }
+\newcommand*{\LetterOptionNeedsPapersize}[2]{%
+ \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
+}
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+\newcommand*{\g@addnumerical@date}[2]{%
+ \@ifundefined{date#1}{%
+ \PackageInfo{scrletter%
+ }{%
+ no date found for language `#1'\MessageBreak
+ --> skipped%
+ }%
+ }{%
+ \expandafter\g@addto@macro\csname date#1\endcsname{%
+ \let\sym@date=\today%
+ \def\num@date{#2}%
+ \def\today{\if@orgdate\sym@date\else\num@date\fi}%
+ }%
+ }%
+}
+\AtBeginDocument{%
+ \@ifundefined{captionsenglish}{\let\captionsenglish\@empty}{}%
+ \@ifundefined{dateenglish}{\def\dateenglish{%
+ \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}%
+ }%
+ }{}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\yourrefname{Your ref.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\yourmailname{Your letter of}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\myrefname{Our ref.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\customername{Customer no.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\invoicename{Invoice no.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\subjectname{Subject}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\ccname{cc}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\enclname{encl}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\headtoname{To}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\headfromname{From}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\datename{Date}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\pagename{Page}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\phonename{Phone}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\mobilephonename{Mobile phone}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\faxname{Fax}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\emailname{Email}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\wwwname{Url}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\bankname{Bank account}%
+ \g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
+ \g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
+ \g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{newzealand}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
+ \g@addnumerical@date{UKenglish}{\number\day/\number\month/\number\year}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\yourrefname{Ihr Zeichen}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\yourmailname{Ihr Schreiben vom}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\myrefname{Unser Zeichen}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\customername{Kundennummer}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\invoicename{Rechnungsnummer}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\subjectname{Betrifft}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\ccname{Kopien an}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\enclname{Anlage}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\headtoname{An}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\headfromname{Von}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\datename{Datum}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\pagename{Seite}%
+ \providecaptionname{german}\phonename{Telephon}%
+ \providecaptionname{ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\phonename{Telefon}%
+ \providecaptionname{german}\mobilephonename{Mobiltelephon}%
+ \providecaptionname{ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\mobilephonename{Mobiltelefon}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\faxname{Fax}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\emailname{E-Mail}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\wwwname{URL}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\bankname{Bankverbindung}%
+ \g@addnumerical@date{german}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{ngerman}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{austrian}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{naustrian}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{swissgerman}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{nswissgerman}{%
+ \number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\yourrefname{Vos r\'ef\'erences}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\yourmailname{Votre lettre du}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\myrefname{Nos r\'ef\'erences}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\customername{Num\'ero de client}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\invoicename{Num\'ero de facture}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\subjectname{Concernant}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\ccname{Copie \`a}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\enclname{Annexes}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\headtoname{A}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\headfromname{De}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\datename{Date}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\pagename{Page}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\phonename{T\'el\'ephone}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\mobilephonename{Portable}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\faxname{T\'el\'efax}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\emailname{E-mail}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\wwwname{URL}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\bankname{Compte en banque}%
+ \g@addnumerical@date{acadian}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{canadien}{\number\year/\number\month/\number\day}%
+ \g@addnumerical@date{francais}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{french}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{italian}\yourrefname{Vs./Rif.}% or Vostro Riferimento
+ \providecaptionname{italian}\yourmailname{Vs.~lettera del}% or Vostra
+ % lettera del
+ \providecaptionname{italian}\myrefname{Ns./Rif.}% or Nostro Riferimento
+ \providecaptionname{italian}\customername{Nr.~cliente}% or Cliente num.
+ \providecaptionname{italian}\invoicename{Nr.~fattura}% or Fattura num.
+ \providecaptionname{italian}\subjectname{Oggetto}%
+ \providecaptionname{italian}\ccname{Per conoscenza}% or Copia a
+ \providecaptionname{italian}\enclname{Allegato}% or (plural) Allegati
+ \providecaptionname{italian}\headtoname{A}%
+ \providecaptionname{italian}\headfromname{Da}%
+ \providecaptionname{italian}\datename{Data}%
+ \providecaptionname{italian}\pagename{Pagina}%
+ \providecaptionname{italian}\phonename{Telefono}%
+ \providecaptionname{italian}\mobilephonename{Telefonino}%
+ \providecaptionname{italian}\faxname{Fax}%
+ \providecaptionname{italian}\emailname{Email}%
+ \providecaptionname{italian}\wwwname{Sito Web}%
+ \providecaptionname{italian}\bankname{Conto bancario}%
+ \g@addnumerical@date{italian}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{spanish}\yourrefname{Su ref.}%
+ \providecaptionname{spanish}\yourmailname{Su carta de}%
+ \providecaptionname{spanish}\myrefname{Nuestra ref.}%
+ \providecaptionname{spanish}\customername{No. de cliente}%
+ \providecaptionname{spanish}\invoicename{No. de factura}%
+ \providecaptionname{spanish}\subjectname{Asunto}%
+ \providecaptionname{spanish}\ccname{Copias}%
+ \providecaptionname{spanish}\enclname{Adjunto}%
+ \providecaptionname{spanish}\headtoname{A}%
+ \providecaptionname{spanish}\headfromname{De}%
+ \providecaptionname{spanish}\datename{Fecha}%
+ \providecaptionname{spanish}\pagename{P\'agina}%
+ \providecaptionname{spanish}\phonename{Tel\'efono}%
+ \providecaptionname{spanish}\mobilephonename{M\'ovil}%
+ \providecaptionname{spanish}\faxname{Fax}%
+ \providecaptionname{spanish}\emailname{Email}% or Correo electr\'onico
+ \providecaptionname{spanish}\wwwname{URL}% or P\`agina web
+ \providecaptionname{spanish}\bankname{Cuenta bancaria}%
+ \g@addnumerical@date{spanish}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{croatian}\yourrefname{Va\v{s} znak}%
+ \providecaptionname{croatian}\yourmailname{Va\v{s}e pismo od}%
+ \providecaptionname{croatian}\myrefname{Na\v{s} znak}%
+ \providecaptionname{croatian}\customername{Broj kupca}%
+ \providecaptionname{croatian}\invoicename{Broj fakture}%
+ \providecaptionname{croatian}\subjectname{Predmet}%
+ \providecaptionname{croatian}\ccname{Kopija}%
+ \providecaptionname{croatian}\enclname{Privitak}%
+ \providecaptionname{croatian}\headtoname{Prima}%
+ \providecaptionname{croatian}\headfromname{\v{S}alje}%
+ \providecaptionname{croatian}\datename{Nadnevak}%
+ \providecaptionname{croatian}\pagename{Stranica}%
+ \providecaptionname{croatian}\phonename{Telefon}%
+ \providecaptionname{croatian}\mobilphonename{Mobitel}%
+ \providecaptionname{croatian}\faxname{Fax}%
+ \providecaptionname{croatian}\emailname{E-Mail}%
+ \providecaptionname{croatian}\wwwname{URL}%
+ \providecaptionname{croatian}\bankname{Bankovna veza}%
+ \g@addnumerical@date{croatian}{\number\day.\,\number\month.\,\number\year.}%
+ \providecaptionname{dutch}\yourrefname{Uw kenmerk}%
+ \providecaptionname{dutch}\yourmailname{Uw brief van}%
+ \providecaptionname{dutch}\myrefname{Ons kenmerk}%
+ \providecaptionname{dutch}\customername{Klant No.}%
+ \providecaptionname{dutch}\invoicename{Rekening No.}%
+ \providecaptionname{dutch}\subjectname{Onderwerp}%
+ \providecaptionname{dutch}\ccname{Kopie aan}%
+ \providecaptionname{dutch}\enclname{Bijlage(n)}%
+ \providecaptionname{dutch}\headtoname{Aan}%
+ \providecaptionname{dutch}\headfromname{Van}%
+ \providecaptionname{dutch}\datename{Datum}%
+ \providecaptionname{dutch}\pagename{Pagina}%
+ \providecaptionname{dutch}\phonename{Telefoon}%
+ \providecaptionname{dutch}\mobilephonename{Mobieltje}%
+ \providecaptionname{dutch}\faxname{Fax}%
+ \providecaptionname{dutch}\emailname{E--mail}%
+ \providecaptionname{dutch}\wwwname{URL}%
+ \providecaptionname{dutch}\bankname{Bankrekening}%
+ \g@addnumerical@date{dutch}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{finnish}\yourrefname{Viitteenne}%
+ \providecaptionname{finnish}\yourmailname{Kirjeenne}%
+ \providecaptionname{finnish}\myrefname{Viitteemme}%
+ \providecaptionname{finnish}\customername{Asiakasnumero}%
+ \providecaptionname{finnish}\invoicename{Laskun numero}%
+ \providecaptionname{finnish}\subjectname{Asia}%
+ \providecaptionname{finnish}\ccname{Jakelu}%
+ \providecaptionname{finnish}\enclname{Liitteet}%
+ \providecaptionname{finnish}\headtoname{Vastaanottaja}%
+ \providecaptionname{finnish}\headfromname{L\"ahett\"aj\"a}%
+ \providecaptionname{finnish}\datename{P\"aiv\"a}%
+ \providecaptionname{finnish}\pagename{Sivu}%
+ \providecaptionname{finnish}\phonename{Puhelin}%
+ \providecaptionname{finnish}\mobilephonename{Matkapuhelin}%
+ \providecaptionname{finnish}\faxname{Faksi}%
+ \providecaptionname{finnish}\emailname{S\"ahk\"oposti}%
+ \providecaptionname{finnish}\wwwname{URL}%
+ \providecaptionname{finnish}\bankname{Pankkitilin numero}%
+ \g@addnumerical@date{finnish}{\number\day.\number\month.\number\year}%
+ \providecaptionname{norsk}\yourrefname{Deres ref.}%
+ \providecaptionname{norsk}\yourmailname{Deres brev av:}%
+ \providecaptionname{norsk}\myrefname{V\aa{}r ref:}%
+ \providecaptionname{norsk}\customername{Kundenummer}%
+ \providecaptionname{norsk}\invoicename{Fakturanummer}%
+ \providecaptionname{norsk}\subjectname{Emne}%
+ \providecaptionname{norsk}\ccname{Kopi til}%
+ \providecaptionname{norsk}\enclname{Vedlegg}%
+ \providecaptionname{norsk}\headtoname{Til}%
+ \providecaptionname{norsk}\headfromname{Fra}%
+ \providecaptionname{norsk}\datename{Dato}%
+ \providecaptionname{norsk}\pagename{Side}%
+ \providecaptionname{norsk}\phonename{Telefon}%
+ \providecaptionname{norsk}\mobilephonename{Mobiltelefon}%
+ \providecaptionname{norsk}\faxname{Telefaks}%
+ \providecaptionname{norsk}\emailname{E-post}%
+ \providecaptionname{norsk}\wwwname{Url}%
+ \providecaptionname{norsk}\bankname{Bankkontonummer}%
+ \g@addnumerical@date{norsk}{\number\day.\number\month.\number\year}%
+ \providecaptionname{swedish}\yourrefname{Er ref}%
+ \providecaptionname{swedish}\yourmailname{Ert brev av}%
+ \providecaptionname{swedish}\myrefname{V\aa{}r ref}%
+ \providecaptionname{swedish}\customername{Kundnummer}%
+ \providecaptionname{swedish}\invoicename{Fakturanummer}%
+ \providecaptionname{swedish}\subjectname{\"Amne}%
+ \providecaptionname{swedish}\ccname{Kopia till}%
+ \providecaptionname{swedish}\enclname{Bilagor}% Singular: Bilaga
+ \providecaptionname{swedish}\headtoname{Till}%
+ \providecaptionname{swedish}\headfromname{Fr\aa{}n}%
+ \providecaptionname{swedish}\datename{Datum}%
+ \providecaptionname{swedish}\pagename{Sida}%
+ \providecaptionname{swedish}\phonename{Telefon}%
+ \providecaptionname{swedish}\mobilephonename{Mobiltelefon}%
+ \providecaptionname{swedish}\faxname{Telefax}%
+ \providecaptionname{swedish}\emailname{E-post}%
+ \providecaptionname{swedish}\wwwname{Hemsida}%
+ \providecaptionname{swedish}\bankname{Bankgiro}% PlusGiro
+ \g@addnumerical@date{swedish}{\number\day/\number\month~\number\year}%
+ \providecaptionname{polish}\yourrefname{Wasz znak}%
+ \providecaptionname{polish}\yourmailname{Wasze pismo z dnia}%
+ \providecaptionname{polish}\myrefname{Nasz znak}%
+ \providecaptionname{polish}\customername{Numer klienta}%
+ \providecaptionname{polish}\invoicename{Numer rachunku}%
+ \providecaptionname{polish}\subjectname{Dotyczy}%
+ \providecaptionname{polish}\ccname{Rozdzielnik}%
+ \providecaptionname{polish}\enclname{Za\l\aob{}czniki}%
+ \providecaptionname{polish}\headtoname{Do}%
+ \providecaptionname{polish}\headfromname{Od}%
+ \providecaptionname{polish}\datename{Data}%
+ \providecaptionname{polish}\pagename{Strona}%
+ \providecaptionname{polish}\phonename{Telefon}%
+ \providecaptionname{polish}\mobilephonename{Numer mobilny}%
+ \providecaptionname{polish}\faxname{Fax}%
+ \providecaptionname{polish}\emailname{E-mail}%
+ \providecaptionname{polish}\wwwname{URL}%
+ \providecaptionname{polish}\bankname{Konto}%
+ \g@addnumerical@date{polish}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{czech}\yourrefname{Va\v{s}e zna\v{c}ka}%
+ \providecaptionname{czech}\yourmailname{V\'{a}\v{s} dopis ze dne}%
+ \providecaptionname{czech}\myrefname{Na\v{s}e zna\v{c}ka}%
+ \providecaptionname{czech}\customername{Z\'akaznick\'e \v{c}\'{\i}slo}%
+ \providecaptionname{czech}\invoicename{Fakura\v{c}n\'{\i} \v{c}\'{\i}slo}%
+ \providecaptionname{czech}\subjectname{Pr\v{e}dm\v{e}t}%
+ \providecaptionname{czech}\ccname{Kopie}%
+ \providecaptionname{czech}\enclname{P\v{r}\'{\i}loha}%
+ \providecaptionname{czech}\headtoname{Komu}%
+ \providecaptionname{czech}\headfromname{Od}%
+ \providecaptionname{czech}\datename{Datum}%
+ \providecaptionname{czech}\pagename{Strana}%
+ \providecaptionname{czech}\phonename{Telefon}%
+ \providecaptionname{czech}\mobilephonename{Mobil}%
+ \providecaptionname{czech}\faxname{Fax}%
+ \providecaptionname{czech}\emailname{E-Mail}%
+ \providecaptionname{czech}\wwwname{URL}%
+ \providecaptionname{czech}\bankname{Bankovn\'{\i} spojen\'{\i}}%
+ \g@addnumerical@date{czech}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{slovak}\yourrefname{Va\v{s}a zna\v{c}ka}%
+ \providecaptionname{slovak}\yourmailname{V\'{a}\v{s} list zo d\v{n}a}%
+ \providecaptionname{slovak}\myrefname{Na\v{s}a zna\v{c}ka}%
+ \providecaptionname{slovak}\customername{Z\'akazn\'{\i}cke \v{c}\'{\i}slo}%
+ \providecaptionname{slovak}\invoicename{\'{C}\'{\i}slo fakt\'ury}%
+ \providecaptionname{slovak}\subjectname{Predmet}%
+ \providecaptionname{slovak}\ccname{K\'{o}pia pre koho}%
+ \providecaptionname{slovak}\enclname{Pr\'{\i}loha}%
+ \providecaptionname{slovak}\headtoname{Komu}%
+ \providecaptionname{slovak}\headfromname{Od}%
+ \providecaptionname{slovak}\datename{D\'{a}tum}%
+ \providecaptionname{slovak}\pagename{Strana}%
+ \providecaptionname{slovak}\phonename{Telef\'{o}n}%
+ \providecaptionname{slovak}\mobilephonename{Mobil}%
+ \providecaptionname{slovak}\faxname{Fax}%
+ \providecaptionname{slovak}\emailname{E-Mail}%
+ \providecaptionname{slovak}\wwwname{URL}%
+ \providecaptionname{slovak}\bankname{Bankov\'{e} spojenie}%
+ \g@addnumerical@date{slovak}{\number\day.\,\number\month.\,\number\year}%
+ \captionsenglish
+ \dateenglish
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname date\languagename\endcsname\relax
+ \PackageWarningNoLine{scrletter%
+ }{%
+ \string\language\space is \the\language, \string\languagename\space is
+ `\languagename'\MessageBreak
+ but \expandafter\string\csname
+ date\languagename\endcsname\space not defined!\MessageBreak
+ This seems to be a bug at you're `hyphen.cfg'.\MessageBreak
+ Undefining macro \string\languagename\space to avoid errors%
+ }%
+ \let\languagename=\undefined
+ \fi
+ \ifx\languagename\undefined
+ \PackageWarningNoLine{scrletter%
+ }{\string\languagename\space not
+ defined, using \string\language.\MessageBreak
+ This may result in use of wrong language!\MessageBreak
+ You should use a compatible language
+ package\MessageBreak
+ (e.g. `Babel', `german', `ngerman', ...)}%
+ \ifx\l@american\undefined\else\ifnum\language=\l@american
+ \captionsamerican
+ \dateamerican
+ \fi\fi
+ \ifx\l@australian\undefined\else\ifnum\language=\l@australian
+ \captionsaustralian
+ \dateaustralian
+ \fi\fi
+ \ifx\l@british\undefined\else\ifnum\language=\l@british
+ \captionsbritish
+ \datebritish
+ \fi\fi
+ \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian
+ \captionscanadian
+ \datecanadian
+ \fi\fi
+ \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand
+ \captionsnewzealand
+ \datenewzealand
+ \fi\fi
+ \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish
+ \captionsUKenglish
+ \dateUKenglish
+ \fi\fi
+ \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish
+ \captionsUSenglish
+ \dateUSenglish
+ \fi\fi
+ \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian
+ \captionsaustrian
+ \dateaustrian
+ \fi\fi
+ \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian
+ \captionsnaustrian
+ \datenaustrian
+ \fi\fi
+ \ifx\l@german\undefined\else\ifnum\language=\l@german
+ \captionsgerman
+ \dategerman
+ \fi\fi
+ \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman
+ \captionsngerman
+ \datengerman
+ \fi\fi
+ \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman
+ \captionsswissgerman
+ \dateswissgerman
+ \fi\fi
+ \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman
+ \captionsnswissgerman
+ \datenswissgerman
+ \fi\fi
+ \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian
+ \captionsacadian
+ \dateacadian
+ \fi\fi
+ \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien
+ \captionscanadien
+ \datecanadien
+ \fi\fi
+ \ifx\l@francais\undefined\else\ifnum\language=\l@francais
+ \captionsfrancais
+ \datefrancais
+ \fi\fi
+ \ifx\l@french\undefined\else\ifnum\language=\l@french
+ \captionsfrench
+ \datefrench
+ \fi\fi
+ \ifx\l@italian\undefined\else\ifnum\language=\l@italian
+ \captionsitalian
+ \dateitalian
+ \fi\fi
+ \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish
+ \captionsspanish
+ \datespanish
+ \fi\fi
+ \ifx\l@croatian\undefined\else\ifnum\language=\l@croatian
+ \captionscroatian
+ \datecroatian
+ \fi\fi
+ \ifx\l@dutch\undefined\else\ifnum\language=\l@dutch
+ \captionsdutch
+ \datedutch
+ \fi\fi
+ \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish
+ \captionsfinnish
+ \datefinnish
+ \fi\fi
+ \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk
+ \captionsnorsk
+ \datenorsk
+ \fi\fi
+ \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish
+ \captionsswedish
+ \dateswedish
+ \fi\fi
+ \ifx\l@polish\undefined\else\ifnum\language=\l@polish
+ \captionspolish
+ \datepolish
+ \fi\fi
+ \ifx\l@czech\undefined\else\ifnum\language=\l@czech
+ \captionsczech
+ \dateczech
+ \fi\fi
+ \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak
+ \captionsslovak
+ \dateslovak
+ \fi\fi
+ \else
+ \edef\@tempa{nohyphenation}%
+ \ifx\languagename\@tempa
+ \PackageWarningNoLine{scrletter%
+ }{%
+ You've selected language `\languagename'.\MessageBreak
+ Maybe your LaTeX format contains Babel extension\MessageBreak
+ but you have not selected a language using\MessageBreak
+ Babel package.\MessageBreak
+ Please select another language!\MessageBreak
+ Only as a workaround english captions and date\MessageBreak
+ will be used%
+ }%
+ \else
+ \PackageInfo{scrletter%
+ }{%
+ trying to activate captions and date\MessageBreak
+ of language `\languagename'%
+ }%
+ \csname date\languagename\endcsname
+ \csname captions\languagename\endcsname
+ \PackageInfo{scrletter%
+ }{%
+ used language is `\languagename'.\MessageBreak
+ Supported languages are: `english', `UKenglish',\MessageBreak
+ `british', `american', `USenglish', `australian`,\MessageBreak
+ `canadian', `newzealand',\MessageBreak
+ `german', `ngerman', `austrian', `naustrian',\MessageBreak
+ `swissgerman', `nswissgermsn',\MessageBreak
+ `acadian', `canadien', `francais', `french', \MessageBreak
+ `dutch', `italian', `spanish', `polish',\MessageBreak
+ `croatian', `finnish', `norsk', `swedish',\MessageBreak
+ `czech'. `slovak'
+ }%
+ \fi
+ \fi
+}
+%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
+\newcommand*{\newkomavar}{%
+ \@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
+\newcommand*{\@newkomavar}[2][\relax]{%
+ \@ifundefined{scr@#2@name}{%
+ \@ifundefined{scr@#2@var}{%
+ \begingroup
+ \def\@tempa{#1}\def\@tempb{\relax}%
+ \ifx\@tempa\@tempb\endgroup\else
+ \endgroup\@namedef{scr@#2@name}{#1}%
+ \fi%
+ \expandafter\let\csname scr@#2@var\endcsname=\@empty
+ \if@tempswa\addtoreffields{#2}\fi
+ }{%
+ \PackageError{scrletter%
+ }{%
+ This should never happen%
+ }{%
+ The contents of the KOMA-Script variable `#2'\MessageBreak
+ is undefined, but the name of the variable is
+ defined.\MessageBreak
+ This should never happen. So someone crashs me!%
+ }%
+ }%
+ }{%
+ \PackageError{scrletter%
+ }{%
+ Variable `#2' already defined%
+ }{%
+ I'll ignore this command, if you'll continue.%
+ }%
+ }%
+}
+\newcommand*{\setkomavar}{%
+ \@ifstar {\@setkomaname}{\@setkomavar}}
+\newcommand*{\@setkomavar}[1]{%
+ \@ifnextchar [%]
+ {\@@setkomavar{#1}}{\@@setkomavar{#1}[\relax]}}
+\newcommand*{\@setkomaname}[2]{%
+ \@ifundefined{scr@#1@var}{%
+ \@komavar@err{set}{#1}%
+ }{%
+ \@namedef{scr@#1@name}{#2}%
+ \csname scr@#1@postsetname\endcsname
+ }%
+}
+\newcommand*{\@@setkomavar}{}
+\long\def\@@setkomavar#1[#2]#3{%
+ \@ifundefined{scr@#1@var}{%
+ \@komavar@err{set}{#1}%
+ }{%
+ \@namedef{scr@#1@var}{#3}%
+ \csname scr@#1@postsetvar\endcsname
+ \begingroup
+ \def\@tempa{#2}\def\@tempb{\relax}%
+ \ifx\@tempa\@tempb\endgroup\else
+ \endgroup\@namedef{scr@#1@name}{#2}%
+ \csname scr@#1@postsetname\endcsname
+ \fi
+ }%
+}
+\newcommand*{\@komavar@err}[2]{%
+ \PackageError{scrletter%
+ }{%
+ KOMA-Script variable not defined%
+ }{%
+ You've tried to #1 the not defined KOMA-Script variable
+ `#2'.\MessageBreak
+ You have to define the variable using \string\newkomavar\space
+ before\MessageBreak
+ you do this.%
+ }%
+}
+\DeclareRobustCommand*{\usekomavar}{%
+ \@ifstar {\@usekomaname}{\@usekomavar}}
+\newcommand*{\@usekomavar}[2][\@firstofone]{%
+ \@ifundefined{scr@#2@var}{%
+ \@komavar@err{use}{#2}%
+ }{%
+ #1{\@nameuse{scr@#2@var}}%
+ }%
+}
+\newcommand*{\@usekomaname}[2][\@firstofone]{%
+ \@ifundefined{scr@#2@var}{%
+ \@komavar@err{use}{#2}%
+ }{%
+ #1{\@nameuse{scr@#2@name}}%
+ }%
+}
+\DeclareRobustCommand*{\ifkomavar}[1]{%
+ \scr@ifundefinedorrelax{scr@#1@var}{%
+ \expandafter\@secondoftwo
+ }{%
+ \expandafter\@firstoftwo
+ }%
+}
+\DeclareRobustCommand*{\ifkomavarempty}{%
+ \begingroup
+ \@ifstar {\@tempswatrue\@ifkomavarempty}%
+ {\@tempswafalse\@ifkomavarempty}%
+}
+\newcommand{\@ifkomavarempty}[1]{%
+ \ifkomavar{#1}{%
+ \if@tempswa
+ \@ifundefined{scr@#1@name}{%
+ \aftergroup\@firstoftwo
+ }{%
+ \expandafter\ifx\csname scr@#1@name\endcsname\@empty
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ }%
+ \else
+ \expandafter\ifx\csname scr@#1@var\endcsname\@empty
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \fi
+ }{%
+ \@komavar@err{use}{#1}%
+ \aftergroup\@gobbletwo
+ }%
+ \endgroup
+}
+%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
+\newcommand*{\@newplength}[1]{%
+ \@ifundefined{ltr@len@#1}{%
+ \expandafter\let\csname ltr@len@#1\endcsname=\z@%
+ }{%
+ \PackageError{scrletter%
+ }{%
+ pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
+ already defined%
+ }{%
+ You tried to define a new pseudo-length using
+ \string\@newplength\MessageBreak
+ which is already defined. Try another name or
+ better\MessageBreak
+ Don't use this KOMA-Script internal macro}%
+ }%
+ }
+\scr@ifundefinedorrelax{dimexpr}{%
+ \newcommand*{\useplength}[1]{%
+ \number \csname ltx@len@#1\endcsname\relax}%
+}{%
+ \newcommand*{\useplength}[1]{%
+ \dimexpr \csname ltr@len@#1\endcsname\relax}%
+}
+\newcommand*{\setlengthtoplength}[3][]{%
+ \setlength{#2}{\useplength{#3}}%
+ \setlength{#2}{#1#2}}
+\newcommand*{\@setplength}[3][]{%
+ \begingroup%
+ \setlength{\@tempskipa}{#3}%
+ \setlength{\@tempskipa}{#1\@tempskipa}%
+ \edef\@tempa{\noexpand\endgroup%
+ \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
+ \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempskipa}%
+ }%
+ \@tempa%
+ }
+\newcommand*{\addtolengthplength}[3][]{%
+ \begingroup%
+ \setlengthtoplength[{#1}]{\@tempskipa}{#3}%
+ \edef\@tempa{\endgroup%
+ \noexpand\addtolength{#2}{\the\@tempskipa}}%
+ \@tempa%
+ }
+\newcommand*{\@addtoplength}[3][]{%
+ \begingroup%
+ \setlength{\@tempskipa}{#3}%
+ \setlength{\@tempskipa}{#1\@tempskipa}%
+ \addtolengthplength{\@tempskipa}{#2}%
+ \edef\@tempa{\noexpand\endgroup%
+ \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
+ \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempskipa}%
+ }%
+ \@tempa%
+ }
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+\RequirePackage{scrlayer-scrpage}
+\newpairofpagestyles{letter}{%
+ \clearpairofpagestyles
+ \lehead[\ifnum\@pageat=\z@\pagemark\fi]%
+ {\usekomavar{nexthead}}%
+ \lohead[\ifnum\@pageat=\z@\pagemark\fi]%
+ {\usekomavar{nexthead}}%
+ \chead[\ifnum\@pageat=\@ne\pagemark\fi]%
+ {}%
+ \rehead[\ifnum\@pageat=\tw@\pagemark\fi]%
+ {}%
+ \rohead[\ifnum\@pageat=\tw@\pagemark\fi]%
+ {}%
+ \lefoot[\ifnum\@pageat=\thr@@\pagemark\fi]%
+ {\usekomavar{nextfoot}}%
+ \lofoot[\ifnum\@pageat=\thr@@\pagemark\fi]%
+ {\usekomavar{nextfoot}}%
+ \cfoot[\ifnum\@pageat=4 \pagemark\fi]%
+ {}%
+ \refoot[\ifnum\@pageat=5 \pagemark\fi]%
+ {}%
+ \rofoot[\ifnum\@pageat=5 \pagemark\fi]%
+ {}%
+}
+%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
+\newkomavar{firsthead}
+\setkomavar{firsthead}{%
+ \parbox[b]{\useplength{firstheadwidth}}%
+ {\centering\usekomafont{fromaddress}{%
+ \ifkomavarempty{fromname}{}{%
+ {\usekomafont{fromname}%
+ {\ignorespaces\usekomavar{fromname}}}\\[-8pt]
+ {\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
+ }%
+ \ifkomavarempty{fromaddress}{}{%
+ \csname scr@default@firsthead@fromaddress@hook\endcsname
+ \ignorespaces\usekomavar{fromaddress}%
+ }%
+ }%
+ }%
+}
+\newcommand*{\scr@firsthead@postsetvar}{%
+ \renewcommand*{\@alignfrom}{10000}%
+}
+\newcommand*{\@gen@firsthead}{%
+ \ifcase\@alignfrom
+ \setkomavar{firsthead}{%
+ \parbox[b]{\textwidth}{\raggedright
+ {\usekomafont{fromname}\strut\ignorespaces
+ \usekomavar{fromname}%
+ {%
+ \ifnum\@rulefrom=1\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \if@logo
+ \settowidth{\@tempdimb}{\usekomavar{fromlogo}}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \fi
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ }%
+ \\
+ }%
+ {\usekomafont{fromaddress}\strut\ignorespaces
+ \usekomavar{fromaddress}%
+ \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
+ \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
+ \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
+ \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
+ \ifnum\@rulefrom=2\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ \\
+ }%
+ }%
+ \if@logo
+ \llap{\usekomavar{fromlogo}}%
+ \fi
+ }%
+ \renewcommand*{\@alignfrom}{0}%
+ \or
+ \setkomavar{firsthead}{%
+ \parbox[b]{\textwidth}{\centering
+ {\usekomafont{fromname}\strut\ignorespaces
+ \usekomavar{fromname}%
+ {%
+ \ifnum\@rulefrom=1\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ }%
+ \\
+ }%
+ {\usekomafont{fromaddress}\strut\ignorespaces
+ \usekomavar{fromaddress}%
+ \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
+ \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
+ \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
+ \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
+ \ifnum\@rulefrom=2\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ \\
+ }%
+ }%
+ }%
+ \renewcommand*{\@alignfrom}{1}%
+ \or
+ \setkomavar{firsthead}{%
+ \if@logo
+ \rlap{\usekomavar{fromlogo}}%
+ \fi
+ \parbox[b]{\textwidth}{\raggedleft
+ {\usekomafont{fromname}\strut\ignorespaces
+ \usekomavar{fromname}%
+ {%
+ \ifnum\@rulefrom=1\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \if@logo
+ \settowidth{\@tempdimb}{\usekomavar{fromlogo}}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \fi
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ }%
+ \\
+ }%
+ {\usekomafont{fromaddress}\strut\ignorespaces
+ \usekomavar{fromaddress}%
+ \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
+ \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
+ \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
+ \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
+ \ifnum\@rulefrom=2\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ \\
+ }%
+ }%
+ }%
+ \renewcommand*{\@alignfrom}{2}%
+ \fi
+}
+\newkomafont{foldmark}{}
+\newkomafont{fromname}{}
+\newkomafont{fromaddress}{}
+\newkomafont{fromrule}{}
+\newkomafont{backaddress}{\sffamily}
+\newkomafont{specialmail}{}
+\newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries}
+\newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont}
+\newkomafont{PPlogo}{\sffamily\bfseries}
+\newkomafont{PPdata}{\sffamily}
+\newkomafont{addressee}{}
+\newkomafont{toname}{}
+\newkomafont{toaddress}{}
+\newkomafont{refname}{\sffamily\scriptsize}
+ \newkomafont{refvalue}{}
+\newkomafont{placeanddate}{}
+\scr@ifundefinedorrelax{scr@fnt@title}{%
+ \newkomafont{title}{\normalcolor\sffamily\bfseries}%
+}{}
+\scr@ifundefinedorrelax{scr@fnt@subject}{%
+ \newkomafont{subject}{\normalcolor\bfseries}%
+}{}
+\@newplength{foldmarkhpos}
+\@newplength{foldmarkvpos}
+\@newplength{tfoldmarkvpos}
+\@newplength{mfoldmarkvpos}
+\@newplength{bfoldmarkvpos}
+\@newplength{lfoldmarkhpos}
+\@newplength{pfoldmarklength}
+\@newplength{tfoldmarklength}
+\@newplength{mfoldmarklength}
+\@newplength{bfoldmarklength}
+\@newplength{lfoldmarklength}
+\@newplength{foldmarkthickness}
+\@setplength{foldmarkthickness}{.2pt}
+\@newplength{toaddrvpos}
+\@newplength{backaddrheight}
+\@newplength{toaddrhpos}
+\@newplength{specialmailindent}
+\@newplength{specialmailrightindent}
+\@newplength{toaddrindent}
+\@newplength{PPheadheight}
+\@newplength{PPheadwidth}
+\@newplength{PPdatamatrixvskip}
+\@newplength{toaddrwidth}
+\@newplength{toaddrheight}
+\@newplength{locvpos}
+\@newplength{locwidth}
+\@newplength{lochpos}
+\@newplength{locheight}
+\@newplength{refvpos}
+\@newplength{refwidth}
+\@newplength{refhpos}
+\@newplength{refaftervskip}
+\@newplength{sigbeforevskip}
+\@newplength{sigindent}
+\@newplength{firstfootvpos}
+\@newplength{firstfootwidth}
+\@newplength{firstfoothpos}
+\@setplength{firstfoothpos}{\maxdimen}
+\@newplength{firstheadvpos}
+\@newplength{firstheadwidth}
+\@newplength{firstheadhpos}
+\@setplength{firstheadhpos}{\maxdimen}
+\@newplength{fromrulewidth}
+\@setplength{fromrulewidth}{0pt}
+\@newplength{fromrulethickness}
+\@setplength{fromrulethickness}{.4pt}
+\newkomavar{firstfoot}
+\newcommand*{\move@topt}{%
+ \null\vskip -1in\vskip -\topmargin%
+ \vskip -\headheight\vskip -\headsep%
+ \vskip -\topskip%
+ \ignorespaces%
+}
+\newcommand*{\move@frompt}{%
+ \vskip 1in\vskip \topmargin%
+ \vskip \headheight\vskip \headsep%
+ \vskip \topskip%
+ \vskip -\baselineskip%
+ \ignorespaces%
+}
+\newcommand*{\move@topl}{%
+ \null\hskip -1in%
+ \ifodd\value{page}\hskip -\oddsidemargin\else\hskip -\evensidemargin\fi
+ \ignorespaces%
+}
+\newcommand*{\move@frompl}{%
+ \hskip 1in%
+ \ifodd\value{page}\hskip \oddsidemargin\else\hskip \evensidemargin\fi%
+ \ignorespaces%
+}
+\newcommand{\vb@t@z}[1]{{%
+ \setbox0\vbox to\z@{#1\vss}%
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
+ \setlength{\baselineskip}{\z@}%
+ \setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
+ \box0\vskip-\@tempdima%
+ }%
+}
+\newcommand*{\@foldmark}[2]{%
+ \vb@t@z{\setlength{\@tempdima}{#1}%
+ \addtolengthplength[-.5]{\@tempdima}{foldmarkthickness}%
+ \vskip \@tempdima
+ \rlap{\move@topl\hskip\useplength{foldmarkhpos}%
+ \usekomafont{foldmark}{%
+ \rule{#2}{\useplength{foldmarkthickness}}}}}%
+ \ignorespaces
+}
+\newcommand*{\@hfoldmark}[1]{%
+ \begingroup
+ \@expandtwoargs\in@{#1}{\@usefolds}%
+ \ifin@
+ \lowercase{%
+ \edef\@tempa{%
+ \noexpand\ifdim \noexpand\useplength{#1foldmarkvpos}=\noexpand\z@
+ \noexpand\else
+ \noexpand\@foldmark{%
+ \noexpand\useplength{#1foldmarkvpos}%
+ }{%
+ \noexpand\useplength{#1foldmarklength}%
+ }%
+ \noexpand\fi
+ }%
+ }%
+ \@tempa
+ \fi
+ \endgroup
+}
+\newcommand*{\@vfoldmark}[1]{%
+ \begingroup
+ \@expandtwoargs\in@{#1}{\@usefolds}%
+ \ifin@
+ \ifdim \useplength{lfoldmarkhpos}=\z@\else
+ \vb@t@z{%
+ \ifdim \useplength{foldmarkvpos}<\z@
+ \nobreak\vskip \paperheight\nobreak
+ \fi
+ \vskip \useplength{foldmarkvpos}%
+ \vskip \useplength{foldmarkthickness}%
+ \rlap{\move@topl
+ \setlength{\@tempdima}{\useplength{lfoldmarkhpos}}%
+ \addtolengthplength[-.5]{\@tempdima}{foldmarkthickness}%
+ \hskip\@tempdima
+ \usekomafont{foldmark}{%
+ \rule{\useplength{foldmarkthickness}}%
+ {\useplength{lfoldmarklength}}%
+ }%
+ }%
+ }%
+ \ignorespaces
+ \fi
+ \fi
+ \endgroup
+}
+\newcommand*{\@foldmarks}{%
+ \if@fold%
+ \typeout{Foldmarks: yes}%
+ \move@topt
+ \ifdim \useplength{pfoldmarklength}=\z@
+ \@setplength{pfoldmarklength}{4mm}%
+ \fi
+ \ifdim \useplength{tfoldmarklength}=\z@
+ \@setplength{tfoldmarklength}{2mm}%
+ \fi
+ \ifdim \useplength{mfoldmarklength}=\z@
+ \@setplength{mfoldmarklength}{2mm}%
+ \fi
+ \ifdim \useplength{bfoldmarklength}=\z@
+ \@setplength{bfoldmarklength}{2mm}%
+ \fi
+ \ifdim \useplength{lfoldmarklength}=\z@
+ \@setplength{lfoldmarklength}{4mm}%
+ \fi
+ \begingroup
+ \@expandtwoargs\in@{P}{\@usefolds}%
+ \ifin@
+ \@foldmark{.5\paperheight}{\useplength{pfoldmarklength}}%
+ \fi
+ \endgroup
+ \@hfoldmark{T}%
+ \@hfoldmark{M}%
+ \@hfoldmark{B}%
+ \@vfoldmark{L}%
+ \move@frompt
+ \else
+ \typeout{Foldmarks: no}%
+ \fi%
+}
+\newif\if@savevbox@warning\@savevbox@warningtrue
+\newcommand{\@savevbox}[6][]{%
+ \begingroup%
+ \vbox to #2{#1#3}%
+ \if@savevbox@warning\@savevbox@warningfalse%
+ \setbox0\vbox{#3}%
+ \setlength{\@tempdima}{#2}%
+ \setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
+ \ifdim \@tempdimb>\@tempdima%
+ \addtolength{\@tempdimb}{-\@tempdima}%
+ \PackageWarning{scrletter}{%
+ #4 is \the\@tempdimb\space too high.\MessageBreak
+ You have to change `\string#5'\MessageBreak
+ or you have to define a smaller\MessageBreak
+ #4 using \string#6.\MessageBreak
+ Because of this too high #4\MessageBreak
+ you've got an overfull \string\vbox\space message%
+ }%
+ \fi%
+ \fi%
+ \endgroup%
+}
+\newcommand*{\@firstheadfootfield}{%
+ \if@firsthead
+ \typeout{Head of first page}%
+ \move@topt\vskip\useplength{firstheadvpos}%
+ \vb@t@z{%
+ \rlap{\move@topl
+ \ifdim\useplength{firstheadhpos}<\paperwidth
+ \ifdim \useplength{firstheadhpos}>-\paperwidth
+ \ifdim \useplength{firstheadhpos}<\z@
+ \setlength\@tempskipa{\paperwidth}%
+ \addtolengthplength{\@tempskipa}{firstheadhpos}%
+ \addtolengthplength[-]{\@tempskipa}{firstheadwidth}%
+ \else
+ \setlength{\@tempskipa}{\useplength{firstheadhpos}}%
+ \fi
+ \else
+ \setlength\@tempskipa{\oddsidemargin}%
+ \addtolength\@tempskipa{1in}%
+ \fi
+ \else
+ \setlength\@tempskipa{.5\paperwidth}%
+ \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}%
+ \fi
+ \hskip\@tempskipa
+ \vbox{\hsize\useplength{firstheadwidth}%
+ \setlength{\@tempskipa}{\useplength{toaddrvpos}}%
+ \addtolengthplength[-1]{\@tempskipa}{firstheadvpos}%
+ \addtolength{\@tempskipa}{-\baselineskip}%
+ \setlength{\textwidth}{\useplength{firstheadwidth}}%
+ \setlength{\parfillskip}{\z@ \@plus 1fil}%
+ \@savevbox{\@tempskipa}{\noindent\usekomavar{firsthead}%
+ \vskip \z@ \@plus .00001fil}%
+ {head of first page}{firstheadvpos}{\setkomavar}%
+ }%
+ }%
+ }%
+ \vskip-\useplength{firstheadvpos}\move@frompt
+ \else
+ \typeout{No head at first page}%
+ \fi
+ \move@topt
+ \if@firstfoot
+ \typeout{Foot of first page}%
+ \vb@t@z{%
+ \rlap{\move@topl
+ \ifdim\useplength{firstfoothpos}<\paperwidth
+ \ifdim \useplength{firstfoothpos}>-\paperwidth
+ \ifdim \useplength{firstfoothpos}<\z@
+ \setlength\@tempskipa{\paperwidth}%
+ \addtolengthplength{\@tempskipa}{firstfoothpos}%
+ \addtolengthplength[-]{\@tempskipa}{firstfootwidth}%
+ \else
+ \setlength{\@tempskipa}{\useplength{firstfoothpos}}%
+ \fi
+ \else
+ \setlength\@tempskipa{\oddsidemargin}%
+ \addtolength\@tempskipa{1in}%
+ \fi
+ \else
+ \setlength\@tempskipa{.5\paperwidth}%
+ \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}%
+ \fi
+ \hskip\@tempskipa
+ \vbox{\hsize\useplength{firstfootwidth}%
+ \vskip\useplength{firstfootvpos}%
+ \setlength{\textwidth}{\useplength{firstfootwidth}}%
+ \setlength{\parfillskip}{\z@ \@plus 1fil}%
+ \vbox{\hsize\useplength{firstfootwidth}\noindent
+ \usekomavar{firstfoot}}%
+ }%
+ }%
+ }%
+ \else
+ \typeout{No foot at first page}%
+ \fi
+ \move@frompt%
+ {%
+ \setlength{\@tempdima}{1in}\addtolength{\@tempdima}{\topmargin}%
+ \addtolength{\@tempdima}{\headheight}%
+ \addtolength{\@tempdima}{\headsep}%
+ \addtolength{\@tempdima}{\textheight}%
+ \addtolength{\@tempdima}{\footskip}%
+ \if@firstfoot
+ \addtolengthplength[-1]{\@tempdima}{firstfootvpos}%
+ \else
+ \addtolength{\@tempdima}{-\paperheight}%
+ \fi
+ \ifdim\@tempdima>\z@\enlargethispage{-\@tempdima}%
+ \else\if@enlargefp\enlargethispage{-\@tempdima}\fi\fi
+ }%
+}
+\newcommand*{\@addrfield}{%
+ \ifcase \@afieldmode\relax
+ \typeout{Address: No}%
+ \or
+ \begingroup%
+ \if@baddr
+ \ifkomavarempty{backaddress}{%
+ \let\@tempa\@empty\let\@tempb\@empty
+ }{%
+ \def\@tempa{backaddress}\def\@tempb{,\space}%
+ }%
+ \else
+ \let\@tempa\@empty\let\@tempb\@empty
+ \fi
+ \ifcase \ltr@priority
+ \ifkomavarempty{specialmail}{}{%
+ \edef\@tempa{\@tempa\@tempb specialmail}\def\@tempb{,\space}%
+ }%
+ \or
+ \edef\@tempa{\@tempa\@tempb B-Economy}\def\@tempb{,\space}%
+ \or
+ \edef\@tempa{\@tempa\@tempb A-Priority}\def\@tempb{,\space}%
+ \fi
+ \typeout{Address (\@tempa\@tempb addressee)}%
+ \endgroup%
+ \move@topt\vskip\useplength{toaddrvpos}%
+ \vb@t@z{{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
+ \rlap{\move@topl
+ \setlengthtoplength{\@tempskipa}{toaddrhpos}%
+ \ifdim \@tempskipa<\z@
+ \addtolength{\@tempskipa}{\paperwidth}%
+ \addtolengthplength[-]{\@tempskipa}{toaddrwidth}%
+ \fi
+ \hskip\@tempskipa
+ \@savevbox{\useplength{toaddrheight}}{\hsize\useplength{toaddrwidth}%
+ \@savevbox[\vss]{\useplength{backaddrheight}}{%
+ \hsize\useplength{toaddrwidth}%
+ \if@baddr
+ \ifkomavarempty{backaddress}{}{{%
+ \noindent%
+ \def\\{\usekomavar{backaddressseparator}\@ogobble}%
+ \backaddr@format{\scriptsize\usekomafont{backaddress}%
+ \usekomavar{backaddress}}}}%
+ \fi
+ }{backaddress}{backaddrheight}{\setkomavar}%
+ \ifcase \ltr@priority
+ \or
+ \setkomavar{specialmail}{%
+ {\usekomafont{priority}{%
+ {\usekomafont{prioritykey}{B}}%
+ -ECONOMY}}%
+ }%
+ \or
+ \setkomavar{specialmail}{%
+ {\usekomafont{priority}{%
+ {\usekomafont{prioritykey}{A}}%
+ -PRIORITY}}%
+ }%
+ \fi
+ \ifkomavarempty{specialmail}{}{%
+ \vbox{\hsize\useplength{toaddrwidth}%
+ \noindent\hspace*{\useplength{specialmailindent}}%
+ \specialmail@format{%
+ \usekomafont{specialmail}\usekomavar{specialmail}}%
+ \hspace*{\useplength{specialmailrightindent}}}%
+ }%
+ \vfil%
+ \noindent\hskip\useplength{toaddrindent}%
+ \setlength{\@tempdima}{\useplength{toaddrwidth}}%
+ \addtolengthplength[-2]{\@tempdima}{toaddrindent}%
+ \vbox{\hsize\@tempdima\raggedright
+ \usekomafont{addressee}{%
+ \usekomafont{toname}{\usekomavar{toname}\\}%
+ \usekomafont{toaddress}{\usekomavar{toaddress}}}}%
+ \vfil\null\vskip-\baselineskip}%
+ {address field}{toaddrheight}%
+ {\begin{letter} or you\MessageBreak
+ have to define a smaller special purpose using\MessageBreak
+ \string\specialmail}%
+ }}}%
+ \vskip-\useplength{toaddrvpos}\move@frompt
+ \else
+ \begingroup%
+ \if@baddr
+ \let\@tempa\@empty\let\@tempb\@empty
+ \ifcase \@afieldmode\relax\or\or
+ \def\@tempa{PP-mode}\def\@tempb{,\space}%
+ \or
+ \def\@tempa{backgroundimage-mode}\def\@tempb{,\space}%
+ \or
+ \def\@tempa{image-mode}\def\@tempb{,\space}%
+ \fi
+ \ifkomavarempty{backaddress}{}{%
+ \edef\@tempa{\@tempa\@tempb backaddress ignored}\def\@tempb{,\space}%
+ }%
+ \else
+ \let\@tempa\@empty\let\@tempb\@empty
+ \fi
+ \ifcase \ltr@priority
+ \ifkomavarempty{specialmail}{}{%
+ \edef\@tempa{\@tempa\@tempb specialmail ignored}\def\@tempb{,\space}%
+ }%
+ \or
+ \edef\@tempa{\@tempa\@tempb B-Economy}\def\@tempb{,\space}%
+ \or
+ \edef\@tempa{\@tempa\@tempb A-Priority}\def\@tempb{,\space}%
+ \fi
+ \typeout{Address (\@tempa\@tempb addressee)}%
+ \endgroup%
+ \move@topt\vskip\useplength{toaddrvpos}%
+ \vb@t@z{{%
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
+ \ifdim \useplength{toaddrindent}=\z@
+ \@setplength{toaddrindent}{8mm}%
+ \fi
+ \ifdim \useplength{PPheadheight}=\z@
+ \@setplength{PPheadheight}{20.74pt}%
+ \fi
+ \ifdim \useplength{PPheadwidth}=\z@
+ \@setplength{PPheadwidth}{42mm}%
+ \fi
+ \ifdim \useplength{PPdatamatrixvskip}=\z@
+ \@setplength{PPdatamatrixvskip}{9mm}%
+ \fi
+ \rlap{\move@topl
+ \setlengthtoplength{\@tempskipa}{toaddrhpos}%
+ \ifdim \@tempskipa<\z@
+ \addtolength{\@tempskipa}{\paperwidth}%
+ \addtolengthplength[-]{\@tempskipa}{toaddrwidth}%
+ \fi
+ \hskip\@tempskipa
+ \@savevbox{\useplength{toaddrheight}}{\hsize\useplength{toaddrwidth}%
+ \ifnum\@afieldmode=\tw@
+ \vskip 2pt\relax
+ \hskip \useplength{toaddrindent}\relax
+ \fbox{%
+ \vbox to \dimexpr \useplength{PPheadheight}-2\fboxsep\relax{%
+ \setlength{\parindent}{0pt}%
+ \hsize \dimexpr \useplength{PPheadwidth}-2\fboxsep\relax
+ \setbox\@tempboxa\hbox{%
+ {\fontsize{20.74pt}{20.74pt}\selectfont
+ \usekomafont{PPlogo}{P.P.}}\hskip 2mm%
+ }%
+ \dp\@tempboxa\z@
+ \setlength{\@tempdima}{\hsize}%
+ \addtolength{\@tempdima}{-\wd\@tempboxa}%
+ \hbox{\box\@tempboxa
+ \vbox to \dimexpr
+ \useplength{PPheadheight}-2\fboxsep\relax{%
+ \vss\hsize\@tempdima
+ \raggedright
+ \fontsize{8pt}{9pt}\selectfont\usekomafont{PPdata}%
+ \usekomavar*{fromzipcode}\usekomavar{zipcodeseparator}%
+ \usekomavar{fromzipcode}\unskip\strut\\
+ \usekomavar{place}\unskip\strut
+ \hfill
+ }%
+ }%
+ \vss
+ }%
+ }%
+ \hskip 1mm
+ \mbox{%
+ \vbox to \useplength{PPheadheight}{%
+ \addtolengthplength[-]{\hsize}{PPheadwidth}%
+ \addtolength{\hsize}{-1mm}%
+ \addtolengthplength[-2]{\hsize}{toaddrindent}%
+ \setlength{\parindent}{0pt}%
+ \fontsize{8pt}{9pt}\selectfont\usekomafont{PPdata}%
+ \hfill\usekomavar{PPcode}
+ \vss
+ \ifcase \ltr@priority
+ \or
+ \usekomafont{priority}{%
+ {\usekomafont{prioritykey}{B}}%
+ -ECONOMY\hss\vskip-\dp\strutbox
+ }%
+ \or
+ \usekomafont{priority}{%
+ {\usekomafont{prioritykey}{A}}%
+ -PRIORITY\hss\vskip-\dp\strutbox
+ }%
+ \fi
+ \vss
+ }%
+ }%
+ \vskip 1mm
+ \vskip-\ht\strutbox
+ \noindent\hskip\useplength{toaddrindent}%
+ \hrulefill%
+ \hskip\useplength{toaddrindent}%
+ \vbox to\z@{\hsize\z@
+ \vskip \useplength{PPdatamatrixvskip}\relax
+ \llap{\usekomavar{PPdatamatrix}\hskip\useplength{toaddrindent}}%
+ \vss
+ }%
+ \else
+ \vskip 1mm
+ \noindent\expandafter\hskip\useplength{toaddrindent}%
+ \vbox to \useplength{PPheadheight}{%
+ \addtolengthplength[-2]{\hsize}{toaddrindent}%
+ \setlength{\parindent}{0pt}%
+ \usekomavar{addresseeimage}%
+ \vss
+ }%
+ \vskip 1mm
+ \vskip\dp\strutbox
+ \fi
+ \ifnum \@afieldmode=4 \else
+ \vfil%
+ \noindent\hskip\useplength{toaddrindent}%
+ \setlength{\@tempdima}{\useplength{toaddrwidth}}%
+ \addtolengthplength[-2]{\@tempdima}{toaddrindent}%
+ \vbox{\hsize\@tempdima
+ \ifkomavarempty{PPdatamatrix}{}{%
+ \addtolength{\hsize}{-2mm}%
+ \settowidth\@tempdima{\usekomavar{PPdatamatrix}}%
+ \addtolength{\hsize}{-\@tempdima}%
+ }%
+ \raggedright
+ \usekomafont{addressee}{%
+ \usekomafont{toname}{\usekomavar{toname}\\}%
+ \usekomafont{toaddress}{\usekomavar{toaddress}}}}%
+ \fi
+ \vss\null}%
+ {address field}{toaddrheight}%
+ {\string\begin{letter}}%
+ }}}%
+ \vskip-\useplength{toaddrvpos}\move@frompt
+ \fi
+}
+\newcommand*{\specialmail@format}[1]{}
+\let\specialmail@format\underline
+\newcommand*{\@ogobble}[1][]{}
+\newcommand*{\@locfield}{%
+ \ifdim \useplength{locwidth}=\z@%
+ \@setplength{locwidth}{\paperwidth}%
+ \ifdim \useplength{toaddrhpos}>\z@
+ \@addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}%
+ \else
+ \@addtoplength[2]{locwidth}{\useplength{toaddrhpos}}%
+ \fi
+ \@addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}%
+ \if@bigloc%
+ \@setplength[.66667]{locwidth}{\useplength{locwidth}}%
+ \else%
+ \@setplength[.5]{locwidth}{\useplength{locwidth}}%
+ \fi%
+ \fi%
+ \ifcase\@alignfrom
+ \or
+ \if@logo
+ \ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
+ \fi
+ \or
+ \or
+ \ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
+ \or
+ \ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
+ \fi
+ \ifkomavarempty{location}{%
+ \typeout{Location field: empty}%
+ }{%
+ \typeout{Location field: yes}%
+ \ifdim \useplength{lochpos}=\z@%
+ \@setplength{lochpos}{\useplength{toaddrhpos}}%
+ \fi
+ \ifdim \useplength{locvpos}=\z@%
+ \@setplength{locvpos}{\useplength{toaddrvpos}}%
+ \fi
+ \ifdim \useplength{locheight}=\z@%
+ \@setplength{locheight}{\useplength{toaddrheight}}%
+ \fi
+ \move@topt\vskip\useplength{locvpos}%
+ \vb@t@z{\noindent\makebox[0pt][l]{%
+ \move@topl
+ \setlengthtoplength[-]{\@tempskipa}{lochpos}%
+ \ifdim \@tempskipa<\z@
+ \addtolength{\@tempskipa}{\paperwidth}%
+ \else
+ \addtolengthplength{\@tempskipa}{locwidth}%
+ \fi
+ \hskip\@tempskipa
+ \makebox[0pt][r]{%
+ \@savevbox{\useplength{locheight}}{%
+ \noindent\hsize\useplength{locwidth}%
+ \ifcase\@alignfrom
+ \or
+ \if@logo
+ \ifkomavarempty{fromlogo}{\null}{%
+ {\raggedleft\noindent\usekomavar{fromlogo}\\
+ \vskip\parskip}\noindent}%
+ \fi
+ \or
+ \or
+ \if@logo
+ \ifkomavarempty{fromlogo}{}{%
+ \raggedleft\usekomavar{fromlogo}\par}%
+ \fi
+ \raggedright
+ {\usekomafont{fromname}\strut\ignorespaces
+ \usekomavar{fromname}%
+ {%
+ \ifnum\@rulefrom=1\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\useplength{locwidth}}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}%
+ }%
+ \fi
+ }%
+ \\
+ }%
+ {\usekomafont{fromaddress}\strut\ignorespaces
+ \usekomavar{fromaddress}%
+ \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
+ \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
+ \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
+ \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
+ \ifnum\@rulefrom=2\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\useplength{locwidth}}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ \\
+ }%
+ \or
+ \raggedleft
+ \if@logo
+ \ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}%
+ \fi
+ {\usekomafont{fromname}\strut\ignorespaces
+ \usekomavar{fromname}%
+ {%
+ \ifnum\@rulefrom=1\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\useplength{locwidth}}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}%
+ }%
+ \fi
+ }%
+ \\
+ }%
+ {\usekomafont{fromaddress}\strut\ignorespaces
+ \usekomavar{fromaddress}%
+ \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone%
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
+ \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
+ \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
+ \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
+ \ifnum\@rulefrom=2\\[-.5\baselineskip]%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\useplength{locwidth}}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
+ \fi
+ \\
+ }%
+ \fi
+ \usekomavar{location}%
+ \vskip \z@ \@plus .00001fil}%
+ {location field}{locheight}{\setkomavar}%
+ }}%
+ }%
+ \vskip-\useplength{locvpos}\move@frompt
+ }%
+}
+\newcommand*{\do@set@reffield}{}
+\newcommand*{\@set@reffield}[1]{%
+ \ifkomavarempty{#1}{}{%
+ \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}%
+ \setbox0\hbox{\strut\usekomafont{refname}\usekomavar*{#1}}%
+ \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
+ \if@tempswa\enskip\hfill\fi
+ \parbox[t]{\@tempdima}{\noindent\raggedright
+ \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
+ \@tempswatrue
+ }%
+}
+\newcommand*{\@test@reffield}[1]{%
+ \ifkomavarempty{#1}{}{%
+ \@tempswatrue
+ }%
+}
+\newcommand*{\@set@reffields}{}%
+\newcommand*{\addtoreffields}[1]{%
+ \l@addto@macro{\@set@reffields}{\do@set@reffield{#1}}%
+}
+\newcommand*{\removereffields}{%
+ \renewcommand*{\@set@reffields}{}%
+}
+\newcommand*{\defaultreffields}{%
+ \removereffields
+ \addtoreffields{yourref}%
+ \addtoreffields{yourmail}%
+ \addtoreffields{myref}%
+ \addtoreffields{customer}%
+ \addtoreffields{invoice}%
+}
+\defaultreffields
+\newcommand*{\@datefield}{{%
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
+ \ifdim\useplength{refwidth}=\z@
+ \if@refwide
+ \@setplength{refwidth}{\paperwidth}%
+ \ifdim \useplength{toaddrhpos}>\z@
+ \@setplength{refhpos}{\useplength{toaddrhpos}}%
+ \else
+ \@setplength[-]{refhpos}{\useplength{toaddrhpos}}%
+ \fi
+ \@addtoplength[-2]{refwidth}{\useplength{refhpos}}%
+ \else
+ \@setplength{refwidth}{\textwidth}%
+ \@setplength{refhpos}{\oddsidemargin}%
+ \@addtoplength{refhpos}{1in}%
+ \fi
+ \else
+ \ifdim\useplength{refhpos}=\z@
+ \begingroup
+ \setlength\@tempdima{\textwidth}%
+ \addtolengthplength[-]{\@tempdima}{refwidth}%
+ \setlength\@tempdimb{\oddsidemargin}%
+ \addtolength\@tempdimb{1in}%
+ \setlength{\@tempdimc}{\paperwidth}%
+ \addtolength{\@tempdimc}{-\textwidth}%
+ \divide\@tempdimb by 32768\relax
+ \divide\@tempdimc by 32768\relax
+ \ifdim\@tempdimc=\z@\else
+ \multiply\@tempdima by\@tempdimb
+ \divide\@tempdima by\@tempdimc
+ \fi
+ \edef\@tempa{\noexpand\endgroup
+ \noexpand\@setplength{refhpos}{\the\@tempdima}}%
+ \@tempa
+ \fi\fi
+ \@tempswafalse
+ \move@topt\vskip\useplength{refvpos}%
+ \@tempswafalse
+ \let\do@set@reffield\@test@reffield
+ \@set@reffields
+ \ifcase \@datepos\else\@test@reffield{date}\fi
+ \if@tempswa
+ \@tempswafalse
+ \rlap{\noindent\move@topl\hskip\useplength{refhpos}%
+ \vbox{\hsize\useplength{refwidth}%
+ \noindent
+ \ifnum \@datepos=2
+ \@set@reffields
+ \if@tempswa
+ \@tempswafalse
+ \@set@reffield{date}%
+ \fi
+ \fi
+ \let\do@set@reffield\@set@reffield
+ \@set@reffields%
+ \if@tempswa
+ \ifnum \@datepos=1 \@set@reffield{date}\fi%
+ \setbox0\hbox{\usekomafont{refname}\strutbox}%
+ \ifdim\ht0>\ht\strutbox
+ \PackageWarningNoLine{scrletter}{%
+ Font element `refname' should not be larger than
+ \string\normalsize!}%
+ \fi
+ \setbox0\hbox{\usekomafont{refvalue}\strutbox}%
+ \ifdim\ht0>\ht\strutbox
+ \PackageWarningNoLine{scrletter}{%
+ Font element `refvalue' should not be larger than
+ \string\normalsize!}%
+ \fi
+ \else
+ \ifcase \@datepos\else
+ \ifnum \@datepos=1 \enskip\hfill\fi
+ {\usekomafont{placeanddate}{\ifkomavarempty{place}{}{%
+ \usekomavar{place}\usekomavar{placeseparator}}%
+ \usekomavar{date}}}%
+ \fi
+ \fi
+ }%
+ }%
+ \fi
+ \vskip\useplength{refaftervskip}%
+ }%
+}
+\newcommand*{\@makelettertitle}{%
+ \ifkomavarempty{title}{%
+ \typeout{Title: no}%
+ }{%
+ \typeout{Title: yes}%
+ {\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
+ \centering\LARGE\usekomafont{title}\usekomavar{title}\par}%
+ \vskip\baselineskip%
+ }%
+}
+\newcommand*{\@subjfield}{{%
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
+ \ifkomavarempty{subject}{%
+ \typeout{Subject: no}%
+ }{%
+ \ifx\raggedsubject\@empty
+ \ifdim\useplength{subjectvpos}=\z@
+ \if@subjafter%
+ \typeout{Subject: after opening}%
+ \let\raggedsubject\centering%
+ \else
+ \typeout{Subject: before opening}%
+ \def\raggedsubject{\noindent\@hangfrom}%
+ \fi
+ \else
+ \typeout{Subject: at absolute vertical position}%
+ \def\raggedsubject{\noindent\@hangfrom}%
+ \fi
+ \fi
+ \ifdim\useplength{subjectvpos}=\z@
+ \vskip\useplength{subjectbeforevskip}%
+ \begingroup
+ \else
+ \move@topt\vskip\useplength{subjectvpos}%
+ \expandafter\vb@t@z\expandafter{%
+ \fi
+ \usekomafont{subject}%
+ \raggedsubject{\if@subj \subject@format{\strut\ignorespaces
+ \usekomavar*{subject}}\fi}%
+ \subject@format{\strut\ignorespaces\usekomavar{subject}}\par
+ \ifdim\useplength{subjectvpos}=\z@
+ \endgroup
+ \vskip\useplength{subjectaftervskip}%
+ \else
+ }%
+ \vskip-\useplength{subjectvpos}\move@frompt
+ \fi
+ }%
+ }%
+}
+\@newplength{subjectvpos}
+\@setplength{subjectvpos}{0pt}
+\@newplength{subjectaftervskip}
+\@setplength{subjectaftervskip}{2\baselineskip}
+\@newplength{subjectbeforevskip}
+\@setplength{subjectbeforevskip}{0pt}
+\newkomavar{nexthead}
+\setkomavar{nexthead}{%
+ \rlap{\parbox[c]{\textwidth}{\raggedright\strut
+ \ifnum\@pageat=0\pagemark\else\leftmark\fi\strut}}%
+ \parbox[c]{\textwidth}{%
+ \centering\strut
+ \ifcase\@pageat
+ \rightmark
+ \or
+ \pagemark
+ \or
+ \rightmark
+ \fi\strut}%
+ \llap{\parbox[c]{\textwidth}{\raggedleft\strut
+ \ifcase\@pageat
+ \leftmark
+ \or
+ \rightmark
+ \or
+ \pagemark
+ \else
+ \rightmark
+ \fi\strut}}%
+}%
+\newkomavar{nextfoot}
+\setkomavar{nextfoot}{%
+ \ifnum\@pageat>2
+ \parbox[c]{\textwidth}{%
+ \ifcase\@pageat\or\or\or\raggedright\or\centering\or\raggedleft\fi
+ \strut\pagemark%
+ }%
+ \fi
+}
+\newenvironment{letter}[2][]{%
+ \newpage
+ \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi
+ \setcounter{page}{\@ne}%
+ \setcounter{footnote}{0}%
+ \interlinepenalty=200\@processto{#2}%
+ \KOMAoptions{#1}%
+ \@beginletterhook
+}{%
+ \stopletter\@@par\pagebreak\@@par%
+}
+\newcommand*{\stopletter}{}
+\newcommand{\@processto}[1]{%
+ \ifx\relax#1\relax\else
+ \expandafter\@xproc#1\\\@nil\ifkomavarempty{toaddress}{}{%
+ \expandafter\@xproc#1\@nil}%
+ \fi
+}
+\newcommand*{\@xproc}{}
+\long\def\@xproc#1\\#2\@nil{%
+ \setkomavar{toname}{#1}\setkomavar{toaddress}{#2}}
+\g@addto@macro\flushbottom{%
+ \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}%
+}
+\newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook}
+\newcommand{\@beginletterhook}{}
+\newcommand{\AtEndLetter}{\g@addto@macro\stopletter}
+\newcommand*{\stopbreaks}{\interlinepenalty \@M
+ \def\par{\@@par\nobreak}\let\\=\@nobreakcr
+ \let\vspace\@nobreakvspace}
+\newcommand*{\@nobreakvspace}{%
+ \@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}}
+\newcommand*{\startbreaks}{\let\\=\@normalcr
+ \interlinepenalty 200\def\par{\@@par\penalty 200}}
+\newcommand{\opening}[1]{%
+ \@PapersizeWarning
+ \@gen@firsthead
+ \@mkboth{\scr@fromname@var}{\scr@subject@var}%
+ \thispagestyle{empty}\noindent
+ \@foldmarks\@firstheadfootfield\@addrfield\@locfield
+ \ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
+ \@datefield
+ \@makelettertitle
+ \ifdim\useplength{subjectvpos}=\z@\if@subjafter\else\@subjfield\fi\fi
+ {\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative#1\par}%
+ {\setlength{\@tempdima}{\baselineskip}%
+ \addtolength{\@tempdima}{-\parskip}%
+ \ifdim \@tempdima>\z@\vskip\@tempdima\fi}%
+ \ifdim\useplength{subjectvpos}=\z@\if@subjafter\@subjfield\fi\fi
+ \@afterindentfalse\@afterheading
+}
+\newcommand*{\@xtrimtempa}{%
+ \@ifnextchar [{\@@xtrimtempa}{\@@xtrimtempa[]}}
+\newcommand*{\@@xtrimtempa}{}
+\def\@@xtrimtempa[#1]#2\@nil{\def\@tempa{#2}}
+\newcommand*{\@tempdimaismaxwidthof}{}
+\def\@tempdimaismaxwidthof#1\\#2\@nil{%
+ \settowidth{\@tempdimb}{\strut\ignorespaces#1}%
+ \ifdim\@tempdima<\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
+ \def\@tempa{#2}\ifx\@tempa\@empty
+ \let\@tempb\relax
+ \else
+ \expandafter\@xtrimtempa\@tempa\@nil
+ \def\@tempb{\expandafter\@tempdimaismaxwidthof\@tempa\@nil}%
+ \fi
+ \@tempb
+}
+\newcommand*{\closing}[1]{{%
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par%
+ \nobreak\vskip\baselineskip%
+ \stopbreaks\noindent%
+ \setlength{\@tempdima}{0pt}%
+ \expandafter\@tempdimaismaxwidthof\scr@signature@var\\\@nil
+ \expandafter\@tempdimaismaxwidthof\strut\ignorespaces#1\\\@nil
+ \setlength{\@tempdimb}{\hsize}%
+ \addtolength{\@tempdimb}{-\useplength{sigindent}}%
+ \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi%
+ \hspace{\useplength{sigindent}}%
+ \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces%
+ #1\strut\\[\useplength{sigbeforevskip}]
+ \strut\usekomavar{signature}\strut}}\par
+ \nobreak\vskip\baselineskip%
+}
+\newcommand\ps{\par%
+ \ifdim\parskip=\z@%
+ \vskip\baselineskip%
+ \fi\startbreaks\noindent\ignorespaces%
+}
+\newcommand*{\cc}[1]{\par%
+ \ifdim\parskip=\z@%
+ \vskip\baselineskip%
+ \fi\noindent%
+ \begingroup
+ \parbox[t]{\textwidth}{%
+ \ifkomavarempty{ccseparator}{}{%
+ \@hangfrom{%
+ \strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}%
+ }%
+ \ignorespaces #1\strut}%
+ \setlength{\parfillskip}{\z@ \@plus 1fil}\par
+ \endgroup
+}
+\newcommand*{\encl}[1]{\par%
+ \ifdim\parskip=\z@%
+ \vskip\baselineskip%
+ \fi\noindent%
+ \begingroup
+ \parbox[t]{\textwidth}{%
+ \ifkomavarempty*{enclseparator}{}{%
+ \@hangfrom{%
+ \strut\usekomavar*{enclseparator}\usekomavar{enclseparator}}%
+ }%
+ \ignorespaces #1\strut}%
+ \setlength{\parfillskip}{\z@ \@plus 1fil}\par
+ \endgroup
+}
+\newkomavar{signature}
+\setkomavar{signature}{\usekomavar{fromname}}
+\newkomavar{place}
+\newkomavar{location}
+\newkomavar{backaddress}
+\setkomavar{backaddress}{%
+ \ifkomavarempty{fromname}{}{%
+ \strut\ignorespaces\usekomavar{fromname}%
+ \ifkomavarempty{fromaddress}{}{\\}}%
+ \ifkomavarempty{fromaddress}{}{%
+ \strut\ignorespaces\usekomavar{fromaddress}}%
+ }
+\newkomavar{specialmail}
+\newkomavar{title}
+\newkomavar{fromlogo}
+\newkomavar{fromzipcode}
+\newkomavar{PPcode}
+\newkomavar{PPdatamatrix}
+\newkomavar{addresseeimage}
+\newkomavar[\usekomavar{place}]{placeseparator}
+\setkomavar{placeseparator}{,\nobreakspace}
+\newkomavar[\subjectname]{subjectseparator}
+\setkomavar{subjectseparator}{: }
+\newkomavar[\ccname]{ccseparator}
+\setkomavar{ccseparator}{: }
+\newkomavar[\enclname]{enclseparator}
+\setkomavar{enclseparator}{: }
+\newkomavar{backaddressseparator}
+\setkomavar{backaddressseparator}{,\nobreakspace}
+\newkomavar[\if@scrsymbols\Telefon\else\phonename\fi]{phoneseparator}
+\setkomavar{phoneseparator}{\if@scrsymbols\else:\fi\nobreakspace}
+\newkomavar[%
+ \if@scrsymbols\Mobilefone\else\mobilephonename\fi
+]{mobilephoneseparator}
+\setkomavar{mobilephoneseparator}{\usekomavar{phoneseparator}}
+\newkomavar[\if@scrsymbols\FAX\else\faxname\fi]{faxseparator}
+\setkomavar{faxseparator}{\if@scrsymbols\else:\fi\nobreakspace}
+\newkomavar[\if@scrsymbols\Email\else\emailname\fi]{emailseparator}
+\setkomavar{emailseparator}{\if@scrsymbols\else:\fi\nobreakspace}
+\newkomavar[\if@scrsymbols\else\wwwname\fi]{urlseparator}
+\setkomavar{urlseparator}{\if@scrsymbols\else:\nobreakspace\fi}
+\newkomavar{zipcodeseparator}
+\setkomavar{zipcodeseparator}{\,--\,}
+\newkomavar[\headfromname]{fromname}
+\newkomavar[\usekomavar{fromname}]{fromaddress}
+\newkomavar[\headtoname]{toname}
+\newkomavar[\usekomavar{toname}]{toaddress}
+\newkomavar[\usekomavar*{phoneseparator}%
+ \usekomavar{phoneseparator}]{fromphone}
+\newkomavar[\usekomavar*{mobilephoneseparator}%
+ \usekomavar{mobilephoneseparator}]{frommobilephone}
+\newkomavar[\usekomavar*{faxseparator}%
+ \usekomavar{faxseparator}]{fromfax}
+\newkomavar[\usekomavar*{emailseparator}%
+ \usekomavar{emailseparator}]{fromemail}
+\newkomavar[\usekomavar*{urlseparator}%
+ \usekomavar{urlseparator}]{fromurl}
+\newkomavar[\bankname]{frombank}
+\newkomavar[\yourrefname]{yourref}
+\newkomavar[\yourmailname]{yourmail}
+\newkomavar[\myrefname]{myref}
+\newkomavar[\customername]{customer}
+\newkomavar[\invoicename]{invoice}
+\newkomavar[\usekomavar*{subjectseparator}%
+ \usekomavar{subjectseparator}]{subject}
+\newkomavar[\datename]{date}
+\setkomavar{date}{\@date}
+%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
+\newcommand*{\adrentry}[7]{%
+ \addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
+\newcommand*{\adrchar}{\addrchar}
+\newcommand*{\addrentry}[9]{\def\@tempa{#1}\ifx \@tempa\@empty \else
+ \def\@tempa{#2}\ifx \@tempa\@empty
+ \expandafter\def\csname #9\endcsname{#1\\#3}%
+ \else
+ \expandafter\def\csname #9\endcsname{#2 #1\\#3}%
+ \fi \fi}
+\newcommand*{\addrchar}[1]{}
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
+\@ifundefined{KOMAScript}{%
+ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
+ M\kern.05em A\kern.1em-\kern.1em Script}}}{}
+\endinput
+%%
+%% End of file `scrletter.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 7d4e2caadcc..de09f23e353 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\ProvidesPackage{scrlfile}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package (loading files)]
\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
^^J\@spaces\@spaces\@spaces\@spaces\space\space
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 986982b7572..b66bff1bdb0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -102,12 +102,12 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -189,6 +189,7 @@
\@namedef{scr@v@3.13}{12}
\@namedef{scr@v@3.13a}{13}
\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@last}{14}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
@@ -229,7 +230,7 @@
}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\@ptsize{%
12%
}
@@ -368,7 +369,7 @@
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -1012,7 +1013,7 @@
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1024,7 +1025,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2348,7 +2349,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 031f50fe9da..02c64c2df52 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -42,7 +42,7 @@
%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package (page head and foot)]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 48127c9fa34..53b40d44ccf 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-sections.dtx (with options: `class,report,prepare')
%% scrkernel-compatibility.dtx (with options: `class,report,option')
%% scrkernel-miscellaneous.dtx (with options: `class,report,option')
%% scrkernel-language.dtx (with options: `class,report,option')
@@ -72,7 +73,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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -94,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -103,21 +104,70 @@
report%
}
\ProvidesClass{\KOMAClassName}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
+%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
\RequirePackage{tocbasic}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 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-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+\newif\if@openright
+\@openrightfalse
+\newcommand*{\scr@dotchangeatdocument}[1]{%
+ \ClassError{\KOMAClassName}{%
+ change of end dot feature after \string\begin{document}%
+ }{%
+ You've tried to set `numbers=#1' after \string\begin{document},\MessageBreak
+ but this option is only allowed at the document preamble.\MessageBreak
+ See KOMA-Script manual for more information about.%
+ }%
+}
+\newcommand*{\scr@osectarg}{0}
+\newcommand*{\scr@activate@xsection}[1]{%
+ \renewcommand*{\scr@osectarg}{#1}%
+}
+\newif\if@altsecnumformat\@altsecnumformatfalse
+\newif\if@autodot
+\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
+\renewcommand*{\@autodotfalse}{\global\let\if@autodot\iffalse}
+\@autodotfalse
+\newcommand*{\scr@altsecnumhook}{}
+\AtBeginDocument{\scr@altsecnumhook}
+\newcommand*{\scr@altsecnumhooktrue}{%
+ \@altsecnumformattrue\global\let\@altsecnumformatfalse\@altsecnumformattrue
+}
+\newcommand*{\scr@altsecnumhookfalse}{%
+ \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse
+}
+\newcommand*{\size@part}{}
+\newcommand*{\size@partnumber}{}
+\newcommand*{\size@chapter}{}
+\newcommand*{\size@chapterprefix}{\size@chapter}
+\newcommand*{\scr@chapter@sectionbeforeskip}{\z@}
+\let\scr@chapter@sectionbeforeskip\z@
+\newcommand*{\scr@chapter@sectionafterskip}{\z@}
+\let\scr@chapter@sectionafterskip\z@
+\newcommand*{\scr@chapter@sectionindent}{\z@}
+\let\scr@chapter@sectionindent\z@
+\newcommand*{\scr@chapter@style}{}
+\newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}
+\newcommand*{\chapterheadendvskip}{\vskip\@tempskipa}
+\newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}
+\newcommand*{\size@section}{}
+\newcommand*{\size@subsection}{}
+\newcommand*{\size@subsubsection}{}
+\newcommand*{\size@paragraph}{}
+\newcommand*{\size@subparagraph}{}
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -224,6 +274,7 @@
\@namedef{scr@v@3.13}{12}
\@namedef{scr@v@3.13a}{13}
\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@last}{14}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
@@ -241,7 +292,7 @@
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -377,7 +428,7 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -510,7 +561,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -533,9 +584,7 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
-\newif\if@openright
-\@openrightfalse
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
{any}{0},%
@@ -557,15 +606,6 @@
}
\KOMA@DeclareStandardOption{openright}{open=right}
\KOMA@DeclareStandardOption{openany}{open=any}
-\newcommand*{\scr@dotchangeatdocument}[1]{%
- \ClassError{\KOMAClassName}{%
- change of end dot feature after \string\begin{document}%
- }{%
- You've tried to set `numbers=#1' after \string\begin{document},\MessageBreak
- but this option is only allowed at the document preamble.\MessageBreak
- See KOMA-Script manual for more information about.%
- }%
-}
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
{autoendperiod}{0},{autoenddot}{0},{auto}{0},%
@@ -590,42 +630,30 @@
\fi
\fi
}
-\newcommand*{\scr@altsecnumhook}{}
-\AtBeginDocument{\scr@altsecnumhook}
-\newcommand*{\scr@altsecnumhooktrue}{%
- \@altsecnumformattrue\global\let\@altsecnumformatfalse\@altsecnumformattrue
-}
-\newcommand*{\scr@altsecnumhookfalse}{%
- \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse
-}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
-\newif\if@chapterprefix\@chapterprefixfalse
\KOMA@ifkey{chapterprefix}{@chapterprefix}
\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
\KOMA@key{appendixprefix}[true]{%
\KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
- \def\appendixmore{\@chapterprefixtrue}%
+ \@ifundefined{appendixmore}{%
+ \def\appendixmore{\@chapterprefixtrue}%
+ }{%
+ \l@addto@macro\appendixmore{\@chapterprefixtrue}%
+ }%
\else
- \def\appendixmore{\@chapterprefixfalse}%
+ \@ifundefined{appendixmore}{%
+ \def\appendixmore{\@chapterprefixfalse}%
+ }{%
+ \l@addto@macro\appendixmore{\@chapterprefixfalse}%
+ }%
\fi
\fi
}
\KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false}
-\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-\newcommand*{\size@part}{}
-\newcommand*{\size@partnumber}{}
-\newcommand*{\size@chapter}{}
-\newcommand*{\size@chapterprefix}{\size@chapter}
-\newcommand*{\size@section}{}
-\newcommand*{\size@subsection}{}
-\newcommand*{\size@subsubsection}{}
-\newcommand*{\size@paragraph}{}
-\newcommand*{\size@subparagraph}{}
-\newcommand*{\chapterheadstartvskip}{}
-\newcommand*{\chapterheadendvskip}{}
+\KOMA@ifkey{chapterentrydots}{@chapterentrywithdots}
\KOMA@key{headings}{%
\KOMA@set@ncmdkey{headings}{@tempa}{%
{big}{0},%
@@ -649,13 +677,16 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2.3\baselineskip}%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{3.3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{%
+ 1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip
}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \vspace{1.725\baselineskip
- \@plus .115\baselineskip \@minus .192\baselineskip}%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \else\vskip\@tempskipa\fi
}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\huge}%
@@ -666,13 +697,16 @@
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
\or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2\baselineskip}%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{%
+ 1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip
}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \vspace{1.5\baselineskip
- \@plus .1\baselineskip \@minus .167\baselineskip}%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \else\vskip\@tempskipa\fi
}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
\renewcommand*{\size@part}{\huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\LARGE}%
@@ -683,13 +717,16 @@
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
\or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{1.8\baselineskip}%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{2.8\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{%
+ 1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip
}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \vspace{1.35\baselineskip
- \@plus 0.09\baselineskip \@minus .15\baselineskip}%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \else\vskip\@tempskipa\fi
}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
\renewcommand*{\size@part}{\LARGE}%
\renewcommand*{\size@partnumber}{\LARGE}%
\renewcommand*{\size@chapter}{\Large}%
@@ -720,12 +757,11 @@
\or
\scr@activate@xsection{1}%
\or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{50\p@}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{40\p@}%
- }%
+ \renewcommand*{\scr@chapter@sectionbeforeskip}{50\p@}%
+ \renewcommand*{\scr@chapter@sectionafterskip}{40\p@}%
+ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
+ \renewcommand*{\chapterheadendvskip}{\vskip\@tempskipa}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip 20\p@}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\Huge}%
@@ -743,10 +779,6 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-\newcommand*{\scr@osectarg}{0}
-\newcommand*{\scr@activate@xsection}[1]{%
- \renewcommand*{\scr@osectarg}{#1}%
-}
%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
@@ -962,7 +994,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -978,7 +1010,9 @@
{flat}{8},{left}{8},%
{graduated}{9},{indent}{9},{indented}{9},%
{indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
- {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11}%
+ {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11},%
+ {chapterentrywithdots}{12},{chapterentrydotfill}{12},
+ {chapterentrywithoutdots}{13},{chapterentryfill}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
@@ -1005,6 +1039,10 @@
\setuptoc{toc}{numberline}%
\or
\unsettoc{toc}{numberline}%
+ \or
+ \KOMAoptions{chapterentrydots=true}%
+ \or
+ \KOMAoptions{chapterentrydots=false}%
\fi
\fi
}
@@ -1290,8 +1328,8 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -1769,7 +1807,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1897,7 +1935,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2235,34 +2273,31 @@
\if@twocolumn\else\endquotation\fi
\fi
}
-%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
-\newcommand*\appendix{\par%
- \setcounter{chapter}{0}%
- \setcounter{section}{0}%
- \gdef\@chapapp{\appendixname}%
- \gdef\thechapter{\@Alph\c@chapter}%
- \csname appendixmore\endcsname
-}
-\newcommand*\chaptermark[1]{}
-\newcommand*\addchapmark[1]{%
- \begingroup
- \expandafter\let\csname if@mainmatter\expandafter\endcsname
- \csname iffalse\endcsname
- \c@secnumdepth=\m@ne
- \chaptermark{#1}%
- \endgroup
+\newcommand*\abstractname{Abstract}
+%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+\setcounter{secnumdepth}{2}
+\newcommand*{\ifnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@secondoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }%
}
-\newcommand*\addsecmark[1]{%
- \begingroup
- \c@secnumdepth=\m@ne
- \sectionmark{#1}%
- \endgroup
+\newcommand*{\ifunnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@firstoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
}
-\newif\if@altsecnumformat\@altsecnumformatfalse
-\newif\if@autodot
-\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
-\renewcommand*{\@autodotfalse}{\global\let\if@autodot\iffalse}
-\@autodotfalse
\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup%
\expandafter\@@maybeautodot #1\@stop\endgroup\fi
}
@@ -2281,6 +2316,7 @@
\fi
\@@maybeautodot
}
+\newcommand*\autodot{\if@altsecnumformat.\fi}
\newcommand*{\scr@saved@startsection}[6]{%
\if@noskipsec \leavevmode \fi
\par
@@ -2503,102 +2539,532 @@
\if@autodot\if@filesw\immediate\write\@mainaux{%
\string\global\string\@altsecnumformattrue}%
\fi\fi}
-\newcommand*\autodot{\if@altsecnumformat.\fi}
-\setcounter{secnumdepth}{2}
-\newcommand*{\partnumdepth}{%
- \m@ne
-}
-\newcommand*{\chapternumdepth}{\z@}
-\newcommand*{\sectionnumdepth}{\@ne}
-\newcommand*{\subsectionnumdepth}{\tw@}
-\newcommand*{\subsubsectionnumdepth}{\thr@@}
-\newcommand*{\paragraphnumdepth}{4}
-\newcommand*{\subparagraphnumdepth}{5}
-\newcommand*{\ifnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@secondoftwo
+\newcommand*{\raggedsection}{}
+\let\raggedsection\raggedright
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.dsc]{KOMAarg}
+\newcommand*{\DeclareSectionCommand}[2][]{%
+ \edef\reserved@a{%
+ \noexpand\FamilyStringKey[.dsc]{KOMAarg}{style}{%
+ \expandafter\noexpand\csname scr@#2@style\endcsname
+ }%
+ }\reserved@a
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ }%
+ \scr@ifundefinedorrelax{scr@local@leveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
+ \expandafter\noexpand\csname #2numdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@leveloffset\relax}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
+ }%
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{indent}{%
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{beforeskip}{%
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{afterskip}{%
+ \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{font}{%
+ \noexpand\IfExistskomafont{#2}{%
+ \noexpand\setkomafont
+ }{%
+ \noexpand\newkomafont
+ }{#2}{####1}%
+ \noexpand\FamilyKeyStateProcessed
+ }%
+ }\reserved@a
+ \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 #2tocdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname #2tocdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@tocleveloffset\relax}%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
+ }%
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocindent}{%
+ \expandafter\noexpand\csname scr@#2@tocindent\endcsname}%
+ }\reserved@a
+ \edef\reserved@a{%
+ \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocnumwidth}{%
+ \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname}%
+ }\reserved@a
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \begingroup
+ \scr@ifundefinedorrelax{#2numdepth}{%
+ \scr@declaresectioncommanderror{#2}{section level}{level}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionindent}{%
+ \scr@declaresectioncommanderror{#2}{section indent}{indent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionbeforeskip}{%
+ \scr@declaresectioncommanderror{#2}{before section skip}{beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@sectionafterskip}{%
+ \scr@declaresectioncommanderror{#2}{after section skip}{afterskip}%
+ }{}%
+ \IfExistskomafont{#2}{}{%
+ \scr@declaresectioncommanderror{#2}{font}{font}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@tocindent}{%
+ \scr@declaresectioncommanderror{#2}{toc entry indent}{tocindent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@#2@tocnumwidth}{%
+ \scr@declaresectioncommanderror{#2}{toc entry number
+ width}{tocnumwidth}%
+ }{}%
+ \endgroup
+ \@firstofone{%
+ \@ifundefined{c@#2}{\newcounter{#2}}{}%
+ \ifx\scr@local@counterwithin\relax
+ \else\ifx\scr@local@counterwithin\@empty
+ \@namedef{the#2}{\arabic{#2}}%
+ \else
+ \@removefromreset{#2}{\scr@local@counterwithin}%
+ \@addtoreset{#2}{\scr@local@counterwithin}%
+ \expandafter\def\csname the#2\expandafter\endcsname{%
+ \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
+ \fi
\fi
+ \@ifundefined{#2format}{%
+ \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \ifstr{\csname scr@#2@style\endcsname}{}{%
+ \ClassInfo{\KOMAClassName}{%
+ not defining `\string\csname #2\endcsname' due to\MessageBreak
+ empty section style%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{scr@#2@style}{%
+ \ClassWarning{\KOMAClassName}{using default section style}%
+ \@namedef{scr@#2@style}{section}%
+ }{}%
+ \expandafter\edef\csname #2\endcsname{%
+ \noexpand\scr@ifundefinedorrelax{%
+ scr@start\csname scr@#2@style\endcsname}{%
+ \noexpand\ClassError{\noexpand\KOMAClassName}{%
+ section style `\csname scr@#2@style\endcsname' not defined}{%
+ A not yet defined section style `\csname scr@#2@style\endcsname'
+ has been setup for\MessageBreak
+ `\expandafter\string\csname #2\endcsname'. You should either setup
+ another style\MessageBreak
+ or define the style.\MessageBreak
+ If you'll continue, style `section' will be used as an emergency
+ fallback.%
+ }%
+ \noexpand\def\expandafter\noexpand\csname scr@#2@style\endcsname
+ {section}%
+ }{}%
+ \expandafter\noexpand
+ \csname scr@start\csname scr@#2@style\endcsname\endcsname
+ {#2}%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname{%
+ \noexpand\ifdim\noexpand\glueexpr
+ \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
+ <\noexpand\z@
+ \unexpanded{%
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
+ }%
+ \noexpand\fi
+ \unexpanded{%
+ \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ }%
+ }%
+ }%
+ }%
+ \@ifundefined{DeclareSectionNumberDepth}{%
+ \@ifundefined{#2markformat}{%
+ \@namedef{#2markformat}{\csname the#2\endcsname\autodot\endskip}%
+ }{}%
+ \@ifundefined{#2mark}{%
+ \expandafter\let\csname #2mark\endcsname\@gobble
+ }{}%
+ }{%
+ \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{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
+ }%
+ }{}%
}%
}
-\newcommand*{\ifunnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@firstoftwo
+\newcommand*{\scr@declaresectioncommanderror}[3]{%
+ \ClassError{\KOMAClassName}{%
+ #2 of \expandafter\string\csname #1\endcsname\space unknown%
}{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
+ Please use option `#3' to declare the #2.\MessageBreak
+ If you'll continue, declaration will be ignored%
}%
+ \aftergroup\@gobbletwo
}
-\newcounter{part}
-\renewcommand*{\thepart}{\@Roman\c@part}
-\newcommand*{\partformat}{\partname~\thepart\autodot}
-\newcounter{chapter}
-\renewcommand*{\thechapter}{\@arabic\c@chapter}
-\newcommand*{\chapterformat}{%
- \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot\enskip}%
+\newcommand*{\DeclareNewSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname #1\endcsname` already defined%
+ }{%
+ You've tried to define the section command `\expandafter\string\csname
+ #1\endcsname` newly,\MessageBreak
+ but a command, token, box or length with this name already
+ exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be irgnored.%
+ }%
+ }%
}
-\newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }%
- \thechapter\autodot\enskip}
-\newcounter{section}[chapter]
-\renewcommand*\thesection{%
- \thechapter.%
- \@arabic\c@section
+\newcommand*{\RedeclareSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname #1\endcsname` not defined%
+ }{%
+ You've tried to re-define the section command `\expandafter\string\csname
+ #1\endcsname`,\MessageBreak
+ but a command with this name does not exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\DeclareNewSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be irgnored.%
+ }%
+ }{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }%
}
-\newcommand*\sectionmarkformat{\thesection\autodot\enskip}
-\newcounter{subsection}[section]
-\renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection}
-\newcounter{subsubsection}[subsection]
-\renewcommand*{\thesubsubsection}{%
- \thesubsection.\@arabic\c@subsubsection
+\newcommand*{\ProvideSectionCommand}[2][]{%
+ \@ifundefined{#2}{%
+ \DeclareSectionCommand[{#1}]{#2}%
+ }{%
+ \ClassInfo{\KOMAClassName}{%
+ \string\ProvideSectionCommand{#1} ignored%
+ }%
+ }%
}
-\newcounter{paragraph}[subsubsection]
-\renewcommand*{\theparagraph}{\thesubsubsection.\@arabic\c@paragraph}
-\newcounter{subparagraph}[paragraph]
-\renewcommand*{\thesubparagraph}{%
- \theparagraph.\@arabic\c@subparagraph
+\newcommand*{\DeclareSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\DeclareNewSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname\reserved@a\endcsname` already
+ defined%
+ }{%
+ You've tried to define the section command
+ `\expandafter\string\csname\reserved@a\endcsname` newly,\MessageBreak
+ but a command, token, box or length with this name already
+ exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ Nevertheless, if you'll continue, the command will be defined.%
+ }%
+ }%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\RedeclareSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{%
+ \ClassError{\KOMAClassName}{%
+ command `\expandafter\string\csname\reserved@a\endcsname` not defined%
+ }{%
+ You've tried to re-define the section command
+ `\expandafter\string\csname\reserved@a\endcsname`,\MessageBreak
+ but a command with this name does not exists.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\DeclareNewSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ Nevertheless, if you'll continue, the command will be defined.%
+ }%
+ }{}%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
+}
+\newcommand*{\ProvideSectionCommands}[2][]{%
+ \edef\reserved@a{#2}%
+ \let\scr@local@levelincrease\z@
+ \let\scr@local@leveloffset\z@
+ \let\scr@local@tocleveloffset\z@
+ \@for\reserved@a:=\reserved@a\do{%
+ \@ifundefined{\reserved@a}{%
+ \edef\reserved@a{%
+ \unexpanded{\DeclareSectionCommand[{#1}]}{\reserved@a}%
+ }%
+ \reserved@a
+ }{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{}%
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \FamilySetCounterMacro{KOMAarg}{level}{\reserved@b}{##1}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
+ }%
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{indent}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{beforeskip}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{afterskip}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{font}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{counterwidthin}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{}%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ }%
+ }%
+ \let\scr@local@levelincrease\relax
+ \let\scr@local@leveloffset\relax
+ \let\scr@local@tocleveloffset\relax
}
-\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
-\renewcommand*{\@seccntformat}[1]{%
- \protect\othersectionlevelsformat{#1}{%
- \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+\newcommand*{\use@preamble}[1]{%
+ \@ifundefined{#1@preamble}{}{%
+ \@nameuse{#1@preamble}%
+ \global\expandafter\let\csname#1@preamble\endcsname=\relax
+ }%
}
-\newcommand*\partname{Part}
-\newcommand*\chaptername{Chapter}
-\newcommand*\abstractname{Abstract}
-\newcommand*\appendixname{Appendix}
-\newcommand*{\chapappifprefix}[1][]{%
- \ClassWarning{\KOMAClassName}{%
- Please don't use obsolete command
- \string\chapappifprefix.\MessageBreak
- The new command \string\chapappifchapterprefix\space has
- an\MessageBreak
- obligatory instead of an optional argument. Use that\MessageBreak
- new command%
+\newcommand*{\set@preamble}[1]{%
+ \@ifnextchar [%]
+ {\set@@preamble{#1}}{\set@@@preamble{#1}[][\hsize]}%
+}
+\newcommand*{\set@@preamble}{}
+\def\set@@preamble#1[#2]{%
+ \@ifnextchar [%]
+ {\set@@@preamble{#1}[{#2}]}{\set@@@preamble{#1}[{#2}][\hsize]}%
+}
+\newcommand{\set@@@preamble}{}
+\long\def\set@@@preamble#1[#2][#3]#4{%
+ \begingroup
+ \def\prmbl@pos{#2}\let\prmbl@hpos\relax\let\prmbl@vpos\relax
+ \expandafter \@tfor \expandafter \@tempa
+ \expandafter :\expandafter =\prmbl@pos
+ \do{%
+ \if \@tempa l%
+ \set@preamble@hpos{0}{#2}%
+ \fi%
+ \if \@tempa c%
+ \set@preamble@hpos{1}{#2}%
+ \fi%
+ \if \@tempa r%
+ \set@preamble@hpos{2}{#2}%
+ \fi%
+ \if \@tempa u%
+ \set@preamble@vpos{0}{#2}%
+ \fi%
+ \if \@tempa b%
+ \set@preamble@vpos{0}{#2}%
+ \fi
+ \if \@tempa o%
+ \set@preamble@vpos{1}{#2}%
+ \fi%
+ \if \@tempa t%
+ \set@preamble@vpos{1}{#2}%
+ \fi
+ }%
+ \@ifundefined{prmbl@hpos}{\def\prmbl@hpos{0}}{}%
+ \@ifundefined{prmbl@vpos}{\def\prmbl@vpos{0}}{}%
+ \ifcase\prmbl@hpos
+ \ifcase\prmbl@vpos
+ \set@@@@preamble{#1@u}{t}{#3}{}{\hfil}{#4}%
+ \else
+ \set@@@@preamble{#1@o}{b}{#3}{}{\hfil}{#4}%
+ \fi
+ \or
+ \ifcase\prmbl@vpos
+ \set@@@@preamble{#1@u}{t}{#3}{\hfil}{\hfil}{#4}%
+ \else
+ \set@@@@preamble{#1@o}{b}{#3}{\hfil}{\hfil}{#4}%
+ \fi
+ \else
+ \ifcase\prmbl@vpos
+ \set@@@@preamble{#1@u}{t}{#3}{\hfil}{}{#4}%
+ \else
+ \set@@@@preamble{#1@o}{b}{#3}{\hfil}{}{#4}%
+ \fi
+ \fi
+ \endgroup
+}
+\newcommand{\set@@@@preamble}[6]{%
+ \expandafter\gdef\csname #1@preamble\endcsname{%
+ \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
}%
- \if@chapterprefix\chapapp#1\fi
}
-\newcommand*{\chapappifchapterprefix}[1]{%
- \if@chapterprefix\chapapp#1\fi
+\newcommand*{\set@preamble@hpos}[2]{%
+ \@ifundefined{prbml@hpos}{%
+ \def\prmbl@hpos{#1}%
+ }{%
+ \ifnum \prmbl@hpos=0\relax\else%
+ \ClassError{\KOMAClassName}{%
+ inconsistent hpos options%
+ }{%
+ You've said `#2' as position option. But you have
+ to\MessageBreak
+ use only one of `l', `r', or `c' not two of
+ these.\MessageBreak
+ If you'll continue only first hpos option will be
+ used%
+ }%
+ \fi
+ }%
+}
+\newcommand*{\set@preamble@vpos}[2]{%
+ \@ifundefined{prbml@vpos}{%
+ \def\prmbl@vpos{#1}%
+ }{%
+ \ifnum \prmbl@vpos=0\relax\else%
+ \ClassError{\KOMAClassName}{%
+ inconsistent vpos options%
+ }{%
+ You've said `#2' as position option. But you have
+ to\MessageBreak
+ use only one of `t', `o', `b', or `u' not two of
+ these.\MessageBreak
+ If you'll continue only first vpos option will be
+ used%
+ }%
+ \fi
+ }%
+}
+\newcommand*{\bprot@dottedtocline}[5]{%
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \ifnum #1>\c@tocdepth \else
+ \begingroup
+ \@tempcnta 20010
+ \advance \@tempcnta by -#1
+ \ifnum \@tempcnta>\lastpenalty
+ \endgroup
+ \addpenalty{\@lowpenalty}%
+ \else
+ \endgroup
+ \fi
+ \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
+ \@tempcnta 20009
+ \advance \@tempcnta by -#1
+ \penalty\@tempcnta
+ \fi
+ \else
+ \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
+ \fi
+}
+\newcommand*\appendix{\par%
+ \setcounter{chapter}{0}%
+ \setcounter{section}{0}%
+ \gdef\@chapapp{\appendixname}%
+ \gdef\thechapter{\@Alph\c@chapter}%
+ \csname appendixmore\endcsname
+}
+\newcommand*{\partnumdepth}{%
+ \m@ne
+}
+\newcommand*{\scr@part@sectionbeforeskip}{%
+ \z@ \@plus 1fil + \baselineskip
}
-\newcommand*{\chapapp}{\@chapapp}
-\newcommand*\@chapapp{\chaptername}
\newcommand*{\partheadstartvskip}{%
- \null\vfil
+ \null\vskip-\baselineskip\vskip\@tempskipa
}
\newcommand*{\partheadmidvskip}{%
\par\nobreak
\vskip 20\p@
}
+\newcommand*{\scr@part@sectionafterskip}{%
+ \z@ \@plus 1fil
+}
\newcommand*{\partheadendvskip}{%
- \vfil\newpage
+ \vskip\@tempskipa\newpage
}
+\newcommand*{\scr@part@sectionindent}{\z@}
+\newcommand*{\scr@part@style}{}
\newcommand*{\partheademptypage}{%
\if@twoside\if@openright
\null%
@@ -2614,6 +3080,8 @@
\else
\@tempswafalse
\fi
+ \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
@@ -2679,12 +3147,19 @@
\@endpart
}
\newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}%
+ \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\partheademptypage
\if@tempswa
\twocolumn
\fi
}
+\newcommand*{\setpartpreamble}{\set@preamble{part}}
+\newcommand*{\part@u@preamble}{}
+\let\part@u@preamble\relax
+\newcommand*{\part@o@preamble}{}
+\let\part@o@preamble\relax
\newcommand*{\addparttocentry}[2]{%
\addtocentrydefault{part}{#1}{#2}%
}
@@ -2738,6 +3213,50 @@
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
+\newcommand*{\parttocdepth}{\m@ne}
+\let\parttocdepth\m@ne
+\newcommand*{\scr@part@tocindent}{\z@}
+\let\scr@part@tocindent\z@
+\newcommand*{\scr@part@tocnumwidth}{2em}
+\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
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \endgroup
+ \penalty20010
+ \else
+ \penalty\@highpenalty
+ \endgroup
+ \fi
+ \fi
+}
+\newcounter{part}
+\renewcommand*{\thepart}{\@Roman\c@part}
+\newcommand*{\partformat}{\partname~\thepart\autodot}
+\newcommand*\partname{Part}
+\newcommand*{\raggedpart}{}
+\let\raggedpart\centering
+\newcommand*{\scr@fnt@part}{\size@part}
+\newcommand*{\scr@fnt@partnumber}{\size@partnumber}
+\newkomafont{partentry}{\usekomafont{disposition}\large}
+\newkomafont{partentrypagenumber}{}
+\newcommand*{\chapternumdepth}{\z@}
\newif\if@at@twocolumn
\newcommand*\scr@topnewpage{}
\let\scr@topnewpage\@topnewpage
@@ -2745,17 +3264,32 @@
\@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse
}
\newcommand*{\use@chapter@o@preamble}{%
- {\settoheight{\@tempdima}{\vbox{\chapterheadstartvskip}}%
- \settodepth{\@tempdimb}{\vbox{\chapterheadstartvskip}}%
+ {%
+ \settoheight{\@tempdima}{%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \vbox{\chapterheadstartvskip}%
+ }%
+ \settodepth{\@tempdimb}{%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \vbox{\chapterheadstartvskip}%
+ }%
\addtolength{\@tempdima}{\@tempdimb}%
- \setbox0\vbox{\use@preamble{chapter@o}%
- \vskip-\parskip}%
+ \setbox0\vbox{%
+ \vskip-\ht\strutbox
+ \use@preamble{chapter@o}%
+ \vskip\baselineskip
+ }%
\setlength{\@tempdimb}{\ht0}%
\addtolength{\@tempdimb}{\dp0}%
\vbox to \z@{%
- \vbox to \@tempdima{\vfill\box0}%
- \vskip-\@tempdima%
+ \vbox to \@tempdima{%
+ \vfill
+ \unvbox0
}%
+ \vss
+ }\vskip-\parskip\vskip-\baselineskip
\ifdim \@tempdimb>\@tempdima%
\addtolength{\@tempdimb}{-\@tempdima}%
\ClassWarning{\KOMAClassName}{%
@@ -2838,33 +3372,53 @@
\newcommand*{\@makechapterhead}[1]{%
\use@chapter@o@preamble
\@@makechapterhead{#1}%
- \use@preamble{chapter@u}\nobreak
+ \use@preamble{chapter@u}%
}
-\newcommand*{\@@makechapterhead}[1]{\chapterheadstartvskip
+\newcommand*{\@@makechapterhead}[1]{%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \normalfont\sectfont\nobreak\size@chapter{}%
+ \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}%
+ \def\IfUseNumber{\ifnumbered{chapter}}%
\if@chapterprefix
- \let\@tempa\raggedsection
+ \raggedchapter
+ \let\IfUsePrefixLine\@firstoftwo
+ \let\@tempa\@firstofone
\else
+ \let\IfUsePrefixLine\@secondoftwo
\let\@tempa\@hangfrom
\fi
\@tempa{%
- \ifnumbered{chapter}{%
- \if@chapterprefix
- \expandafter\size@chapterprefix
- \else
- \expandafter\size@chapter
- \fi
- {\chapterformat}%
- \if@chapterprefix
- \size@chapterprefix{}\endgraf\nobreak\vskip.5\baselineskip
- \fi
+ \IfUseNumber{%
+ \usekomafont{chapter}{%
+ \IfUsePrefixLine{%
+ {\usekomafont{chapterprefix}{%
+ \chapterformat\chapterheadmidvskip
+ }}%
+ }{%
+ \chapterformat
+ }%
+ }%
}{}%
}%
- {\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}%
- \nobreak\chapterheadendvskip
+ {%
+ \IfUsePrefixLine{}{\raggedchapter}%
+ \interlinepenalty \@M
+ \usekomafont{chapter}{#1}\par
+ }%
+ }%
+ \nobreak\par\nobreak
+ \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadendvskip
}
+\newcommand*{\setchapterpreamble}{\set@preamble{chapter}}
+\newcommand*{\chapter@u@preamble}{}
+\let\chapter@u@preamble\relax
+\newcommand*{\chapter@o@preamble}{}
+\let\chapter@o@preamble\relax
\newcommand*{\addchaptertocentry}[2]{%
\addtocentrydefault{chapter}{#1}{#2}%
\if@chaptertolists
@@ -2889,16 +3443,23 @@
\fi
}
\newcommand*{\@@makeschapterhead}[1]{%
- \chapterheadstartvskip%
- {\normalfont\sectfont\nobreak\size@chapter{}%
+ \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadstartvskip
+ {%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \raggedsection \interlinepenalty \@M \size@chapter{#1}\par}%
- \nobreak\chapterheadendvskip%
+ \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}%
+ \raggedchapter \interlinepenalty \@M \usekomafont{chapter}{#1}\par
+ }%
+ \nobreak\par\nobreak
+ \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadendvskip%
}
\newcommand*{\@makeschapterhead}[1]{%
\use@chapter@o@preamble
\@@makeschapterhead{#1}%
- \use@preamble{chapter@u}\nobreak
+ \use@preamble{chapter@u}%
}
\newcommand\addchap{%
\if@openright\cleardoublepage\else\clearpage\fi
@@ -2947,6 +3508,96 @@
\addchapmark{\scr@ds@head}%
}%
\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
+\newcommand*{\chaptertocdepth}{\z@}
+\let\chaptertocdepth\z@
+\newcommand*{\scr@chapter@tocindent}{\z@}
+\let\scr@chapter@tocindent\z@
+\newcommand*{\scr@chapter@tocnumwidth}{1.5em}
+\newcommand*\l@chapter[2]{%
+ \ifnum \c@tocdepth <\chaptertocdepth \else
+ \ifnum \lastpenalty<20010
+ \addpenalty{-\@highpenalty}%
+ \fi
+ \ifnum \scr@compatibility<\@nameuse{scr@v@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
+ \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \endgroup
+ \penalty20009
+ \else
+ \penalty\@highpenalty
+ \endgroup
+ \fi
+ \fi
+}
+\newcommand*{\raggedchapterentry}{}
+\newcommand*{\l@chapteratlist}{\l@chapter}
+\newcounter{chapter}
+\renewcommand*{\thechapter}{\@arabic\c@chapter}
+\newcommand*{\chapterformat}{%
+ \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot\enskip}%
+}
+\newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }%
+ \thechapter\autodot\enskip}
+\newcommand*\chaptername{Chapter}
+\newcommand*\appendixname{Appendix}
+\newcommand*{\chapappifprefix}[1][]{%
+ \ClassWarning{\KOMAClassName}{%
+ Please don't use obsolete command
+ \string\chapappifprefix.\MessageBreak
+ The new command \string\chapappifchapterprefix\space has
+ an\MessageBreak
+ obligatory instead of an optional argument. Use that\MessageBreak
+ new command%
+ }%
+ \if@chapterprefix\chapapp#1\fi
+}
+\newcommand*{\chapappifchapterprefix}[1]{%
+ \if@chapterprefix\chapapp#1\fi
+}
+\newcommand*{\chapapp}{\@chapapp}
+\newcommand*\@chapapp{\chaptername}
+\newcommand*\chaptermark[1]{}
+\newcommand*\addchapmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=\m@ne
+ \chaptermark{#1}%
+ \endgroup
+}
+\newcommand*{\raggedchapter}{\raggedsection}
+\newcommand*{\scr@fnt@chapter}{\size@chapter}
+\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix}
+\newkomafont{chapterentry}{\usekomafont{disposition}}
+\newkomafont{chapterentrypagenumber}{}
+\newkomafont{chapterentrydots}{\normalfont}
\newcommand*\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
\def\@addsec[#1]#2{\section*{#2}%
@@ -2974,56 +3625,6 @@
\addsecmark{\scr@ds@head}%
}
\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
-\newcommand*{\addsectiontocentry}[2]{%
- \addtocentrydefault{section}{#1}{#2}%
-}
-\newcommand*{\addsubsectiontocentry}[2]{%
- \addtocentrydefault{subsection}{#1}{#2}%
-}
-\newcommand*{\addparagraphtocentry}[2]{%
- \addtocentrydefault{paragraph}{#1}{#2}%
-}
-\newcommand*{\addsubparagraphtocentry}[2]{%
- \addtocentrydefault{subparagraph}{#1}{#2}%
-}
-\newcommand\section{%
- \scr@startsection{section}{\sectionnumdepth}{\z@}%
- {-3.5ex \@plus -1ex \@minus -.2ex}%
- {2.3ex \@plus.2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@section}%
-}
-\newcommand\subsection{%
- \scr@startsection{subsection}{\subsectionnumdepth}{\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@subsection
- }%
-}
-\newcommand\subsubsection{%
- \scr@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@subsubsection
- }%
-}
-\newcommand\paragraph{%
- \scr@startsection{paragraph}{\paragraphnumdepth}{\z@}%
- {3.25ex \@plus1ex \@minus.2ex}%
- {-1em}%
- {\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
-}
-\newcommand\subparagraph{%
- \scr@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
- {3.25ex \@plus1ex \@minus .2ex}%
- {-1em}%
- {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
-}
\newkomafont{minisec}{}
\newcommand\minisec[1]{%
\ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
@@ -3045,231 +3646,104 @@
\usekomafont{minisec}#1\par\nobreak}\nobreak%
\@afterheading
}
-\newcommand*{\raggedsection}{}
-\let\raggedsection\raggedright
-\newcommand*{\raggedpart}{}
-\let\raggedpart\centering
-\newkomafont{partentry}{\usekomafont{disposition}\large}
-\newkomafont{partentrypagenumber}{}
-\newkomafont{chapterentry}{\usekomafont{disposition}}
-\newkomafont{chapterentrypagenumber}{}
-\newcommand*{\scr@fnt@disposition}{\sectfont}
-\aliaskomafont{sectioning}{disposition}
-\newcommand*{\scr@fnt@part}{\size@part}
-\newcommand*{\scr@fnt@partnumber}{\size@partnumber}
-\newcommand*{\scr@fnt@chapter}{\size@chapter}
-\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix}
-\newcommand*{\scr@fnt@section}{\size@section}
-\newcommand*{\scr@fnt@subsection}{\size@subsection}
-\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection}
-\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
-\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
-\newcommand*{\use@preamble}[1]{%
- \@ifundefined{#1@preamble}{}{%
- \@nameuse{#1@preamble}%
- \global\expandafter\let\csname#1@preamble\endcsname=\relax
- }%
-}
-\newcommand*{\set@preamble}[1]{%
- \@ifnextchar [%]
- {\set@@preamble{#1}}{\set@@@preamble{#1}[][\hsize]}%
+\newcommand*{\addsectiontocentry}[2]{%
+ \addtocentrydefault{section}{#1}{#2}%
}
-\newcommand*{\set@@preamble}{}
-\def\set@@preamble#1[#2]{%
- \@ifnextchar [%]
- {\set@@@preamble{#1}[{#2}]}{\set@@@preamble{#1}[{#2}][\hsize]}%
+\newcommand*{\addsubsectiontocentry}[2]{%
+ \addtocentrydefault{subsection}{#1}{#2}%
}
-\newcommand{\set@@@preamble}{}
-\long\def\set@@@preamble#1[#2][#3]#4{%
- \begingroup
- \def\prmbl@pos{#2}\let\prmbl@hpos\relax\let\prmbl@vpos\relax
- \expandafter \@tfor \expandafter \@tempa
- \expandafter :\expandafter =\prmbl@pos
- \do{%
- \if \@tempa l%
- \set@preamble@hpos{0}{#2}%
- \fi%
- \if \@tempa c%
- \set@preamble@hpos{1}{#2}%
- \fi%
- \if \@tempa r%
- \set@preamble@hpos{2}{#2}%
- \fi%
- \if \@tempa u%
- \set@preamble@vpos{0}{#2}%
- \fi%
- \if \@tempa b%
- \set@preamble@vpos{0}{#2}%
- \fi
- \if \@tempa o%
- \set@preamble@vpos{1}{#2}%
- \fi%
- \if \@tempa t%
- \set@preamble@vpos{1}{#2}%
- \fi
- }%
- \@ifundefined{prmbl@hpos}{\def\prmbl@hpos{0}}{}%
- \@ifundefined{prmbl@vpos}{\def\prmbl@vpos{0}}{}%
- \ifcase\prmbl@hpos
- \ifcase\prmbl@vpos
- \set@@@@preamble{#1@u}{t}{#3}{}{\hfil}{#4}%
- \else
- \set@@@@preamble{#1@o}{b}{#3}{}{\hfil}{#4}%
- \fi
- \or
- \ifcase\prmbl@vpos
- \set@@@@preamble{#1@u}{t}{#3}{\hfil}{\hfil}{#4}%
- \else
- \set@@@@preamble{#1@o}{b}{#3}{\hfil}{\hfil}{#4}%
- \fi
- \else
- \ifcase\prmbl@vpos
- \set@@@@preamble{#1@u}{t}{#3}{\hfil}{}{#4}%
- \else
- \set@@@@preamble{#1@o}{b}{#3}{\hfil}{}{#4}%
- \fi
- \fi
- \endgroup
+\newcommand*{\addparagraphtocentry}[2]{%
+ \addtocentrydefault{paragraph}{#1}{#2}%
}
-\newcommand{\set@@@@preamble}[6]{%
- \expandafter\gdef\csname #1@preamble\endcsname{%
- \hbox to\hsize{#4\parbox[{#2}]{#3}{#6\par}#5\par}%
- }%
+\newcommand*{\addsubparagraphtocentry}[2]{%
+ \addtocentrydefault{subparagraph}{#1}{#2}%
}
-\newcommand*{\set@preamble@hpos}[2]{%
- \@ifundefined{prbml@hpos}{%
- \def\prmbl@hpos{#1}%
- }{%
- \ifnum \prmbl@hpos=0\relax\else%
- \ClassError{\KOMAClassName}{%
- inconsistent hpos options%
- }{%
- You've said `#2' as position option. But you have
- to\MessageBreak
- use only one of `l', `r', or `c' not two of
- these.\MessageBreak
- If you'll continue only first hpos option will be
- used%
- }%
- \fi
- }%
+\newcounter{section}[chapter]
+\renewcommand*\thesection{%
+ \thechapter.%
+ \@arabic\c@section
}
-\newcommand*{\set@preamble@vpos}[2]{%
- \@ifundefined{prbml@vpos}{%
- \def\prmbl@vpos{#1}%
- }{%
- \ifnum \prmbl@vpos=0\relax\else%
- \ClassError{\KOMAClassName}{%
- inconsistent vpos options%
- }{%
- You've said `#2' as position option. But you have
- to\MessageBreak
- use only one of `t', `o', `b', or `u' not two of
- these.\MessageBreak
- If you'll continue only first vpos option will be
- used%
- }%
- \fi
- }%
+\newcommand*\sectionmarkformat{\thesection\autodot\enskip}
+\newcounter{subsection}[section]
+\renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection}
+\newcounter{subsubsection}[subsection]
+\renewcommand*{\thesubsubsection}{%
+ \thesubsection.\@arabic\c@subsubsection
}
-\newcommand*{\setchapterpreamble}{\set@preamble{chapter}}
-\newcommand*{\chapter@u@preamble}{}
-\let\chapter@u@preamble\relax
-\newcommand*{\chapter@o@preamble}{}
-\let\chapter@o@preamble\relax
-\newcommand*{\setpartpreamble}{\set@preamble{part}}
-\newcommand*{\part@u@preamble}{}
-\let\part@u@preamble\relax
-\newcommand*{\part@o@preamble}{}
-\let\part@o@preamble\relax
-\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth >-2\relax
- \addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\p@}%
- \setlength{\@tempdima}{2em}%
- \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
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \endgroup
- \penalty20010
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
+\newcounter{paragraph}[subsubsection]
+\renewcommand*{\theparagraph}{\thesubsubsection.\@arabic\c@paragraph}
+\newcounter{subparagraph}[paragraph]
+\renewcommand*{\thesubparagraph}{%
+ \theparagraph.\@arabic\c@subparagraph
}
-\newcommand*\l@chapter[2]{%
- \ifnum \c@tocdepth >\m@ne
- \ifnum \lastpenalty<20010
- \addpenalty{-\@highpenalty}%
- \fi
- \vskip 1.0em \@plus\p@
- \setlength\@tempdima{1.5em}%
- \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
- \usekomafont{chapterentry}{#1\nobreak
- \usekomafont{chapterentrypagenumber}{%
- \hfill\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}}\par
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \endgroup
- \penalty20009
- \else
- \penalty\@highpenalty
- \endgroup
- \fi
- \fi
+\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
+\renewcommand*{\@seccntformat}[1]{%
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
}
-\newcommand*{\raggedchapterentry}{}
-\newcommand*{\l@chapteratlist}{\l@chapter}
-\newcommand*\l@section{\bprot@dottedtocline{1}{1.5em}{2.3em}}
-\newcommand*\l@subsection{\bprot@dottedtocline{2}{3.8em}{3.2em}}
-\newcommand*\l@subsubsection{\bprot@dottedtocline{3}{7.0em}{4.1em}}
-\newcommand*\l@paragraph{\bprot@dottedtocline{4}{10em}{5em}}
-\newcommand*\l@subparagraph{\bprot@dottedtocline{5}{12em}{6em}}
-\newcommand*{\bprot@dottedtocline}[5]{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \ifnum #1>\c@tocdepth \else
- \begingroup
- \@tempcnta 20010
- \advance \@tempcnta by -#1
- \ifnum \@tempcnta>\lastpenalty
- \endgroup
- \addpenalty{\@lowpenalty}%
- \else
- \endgroup
- \fi
- \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \@tempcnta 20009
- \advance \@tempcnta by -#1
- \penalty\@tempcnta
- \fi
- \else
- \@dottedtocline{#1}{#2}{#3}{#4}{#5}%
- \fi
+\newcommand*\addsecmark[1]{%
+ \begingroup
+ \c@secnumdepth=\m@ne
+ \sectionmark{#1}%
+ \endgroup
}
+\newcommand*{\scr@fnt@section}{\size@section}
+\newcommand*{\scr@fnt@subsection}{\size@subsection}
+\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection}
+\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
+\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
+\DeclareSectionCommand[%
+ style=section,%
+ level=1,%
+ indent=\z@,%
+ beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,%
+ afterskip=2.3ex \@plus.2ex,%
+ tocindent=1.5em,%
+ tocnumwidth=2.3em%
+]{section}
+\DeclareSectionCommand[%
+ style=section,%
+ level=2,%
+ indent=\z@,%
+ beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
+ afterskip=1.5ex \@plus .2ex,%
+ tocindent=3.8em,%
+ tocnumwidth=3.2em%
+]{subsection}
+\DeclareSectionCommand[%
+ style=section,%
+ level=3,%
+ indent=\z@,%
+ beforeskip=-3.25ex\@plus -1ex \@minus -.2ex,%
+ afterskip=1.5ex \@plus .2ex,%
+ tocindent=7.0em,%
+ tocnumwidth=4.1em%
+]{subsubsection}
+\DeclareSectionCommand[%
+ style=section,%
+ level=4,%
+ indent=\z@,%
+ beforeskip=3.25ex \@plus1ex \@minus.2ex,%
+ afterskip=-1em,%
+ tocindent=10em,%
+ tocnumwidth=5em%
+]{paragraph}
+\DeclareSectionCommand[%
+ style=section,%
+ level=5,%
+ indent=\scr@parindent,%
+ beforeskip=3.25ex \@plus1ex \@minus .2ex,%
+ afterskip=-1em,%
+ tocindent=12em,%
+ tocnumwidth=6em%
+]{subparagraph}
+\ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\relax
+ \let\scr@subparagraph@sectionindent\parindent
+\else
+ \def\scr@subparagraph@sectionindent{\scr@parindent}%
+\fi
+\newcommand*{\scr@fnt@disposition}{\sectfont}
+\aliaskomafont{sectioning}{disposition}
%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -4237,7 +4711,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 86fce62c582..db47aac42ee 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\ProvidesFile{%
scrsize10pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,16 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+\@ifundefined{@list@extra}{}{%
+ \l@addto@macro{\@listi}{\@list@extra}%
+ \let\@listI=\@listi
+ \l@addto@macro{\@listii}{\@list@extra}%
+ \l@addto@macro{\@listiii}{\@list@extra}%
+ \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}%
+ \l@addto@macro{\small}{\protect\add@extra@listi{sml}}%
+}
+\@listi
\endinput
%%
%% End of file `scrsize10pt.clo'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index c1517f54219..35f0b9992a8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\ProvidesFile{%
scrsize11pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,16 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+\@ifundefined{@list@extra}{}{%
+ \l@addto@macro{\@listi}{\@list@extra}%
+ \let\@listI=\@listi
+ \l@addto@macro{\@listii}{\@list@extra}%
+ \l@addto@macro{\@listiii}{\@list@extra}%
+ \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}%
+ \l@addto@macro{\small}{\protect\add@extra@listi{sml}}%
+}
+\@listi
\endinput
%%
%% End of file `scrsize11pt.clo'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index bc99b8dd500..f07c87fe8bd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
\ProvidesFile{%
scrsize12pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,16 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+\@ifundefined{@list@extra}{}{%
+ \l@addto@macro{\@listi}{\@list@extra}%
+ \let\@listI=\@listi
+ \l@addto@macro{\@listii}{\@list@extra}%
+ \l@addto@macro{\@listiii}{\@list@extra}%
+ \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}%
+ \l@addto@macro{\small}{\protect\add@extra@listi{sml}}%
+}
+\@listi
\endinput
%%
%% End of file `scrsize12pt.clo'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index 2e01f352e67..b60799116be 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,23 +65,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
+%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
+%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
\newif\if@Hxii
\KOMA@ifkey{12h}{@Hxii}
\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
+%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
\def\thistime{%
\@ifstar
{\let\@tempif\iffalse\@thistime}
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 942aae4c940..9b5347a1aa6 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -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: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
+%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(handling toc-files)%
]
@@ -370,20 +370,26 @@
\subsection[##1]{##1}%
}{%
\subsection*{##1}%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
\iftocfeature{\@currext}{totoc}{%
\addxcontentsline{toc}{subsection}{##1}%
}{}%
+ \begingroup
+ \@ifundefined{@mkright}{%
+ \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{##1}}%
+ }%
+ \endgroup
}%
}{%
\iftocfeature{\@currext}{numbered}{%
\section[##1]{##1}%
}{%
\section*{##1}%
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
\iftocfeature{\@currext}{totoc}{%
\addxcontentsline{toc}{section}{##1}%
}{}%
+ \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
}%
}%
}%
@@ -393,18 +399,41 @@
\iftocfeature{\@currext}{numbered}{%
\section{##1}%
}{%
- \section*{##1}%
\iftocfeature{\@currext}{totoc}{%
- \addxcontentsline{toc}{section}{##1}%
- }{}%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
+ \begingroup
+ \@ifundefined{addsec}{%
+ \section*{##1}%
+ \begingroup
+ \@ifundefined{@mkright}{%
+ \ifx\@mkboth\@gobbletwo
+ \else\markright{\MakeMarkcase{##1}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{##1}}%
+ }%
+ \endgroup
+ \addxcontentsline{toc}{section}{##1}%
+ }{%
+ \addsec{##1}%
+ }%
+ \endgroup
+ }{%
+ \section*{##1}%
+ \begingroup
+ \@ifundefined{@mkright}{%
+ \ifx\@mkboth\@gobbletwo
+ \else\markright{\MakeMarkcase{##1}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{##1}}%
+ }%
+ \endgroup
+ }%
}%
}{%
\iftocfeature{\@currext}{numbered}{%
\chapter[##1]{##1}%
}{%
- \chapter*{##1}%
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
+ \chapter*{##1\unskip
+ \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}}%
\iftocfeature{\@currext}{totoc}{%
\addxcontentsline{toc}{chapter}{##1}%
}{}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 61cfd0c7066..7455824f1cc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -47,7 +47,7 @@
%% EVERYTHING MAY CHANGE IN FUTURE!
%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
%%
-%%% From File: $Id: tocstyle.dtx 1716 2014-03-01 15:38:49Z kohm $
+%%% From File: $Id: tocstyle.dtx 1857 2014-12-03 07:22:56Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
[2013/08/11 v0.2e-alpha KOMA-Script package (versatile toc styles)]
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 3f17c9df40b..bec0ef4ad51 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,12 +67,12 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package (type area)]
\typeout{%
Package typearea, \csname ver@typearea.sty\endcsname^^J%
@@ -81,7 +81,7 @@
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
@@ -618,7 +618,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -707,6 +707,7 @@
\@namedef{scr@v@3.13}{12}
\@namedef{scr@v@3.13a}{13}
\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@last}{14}
%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\InputIfFileExists{typearea.cfg}{%
@@ -1338,7 +1339,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04: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 3996796f07a..dc0e5e802e7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -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 1815 2014-10-28 10:15:59Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%