summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
committerKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
commit4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch)
tree968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/tex/latex/koma-script
parent59d9a998c6236de39603cb2ea077c5371e06b842 (diff)
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls325
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty80
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls346
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty64
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdoc.cls9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty85
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty81
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty22
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty206
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty31
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls622
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls346
-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.sty19
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrwfile.sty49
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty40
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco12
45 files changed, 1691 insertions, 912 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 3216db72798..7b44105a3a5 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
DIN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DIN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 64479025bc2..ff505c80898 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
DINmtext%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DINmtext%
@@ -146,22 +146,7 @@
\@setplength{sigindent}{0mm}
\@setplength{sigbeforevskip}{2\baselineskip}
\let\raggedsignature=\centering
-\renewcommand*{\@firsthead}{\noindent
- \parbox[b]{\useplength{firstheadwidth}}{\centering%
- \usekomafont{fromaddress}{%
- \ifkomavarempty{fromname}{}{%
- \usekomafont{fromname}%
- {\ignorespaces\usekomavar{fromname}\\[-8pt]
- \rule{\useplength{firstheadwidth}}{.4pt}\\
- }%
- }%
- \ifkomavarempty{fromaddress}{}{%
- \def\\{,\ \@ogobble}%
- \ignorespaces\usekomavar{fromaddress}%
- }%
- }%
- }%
- }
+\def\scr@default@firsthead@fromaddress@hook{\def\\{,\ \@gobble}}
\endinput
%%
%% End of file `DINmtext.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 6d00cc1cfcc..7695e54b3fd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -9,7 +9,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,KOMAold,body')
%% scrkernel-notepaper.dtx (with options: `lco,KOMAold,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
KOMAold%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
KOMAold%
@@ -204,7 +204,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
\def\setpresigskip{\@setplength{sigbeforevskip}}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index 795903d6b2f..60da6c2a71d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 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 6ec1eeead31..d83996be61b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
NF%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
NF%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index e807d164226..f97f4259bc5 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 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 33118546d19..64a50eb834b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 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 8c7f9d48b3e..2e3a752fa75 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 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 3faf11f0e3e..609dec06f2b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 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 375f67a0cb1..ac51b27995b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 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 2909d28439d..e54512e5843 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
SN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index a8111207c1a..f3144261cf7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
SNleft%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SNleft%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index c8d82ccd879..a3cafd59409 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
UScommercial9
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index 9f8d1f8ad49..e2466bb3235 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
UScommercial9DW
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9DW%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index 0d6bad158e9..6976622e707 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,float,identify')
%% scrhack.dtx (with options: `hack,float,body')
%%
-%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{float.hak}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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 563b62e7e9d..269a1b4c677 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,floatrow,identify')
%% scrhack.dtx (with options: `hack,floatrow,body')
%%
-%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{floatrow.hak}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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 138c9929fbb..cfb7dd37076 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,hyperref,identify')
%% scrhack.dtx (with options: `hack,hyperref,body')
%%
-%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{hyperref.hak}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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 de9a0d3735a..60577093a29 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,listings,identify')
%% scrhack.dtx (with options: `hack,listings,body')
%%
-%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\ProvidesFile{listings.hak}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package
(hacking package
listings)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index d9fc6499204..969e73dc4c1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
@@ -7,7 +7,7 @@
%% scraddr.dtx (with options: `scraddr')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2006-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2006-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 988204abdd9..32a5b3a8b58 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -40,7 +40,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,article,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -72,7 +72,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -103,19 +103,19 @@
article%
}
\ProvidesClass{\KOMAClassName}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
\RequirePackage{tocbasic}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
]
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -218,8 +218,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -234,7 +237,7 @@
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
@@ -299,7 +302,7 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -359,17 +362,19 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -502,7 +507,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newif\if@titlepage
\@titlepagefalse
\newif\if@titlepageiscoverpage
@@ -525,8 +530,7 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
-%% \fi
+%%% 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}%
@@ -645,7 +649,7 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
@@ -663,9 +667,9 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\@ifundefined{typearea}{%
- \PassOptionsToPackage{typearea}{headinclude=#1}%
+ \PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
- \KOMAoptions{footinclude=#1,DIV=current}%
+ \KOMAoptions{footinclude=#1}%
}%
\fi
}
@@ -676,7 +680,7 @@
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -693,7 +697,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -847,7 +864,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -867,21 +884,21 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMAExecuteOptions{index=notoc}%
+ \KOMAoptions{index=notoc}%
\or
- \KOMAExecuteOptions{index=totoc}%
+ \KOMAoptions{index=totoc}%
\or
- \KOMAExecuteOptions{listof=notoc}%
+ \KOMAoptions{listof=notoc}%
\or
- \KOMAExecuteOptions{listof=totoc}%
+ \KOMAoptions{listof=totoc}%
\or
- \KOMAExecuteOptions{listof=numbered}%
+ \KOMAoptions{listof=numbered}%
\or
- \KOMAExecuteOptions{bibliography=nottotoc}%
+ \KOMAoptions{bibliography=nottotoc}%
\or
- \KOMAExecuteOptions{bibliography=totoc}%
+ \KOMAoptions{bibliography=totoc}%
\or
- \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \KOMAoptions{bibliography=totocnumbered}%
\or
\@toclefttrue
\or
@@ -1001,7 +1018,7 @@
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1056,7 +1073,7 @@
\newcommand*\bib@heading{%
\ifbib@leveldown
\subsection*{\refname}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\refname}}\fi
+ \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\refname}}\fi
\else
\section*{\refname}%
\@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
@@ -1142,13 +1159,13 @@
}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% 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 $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
@@ -1578,12 +1595,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1627,7 +1644,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1755,7 +1772,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -1928,12 +1945,14 @@
\let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
- \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \@makeextratitle
- \next@tdpage
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle
+ \next@tdpage
+ \fi
\@maketitle
\else
\ifx\@extratitle\@empty\else
@@ -1942,7 +1961,9 @@
\twocolumn[\@maketitle]%
\fi
\else
- \@makeextratitle
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle\next@tdpage
+ \fi
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
@@ -1979,13 +2000,11 @@
\global\let\and\relax
}%
\newcommand*{\@makeextratitle}{%
- \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tdpage
+ \noindent\@extratitle\par
\fi
}
\newcommand*{\@maketitle}{%
- \next@tdpage
\global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
@@ -2090,7 +2109,7 @@
\if@twocolumn\else\endquotation\fi
\fi
}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newcommand*\appendix{\par%
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -2126,6 +2145,101 @@
\fi
\@@maybeautodot
}
+\newcommand*{\scr@saved@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \@ifstar
+ {\@ssect{#3}{#4}{#5}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+}
+\ifx\@startsection\scr@saved@startsection
+ \newcommand*{\scr@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \csname scr@startsection@hook\endcsname
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \@ifstar
+ {\csname scr@preto@ssect@hook\endcsname\@ssect{#3}{#4}{#5}{#6}}%
+ {\csname scr@preto@sect@hook\endcsname
+ \scr@section@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ }
+\else
+ \ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
+ changed.\MessageBreak
+ \KOMAClassName\space needs it's own Definition of
+ `\string\@startsection'\MessageBreak
+ to provide extended features for the optional argument\MessageBreak
+ of `\string\section` etc.\MessageBreak
+ Generally it defines `\string\@startsection` completely new\MessageBreak
+ to achieve this. Because of the unexpected definition\MessageBreak
+ an alternative approach will be used.\MessageBreak
+ If this fails and if there isn't a new release of\MessageBreak
+ KOMA-Scriptt that fixes the problem, please\MessageBreak
+ send a report to the KOMA-Script author.\MessageBreak
+ Note, that this alternative approach does not\MessageBreak
+ execute `\string\scr@startsection@hook', \MessageBreak
+ `\string\scr@preto@ssect@hook', or `\string\scr@preto@sect@hook'%
+ }%
+ \let\scr@saved@startsection\@startsection
+ \newcommand*{\scr@startsection}[6]{%
+ \@ifstar
+ {\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}*}%
+ {\scr@section@dblarg{\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ }
+\fi
+\newcommand*{\At@startsection}[1]{%
+ \@ifundefined{scr@startsection@hook}{\let\scr@startsection@hook\@empty}{}%
+ \l@addto@macro{\scr@startsection@hook}{#1}%
+}
+\newcommand*{\Before@ssect}[1]{%
+ \@ifundefined{scr@preto@ssect@hook}{\let\scr@preto@ssect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@ssect@hook}{#1}%
+}
+\newcommand*{\Before@sect}[1]{%
+ \@ifundefined{scr@preto@sect@hook}{\let\scr@preto@sect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@sect@hook}{#1}%
+}
+\newcommand{\scr@section@dblarg}[1]{%
+ \kernel@ifnextchar[%]
+ {#1}%
+ {\scr@section@xdblarg{#1}}%
+}
+\newcommand{\scr@section@xdblarg}[2]{%
+ \begingroup
+ \edef\reserved@a{%
+ \unexpanded{\endgroup\let\scr@osectarg\z@#1[{#2}]{#2}\def\scr@osectarg}%
+ {\scr@osectarg}}%
+ \reserved@a
+}
+\renewcommand*{\@startsection}{%
+ \ifnum \scr@osectarg=\z@
+ \expandafter\scr@saved@startsection
+ \else
+ \expandafter\scr@startsection
+ \fi
+}
+\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}}
+\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
+\let\secdef\SecDef
\def\@tempa#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
\let\@svsec\@empty
@@ -2324,7 +2438,7 @@
\newcommand\part{\par
\partheadstartvskip%
\@afterindentfalse
- \secdef\@part\@spart
+ \SecDef\@part\@spart
}
\newcommand*{\@part}{}
\def\@part[#1]#2{%
@@ -2396,7 +2510,7 @@
\par
\partheadstartvskip
\@afterindentfalse
- \secdef\@addpart\@saddpart
+ \SecDef\@addpart\@saddpart
}
\newcommand*{\@addpart}{}
\def\@addpart[#1]#2{%
@@ -2434,7 +2548,7 @@
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
-\newcommand*\addsec{\secdef\@addsec\@saddsec}
+\newcommand*\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
\def\@addsec[#1]#2{\section*{#2}%
\ifnum \scr@osectarg=\z@
@@ -2474,7 +2588,7 @@
\addtocentrydefault{subparagraph}{#1}{#2}%
}
\newcommand\section{%
- \@startsection{section}{\sectionnumdepth}{\z@}%
+ \scr@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2482,7 +2596,7 @@
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
\newcommand\subsection{%
- \@startsection{subsection}{\subsectionnumdepth}{\z@}%
+ \scr@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2491,7 +2605,7 @@
}%
}
\newcommand\subsubsection{%
- \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
+ \scr@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2500,19 +2614,31 @@
}%
}
\newcommand\paragraph{%
- \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
+ \scr@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
\newcommand\subparagraph{%
- \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
+ \scr@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
}
\newkomafont{minisec}{}
-\newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex
+\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
@@ -2625,7 +2751,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -2726,7 +2852,75 @@
the extended optional argument of the section\MessageBreak
commands
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+\BeforePackage{titlesec}{%
+ \let\scr@ttl@saved@section\section
+ \let\scr@ttl@saved@subsection\subsection
+ \let\scr@ttl@saved@subsubsection\subsubsection
+ \let\scr@ttl@saved@paragraph\paragraph
+ \let\scr@ttl@saved@subparagraph\subparagraph
+}
+\AfterPackage{titlesec}{%
+ \@ifpackagelater{titlesec}{2014/10/09}{%
+ \ClassInfo{\KOMAClassName}{%
+ Deactivating the `titlesec` workaround,\MessageBreak
+ because package is newer than expected%
+ }%
+ }{%
+ \PackageWarning{\KOMAClassName}{%
+ Activating an ugly workaround for a missing\MessageBreak
+ feature of package `titlesec`%
+ }%
+ \def\scr@ttl@@extract#1\scr@startsection#2#3#4#5#6#7#8{%
+ \@tempskipa=#5
+ \@tempskipb=#6
+ \ifdim\@tempskipa<\z@
+ \toks@{\titlespacing*#8{#4}}%
+ \@tempskipa-\@tempskipa
+ \else
+ \toks@{\titlespacing#8{#4}}%
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipa*\ttl@space\relax\beforetitleunit}%
+ \ifdim\@tempskipb<\z@
+ \if@tempswa
+ \titleformat#8[runin]%
+ {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8[runin]%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@tempskipb-\@tempskipb
+ \else
+ \if@tempswa
+ \titleformat#8%
+ {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
+ \fi
+ \edef\ttl@a{\the\toks@{\the\@tempskipa}{\the\@tempskipb}}
+ \ttl@a}%
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@section\section
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsection\subsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsubsection\subsubsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@paragraph\paragraph
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subparagraph\subparagraph
+ \let\scr@ttl@saved@section\relax
+ \let\scr@ttl@saved@subsection\relax
+ \let\scr@ttl@saved@subsubsection\relax
+ \let\scr@ttl@saved@paragraph\relax
+ \let\scr@ttl@saved@subparagraph\relax
+ \let\scr@ttl@@extract\relax
+ }%
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2744,10 +2938,11 @@
\newcommand*{\scr@fnt@pagefoot}{\footfont}
\newcommand*{\scr@fnt@wrn@pagefoot}[1]{%
This class does not use font element `pagefoot'!\MessageBreak
- Maybe you should load package `scrpage2', before\MessageBreak
- using this element%
+ Maybe you should load package `scrlayer-scrpage',\MessageBreak
+ before using this element%
}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*
+ {\pagemark}{{\usekomafont{pagenumber}{%
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
@@ -2783,7 +2978,7 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat\fi}{}##1}}{}}%
+ {\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}##1}}{}}%
\renewcommand*{\subsectionmark}[1]{%
\if@twoside
\markright{%
@@ -3511,7 +3706,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\renewcommand*{\numberline}[1]{%
\numberline@box{%
\numberline@prefix
@@ -3605,7 +3800,7 @@
\string\float@listhead\space detected!\MessageBreak
Implementation of \string\float@listhead\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Maybe implementation of \string\float@listhead\space will\MessageBreak
be removed from KOMA-Script soon.\MessageBreak
@@ -3620,7 +3815,7 @@
\string\float@addtolists\space detected!\MessageBreak
Implementation of \string\float@addtolist\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Since Version 3.12 support for deprecated\MessageBreak
\string\float@addtolist\space interface has been\MessageBreak
@@ -3643,7 +3838,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand*\refname{References}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 9755a4c3bc2..f5a22cd2751 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -12,7 +12,7 @@
%% scrkernel-language.dtx (with options: `package,body,base')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2002-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,14 +66,14 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package (%
KOMA-Script-independent
basics and keyval usage)]
@@ -174,8 +174,8 @@
\expandafter{\reserved@a}{#2}{#3}%
}%
}
-\newcommand*{\scr@define@family@key}{}
-\def\scr@define@family@key#1#2#3[#4]#5{%
+\newcommand{\scr@define@family@key}{}
+\long\def\scr@define@family@key#1#2#3[#4]#5{%
\scr@if@familymember{#1}{#2}{define a key}{%
\define@key{#2#1}{#3}[{#4}]{%
\def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
@@ -185,7 +185,7 @@
}%
}%
}
-\newcommand*{\scr@define@family@key@nodefault}[4]{%
+\newcommand{\scr@define@family@key@nodefault}[4]{%
\scr@if@familymember{#1}{#2}{define a key}{%
\define@key{#2#1}{#3}{%
\def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
@@ -282,7 +282,7 @@
\scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{%
\let\FamilyKeyState\OptionNotUsed
}{%
- \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{\CurrentOption}%
+ \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{{\CurrentOption}}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
\reserved@b
\ifx\FamilyKeyState\FamilyKeyStateUnknown
@@ -299,7 +299,7 @@
\let\FamilyKeyState\OptionNotUsed
}%
}{%
- \proteced@edef\reserved@b{\noexpand\setkeys{#2}{\CurrentOption}%
+ \proteced@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
\reserved@b
\ifx\FamilyKeyState\FamilyKeyStateUnknown
@@ -315,7 +315,7 @@
\def\reserved@a##1=##2\@nil{\def\reserved@a{##1}}%
\expandafter\reserved@a\CurrentOption=\@nil
\scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{}{%
- \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{\CurrentOption}%
+ \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{{\CurrentOption}}%
\noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
\ifx\FamilyKeyState\FamiliyKeyStateProcessed
\reserved@b
@@ -357,12 +357,12 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -392,9 +392,9 @@
\@ifundefined{#1}{%
\begingroup
\expandafter\def\expandafter\reserved@a
- \expandafter{\csname scr@#1\endcsname}
+ \expandafter{\csname scr@#1\endcsname}%
\expandafter\def\expandafter\reserved@b
- \expandafter{\csname #1\endcsname}
+ \expandafter{\csname #1\endcsname}%
\expandafter\expandafter\expandafter\endgroup
\expandafter\expandafter\expandafter\let\expandafter\reserved@b\reserved@a
\if@atdocument\else
@@ -601,7 +601,7 @@
\begingroup
\edef\reserved@a{#1}\expandafter
\scr@ifintegerplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup
}
\newcommand*{\scr@ifintegerplusminus}{}
@@ -626,7 +626,7 @@
\begingroup
\edef\reserved@a{#1\relax}\expandafter
\scr@ifdimensionplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup
}
\newcommand*{\scr@ifdimensionplusminus}{}
@@ -653,7 +653,7 @@
\begingroup
\edef\reserved@a{#1\relax}\expandafter
\scr@ifglueplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
- {\aftergroup\@secondoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup
}
\newcommand*{\scr@ifglueplusminus}{}
@@ -687,7 +687,7 @@
\endgroup
}
\newcommand*{\test@number}[1]{%
- \ifx \scr@next#1
+ \ifx \scr@next#1%
\let\scr@next\relax
\else
\@tempcnta=\expandafter\expandafter\expandafter\number
@@ -868,7 +868,10 @@
\providecommand*{\ClassInfoNoLine}[2]{%
\ClassInfo{#1}{#2\@gobble}%
}
-\newcommand*{\FamilyExecuteOptions}[3][.\@currname.\@currext]{%
+\newcommand*{\FamilyExecuteOptions}[2][.\@currname.\@currext]{%
+ \@FamilyExecuteOptions[{#1}]{#2}%
+}
+\newcommand{\@FamilyExecuteOptions}[3][.\@currname.\@currext]{%
\@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}%
\@for\scr@key@atlist:=#3\do{%
\expandafter\scr@key@split@name@value\scr@key@atlist==\@nil
@@ -939,7 +942,8 @@
}%
\fi
}
-\newcommand*{\FamilyOptions}[2]{%
+\newcommand{\FamilyOptions}[1]{\@FamilyOptions{#1}}
+\newcommand{\@FamilyOptions}[2]{%
\@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}%
\@for\scr@key@atlist:=#2\do{%
\ifx\scr@key@atlist\@empty\else
@@ -1030,25 +1034,31 @@
\noexpand\def\noexpand\scr@key@name{%
\unexpanded\expandafter{\scr@key@name}}%
\noexpand\def\noexpand\scr@key@value{%
- \unexpanded\expandafter{\scr@key@value}}
+ \unexpanded\expandafter{\scr@key@value}}%
\ifx\scr@key@run@errors\relax
\noexpand\let\noexpand\scr@key@run@errors\relax
\else
\noexpand\def\noexpand\scr@key@run@errors{%
\unexpanded\expandafter{\scr@key@run@errors}}%
\fi
- \noexpand\def\expandafter\noexpand
- \csname scr@after@options@#1@hook\endcsname{%
- \expandafter\unexpanded\expandafter\expandafter\expandafter{%
- \csname scr@after@options@#1@hook\endcsname
- }}%
+ \expandafter\ifx\csname scr@after@options@#1@hook\endcsname\relax
+ \noexpand\expandafter\noexpand\let\noexpand\csname
+ scr@after@options@#1@hook\endcsname\relax
+ \else
+ \noexpand\def\expandafter\noexpand
+ \csname scr@after@options@#1@hook\endcsname{%
+ \expandafter\unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@after@options@#1@hook\endcsname
+ }}%
+ \fi
}%
\let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions
\reserved@a
\let\AtEndOfFamilyOptions\@firstofone
\ifx\FamilyKeyState\FamilyKeyStateUnknown
\PackageInfo{scrbase}{Unknown processing state.\MessageBreak
- Processing option `\scr@key@atlist'\MessageBreak
+ Processing option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'\MessageBreak
\ifx\FamilyMemberOfKey\@empty\else
of member `\FamilyMemberOfKey'\MessageBreak
\fi
@@ -1060,17 +1070,21 @@
\FamilyKeyStateProcessed
\fi
}
+\newcommand*{\scr@KV@err}[1]{%
+ \FamilyKeyStateNeedValue
+}
\newcommand*{\scr@key@run@errors}{}
\newif\ifscr@key@found@
\newcommand*{\scr@key@atlist}{}
\newcommand*{\scr@key@name}{}
\newcommand*{\scr@key@value}{}
\newcommand*{\scr@key@split@name@value}{}
-\def\scr@key@split@name@value#1=#2=#3\@nil{%
+\long\def\scr@key@split@name@value#1=#2=#3\@nil{%
\KV@@sp@def\scr@key@name{#1}%
\KV@@sp@def\scr@key@value{#2}%
}
-\newcommand*{\FamilyOption}[3]{%
+\newcommand*{\FamilyOption}[2]{\@FamilyOption{#1}{#2}}
+\newcommand{\@FamilyOption}[3]{%
\expandafter\KV@@sp@def\expandafter\scr@key@name\expandafter{#2}%
\let\reserved@a\@empty
\@for\reserved@b:=#3\do{%
@@ -1112,7 +1126,7 @@
\long\def\l@addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-\newcommand*{\FamilyUnknownKeyValue}[4]{%
+\newcommand{\FamilyUnknownKeyValue}[4]{%
\FamilyKeyStateUnknownValue
\ifx\FamilyElseValues\@empty\else
\PackageWarning{scrbase}{non empty \string\FamilyElseValue
@@ -1299,7 +1313,7 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\defcaptionname}{%
\@ifstar\scr@def@scaptionname\scr@def@captionname
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 010e693f9c2..dac9d2fd0a2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -40,7 +40,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -72,7 +72,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -103,21 +103,21 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
\RequirePackage{tocbasic}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -220,8 +220,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -236,7 +239,7 @@
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
@@ -301,7 +304,7 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -361,17 +364,19 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -504,7 +509,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -523,7 +528,7 @@
}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newif\if@openright
\@openrighttrue
\KOMA@key{open}{%
@@ -547,7 +552,6 @@
}
\KOMA@DeclareStandardOption{openright}{open=right}
\KOMA@DeclareStandardOption{openany}{open=any}
-%% \fi
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
change of end dot feature after \string\begin{document}%
@@ -738,7 +742,7 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
@@ -756,9 +760,9 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\@ifundefined{typearea}{%
- \PassOptionsToPackage{typearea}{headinclude=#1}%
+ \PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
- \KOMAoptions{footinclude=#1,DIV=current}%
+ \KOMAoptions{footinclude=#1}%
}%
\fi
}
@@ -769,7 +773,7 @@
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -786,7 +790,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -940,7 +957,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -960,21 +977,21 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMAExecuteOptions{index=notoc}%
+ \KOMAoptions{index=notoc}%
\or
- \KOMAExecuteOptions{index=totoc}%
+ \KOMAoptions{index=totoc}%
\or
- \KOMAExecuteOptions{listof=notoc}%
+ \KOMAoptions{listof=notoc}%
\or
- \KOMAExecuteOptions{listof=totoc}%
+ \KOMAoptions{listof=totoc}%
\or
- \KOMAExecuteOptions{listof=numbered}%
+ \KOMAoptions{listof=numbered}%
\or
- \KOMAExecuteOptions{bibliography=nottotoc}%
+ \KOMAoptions{bibliography=nottotoc}%
\or
- \KOMAExecuteOptions{bibliography=totoc}%
+ \KOMAoptions{bibliography=totoc}%
\or
- \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \KOMAoptions{bibliography=totocnumbered}%
\or
\@toclefttrue
\or
@@ -1092,13 +1109,13 @@
\unsettoc{\@currext}{numberline}%
}
\or% chapterentry
- \KOMAExecuteOptions{chapteratlists=entry}%
+ \KOMAoptions{chapteratlists=entry}%
\or% chaptergap
- \KOMAExecuteOptions{chapteratlists=\z@}%
+ \KOMAoptions{chapteratlists=\z@}%
\or% chaptergapsmall
- \KOMAExecuteOptions{chapteratlists=10\p@}%
+ \KOMAoptions{chapteratlists=10\p@}%
\or% chaptergapline
- \KOMAExecuteOptions{chapteratlists=\baselineskip}%
+ \KOMAoptions{chapteratlists=\baselineskip}%
\fi
\fi
}
@@ -1114,9 +1131,10 @@
}{%
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
}%
+ \FamilyKeyStateProcessed
}
\BeforeTOCHead{\@chaptertolistsfalse}
-%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1171,7 +1189,7 @@
\newcommand*\bib@heading{%
\ifbib@leveldown
\section*{\bibname}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi
\else
\chapter*{\bibname}%
\@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
@@ -1261,13 +1279,13 @@
}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% 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 $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
@@ -1702,12 +1720,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1751,7 +1769,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1879,7 +1897,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2052,12 +2070,14 @@
\let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
- \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \@makeextratitle
- \next@tdpage
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle
+ \next@tdpage
+ \fi
\@maketitle
\else
\ifx\@extratitle\@empty\else
@@ -2066,7 +2086,9 @@
\twocolumn[\@maketitle]%
\fi
\else
- \@makeextratitle
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle\next@tdpage
+ \fi
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
@@ -2103,13 +2125,11 @@
\global\let\and\relax
}%
\newcommand*{\@makeextratitle}{%
- \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tdpage
+ \noindent\@extratitle\par
\fi
}
\newcommand*{\@maketitle}{%
- \next@tdpage
\global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
@@ -2182,7 +2202,7 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% 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
@@ -2240,6 +2260,101 @@
\fi
\@@maybeautodot
}
+\newcommand*{\scr@saved@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \@ifstar
+ {\@ssect{#3}{#4}{#5}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+}
+\ifx\@startsection\scr@saved@startsection
+ \newcommand*{\scr@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \csname scr@startsection@hook\endcsname
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \@ifstar
+ {\csname scr@preto@ssect@hook\endcsname\@ssect{#3}{#4}{#5}{#6}}%
+ {\csname scr@preto@sect@hook\endcsname
+ \scr@section@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ }
+\else
+ \ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
+ changed.\MessageBreak
+ \KOMAClassName\space needs it's own Definition of
+ `\string\@startsection'\MessageBreak
+ to provide extended features for the optional argument\MessageBreak
+ of `\string\section` etc.\MessageBreak
+ Generally it defines `\string\@startsection` completely new\MessageBreak
+ to achieve this. Because of the unexpected definition\MessageBreak
+ an alternative approach will be used.\MessageBreak
+ If this fails and if there isn't a new release of\MessageBreak
+ KOMA-Scriptt that fixes the problem, please\MessageBreak
+ send a report to the KOMA-Script author.\MessageBreak
+ Note, that this alternative approach does not\MessageBreak
+ execute `\string\scr@startsection@hook', \MessageBreak
+ `\string\scr@preto@ssect@hook', or `\string\scr@preto@sect@hook'%
+ }%
+ \let\scr@saved@startsection\@startsection
+ \newcommand*{\scr@startsection}[6]{%
+ \@ifstar
+ {\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}*}%
+ {\scr@section@dblarg{\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ }
+\fi
+\newcommand*{\At@startsection}[1]{%
+ \@ifundefined{scr@startsection@hook}{\let\scr@startsection@hook\@empty}{}%
+ \l@addto@macro{\scr@startsection@hook}{#1}%
+}
+\newcommand*{\Before@ssect}[1]{%
+ \@ifundefined{scr@preto@ssect@hook}{\let\scr@preto@ssect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@ssect@hook}{#1}%
+}
+\newcommand*{\Before@sect}[1]{%
+ \@ifundefined{scr@preto@sect@hook}{\let\scr@preto@sect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@sect@hook}{#1}%
+}
+\newcommand{\scr@section@dblarg}[1]{%
+ \kernel@ifnextchar[%]
+ {#1}%
+ {\scr@section@xdblarg{#1}}%
+}
+\newcommand{\scr@section@xdblarg}[2]{%
+ \begingroup
+ \edef\reserved@a{%
+ \unexpanded{\endgroup\let\scr@osectarg\z@#1[{#2}]{#2}\def\scr@osectarg}%
+ {\scr@osectarg}}%
+ \reserved@a
+}
+\renewcommand*{\@startsection}{%
+ \ifnum \scr@osectarg=\z@
+ \expandafter\scr@saved@startsection
+ \else
+ \expandafter\scr@startsection
+ \fi
+}
+\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}}
+\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
+\let\secdef\SecDef
\def\@tempa#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
\let\@svsec\@empty
@@ -2486,7 +2601,7 @@
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
- \secdef\@part\@spart
+ \SecDef\@part\@spart
}
\newcommand*{\@part}{}
\def\@part[#1]#2{%
@@ -2569,7 +2684,7 @@
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
- \secdef\@addpart\@saddpart
+ \SecDef\@addpart\@saddpart
}
\newcommand*{\@addpart}{}
\def\@addpart[#1]#2{%
@@ -2647,7 +2762,7 @@
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
- \secdef\@chapter\@schapter
+ \SecDef\@chapter\@schapter
}
\newcommand*{\@chapter}{}
\def\@chapter[#1]#2{%
@@ -2782,7 +2897,7 @@
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
- \secdef\@addchap\@saddchap%
+ \SecDef\@addchap\@saddchap%
}%
\newcommand*{\@addchap}{}%
\def\@addchap[#1]#2{%
@@ -2832,7 +2947,7 @@
causing \string\addchap\space to behave strange.\MessageBreak%
Please update hyperref to at least version
6.71b}}}
-\newcommand*\addsec{\secdef\@addsec\@saddsec}
+\newcommand*\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
\def\@addsec[#1]#2{\section*{#2}%
\ifnum \scr@osectarg=\z@
@@ -2872,7 +2987,7 @@
\addtocentrydefault{subparagraph}{#1}{#2}%
}
\newcommand\section{%
- \@startsection{section}{\sectionnumdepth}{\z@}%
+ \scr@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2880,7 +2995,7 @@
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
\newcommand\subsection{%
- \@startsection{subsection}{\subsectionnumdepth}{\z@}%
+ \scr@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2889,7 +3004,7 @@
}%
}
\newcommand\subsubsection{%
- \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
+ \scr@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2898,19 +3013,31 @@
}%
}
\newcommand\paragraph{%
- \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
+ \scr@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
\newcommand\subparagraph{%
- \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
+ \scr@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
}
\newkomafont{minisec}{}
-\newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex
+\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
@@ -2972,7 +3099,7 @@
\set@preamble@vpos{0}{#2}%
\fi%
\if \@tempa b%
- \set@preamble@vpox{0}{#2}%
+ \set@preamble@vpos{0}{#2}%
\fi
\if \@tempa o%
\set@preamble@vpos{1}{#2}%
@@ -3051,10 +3178,10 @@
\newcommand*{\chapter@o@preamble}{}
\let\chapter@o@preamble\relax
\newcommand*{\setpartpreamble}{\set@preamble{part}}
-\newcommand*{\part@preamble@u}{}
-\let\part@preamble@u\relax
-\newcommand*{\part@preamble@o}{}
-\let\part@preamble@o\relax
+\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}%
@@ -3143,7 +3270,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3250,7 +3377,75 @@
the extended optional argument of the section\MessageBreak
commands
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+\BeforePackage{titlesec}{%
+ \let\scr@ttl@saved@section\section
+ \let\scr@ttl@saved@subsection\subsection
+ \let\scr@ttl@saved@subsubsection\subsubsection
+ \let\scr@ttl@saved@paragraph\paragraph
+ \let\scr@ttl@saved@subparagraph\subparagraph
+}
+\AfterPackage{titlesec}{%
+ \@ifpackagelater{titlesec}{2014/10/09}{%
+ \ClassInfo{\KOMAClassName}{%
+ Deactivating the `titlesec` workaround,\MessageBreak
+ because package is newer than expected%
+ }%
+ }{%
+ \PackageWarning{\KOMAClassName}{%
+ Activating an ugly workaround for a missing\MessageBreak
+ feature of package `titlesec`%
+ }%
+ \def\scr@ttl@@extract#1\scr@startsection#2#3#4#5#6#7#8{%
+ \@tempskipa=#5
+ \@tempskipb=#6
+ \ifdim\@tempskipa<\z@
+ \toks@{\titlespacing*#8{#4}}%
+ \@tempskipa-\@tempskipa
+ \else
+ \toks@{\titlespacing#8{#4}}%
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipa*\ttl@space\relax\beforetitleunit}%
+ \ifdim\@tempskipb<\z@
+ \if@tempswa
+ \titleformat#8[runin]%
+ {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8[runin]%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@tempskipb-\@tempskipb
+ \else
+ \if@tempswa
+ \titleformat#8%
+ {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
+ \fi
+ \edef\ttl@a{\the\toks@{\the\@tempskipa}{\the\@tempskipb}}
+ \ttl@a}%
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@section\section
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsection\subsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsubsection\subsubsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@paragraph\paragraph
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subparagraph\subparagraph
+ \let\scr@ttl@saved@section\relax
+ \let\scr@ttl@saved@subsection\relax
+ \let\scr@ttl@saved@subsubsection\relax
+ \let\scr@ttl@saved@paragraph\relax
+ \let\scr@ttl@saved@subparagraph\relax
+ \let\scr@ttl@@extract\relax
+ }%
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3268,10 +3463,11 @@
\newcommand*{\scr@fnt@pagefoot}{\footfont}
\newcommand*{\scr@fnt@wrn@pagefoot}[1]{%
This class does not use font element `pagefoot'!\MessageBreak
- Maybe you should load package `scrpage2', before\MessageBreak
- using this element%
+ Maybe you should load package `scrlayer-scrpage',\MessageBreak
+ before using this element%
}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*
+ {\pagemark}{{\usekomafont{pagenumber}{%
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
@@ -4055,7 +4251,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -4155,7 +4351,7 @@
\string\float@listhead\space detected!\MessageBreak
Implementation of \string\float@listhead\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Maybe implementation of \string\float@listhead\space will\MessageBreak
be removed from KOMA-Script soon.\MessageBreak
@@ -4170,7 +4366,7 @@
\string\float@addtolists\space detected!\MessageBreak
Implementation of \string\float@addtolist\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Since Version 3.12 support for deprecated\MessageBreak
\string\float@addtolist\space interface has been\MessageBreak
@@ -4193,7 +4389,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 12e566fb90c..b8ce5f44b45 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrdate,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,18 +65,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2011/03/31 v3.08b KOMA-Script package
- (day of the week)%
+ 2014/10/28 v3.14 KOMA-Script
+ package
+ (day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
-%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% 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 $
\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
\newcommand*{\@GaussYear}[3]{%
@@ -136,12 +137,13 @@
This may result in use of wrong language!\MessageBreak
You should use a compatible language
package\MessageBreak
- (e.g. `Babel', `german', `french', ...)}%
- \let\scrdate@languagenamewarning\relax}
+ (e.g. `babel', `german', `french', ...)}%
+ \let\scrdate@languagenamewarning\relax
+}
\newcommand\newdaylanguage[8]{%
\scr@ifundefinedorrelax{l@#1}{%
- \PackageInfo{scrdate}{Language #1\space not defined.\MessageBreak
- \protect\dayname@#1\space skipped!}%
+ \PackageInfoNoLine{scrdate}{Language #1\space not defined.\MessageBreak
+ \protect\dayname@#1\space skipped}%
}{%
\@namedef{dayname@#1}##1{%
\ifcase ##1
@@ -149,10 +151,10 @@
}%
\AtBeginDocument{%
\scr@ifundefinedorrelax{date#1}{%
- \PackageWarningNoLine{scrdate}
- {\protect\date#1\space not defined.\MessageBreak
- \protect\todaysname maybe can't use
- \protect\dayname@#1!}%
+ \PackageInfoNoLine{scrdate}
+ {\protect\date#1\space not defined.\MessageBreak
+ \protect\todaysname\space probably cannot use
+ \protect\dayname@#1}%
}{%
\expandafter\let\csname D@date#1\expandafter\endcsname
\csname date#1\endcsname
@@ -181,10 +183,32 @@
{Donnerstag}{Freitag}{Samstag}{Sonntag}
\newdaylanguage{austrian}{Montag}{Dienstag}{Mittwoch}
{Donnerstag}{Freitag}{Samstag}{Sonntag}
+\newdaylanguage{swissgerman}{Montag}{Dienstag}{Mittwoch}
+ {Donnerstag}{Freitag}{Samstag}{Sonntag}
+\newdaylanguage{nswissgerman}{Montag}{Dienstag}{Mittwoch}
+ {Donnerstag}{Freitag}{Samstag}{Sonntag}
+\newdaylanguage{american}{Monday}{Tuesday}{Wednesday}
+ {Thursday}{Friday}{Saturday}{Sunday}
+\newdaylanguage{australian}{Monday}{Tuesday}{Wednesday}
+ {Thursday}{Friday}{Saturday}{Sunday}
+\newdaylanguage{british}{Monday}{Tuesday}{Wednesday}
+ {Thursday}{Friday}{Saturday}{Sunday}
+\newdaylanguage{canadian}{Monday}{Tuesday}{Wednesday}
+ {Thursday}{Friday}{Saturday}{Sunday}
\newdaylanguage{english}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
+\newdaylanguage{newzealand}{Monday}{Tuesday}{Wednesday}
+ {Thursday}{Friday}{Saturday}{Sunday}
+\newdaylanguage{UKenglish}{Monday}{Tuesday}{Wednesday}
+ {Thursday}{Friday}{Saturday}{Sunday}
\newdaylanguage{USenglish}{Monday}{Tuesday}{Wednesday}
{Thursday}{Friday}{Saturday}{Sunday}
+\newdaylanguage{acadian}{Lundi}{Mardi}{Mercredi}
+ {Jeudi}{Vendredi}{Samedi}{Dimanche}
+\newdaylanguage{canadien}{Lundi}{Mardi}{Mercredi}
+ {Jeudi}{Vendredi}{Samedi}{Dimanche}
+\newdaylanguage{francais}{Lundi}{Mardi}{Mercredi}
+ {Jeudi}{Vendredi}{Samedi}{Dimanche}
\newdaylanguage{french}{Lundi}{Mardi}{Mercredi}
{Jeudi}{Vendredi}{Samedi}{Dimanche}
\newdaylanguage{italian}{Luned\`\i}{Marted\`\i}{Mercoled\`\i}
@@ -203,6 +227,12 @@
{Torsdag}{Fredag}{L\o{}rdag}{S\o{}ndag}
\newdaylanguage{swedish}{M\aa{}ndag}{Tisdag}{Onsdag}
{Torsdag}{Fredag}{L\"ordag}{S\"ondag}
+\newdaylanguage{polish}{Poniedzia\l{}ek}{Wtorek}{\'Sroda}
+ {Czwartek}{Pi\aob{}tek}{Sobota}{Niedziela}
+\newdaylanguage{czech}{Pond\v{e}l\'\i}{\'Uter\'y}{St\v{r}eda}
+ {\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
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
index 1dca5a839f9..8ebda7724e0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
@@ -80,6 +80,15 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J%
^^J%
}%
+ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
+ M\kern.05em A\kern.1em-\kern.1em Script}}%
+ \def\addsec{\section*}%
+ \newenvironment{labeling}[2][]{%
+ \description
+ }{%
+ \csname enddescription\endcsname
+ }%
+ \newcommand*{\marginline}{\marginpar}%
}
\LoadClassWithOptions{ltxdoc}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index ec03d9c0029..9409f23e397 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -30,7 +30,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -62,7 +62,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
\PackageWarning{scrextend}{%
@@ -74,7 +74,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -96,11 +96,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
-\ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
- (extend other classes with features of KOMA-Script classes)]
+%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
+\ProvidesPackage{scrextend}[%
+ 2014/10/28 v3.14 KOMA-Script
+ package (extend other classes with features of KOMA-Script classes)%
+]
\newcommand*{\scr@ext@activate}[1]{%
\scr@ifundefinedorrelax{scr@ext@activate@#1}{%
\@namedef{scr@ext@immediate@#1}{%
@@ -122,9 +124,9 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
\AtEndOfPackage{%
@@ -145,7 +147,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -159,7 +161,9 @@
Because of this, version was set to `first'%
}%
}{%
- \PackageInfoNoLine{scrextend}{%
+ \PackageInfoNoLine{%
+ scrextend%
+ }{%
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
@@ -228,8 +232,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -276,7 +283,7 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
\expandafter\newif\csname if@titlepage\endcsname
@@ -307,15 +314,15 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -332,7 +339,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -415,9 +435,9 @@
\ifhmode\spacefactor\@x@sf\fi
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% 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 $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
@@ -775,7 +795,7 @@
\fi
}%
}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -950,12 +970,14 @@
\let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
- \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \@makeextratitle
- \next@tdpage
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle
+ \next@tdpage
+ \fi
\@maketitle
\else
\ifx\@extratitle\@empty\else
@@ -964,7 +986,9 @@
\twocolumn[\@maketitle]%
\fi
\else
- \@makeextratitle
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle\next@tdpage
+ \fi
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
@@ -1001,13 +1025,11 @@
\global\let\and\relax
}%
\newcommand*{\@makeextratitle}{%
- \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tdpage
+ \noindent\@extratitle\par
\fi
}
\newcommand*{\@maketitle}{%
- \next@tdpage
\global\@topnum=\z@
\parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil
\ifx\@titlehead\@empty \else
@@ -1082,10 +1104,10 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
\@restonecolfalse
@@ -1153,8 +1175,7 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
-\newcommand*{\titlepagestyle}{plain}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index 5108000ef64..b4ce05af397 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -10,7 +10,7 @@
%% scrkernel-fonts.dtx (with options: `package,generator,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,7 +42,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,11 +64,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesPackage{scrfontsizes}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package (font size file generator)]
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index a2af19454d7..1cbb082866e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -11,7 +11,7 @@
%% scrhack.dtx (with options: `package,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,15 +65,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\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 10862f91b46..0247fc29322 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 1562 2013-12-19 07:51:16Z mjk $
+%%% From File: $Id: scrjura.dtx 1716 2014-03-01 15:38:49Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}
- [2013/11/04 v0.7 KOMA-Script for jurists
+ [2014/01/28 v0.7a KOMA-Script for jurists
(package)%
]
\@ifpackageloaded{hyperref}{%
@@ -699,7 +699,7 @@
\jura@separator{\nobreakspace}}{\sentence@cite{#1}}}
\newcommand*{\contract@sentence}{%
\refstepcounter{sentence}%
- \ensuremath{^{\mbox{\fontsize\sf@size\z@\selectfont\thesentence}}}%
+ \textsuperscript{\thesentence}\nobreak\hskip\z@
}
\DeclareRobustCommand*{\par@cite}[1]{\parciteformat{#1}}
\newcommand*{\parciteformat}[1]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 0852a04ac5d..7dacb8ea32a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -12,7 +12,7 @@
%% scrkernel-fonts.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,14 +66,14 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package (%
KOMA-Script-dependent
basics and keyval usage)]
@@ -88,9 +88,9 @@
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
}
@@ -121,25 +121,33 @@
\DeclareOption{#2}{\KOMA@UseDeprecatedOption{#1}{#2}{#3}}%
}
\newcommand*{\KOMA@UseDeprecatedOption}[3]{%
- \let\scr@sr@co\CurrentOption
\begingroup
- #1{%
- You've used obsolete option `#2'.\MessageBreak
- Usage of this option indicates an old document and\MessageBreak
- \scr@ifundefinedorrelax{KV@KOMA.\@currname.\@currext @version}{%
- changes compatibility level using\MessageBreak
- `#3,version=first'.\MessageBreak
- If you don't want this, y%
- }{%
- is deprecated.\MessageBreak
- Y%
+ \scr@ifundefinedorrelax{KV@KOMA.\@currname.\@currext @version}{%
+ \edef\reserved@a{\noexpand\endgroup
+ \noexpand#1{%
+ You've used obsolete option `#2'.\noexpand\MessageBreak
+ Usage of this option is deprecated.\noexpand\MessageBreak
+ You should simply replace `#2'\noexpand\MessageBreak
+ by `#3'%
+ }%
+ \noexpand\KOMAExecuteOptions{#3}%
+ \noexpand\def\noexpand\CurrentOption{\CurrentOption}%
+ }%
+ }{%
+ \edef\reserved@a{\noexpand\endgroup
+ \noexpand#1{%
+ You've used obsolete option `#2'.\noexpand\MessageBreak
+ Usage of this option indicates an old document\noexpand\MessageBreak
+ and changes compatibility level using\noexpand\MessageBreak
+ `#3,version=first'.\noexpand\MessageBreak
+ If you don't want this, you should simply\noexpand\MessageBreak
+ replace option `#2' by `#3'%
+ }%
+ \noexpand\KOMAExecuteOptions{#3,version=first}%
+ \noexpand\def\noexpand\CurrentOption{\CurrentOption}%
}%
- ou should simply replace\MessageBreak
- usage of option `#2' by `#3'%
}%
- \endgroup
- \KOMAExecuteOptions{#3,version=first}%
- \let\CurrentOption\scr@sr@co
+ \reserved@a
}
\newcommand*{\KOMA@DeclareStandardOption}{%
\@ifnextchar [%]
@@ -153,19 +161,22 @@
\DeclareOption{#2}{\KOMA@UseStandardOption{#1}{#2}{#3}}%
}
\newcommand*{\KOMA@UseStandardOption}[3]{%
- \let\scr@sr@co\CurrentOption
- #1{%
- You've used standard option `#2'.\MessageBreak
- This is correct!\MessageBreak
- Internally I'm using `#3'.\MessageBreak
- If you'd like to set the option with \string\KOMAoptions,\MessageBreak
- you'd have to use `#3' there\MessageBreak
- instead of `#2', too%
- }%
- \KOMAExecuteOptions{#3}%
- \let\CurrentOption\scr@sr@co
+ \begingroup
+ \edef\reserved@a{\noexpand\endgroup
+ \noexpand#1{%
+ You've used standard option `#2'.\noexpand\MessageBreak
+ This is correct!\noexpand\MessageBreak
+ Internally I'm using `#3'.\noexpand\MessageBreak
+ If you'd like to set the option with \string\KOMAoptions,%
+ \noexpand\MessageBreak
+ you'd have to use `#3' there\noexpand\MessageBreak
+ instead of `#2', too%
+ }%
+ \noexpand\KOMAExecuteOptions{#3}%
+ \noexpand\def\noexpand\CurrentOption{\CurrentOption}%
+ }%
+ \reserved@a
}
-\newcommand*{\scr@sr@co}{}
\newcommand*{\KOMA@newdeprecatedcommand}[3][\@gobbletwo]{%
\newcommand*{#2}{\KOMA@UseDeprecatedCommand{#1}{\string#2}{#3}}%
}
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 8fa4d604372..1845f9b7470 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -14,7 +14,7 @@
%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2013-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -46,13 +46,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (identify)
+%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 15/11/2013 v0.1.1514
+ 2014/06/03 v0.1.1760 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (init)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -63,7 +63,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (init)
+%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
\expandafter\@tempswafalse
@@ -83,7 +83,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (options)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -215,13 +215,13 @@
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoremoveinterfaces}
\scrlayer@AddCsToInterface{%
KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default}
-%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (options)
+%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (options)
\KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns}
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default}
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (body)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (body)
+%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
\@ifundefined{slnc@#2@box}{%
@@ -282,7 +282,9 @@
width=\csname slnc@#2@width\endcsname,%
contents=\slnc@processnotes{#2}%
]{notecolumn.#2}
- \AddLayersToPageStyle{@everystyle@}{notecolumn.#2}%
+ \IfLayerAtPageStyle{@everystyle@}{notecolumn.#2}{}{%
+ \AddLayersToPageStyle{@everystyle@}{notecolumn.#2}%
+ }%
\scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
\RemoveLayersFromPageStyle{@everystyle@}{notecolumn.#2}%
\DestroyLayer{notecolumn.#2}%
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 6519c581d17..06ed5304056 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -13,7 +13,7 @@
%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2012-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,13 +45,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (identify)
+%%% From File: $Id: scrlayer-scrpage.dtx 1806 2014-10-16 06:41:25Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 14/12/2013 v0.9.1548
+ 2014/10/28 v3.14 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (init)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -62,8 +62,11 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (init)
+%%% From File: $Id: scrlayer-scrpage.dtx 1806 2014-10-16 06:41:25Z kohm $ (init)
\AtEndOfPackage{%
+ \sls@auto@pagestyleset%
+}
+\newcommand*{\sls@auto@pagestyleset}{%
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageInfoNoLine{scrlayer-scrpage}{%
auto-selection of `pagestyleset=standard'}%
@@ -75,7 +78,7 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (options)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (options)
\KOMA@key{markcase}{%
\scrlayer@AtEndOfPackage{%
\begingroup
@@ -209,14 +212,14 @@
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoremoveinterfaces}
\scrlayer@AddCsToInterface{%
KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default}
-%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (options)
+%%% From File: $Id: scrlayer-scrpage.dtx 1806 2014-10-16 06:41:25Z kohm $ (options)
\KOMA@key{headwidth}{%
\begingroup
- \sls@split@at@colon#1::\@nil
+ \sls@split@at@iicolons#1:::\@nil
\ifx\reserved@a\@empty \let\reserved@a\sls@headwidth\fi
\edef\reserved@a{%
\noexpand\endgroup
- \noexpand\sls@set@hf@width{head}{\reserved@b}{\reserved@a}%
+ \noexpand\sls@set@hf@width{head}{\reserved@b}{\reserved@c}{\reserved@a}%
}%
\reserved@a
\FamilyKeyStateProcessed
@@ -225,35 +228,38 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth@default}
\KOMA@key{footwidth}{%
\begingroup
- \sls@split@at@colon#1::\@nil
+ \sls@split@at@iicolons#1::\@nil
\ifx\reserved@a\@empty \let\reserved@a\sls@footwidth\fi
\edef\reserved@a{%
\noexpand\endgroup
- \noexpand\sls@set@hf@width{foot}{\reserved@b}{\reserved@a}%
+ \noexpand\sls@set@hf@width{foot}{\reserved@b}{\reserved@c}{\reserved@a}%
}%
\reserved@a
\FamilyKeyStateProcessed
}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth@default}
-\scrlayerAddToInterface\sls@split@at@colon{%
- \def\sls@split@at@colon#1:#2:#3\@nil{%
- \ifstr{#3}{}{}{%
- \ifstr{#3}{:}{}{%
- \PackageWarning{scrlayer}{extra `:' found!\MessageBreak
- You've used more than one colon at the argument\MessageBreak
- of a two value option.\MessageBreak
- The extra value(s) will be ignored%
+\scrlayerAddToInterface\sls@split@at@iicolons{%
+ \def\sls@split@at@iicolons#1:#2:#3:#4\@nil{%
+ \ifstr{#4}{}{}{%
+ \ifstr{#4}{:}{}{%
+ \ifstr{#4}{::}{}{%
+ \PackageWarning{scrlayer}{extra `:' found!\MessageBreak
+ You've used more than two colons at the argument\MessageBreak
+ of a two value option.\MessageBreak
+ The extra value(s) will be ignored%
+ }%
}%
}%
}%
\def\reserved@a{#1}%
\def\reserved@b{#2}%
+ \def\reserved@c{#3}%
}%
}
\scrlayerAddToInterface\sls@set@hf@width{%
- \newcommand*{\sls@set@hf@width}[3]{%
- \sls@settowidthof{\@tempdima}{#3}%
+ \newcommand*{\sls@set@hf@width}[4]{%
+ \sls@settowidthof{\@tempdima}{#4}%
\ifdim\@tempdima>\paperwidth
\PackageWarning
{scrlayer-scrpage}%
@@ -286,8 +292,13 @@
\fi
}{%
\sls@settowidthof{\@tempdimb}{#2}%
- }
- \addtolength{\@tempdima}{-\@tempdimb}%
+ }%
+ \ifstr{#3}{}{%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ }{%
+ \sls@settowidthof{\@tempdima}{#3}%
+ \setlength{\@tempdima}{-\@tempdima}%
+ }%
\ifdim\@tempdimb<\z@
\setlength{\@tempdimb}{-\@tempdimb}%
\expandafter\edef\csname sls@odd#1shift\endcsname{-\the\@tempdimb}%
@@ -453,6 +464,21 @@
\reserved@b
}%
}
+\scrlayerAddToInterface\sls@split@at@colon{%
+ \def\sls@split@at@colon#1:#2:#3\@nil{%
+ \ifstr{#3}{}{}{%
+ \ifstr{#3}{:}{}{%
+ \PackageWarning{scrlayer}{extra `:' found!\MessageBreak
+ You've used more than one colon at the argument\MessageBreak
+ of a two value option.\MessageBreak
+ The extra value(s) will be ignored%
+ }%
+ }%
+ }%
+ \def\reserved@a{#1}%
+ \def\reserved@b{#2}%
+ }%
+}
\scrlayerAddToInterface\sls@headabove@linelength{%
\newcommand*{\sls@headabove@linelength}{\sls@headwidth}%
}
@@ -546,6 +572,7 @@
\scr@ifundefinedorrelax{sls@ps@style@#1}{%
\FamilyKeyStateUnknownValue
}{%
+ \let\sls@auto@pagestyleset\relax
\@nameuse{sls@ps@style@#1}%
\FamilyKeyStateProcessed
}%
@@ -576,24 +603,24 @@
\scr@ifundefinedorrelax{KOMAClassName}{}{%
\ifstr{\KOMAClassName}{scrlttr2}{%
\clearpairofpagestyles
- \lehead[\ifnum\@pageat\z@\pagemark\fi]
- {\ifnum\@pageat\z@\pagemark\else\leftmark\fi}%
- \lohead[\ifnum\@pageat\z@\pagemark\fi]
- {\ifnum\@pageat\z@\pagemark\else\leftmark\fi}%
- \chead[\ifnum\@pageat\@ne\pagemark\fi]
+ \lehead[\ifnum\@pageat=\z@\pagemark\fi]
+ {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}%
+ \lohead[\ifnum\@pageat=\z@\pagemark\fi]
+ {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}%
+ \chead[\ifnum\@pageat=\@ne\pagemark\fi]
{\ifcase\@pageat \rightmark\or \pagemark\or \rightmark\fi}%
- \rehead[\ifnum\@pageat\tw@\pagemark\fi]
+ \rehead[\ifnum\@pageat=\tw@\pagemark\fi]
{\ifcase\@pageat \leftmark\or \rightmark\or \pagemark
\else \rightmark\fi}%
- \rohead[\ifnum\@pageat\tw@\pagemark\fi]
+ \rohead[\ifnum\@pageat=\tw@\pagemark\fi]
{\ifcase\@pageat \leftmark\or \rightmark\or \pagemark
\else \rightmark\fi}%
- \lefoot[\ifnum\@pageat\thr@@\pagemark\fi]
- {\ifnum\@pageat\thr@@\pagemark\fi}%
- \cfoot[\ifnum\@pageat 4 \pagemark\fi]
- {\ifnum\@pageat 4 \pagemark\fi}%
- \refoot[\ifnum\@pageat 5 \pagemark\fi]
- {\ifnum\@pageat 5 \pagemark\fi}%
+ \lefoot[\ifnum\@pageat=\thr@@\pagemark\fi]
+ {\ifnum\@pageat=\thr@@\pagemark\fi}%
+ \cfoot[\ifnum\@pageat=4 \pagemark\fi]
+ {\ifnum\@pageat=4 \pagemark\fi}%
+ \refoot[\ifnum\@pageat=5 \pagemark\fi]
+ {\ifnum\@pageat=5 \pagemark\fi}%
}{}%
}%
}%
@@ -613,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 1480 2013-10-31 10:00:02Z mjk $ (body)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (body)
+%%% From File: $Id: scrlayer-scrpage.dtx 1806 2014-10-16 06:41:25Z kohm $ (body)
\scrlayerAddToInterface\setheadwidth{%
\newcommand*{\setheadwidth}[2][]{%
\KOMAoptions{headwidth=#2:#1}%
@@ -832,8 +859,8 @@
width=\sls@headwidth,%
contents={%
\sls@secure@box\headheight{%
- \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#4}}}}%
- ]{#1.head.odd}%
+ \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#4}}}}}%
+ ]{#1.head.even}%
\DeclareLayer[%
background,oddpage,twoside,%
head,%
@@ -841,8 +868,8 @@
width=\sls@headwidth,%
contents={%
\sls@secure@box\headheight{%
- \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#5}}}}%
- ]{#1.head.even}%
+ \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#5}}}}}%
+ ]{#1.head.odd}%
\DeclareLayer[%
background,oddpage,oneside,%
head,%
@@ -850,7 +877,7 @@
width=\sls@headwidth,%
contents={%
\sls@secure@box\headheight{%
- \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#6}}}}%
+ \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#6}}}}}%
]{#1.head.oneside}%
}%
}
@@ -914,7 +941,7 @@
contents={%
\sls@secure@box\footheight{%
\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#4}}}}%
- ]{#1.foot.odd}%
+ ]{#1.foot.even}%
\DeclareLayer[%
foreground,oddpage,twoside,%
foot,%
@@ -923,7 +950,7 @@
contents={%
\sls@secure@box\footheight{%
\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#5}}}}%
- ]{#1.foot.even}%
+ ]{#1.foot.odd}%
\DeclareLayer[%
foreground,oddpage,oneside,%
foot,%
@@ -990,13 +1017,13 @@
}%
}
\@ifundefined{scr@fnt@pagehead}{%
+ \scrlayer@AddCsToInterface{scr@fnt@pagehead}%
\@ifundefined{@pageheadfont}{%
\newkomafont{pagehead}{}%
\scrlayer@AddCsToInterface{@pageheadfont}%
}{%
\newcommand*{\scr@fnt@pagehead}{\@pageheadfont}%
}%
- \scrlayer@AddCsToInterface{scr@fnt@pagehead}%
}{}
\@ifundefined{scr@fnt@pageheadfoot}{%
\newcommand*{\scr@fnt@pageheadfoot}{\headfont}%
@@ -1005,15 +1032,26 @@
\newcommand*{\headfont}{\normalcolor\slshape}%
}{}
}{}
+\scr@ifundefinedorrelax{scr@wrn@pagehead}{}{%
+ \PackageInfo{scrlayer-scrpage}{%
+ deactivating warning for font element\MessageBreak
+ `pagehead'}%
+ \let\scr@fnt@wrn@pagehead\relax
+}
\@ifundefined{scr@fnt@pagefoot}{%
- \newcommand*{\scr@fnt@pagefoot}{\footfont}%
\scrlayer@AddCsToInterface{scr@fnt@pagefoot}%
+ \def\scr@fnt@pagefoot{\footfont}%
\@ifundefined{footfont}{%
\newcommand*{\footfont}{}%
\scrlayer@AddCsToInterface{footfont}%
}{}%
- \let\scr@fnt@wrn@pagefoot\relax
}{}
+\scr@ifundefinedorrelax{scr@fnt@pagefoot}{}{%
+ \PackageInfo{scrlayer-scrpage}{%
+ deactivating warning for font element\MessageBreak
+ `pagefoot'}%
+ \let\scr@fnt@wrn@pagefoot\relax
+}
\scrlayerAddToInterface\sls@hf@rule{%
\newcommand*\sls@hf@rule[3]{%
\begingroup
@@ -1483,31 +1521,40 @@
\DeclarePageStyleAlias{scrplain}{plain.scrheadings}
\scrlayerOnAutoRemoveInterface{\DestroyPageStyleAlias{scrplain}}
\scrlayerAddToInterface\ihead{%
- \newcommand*{\ihead}{\@ifnextchar[{\@@ihead}{\@ihead}}%
+ \newcommand*{\ihead}{\@ifstar {\@dblarg\@@@ihead}{\@ihead}}%
}
\scrlayerAddToInterface\@ihead{%
- \newcommand*{\@ihead}[1]{\rehead{#1}\lohead{#1}}%
+ \newcommand*{\@ihead}{\@ifnextchar[{\@@@ihead}{\@@ihead}}%
}
\scrlayerAddToInterface\@@ihead{%
- \newcommand*{\@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}%
+ \newcommand*{\@@ihead}[1]{\rehead{#1}\lohead{#1}}%
+}
+\scrlayerAddToInterface\@@@ihead{%
+ \newcommand*{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\ohead{%
- \newcommand*{\ohead}{\@ifnextchar[{\@@ohead}{\@ohead}}%
+ \newcommand*{\ohead}{\@ifstar {\@dblarg\@@@ohead}{\@ohead}}%
}
\scrlayerAddToInterface\@ohead{%
- \newcommand*{\@ohead}[1]{\lehead{#1}\rohead{#1}}%
+ \newcommand*{\@ohead}{\@ifnextchar[{\@@@ohead}{\@@ohead}}%
}
\scrlayerAddToInterface\@@ohead{%
- \newcommand*{\@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}%
+ \newcommand*{\@@ohead}[1]{\lehead{#1}\rohead{#1}}%
+}
+\scrlayerAddToInterface\@@@ohead{%
+ \newcommand*{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\chead{%
- \newcommand*{\chead}{\@ifnextchar[{\@@chead}{\@chead}}%
+ \newcommand*{\chead}{\@ifstar {\@dblarg\@@@chead}{\@chead}}%
}
\scrlayerAddToInterface\@chead{%
- \newcommand*{\@chead}[1]{\cehead{#1}\cohead{#1}}%
+ \newcommand*{\@chead}{\@ifnextchar[{\@@@chead}{\@@chead}}%
}
\scrlayerAddToInterface\@@chead{%
- \newcommand*{\@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}%
+ \newcommand*{\@@chead}[1]{\cehead{#1}\cohead{#1}}%
+}
+\scrlayerAddToInterface\@@@chead{%
+ \newcommand*{\@@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\lehead{%
\newcommand*{\lehead}{\sls@renewelement{even}{left}{head}}%
@@ -1528,31 +1575,40 @@
\newcommand*{\cohead}{\sls@renewelement{odd}{middle}{head}}%
}
\scrlayerAddToInterface\ifoot{%
- \newcommand*{\ifoot}{\@ifnextchar[{\@@ifoot}{\@ifoot}}%
+ \newcommand*{\ifoot}{\@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}%
}
\scrlayerAddToInterface\@ifoot{%
- \newcommand*{\@ifoot}[1]{\refoot{#1}\lofoot{#1}}%
+ \newcommand*{\@ifoot}{\@ifnextchar[{\@@@ifoot}{\@@ifoot}}%
}
\scrlayerAddToInterface\@@ifoot{%
- \newcommand*{\@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}%
+ \newcommand*{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}%
+}
+\scrlayerAddToInterface\@@@ifoot{%
+ \newcommand*{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\ofoot{%
- \newcommand*{\ofoot}{\@ifnextchar[{\@@ofoot}{\@ofoot}}%
+ \newcommand*{\ofoot}{\@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}%
}
\scrlayerAddToInterface\@ofoot{%
- \newcommand*{\@ofoot}[1]{\lefoot{#1}\rofoot{#1}}%
+ \newcommand*{\@ofoot}{\@ifnextchar[{\@@@ofoot}{\@@ofoot}}%
}
\scrlayerAddToInterface\@@ofoot{%
- \newcommand*{\@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}%
+ \newcommand*{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}%
+}
+\scrlayerAddToInterface\@@@ofoot{%
+ \newcommand*{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\cfoot{%
- \newcommand*{\cfoot}{\@ifnextchar[{\@@cfoot}{\@cfoot}}%
+ \newcommand*{\cfoot}{\@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}%
}
\scrlayerAddToInterface\@cfoot{%
- \newcommand*{\@cfoot}[1]{\cefoot{#1}\cofoot{#1}}%
+ \newcommand*{\@cfoot}{\@ifnextchar[{\@@@cfoot}{\@@cfoot}}%
}
\scrlayerAddToInterface\@@cfoot{%
- \newcommand*{\@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}%
+ \newcommand*{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}%
+}
+\scrlayerAddToInterface\@@@cfoot{%
+ \newcommand*{\@@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\lefoot{%
\newcommand*{\lefoot}{\sls@renewelement{even}{left}{foot}}%
@@ -1574,13 +1630,19 @@
}
\scrlayerAddToInterface\sls@renewelement{%
\newcommand*{\sls@renewelement}[3]{%
+ \@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}%
+ {\sls@@renewelement{#1}{#2}{#3}}%
+ }%
+}
+\scrlayerAddToInterface\sls@@renewelement{%
+ \newcommand*{\sls@@renewelement}[3]{%
\@ifnextchar[%]
+ {\sls@@@@renewelement{#1}{#2}{#3}}%
{\sls@@@renewelement{#1}{#2}{#3}}%
- {\sls@@renewelement{#1}{#2}{#3}}%
}%
}
-\scrlayerAddToInterface\sls@@renewelement{%
- \newcommand*{\sls@@renewelement}[4]{%
+\scrlayerAddToInterface\sls@@@renewelement{%
+ \newcommand*{\sls@@@renewelement}[4]{%
\scr@ifundefinedorrelax{sls@ps@\sls@currentheadings @#1@#2@#3}{%
\@namedef{sls@ps@scrheadings@#1@#2@#3}{#4}%
}{%
@@ -1588,10 +1650,10 @@
}%
}%
}
-\scrlayerAddToInterface\sls@@@renewelement{%
- \def\sls@@@renewelement#1#2#3[#4]#5{%
+\scrlayerAddToInterface\sls@@@@renewelement{%
+ \def\sls@@@@renewelement#1#2#3[#4]#5{%
\sls@@renewplainelement{#1}{#2}{#3}{#4}%
- \sls@@renewelement{#1}{#2}{#3}{#5}%
+ \sls@@@renewelement{#1}{#2}{#3}{#5}%
}%
}
\scrlayerAddToInterface\sls@@renewplainelement{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index a11742cf8b2..3867be8f5d3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -11,7 +11,7 @@
%% scrlayer.dtx (with options: `package,trace,scrlayer,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2012-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,13 +43,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (identify)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 31/10/2013 v0.9.1480
+ 2014/10/28 v3.14 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (init)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z 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 1480 2013-10-31 10:00:02Z mjk $ (options)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z 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 1480 2013-10-31 10:00:02Z mjk $ (body)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body)
\KOMAProcessOptions\relax
\@ifundefined{headmark}{}{%
\PackageWarningNoLine{scrlayer}{%
@@ -558,7 +558,7 @@
\FamilyKeyStateProcessed
}
\DefineFamilyKey[.definelayer]{KOMAarg}{contents}{%
- \@namedef{scr@l@\scr@current@layer @contents}{#1}%
+ \long\@namedef{scr@l@\scr@current@layer @contents}{#1}%
\FamilyKeyStateProcessed
}
\DefineFamilyKey[.definelayer]{KOMAarg}{background}[\relax]{%
@@ -797,7 +797,7 @@
\expandafter\let\csname if@scr@l@#1@#3\expandafter\endcsname
\csname if@scr@l@#2@#3\expandafter\endcsname
}
-\newcommand*{\DeclareLayer}[2][]{%
+\newcommand{\DeclareLayer}[2][]{%
\def\scr@current@layer{#2}%
\@namedef{scr@l@#2@x}{\z@}%
\@namedef{scr@l@#2@y}{\z@}%
@@ -822,6 +822,7 @@
\expandafter\newif\csname if@scr@l@#2@nonfloatpage\endcsname
\csname @scr@l@#2@nonfloatpagetrue\endcsname
\FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}%
+ \let\scr@current@layer\@empty
}
\newcommand*{\scr@current@layer}{}
\newcommand*{\IfLayerExists}[1]{%
@@ -831,7 +832,7 @@
\expandafter\@firstoftwo
}%
}
-\newcommand*{\DeclareNewLayer}[2][]{%
+\newcommand{\DeclareNewLayer}[2][]{%
\IfLayerExists{#2}{%
\PackageError{scrlayer}{layer `#2' already defined}{%
You may declare only layer, that haven't been declared previously
@@ -842,13 +843,13 @@
If you'll continue, declaration will be ignored.}%
}{\DeclareLayer[{#1}]{#2}}%
}
-\newcommand*{\ProvideLayer}[2][]{%
+\newcommand{\ProvideLayer}[2][]{%
\IfLayerExists{#2}{%
\PackageInfo{scrlayer}{\string\ProvideLayer{#2} ignored,\MessageBreak
because of already defined layer}%
}{\DeclareNewLayer[{#1}]{#2}}%
}
-\newcommand*{\RedeclareLayer}[2][]{%
+\newcommand{\RedeclareLayer}[2][]{%
\IfLayerExists{#2}{}{%
\PackageError{scrlayer}{layer `#2' not yet defined}{%
You may declare only already declared layers using
@@ -859,9 +860,11 @@
}%
\DeclareLayer[{#1}]{#2}%
}
-\newcommand*{\ModifyLayer}[2][]{%
+\newcommand{\ModifyLayer}[2][]{%
\IfLayerExists{#2}{%
+ \def\scr@current@layer{#2}%
\FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}%
+ \let\scr@current@layer\@empty
}{%
\PackageError{scrlayer}{layer `#2' not yet defined}{%
You may modify only already declared layers using
@@ -1400,7 +1403,7 @@
\newcommand*{\remove@layer@from@page@style}[2]{%
\begingroup
\expandafter\let\expandafter\reserved@a\csname @ps@#2@layers\endcsname
- \@namedef{@ps@#2@layers}{}%
+ \expandafter\global\expandafter\let\csname @ps@#2@layers\endcsname\@empty
\def\@elt##1{%
\ifstr{#1}{##1}{}{%
\expandafter\@cons\csname @ps@#2@layers\endcsname{{##1}}%
@@ -1919,7 +1922,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (final)
+%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z 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/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index bdd0d59a782..7d4e2caadcc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -7,7 +7,7 @@
%% scrlfile.dtx (with options: `scrlfile')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2002-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\ProvidesPackage{scrlfile}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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 3ee13c1b7fa..986982b7572 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -39,7 +39,7 @@
%% scrkernel-circularletters.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -71,7 +71,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -102,12 +102,12 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -186,8 +186,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -200,10 +203,12 @@
}
\KOMA@DeclareStandardOption
{final}{draft=false}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
- \expandafter\AtEndOfClass\expandafter{%
+ \expandafter
+ \AtEndOfClass
+ \expandafter{%
\expandafter\LoadLetterOption\expandafter{\CurrentOption}%
}%
\expandafter\def\expandafter\scr@pti@nerr@r\expandafter{%
@@ -213,8 +218,9 @@
}%
}{}%
}
-\AtEndOfClass{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+\AtEndOfClass
+ {\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
@@ -287,9 +293,9 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-variables.dtx 1389 2013-10-01 16:06:04Z mjk $
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% 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-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -349,18 +355,20 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -493,7 +501,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
@@ -511,9 +519,9 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\@ifundefined{typearea}{%
- \PassOptionsToPackage{typearea}{headinclude=#1}%
+ \PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
- \KOMAoptions{footinclude=#1,DIV=current}%
+ \KOMAoptions{footinclude=#1}%
}%
\fi
}
@@ -524,7 +532,7 @@
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -541,7 +549,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -627,7 +648,7 @@
\ifhmode\spacefactor\@x@sf\fi
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% 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}{%
@@ -962,7 +983,8 @@
}%
\if@tempswa
\aftergroup\@scrsymbolsfalse
- \ClassWarning{scrlttr2}{Option `symbolicnames'
+ \ClassWarning{scrlttr2}{%
+ Option `symbolicnames'
ignorred.\MessageBreak
You've tried to set option `symbolicnames'\MessageBreak
after \string\begin{document}, but without\MessageBreak
@@ -985,12 +1007,12 @@
\fi
}
%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1431,7 +1453,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
@@ -1506,7 +1528,7 @@
the extended optional argument of the section\MessageBreak
commands
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% 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@}{}%
@@ -1523,27 +1545,41 @@
\@tempcnta=\@restore@catcode@level\relax
\advance\@tempcnta by \@ne\relax
\edef\@restore@catcode@level{\the\@tempcnta}%
- \InputIfFileExists{#1.lco}{%
- \ClassInfo{%
- scrlttr2%
+ \KV@@sp@def\reserved@a{#1}%
+ \edef\reserved@a{\noexpand\InputIfFileExists{\reserved@a.lco}{%
+ \noexpand\ClassInfo{scrlttr2%
}{Letter-Class-Option `#1' loaded}%
}{%
- \ClassError{%
- scrlttr2%
+ \noexpand\ClassError{scrlttr2%
}{%
- Letter-Class-Option file `#1.lco' not found%
+ Letter-Class-Option file `#1.lco' not found%
}{%
- You've told me to load the Letter-Class-Option `#1'. So I have
- to load\MessageBreak
- the file `#1.lco'. But the file isn't available.}%
+ 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}{%
@@ -1576,8 +1612,7 @@
\setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}%
\else%
\def\ta@opt@err{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{papersize `\LOPNP@size' undefined}{%
You've told me to check for paper size
`\LOPNP@size'\MessageBreak
@@ -1594,9 +1629,8 @@
}
\newcommand*{\@@PapersizeWarning}{%
\if@tempswa\else%
- \ClassWarningNoLine{%
- scrlttr2%
- }{%
+ \ClassWarningNoLine{scrlttr2%
+ }{%
Letter option file `\LOPNP@option.lco'\MessageBreak
needs paper size `\LOPNP@size'.\MessageBreak
Current paper size is not `\LOPNP@size'!\MessageBreak
@@ -1609,11 +1643,10 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
- \ClassInfo{%
- scrlttr2%
+ \ClassInfo{scrlttr2%
}{%
no date found for language `#1'\MessageBreak
--> skipped%
@@ -1635,195 +1668,134 @@
\space\number\day, \number\year}%
}%
}{}%
- \providecaptionname{english}\yourrefname{Your ref.}%
- \providecaptionname{english}\yourmailname{Your letter of}%
- \providecaptionname{english}\myrefname{Our ref.}%
- \providecaptionname{english}\customername{Customer no.}%
- \providecaptionname{english}\invoicename{Invoice no.}%
- \providecaptionname{english}\subjectname{Subject}%
- \providecaptionname{english}\ccname{cc}%
- \providecaptionname{english}\enclname{encl}%
- \providecaptionname{english}\headtoname{To}%
- \providecaptionname{english}\headfromname{From}%
- \providecaptionname{english}\datename{Date}%
- \providecaptionname{english}\pagename{Page}%
- \providecaptionname{english}\phonename{Phone}%
- \providecaptionname{english}\mobilephonename{Mobile phone}%
- \providecaptionname{english}\faxname{Fax}%
- \providecaptionname{english}\emailname{Email}%
- \providecaptionname{english}\wwwname{Url}%
- \providecaptionname{english}\bankname{Bank account}%
- \g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
- \providecaptionname{USenglish}\yourrefname{Your ref.}%
- \providecaptionname{USenglish}\yourmailname{Your letter of}%
- \providecaptionname{USenglish}\myrefname{Our ref.}%
- \providecaptionname{USenglish}\customername{Customer no.}%
- \providecaptionname{USenglish}\invoicename{Invoice no.}%
- \providecaptionname{USenglish}\subjectname{Subject}%
- \providecaptionname{USenglish}\ccname{cc}%
- \providecaptionname{USenglish}\enclname{encl}%
- \providecaptionname{USenglish}\headtoname{To}%
- \providecaptionname{USenglish}\headfromname{From}%
- \providecaptionname{USenglish}\datename{Date}%
- \providecaptionname{USenglish}\pagename{Page}%
- \providecaptionname{USenglish}\phonename{Phone}%
- \providecaptionname{USenglish}\mobilephonename{Cell phone}%
- \providecaptionname{USenglish}\faxname{Fax}%
- \providecaptionname{USenglish}\emailname{Email}%
- \providecaptionname{USenglish}\wwwname{Url}%
- \providecaptionname{USenglish}\bankname{Bank account}%
- \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
- \providecaptionname{american}\yourrefname{Your ref.}%
- \providecaptionname{american}\yourmailname{Your letter of}%
- \providecaptionname{american}\myrefname{Our ref.}%
- \providecaptionname{american}\customername{Customer no.}%
- \providecaptionname{american}\invoicename{Invoice no.}%
- \providecaptionname{american}\subjectname{Subject}%
- \providecaptionname{american}\ccname{cc}%
- \providecaptionname{american}\enclname{encl}%
- \providecaptionname{american}\headtoname{To}%
- \providecaptionname{american}\headfromname{From}%
- \providecaptionname{american}\datename{Date}%
- \providecaptionname{american}\pagename{Page}%
- \providecaptionname{american}\phonename{Phone}%
- \providecaptionname{american}\mobilephonename{Cell phone}%
- \providecaptionname{american}\faxname{Fax}%
- \providecaptionname{american}\emailname{Email}%
- \providecaptionname{american}\wwwname{Url}%
- \providecaptionname{american}\bankname{Bank account}%
+ \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}%
- \providecaptionname{british}\yourrefname{Your ref.}%
- \providecaptionname{british}\yourmailname{Your letter of}%
- \providecaptionname{british}\myrefname{Our ref.}%
- \providecaptionname{british}\customername{Customer no.}%
- \providecaptionname{british}\invoicename{Invoice no.}%
- \providecaptionname{british}\subjectname{Subject}%
- \providecaptionname{british}\ccname{cc}%
- \providecaptionname{british}\enclname{encl}%
- \providecaptionname{british}\headtoname{To}%
- \providecaptionname{british}\headfromname{From}%
- \providecaptionname{british}\datename{Date}%
- \providecaptionname{british}\pagename{Page}%
- \providecaptionname{british}\phonename{Phone}%
- \providecaptionname{british}\mobilephonename{Mobile phone}%
- \providecaptionname{british}\faxname{Fax}%
- \providecaptionname{british}\emailname{Email}%
- \providecaptionname{british}\wwwname{Url}%
- \providecaptionname{british}\bankname{Bank account}%
+ \g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
- \providecaptionname{UKenglish}\yourrefname{Your ref.}%
- \providecaptionname{UKenglish}\yourmailname{Your letter of}%
- \providecaptionname{UKenglish}\myrefname{Our ref.}%
- \providecaptionname{UKenglish}\customername{Customer no.}%
- \providecaptionname{UKenglish}\invoicename{Invoice no.}%
- \providecaptionname{UKenglish}\subjectname{Subject}%
- \providecaptionname{UKenglish}\ccname{cc}%
- \providecaptionname{UKenglish}\enclname{encl}%
- \providecaptionname{UKenglish}\headtoname{To}%
- \providecaptionname{UKenglish}\headfromname{From}%
- \providecaptionname{UKenglish}\datename{Date}%
- \providecaptionname{UKenglish}\pagename{Page}%
- \providecaptionname{UKenglish}\phonename{Phone}%
- \providecaptionname{UKenglish}\mobilephonename{Mobile phone}%
- \providecaptionname{UKenglish}\faxname{Fax}%
- \providecaptionname{UKenglish}\emailname{Email}%
- \providecaptionname{UKenglish}\wwwname{Url}%
- \providecaptionname{UKenglish}\bankname{Bank account}%
+ \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}\yourrefname{Ihr Zeichen}%
- \providecaptionname{german}\yourmailname{Ihr Schreiben vom}%
- \providecaptionname{german}\myrefname{Unser Zeichen}%
- \providecaptionname{german}\customername{Kundennummer}%
- \providecaptionname{german}\invoicename{Rechnungsnummer}%
- \providecaptionname{german}\subjectname{Betrifft}%
- \providecaptionname{german}\ccname{Kopien an}%
- \providecaptionname{german}\enclname{Anlagen}%
- \providecaptionname{german}\headtoname{An}%
- \providecaptionname{german}\headfromname{Von}%
- \providecaptionname{german}\datename{Datum}%
- \providecaptionname{german}\pagename{Seite}%
+ \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{german}\faxname{Fax}%
- \providecaptionname{german}\emailname{E-Mail}%
- \providecaptionname{german}\wwwname{URL}%
- \providecaptionname{german}\bankname{Bankverbindung}%
+ \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}%
- \providecaptionname{ngerman}\yourrefname{Ihr Zeichen}%
- \providecaptionname{ngerman}\yourmailname{Ihr Schreiben vom}%
- \providecaptionname{ngerman}\myrefname{Unser Zeichen}%
- \providecaptionname{ngerman}\customername{Kundennummer}%
- \providecaptionname{ngerman}\invoicename{Rechnungsnummer}%
- \providecaptionname{ngerman}\subjectname{Betrifft}%
- \providecaptionname{ngerman}\ccname{Kopien an}%
- \providecaptionname{ngerman}\enclname{Anlagen}%
- \providecaptionname{ngerman}\headtoname{An}%
- \providecaptionname{ngerman}\headfromname{Von}%
- \providecaptionname{ngerman}\datename{Datum}%
- \providecaptionname{ngerman}\pagename{Seite}%
- \providecaptionname{ngerman}\phonename{Telefon}%
- \providecaptionname{ngerman}\mobilephonename{Handy}%
- \providecaptionname{ngerman}\faxname{Fax}%
- \providecaptionname{ngerman}\emailname{E-Mail}%
- \providecaptionname{ngerman}\wwwname{URL}%
- \providecaptionname{ngerman}\bankname{Bankverbindung}%
\g@addnumerical@date{ngerman}{\number\day.\,\number\month.\,\number\year}%
- \providecaptionname{austrian}\yourrefname{Ihr Zeichen}%
- \providecaptionname{austrian}\yourmailname{Ihr Schreiben vom}%
- \providecaptionname{austrian}\myrefname{Unser Zeichen}%
- \providecaptionname{austrian}\customername{Kundennummer}%
- \providecaptionname{austrian}\invoicename{Rechnungsnummer}%
- \providecaptionname{austrian}\subjectname{Betrifft}%
- \providecaptionname{austrian}\ccname{Kopien an}%
- \providecaptionname{austrian}\enclname{Anlagen}%
- \providecaptionname{austrian}\headtoname{An}%
- \providecaptionname{austrian}\headfromname{Von}%
- \providecaptionname{austrian}\datename{Datum}%
- \providecaptionname{austrian}\pagename{Seite}%
- \providecaptionname{austrian}\phonename{Telefon}%
- \providecaptionname{austrian}\mobilephonename{Mobiltelefon}%
- \providecaptionname{austrian}\faxname{Fax}%
- \providecaptionname{austrian}\emailname{E-Mail}%
- \providecaptionname{austrian}\wwwname{URL}%
- \providecaptionname{austrian}\bankname{Bankverbindung}%
\g@addnumerical@date{austrian}{\number\day.\,\number\month.\,\number\year}%
- \providecaptionname{naustrian}\yourrefname{Ihr Zeichen}%
- \providecaptionname{naustrian}\yourmailname{Ihr Schreiben vom}%
- \providecaptionname{naustrian}\myrefname{Unser Zeichen}%
- \providecaptionname{naustrian}\customername{Kundennummer}%
- \providecaptionname{naustrian}\invoicename{Rechnungsnummer}%
- \providecaptionname{naustrian}\subjectname{Betrifft}%
- \providecaptionname{naustrian}\ccname{Kopien an}%
- \providecaptionname{naustrian}\enclname{Anlagen}%
- \providecaptionname{naustrian}\headtoname{An}%
- \providecaptionname{naustrian}\headfromname{Von}%
- \providecaptionname{naustrian}\datename{Datum}%
- \providecaptionname{naustrian}\pagename{Seite}%
- \providecaptionname{naustrian}\phonename{Telefon}%
- \providecaptionname{naustrian}\phonename{Handy}%
- \providecaptionname{naustrian}\faxname{Fax}%
- \providecaptionname{naustrian}\emailname{E-Mail}%
- \providecaptionname{naustrian}\wwwname{URL}%
- \providecaptionname{naustrian}\bankname{Bankverbindung}%
\g@addnumerical@date{naustrian}{\number\day.\,\number\month.\,\number\year}%
- \providecaptionname{french}\yourrefname{Vos r\'ef\'erences}%
- \providecaptionname{french}\yourmailname{Votre lettre du}%
- \providecaptionname{french}\myrefname{Nos r\'ef\'erences}%
- \providecaptionname{french}\customername{Num\'ero de client}%
- \providecaptionname{french}\invoicename{Num\'ero de facture}%
- \providecaptionname{french}\subjectname{Concernant}%
- \providecaptionname{french}\ccname{Copie \`a}%
- \providecaptionname{french}\enclname{Annexes}%
- \providecaptionname{french}\headtoname{A}%
- \providecaptionname{french}\headfromname{De}%
- \providecaptionname{french}\datename{Date}%
- \providecaptionname{french}\pagename{Page}%
- \providecaptionname{french}\phonename{T\'el\'ephone}%
- \providecaptionname{french}\mobilephonename{Portable}%
- \providecaptionname{french}\faxname{T\'el\'efax}%
- \providecaptionname{french}\emailname{E-mail}%
- \providecaptionname{french}\wwwname{URL}%
- \providecaptionname{french}\bankname{Compte en banque}%
+ \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
@@ -1959,12 +1931,68 @@
\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
- \ClassWarningNoLine{%
- scrlttr2%
+ \ClassWarningNoLine{scrlttr2%
}{%
\string\language\space is \the\language, \string\languagename\space is
`\languagename'\MessageBreak
@@ -1976,7 +2004,8 @@
\let\languagename=\undefined
\fi
\ifx\languagename\undefined
- \ClassWarningNoLine{scrlttr2}{\string\languagename\space not
+ \ClassWarningNoLine{scrlttr2%
+ }{\string\languagename\space not
defined, using \string\language.\MessageBreak
This may result in use of wrong language!\MessageBreak
You should use a compatible language
@@ -1986,10 +2015,22 @@
\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
@@ -2014,6 +2055,26 @@
\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
@@ -2046,11 +2107,22 @@
\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
- \ClassWarningNoLine{%
- scrlttr2%
+ \ClassWarningNoLine{scrlttr2%
}{%
You've selected language `\languagename'.\MessageBreak
Maybe your LaTeX format contains Babel extension\MessageBreak
@@ -2061,26 +2133,30 @@
will be used%
}%
\else
- \ClassInfo{scrlttr2}{%
+ \ClassInfo{scrlttr2%
+ }{%
trying to activate captions and date\MessageBreak
of language `\languagename'%
}%
\csname date\languagename\endcsname
\csname captions\languagename\endcsname
- \ClassInfo{%
- scrlttr2%
+ \ClassInfo{scrlttr2%
}{%
used language is `\languagename'.\MessageBreak
- Supported languages are `english', `UKenglish',\MessageBreak
- `british', `american', `USenglish',\MessageBreak
+ Supported languages are: `english', `UKenglish',\MessageBreak
+ `british', `american', `USenglish', `australian`,\MessageBreak
+ `canadian', `newzealand',\MessageBreak
`german', `ngerman', `austrian', `naustrian',\MessageBreak
- `dutch', `italian', `spanish',\MessageBreak
- `croatian', `finnish', `norsk', `swedish'%
+ `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 1389 2013-10-01 16:06:04Z mjk $
+%%% 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]{%
@@ -2094,8 +2170,7 @@
\expandafter\let\csname scr@#2@var\endcsname=\@empty
\if@tempswa\addtoreffields{#2}\fi
}{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{%
This should never happen%
}{%
@@ -2106,8 +2181,7 @@
}%
}%
}{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{%
Variable `#2' already defined%
}{%
@@ -2144,8 +2218,7 @@
}%
}
\newcommand*{\@komavar@err}[2]{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{%
KOMA-Script variable not defined%
}{%
@@ -2183,7 +2256,7 @@
\begingroup
\@ifstar {\@tempswatrue\@ifkomavarempty}%
{\@tempswafalse\@ifkomavarempty}%
- }
+}
\newcommand{\@ifkomavarempty}[1]{%
\ifkomavar{#1}{%
\if@tempswa
@@ -2209,12 +2282,13 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $
+%%% 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@%
}{%
- \ClassError{scrlttr2}{%
+ \ClassError{scrlttr2%
+ }{%
pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
already defined%
}{%
@@ -2263,7 +2337,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2274,7 +2348,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
@@ -2400,7 +2474,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2420,7 +2494,8 @@
Font of page foot will also be changed%
}
\newcommand*{\scr@fnt@pagefoot}{\footfont}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*
+ {\pagemark}{{\usekomafont{pagenumber}{%
\pagename\ %
\thepage}}}
\renewcommand*{\ps@plain}{%
@@ -2778,7 +2853,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -2797,6 +2872,7 @@
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
\ifkomavarempty{fromaddress}{}{%
+ \csname scr@default@firsthead@fromaddress@hook\endcsname
\ignorespaces\usekomavar{fromaddress}%
}%
}%
@@ -2973,8 +3049,8 @@
\newkomafont{refvalue}{}
\fi
\newkomafont{placeanddate}{}
-\newkomafont{title}{\normalcolor\sffamily\bfseries}
-\newkomafont{subject}{\normalcolor\bfseries}
+ \newkomafont{title}{\normalcolor\sffamily\bfseries}%
+ \newkomafont{subject}{\normalcolor\bfseries}%
\@newplength{foldmarkhpos}
\@newplength{foldmarkvpos}
\@newplength{tfoldmarkvpos}
@@ -3163,22 +3239,20 @@
\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}%
- \ClassWarning{%
- scrlttr2%
- }{%
- #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%
+ \setbox0\vbox{#3}%
+ \setlength{\@tempdima}{#2}%
+ \setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
+ \ifdim \@tempdimb>\@tempdima%
+ \addtolength{\@tempdimb}{-\@tempdima}%
+ \ClassWarning{scrlttr2}{%
+ #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%
}
@@ -3751,13 +3825,13 @@
\ifnum \@datepos=1 \@set@reffield{date}\fi%
\setbox0\hbox{\usekomafont{refname}\strutbox}%
\ifdim\ht0>\ht\strutbox
- \ClassWarningNoLine{scrlttr}{%
+ \ClassWarningNoLine{scrlttr2}{%
Font element `refname' should not be larger than
\string\normalsize!}%
\fi
\setbox0\hbox{\usekomafont{refvalue}\strutbox}%
\ifdim\ht0>\ht\strutbox
- \ClassWarningNoLine{scrlttr}{%
+ \ClassWarningNoLine{scrlttr2}{%
Font element `refvalue' should not be larger than
\string\normalsize!}%
\fi
@@ -3775,7 +3849,7 @@
\vskip\useplength{refaftervskip}%
}%
}
-\newcommand*{\@maketitle}{%
+\newcommand*{\@makelettertitle}{%
\ifkomavarempty{title}{%
\typeout{Title: no}%
}{%
@@ -3942,7 +4016,7 @@
\@foldmarks\@firstheadfootfield\@addrfield\@locfield
\ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
\@datefield
- \@maketitle
+ \@makelettertitle
\ifdim\useplength{subjectvpos}=\z@\if@subjafter\else\@subjfield\fi\fi
{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative#1\par}%
{\setlength{\@tempdima}{\baselineskip}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 710d4a9daa0..031f50fe9da 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -7,7 +7,7 @@
%% scrpage.dtx (with options: `scrpage,v2')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,7 +42,7 @@
%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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 5047dbcbe99..48127c9fa34 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -40,7 +40,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,report,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -72,7 +72,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -103,21 +103,21 @@
report%
}
\ProvidesClass{\KOMAClassName}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
\RequirePackage{tocbasic}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -221,8 +221,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -237,7 +240,7 @@
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
@@ -302,7 +305,7 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -362,17 +365,19 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -505,7 +510,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -528,7 +533,7 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newif\if@openright
\@openrightfalse
\KOMA@key{open}{%
@@ -552,7 +557,6 @@
}
\KOMA@DeclareStandardOption{openright}{open=right}
\KOMA@DeclareStandardOption{openany}{open=any}
-%% \fi
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
change of end dot feature after \string\begin{document}%
@@ -743,7 +747,7 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
@@ -761,9 +765,9 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\@ifundefined{typearea}{%
- \PassOptionsToPackage{typearea}{headinclude=#1}%
+ \PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
- \KOMAoptions{footinclude=#1,DIV=current}%
+ \KOMAoptions{footinclude=#1}%
}%
\fi
}
@@ -774,7 +778,7 @@
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -791,7 +795,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -945,7 +962,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -965,21 +982,21 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMAExecuteOptions{index=notoc}%
+ \KOMAoptions{index=notoc}%
\or
- \KOMAExecuteOptions{index=totoc}%
+ \KOMAoptions{index=totoc}%
\or
- \KOMAExecuteOptions{listof=notoc}%
+ \KOMAoptions{listof=notoc}%
\or
- \KOMAExecuteOptions{listof=totoc}%
+ \KOMAoptions{listof=totoc}%
\or
- \KOMAExecuteOptions{listof=numbered}%
+ \KOMAoptions{listof=numbered}%
\or
- \KOMAExecuteOptions{bibliography=nottotoc}%
+ \KOMAoptions{bibliography=nottotoc}%
\or
- \KOMAExecuteOptions{bibliography=totoc}%
+ \KOMAoptions{bibliography=totoc}%
\or
- \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \KOMAoptions{bibliography=totocnumbered}%
\or
\@toclefttrue
\or
@@ -1097,13 +1114,13 @@
\unsettoc{\@currext}{numberline}%
}
\or% chapterentry
- \KOMAExecuteOptions{chapteratlists=entry}%
+ \KOMAoptions{chapteratlists=entry}%
\or% chaptergap
- \KOMAExecuteOptions{chapteratlists=\z@}%
+ \KOMAoptions{chapteratlists=\z@}%
\or% chaptergapsmall
- \KOMAExecuteOptions{chapteratlists=10\p@}%
+ \KOMAoptions{chapteratlists=10\p@}%
\or% chaptergapline
- \KOMAExecuteOptions{chapteratlists=\baselineskip}%
+ \KOMAoptions{chapteratlists=\baselineskip}%
\fi
\fi
}
@@ -1119,9 +1136,10 @@
}{%
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
}%
+ \FamilyKeyStateProcessed
}
\BeforeTOCHead{\@chaptertolistsfalse}
-%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1176,7 +1194,7 @@
\newcommand*\bib@heading{%
\ifbib@leveldown
\section*{\bibname}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi
\else
\chapter*{\bibname}%
\@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
@@ -1266,13 +1284,13 @@
}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% 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 $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
@@ -1702,12 +1720,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1751,7 +1769,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1879,7 +1897,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2052,12 +2070,14 @@
\let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
- \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \@makeextratitle
- \next@tdpage
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle
+ \next@tdpage
+ \fi
\@maketitle
\else
\ifx\@extratitle\@empty\else
@@ -2066,7 +2086,9 @@
\twocolumn[\@maketitle]%
\fi
\else
- \@makeextratitle
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle\next@tdpage
+ \fi
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
@@ -2103,13 +2125,11 @@
\global\let\and\relax
}%
\newcommand*{\@makeextratitle}{%
- \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tdpage
+ \noindent\@extratitle\par
\fi
}
\newcommand*{\@maketitle}{%
- \next@tdpage
\global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
@@ -2215,7 +2235,7 @@
\if@twocolumn\else\endquotation\fi
\fi
}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newcommand*\appendix{\par%
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -2261,6 +2281,101 @@
\fi
\@@maybeautodot
}
+\newcommand*{\scr@saved@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \@ifstar
+ {\@ssect{#3}{#4}{#5}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+}
+\ifx\@startsection\scr@saved@startsection
+ \newcommand*{\scr@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \csname scr@startsection@hook\endcsname
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \@ifstar
+ {\csname scr@preto@ssect@hook\endcsname\@ssect{#3}{#4}{#5}{#6}}%
+ {\csname scr@preto@sect@hook\endcsname
+ \scr@section@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ }
+\else
+ \ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
+ changed.\MessageBreak
+ \KOMAClassName\space needs it's own Definition of
+ `\string\@startsection'\MessageBreak
+ to provide extended features for the optional argument\MessageBreak
+ of `\string\section` etc.\MessageBreak
+ Generally it defines `\string\@startsection` completely new\MessageBreak
+ to achieve this. Because of the unexpected definition\MessageBreak
+ an alternative approach will be used.\MessageBreak
+ If this fails and if there isn't a new release of\MessageBreak
+ KOMA-Scriptt that fixes the problem, please\MessageBreak
+ send a report to the KOMA-Script author.\MessageBreak
+ Note, that this alternative approach does not\MessageBreak
+ execute `\string\scr@startsection@hook', \MessageBreak
+ `\string\scr@preto@ssect@hook', or `\string\scr@preto@sect@hook'%
+ }%
+ \let\scr@saved@startsection\@startsection
+ \newcommand*{\scr@startsection}[6]{%
+ \@ifstar
+ {\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}*}%
+ {\scr@section@dblarg{\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ }
+\fi
+\newcommand*{\At@startsection}[1]{%
+ \@ifundefined{scr@startsection@hook}{\let\scr@startsection@hook\@empty}{}%
+ \l@addto@macro{\scr@startsection@hook}{#1}%
+}
+\newcommand*{\Before@ssect}[1]{%
+ \@ifundefined{scr@preto@ssect@hook}{\let\scr@preto@ssect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@ssect@hook}{#1}%
+}
+\newcommand*{\Before@sect}[1]{%
+ \@ifundefined{scr@preto@sect@hook}{\let\scr@preto@sect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@sect@hook}{#1}%
+}
+\newcommand{\scr@section@dblarg}[1]{%
+ \kernel@ifnextchar[%]
+ {#1}%
+ {\scr@section@xdblarg{#1}}%
+}
+\newcommand{\scr@section@xdblarg}[2]{%
+ \begingroup
+ \edef\reserved@a{%
+ \unexpanded{\endgroup\let\scr@osectarg\z@#1[{#2}]{#2}\def\scr@osectarg}%
+ {\scr@osectarg}}%
+ \reserved@a
+}
+\renewcommand*{\@startsection}{%
+ \ifnum \scr@osectarg=\z@
+ \expandafter\scr@saved@startsection
+ \else
+ \expandafter\scr@startsection
+ \fi
+}
+\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}}
+\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
+\let\secdef\SecDef
\def\@tempa#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
\let\@svsec\@empty
@@ -2502,7 +2617,7 @@
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
- \secdef\@part\@spart
+ \SecDef\@part\@spart
}
\newcommand*{\@part}{}
\def\@part[#1]#2{%
@@ -2585,7 +2700,7 @@
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
- \secdef\@addpart\@saddpart
+ \SecDef\@addpart\@saddpart
}
\newcommand*{\@addpart}{}
\def\@addpart[#1]#2{%
@@ -2663,7 +2778,7 @@
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
- \secdef\@chapter\@schapter
+ \SecDef\@chapter\@schapter
}
\newcommand*{\@chapter}{}
\def\@chapter[#1]#2{%
@@ -2790,7 +2905,7 @@
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
- \secdef\@addchap\@saddchap%
+ \SecDef\@addchap\@saddchap%
}%
\newcommand*{\@addchap}{}%
\def\@addchap[#1]#2{%
@@ -2832,7 +2947,7 @@
\addchapmark{\scr@ds@head}%
}%
\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
-\newcommand*\addsec{\secdef\@addsec\@saddsec}
+\newcommand*\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
\def\@addsec[#1]#2{\section*{#2}%
\ifnum \scr@osectarg=\z@
@@ -2872,7 +2987,7 @@
\addtocentrydefault{subparagraph}{#1}{#2}%
}
\newcommand\section{%
- \@startsection{section}{\sectionnumdepth}{\z@}%
+ \scr@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2880,7 +2995,7 @@
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
\newcommand\subsection{%
- \@startsection{subsection}{\subsectionnumdepth}{\z@}%
+ \scr@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2889,7 +3004,7 @@
}%
}
\newcommand\subsubsection{%
- \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
+ \scr@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2898,19 +3013,31 @@
}%
}
\newcommand\paragraph{%
- \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
+ \scr@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
\newcommand\subparagraph{%
- \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
+ \scr@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
}
\newkomafont{minisec}{}
-\newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex
+\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
@@ -2972,7 +3099,7 @@
\set@preamble@vpos{0}{#2}%
\fi%
\if \@tempa b%
- \set@preamble@vpox{0}{#2}%
+ \set@preamble@vpos{0}{#2}%
\fi
\if \@tempa o%
\set@preamble@vpos{1}{#2}%
@@ -3051,10 +3178,10 @@
\newcommand*{\chapter@o@preamble}{}
\let\chapter@o@preamble\relax
\newcommand*{\setpartpreamble}{\set@preamble{part}}
-\newcommand*{\part@preamble@u}{}
-\let\part@preamble@u\relax
-\newcommand*{\part@preamble@o}{}
-\let\part@preamble@o\relax
+\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}%
@@ -3143,7 +3270,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3246,7 +3373,75 @@
the extended optional argument of the section\MessageBreak
commands
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+\BeforePackage{titlesec}{%
+ \let\scr@ttl@saved@section\section
+ \let\scr@ttl@saved@subsection\subsection
+ \let\scr@ttl@saved@subsubsection\subsubsection
+ \let\scr@ttl@saved@paragraph\paragraph
+ \let\scr@ttl@saved@subparagraph\subparagraph
+}
+\AfterPackage{titlesec}{%
+ \@ifpackagelater{titlesec}{2014/10/09}{%
+ \ClassInfo{\KOMAClassName}{%
+ Deactivating the `titlesec` workaround,\MessageBreak
+ because package is newer than expected%
+ }%
+ }{%
+ \PackageWarning{\KOMAClassName}{%
+ Activating an ugly workaround for a missing\MessageBreak
+ feature of package `titlesec`%
+ }%
+ \def\scr@ttl@@extract#1\scr@startsection#2#3#4#5#6#7#8{%
+ \@tempskipa=#5
+ \@tempskipb=#6
+ \ifdim\@tempskipa<\z@
+ \toks@{\titlespacing*#8{#4}}%
+ \@tempskipa-\@tempskipa
+ \else
+ \toks@{\titlespacing#8{#4}}%
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipa*\ttl@space\relax\beforetitleunit}%
+ \ifdim\@tempskipb<\z@
+ \if@tempswa
+ \titleformat#8[runin]%
+ {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8[runin]%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@tempskipb-\@tempskipb
+ \else
+ \if@tempswa
+ \titleformat#8%
+ {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
+ \fi
+ \edef\ttl@a{\the\toks@{\the\@tempskipa}{\the\@tempskipb}}
+ \ttl@a}%
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@section\section
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsection\subsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsubsection\subsubsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@paragraph\paragraph
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subparagraph\subparagraph
+ \let\scr@ttl@saved@section\relax
+ \let\scr@ttl@saved@subsection\relax
+ \let\scr@ttl@saved@subsubsection\relax
+ \let\scr@ttl@saved@paragraph\relax
+ \let\scr@ttl@saved@subparagraph\relax
+ \let\scr@ttl@@extract\relax
+ }%
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3264,10 +3459,11 @@
\newcommand*{\scr@fnt@pagefoot}{\footfont}
\newcommand*{\scr@fnt@wrn@pagefoot}[1]{%
This class does not use font element `pagefoot'!\MessageBreak
- Maybe you should load package `scrpage2', before\MessageBreak
- using this element%
+ Maybe you should load package `scrlayer-scrpage',\MessageBreak
+ before using this element%
}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*
+ {\pagemark}{{\usekomafont{pagenumber}{%
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
@@ -4041,7 +4237,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -4141,7 +4337,7 @@
\string\float@listhead\space detected!\MessageBreak
Implementation of \string\float@listhead\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Maybe implementation of \string\float@listhead\space will\MessageBreak
be removed from KOMA-Script soon.\MessageBreak
@@ -4156,7 +4352,7 @@
\string\float@addtolists\space detected!\MessageBreak
Implementation of \string\float@addtolist\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Since Version 3.12 support for deprecated\MessageBreak
\string\float@addtolist\space interface has been\MessageBreak
@@ -4179,7 +4375,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 3ecc4041cff..86fce62c582 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,10pt')
%% scrkernel-paragraphs.dtx (with options: `clo,10pt')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesFile{%
@@ -149,16 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
-\@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
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\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 b2503e2997d..c1517f54219 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,11pt')
%% scrkernel-paragraphs.dtx (with options: `clo,11pt')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesFile{%
@@ -149,16 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
-\@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
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\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 b049b3438de..bc99b8dd500 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,12pt')
%% scrkernel-paragraphs.dtx (with options: `clo,12pt')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesFile{%
@@ -149,16 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
-\@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
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\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 f0dcf27ebb3..2e01f352e67 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrtime,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,22 +65,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2011/03/31 v3.08b KOMA-Script package
- (time of LaTeX run)%
+ 2014/10/28 v3.14 KOMA-Script
+ package
+ (time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
\newif\if@Hxii
\KOMA@ifkey{12h}{@Hxii}
\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrtime.dtx 1701 2014-02-26 10:04:57Z kohm $
\def\thistime{%
\@ifstar
{\let\@tempif\iffalse\@thistime}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
index 005d3113d67..56e910487bf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
@@ -1,53 +1,48 @@
%%
%% This is file `scrwfile.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
%% scrwfile.dtx (with options: `package,trace,scrwfile,identify,option,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2010-2013 by Markus Kohm <komascript(at)gmx.info>
+%% Copyright (c) 2010-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
%%
-%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3c of the license.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later and of this work.
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
%%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
%%
-%% The Current Maintainer and author of this work is Markus Kohm.
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
%%
-%% This file may only be distributed together with the file
-%% `scrwfile.dtx' and `scrlogo.dtx'. You may however distribute the files
-%% `scrwfile.dtx' and `scrlogo.dtx' without this file.
-%%
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
%% ----------------------------------------------------------
%%
-%% The english manual is at `scrwfile.dtx', too.
-%%
-%% The KOMA-Script bundle (but not this file) was based upon the LaTeX2.09
-%% Script family created by Frank Neukam 1993 and the LaTeX2e standard
-%% classes created by The LaTeX3 Project 1994-1996.
+%% See `README'.
%%
-%% THIS IS AN ALPHA VERSION!
-%% USAGE OF THIS VERSION IS ON YOUR OWN RISK!
-%% EVERYTHING MAY HAPPEN!
-%% EVERYTHING MAY CHANGE IN FUTURE!
-%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
+%% 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: scrwfile.dtx 1562 2013-12-19 07:51:16Z mjk $
+%%% From File: $Id: scrwfile.dtx 1805 2014-10-13 08:55:20Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrwfile}
- [2013/08/05 v0.1f-alpha LaTeX2e KOMA-Script package (write and clone files)]
+ [2013/08/05 v0.1f-alpha KOMA-Script package (write and clone files)]
\PackageWarningNoLine{scrwfile}{%
THIS IS AN ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 2a782c7d570..942aae4c940 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -7,7 +7,7 @@
%% tocbasic.dtx (with options: `package')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,10 +39,10 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package
(handling toc-files)%
]
@@ -682,7 +682,9 @@
\expandafter\noexpand\csname \tb@nt@type name\endcsname
\noexpand\nobreakspace
\expandafter\noexpand\csname the\tb@nt@type\endcsname
- \noexpand\csname autodot\endcsname
+ \ifx\tb@nt@counterwithin\@empty\else
+ \noexpand\csname autodot\endcsname
+ \fi
}%
\noexpand\newcommand*\expandafter\noexpand
\csname fnum@\tb@nt@type\endcsname{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index a38fea1372a..61cfd0c7066 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -47,10 +47,10 @@
%% EVERYTHING MAY CHANGE IN FUTURE!
%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
%%
-%%% From File: $Id: tocstyle.dtx 1562 2013-12-19 07:51:16Z mjk $
+%%% From File: $Id: tocstyle.dtx 1716 2014-03-01 15:38:49Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
- [2013/08/11 v0.2e-alpha LaTeX2e KOMA-Script package (versatile toc styles)]
+ [2013/08/11 v0.2e-alpha KOMA-Script package (versatile toc styles)]
\PackageWarningNoLine{tocstyle}{%
THIS IS AN ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 836273a82af..3f17c9df40b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -13,7 +13,7 @@
%% scrkernel-compatibility.dtx (with options: `package,typearea,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,12 +67,12 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
package (type area)]
\typeout{%
Package typearea, \csname ver@typearea.sty\endcsname^^J%
@@ -81,9 +81,9 @@
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -264,7 +264,9 @@
\fi
\FamilyKeyStateProcessed
}
-\AtEndOfPackage{\KOMA@key{BCOR}{\typearea[{#1}]{last}}}
+\AtEndOfPackage{%
+ \KOMA@key{BCOR}{\typearea[{#1}]{last}\FamilyKeyStateProcessed}%
+}
\KOMA@key{DIV}[calc]{%
\edef\@tempa{#1}%
\def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv\fi
@@ -279,7 +281,9 @@
\fi
\FamilyKeyStateProcessed
}
-\AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}}
+\AtEndOfPackage{%
+ \KOMA@key{DIV}{\typearea[current]{#1}\FamilyKeyStateProcessed}%
+}
\KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc}
\KOMA@DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic}
\KOMA@ifkey{areasetadvanced}{@areasetadvanced}
@@ -313,7 +317,8 @@
\KOMA@key{twocolumn}[true]{%
\if@atdocument\clearpage\fi
\KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState\FammilyKeyStateProcessed
+ \ifx\FamilyKeyState
+ \FamilyKeyStateProcessed
\csname recalctypearea\endcsname
\fi
}
@@ -613,7 +618,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -628,7 +633,9 @@
Because of this, version was set to `first'%
}%
}{%
- \PackageInfoNoLine{scrextend}{%
+ \PackageInfoNoLine{%
+ typearea%
+ }{%
Switching compatibility level to `#1'%
}%
\edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}%
@@ -697,8 +704,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -1328,7 +1338,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z 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 0d5a10a2db4..3996796f07a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -9,7 +9,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,visualize,body')
%% scrkernel-notepaper.dtx (with options: `lco,visualize,body')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\ProvidesFile{%
visualize%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}}
\newcommand*{\showfields}[1]{%
\AtBeginLetter{%
@@ -574,7 +574,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
\endinput
%%
%% End of file `visualize.lco'.