summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-13 22:06:52 +0000
committerKarl Berry <karl@freefriends.org>2017-09-13 22:06:52 +0000
commitd4d66453da7ea3fd6fc443a113b45031e79b0e30 (patch)
tree04a1486ad845a02e1ba67849cb2176831e1e6258 /Master/texmf-dist/tex/latex/koma-script
parentc15b52b518c7d48d1a35d11dd2ba8c34ca8ee373 (diff)
koma-script (14sep17)
git-svn-id: svn://tug.org/texlive/trunk@45292 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.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/lscape.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/nomencl.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls343
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty56
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls431
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty24
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdoc.cls16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty86
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty20
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty32
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty117
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty52
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty100
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty47
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty244
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls321
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty20
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls431
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo13
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty20
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrwfile.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/setspace.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty36
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty1234
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco17
49 files changed, 2358 insertions, 1676 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index e9a6025b246..f70f5a1e05b 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
DIN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +79,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@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 fd7e127d28e..18ece2c6bee 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
DINmtext%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +79,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DINmtext%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 609c8b48d49..cb8d6a94f3c 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,9 +39,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
KOMAold%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +80,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
KOMAold%
@@ -204,7 +206,8 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\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 3ded106409a..83cb01499cb 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Kaku,LATE,LOW,head)
\ProvidesFile{%
Kaku%
L%
@@ -80,7 +81,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Kaku,LATE,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Kaku%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 1606d7e7208..5b8e12ea3bd 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
NF%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +79,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@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 028ad2865c1..351ddb20e0f 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,EARLY,HIGH,head)
\ProvidesFile{%
Nippon%
E%
@@ -80,7 +81,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,EARLY,HIGH,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index 14c54ecc0b7..43816bfb54f 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,EARLY,LOW,head)
\ProvidesFile{%
Nippon%
E%
@@ -80,7 +81,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,EARLY,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index 6e866f2ffd6..48c640a3eb5 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,LATE,HIGH,head)
\ProvidesFile{%
Nippon%
L%
@@ -80,7 +81,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,LATE,HIGH,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index 4ba77516e60..2b420f04dfc 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,LATE,LOW,head)
\ProvidesFile{%
Nippon%
L%
@@ -80,7 +81,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,LATE,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 0f1f3121eca..1c7fec2bc98 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,RIGHT,LOW,head)
\ProvidesFile{%
Nippon%
R%
@@ -80,7 +81,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: Ni,RIGHT,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 4d206671fb4..fb9117ef8a2 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
SN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +79,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@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 d7b77708da5..e1b6fdb6a6b 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
SNleft%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +79,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@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 38bec64dd48..c6375b2e329 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
UScommercial9
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +79,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@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 34d5ce3f01d..08a9e1fefbe 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
UScommercial9DW
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +79,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@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 c36e26d0079..b9e36639195 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\ProvidesFile{float.hak}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(hacking package
float)%
]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\scr@ifexpected{\newfloat}{%
\long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3}
\let\float@do=\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index e3078bd1cf9..d2a8fccb7f8 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(hacking package
floatrow)%
]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\scr@ifexpected{\DeclareNewFloatType}{%
\long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}%
\expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index 7a9561409fb..059f2ba1f38 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(hacking package
hyperref)%
]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\scr@ifexpected\@schapter{%
\def\@schapter#1{%
\H@old@schapter{#1}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index e5de54947a5..1ac8e53d29c 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\ProvidesFile{listings.hak}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(hacking package
listings)%
]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\newcommand*{\scr@do@hack@listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
index f57893b3adf..f45a249ed17 100644
--- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,lscape,identify')
%% scrhack.dtx (with options: `hack,lscape,body')
%%
-%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\ProvidesFile{lscape.hak}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(hacking package
lscape)%
]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\xpatchcmd{\landscape}{\textheight=\vsize}{%
\if@scrhack@lscape
\scrh@LT@textheight=\vsize
diff --git a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
index 7b59d4f8e4b..8c469101e89 100644
--- a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,nomencl,identify')
%% scrhack.dtx (with options: `hack,nomencl,body')
%%
-%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\ProvidesFile{nomencl.hak}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(hacking package
nomencl)%
]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\RequirePackage{tocbasic}
\addtotoclist[nomencl]{nlo}
\addtotoclist[nomencl]{nls}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index 0a0740567c3..e1c147add4f 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2006-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -37,7 +37,7 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
%%% From File: $Id: scraddr.dtx 1380 2013-10-01 15:31:55Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
@@ -105,7 +105,7 @@
\newcommand*{\FreeIII}[1]{\csname #1.FIII\endcsname}
\let\Comment\FreeIII
\newcommand*{\FreeIV}[1]{\csname #1.FIV\endcsname}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 94eadae4f6b..b15559e50bb 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -15,7 +15,7 @@
%% scrkernel-miscellaneous.dtx (with options: `class,article,option')
%% scrkernel-language.dtx (with options: `class,article,option')
%% scrkernel-fonts.dtx (with options: `class,article,option')
-%% scrkernel-typearea.dtx (with options: `class,article,option')
+%% scrkernel-typearea.dtx (with options: `class,article,options')
%% scrkernel-paragraphs.dtx (with options: `class,article,option')
%% scrkernel-title.dtx (with options: `class,article,option')
%% scrkernel-tocstyle.dtx (with options: `class,article,option')
@@ -51,7 +51,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,article,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -81,9 +81,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -105,7 +105,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -120,21 +120,23 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
document class (\ClassName)%
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{tocbasic}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
]
\addtotoclist{toc}
\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: prepare)
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -186,7 +188,8 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
\@namedef{scr@v@first}{0}
@@ -253,9 +256,12 @@
\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
+\@namedef{scr@v@3.24}{16}
\@namedef{scr@v@last}{16}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -329,7 +335,8 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -355,8 +362,10 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*\@ptsize{%
11%
}
@@ -441,7 +450,57 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: options)
+\KOMA@key{twoside}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @twoside%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twoside\flushbottom
+ \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
+}
+\KOMAExecuteOptions{twoside=false}
+\KOMA@DeclareStandardOption%
+ {oneside}{twoside=false}
+\KOMA@key{twocolumn}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi}%
+ \fi
+}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+}
+\KOMAExecuteOptions{twocolumn=false}
+\KOMA@DeclareStandardOption%
+ {onecolumn}{twocolumn=false}
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -499,59 +558,10 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{twoside}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
- \ifstr{#1}{semi}{%
- \@twosidetrue
- \FamilyKeyStateProcessed
- }{%
- \def\FamilyElseValue{, `semi'}%
- \KOMA@set@ifkey{twoside}{%
- @twoside%
- }{#1}%
- }%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@twoside\flushbottom
- \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
- \fi
- \KOMA@kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
- \fi
-}
-\KOMAExecuteOptions{twoside=false}
-\KOMA@DeclareStandardOption%
- {oneside}{twoside=false}
-\KOMA@key{twocolumn}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
- \if@atdocument\expandafter\@firstofone
- \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
- {\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi}%
- \fi
-}
-\AtEndOfClass{%
- \expandafter\ifnum\scr@v@is@lt{3.17}%
- \if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi
-}
-\KOMAExecuteOptions{twocolumn=false}
-\KOMA@DeclareStandardOption%
- {onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: option
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -716,7 +726,8 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@titlepage
\@titlepagefalse
\newif\if@titlepageiscoverpage
@@ -750,9 +761,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: option)
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -878,7 +889,8 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
@@ -982,7 +994,8 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1116,7 +1129,8 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -1186,7 +1200,8 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1403,7 +1418,8 @@
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1574,7 +1590,8 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
\expandafter\subsection
@@ -1657,18 +1674,22 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body)
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2142,12 +2163,14 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: body)
\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 2617 2017-04-03 13:56:55Z kohm $ (body)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2191,8 +2214,8 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: body
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -2320,7 +2343,8 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2660,10 +2684,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2677,7 +2701,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -2697,17 +2721,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,subsection)
\CloneTOCEntryStyle{tocline}{subsection}
\TOCEntryStyleStartInitCode{subsection}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{3}
\newcommand*{\ifnumbered}[1]{%
@@ -3219,35 +3243,66 @@
}
\newcommand*{\scr@dsc@style@section@neededoptionstest}{%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {section indent}{indent}{0pt}%
+ {\@namedef{scr@\scr@dsc@current @sectionindent}{0pt}}%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before section skip}
- {beforeskip}%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before section skip}{beforeskip}%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after section skip}
- {afterskip}%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after section skip}{afterskip}%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
- }{}%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {font}{font}{\normalsize}%
+ {\newkomafont{\scr@dsc@current}{\normalsize}}%
+ }%
}
\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before part skip}
- {beforeskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before part skip}{beforeskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {before part skip}{beforeskip}%
+ {\scr@part@beforeskip}%
+ {\@namedef{scr@\scr@dsc@current @beforeskip}{\scr@part@beforeskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after part skip}
- {afterskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after part skip}{afterskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {after part skip}{afterskip}%
+ {\scr@part@afterskip}%
+ {\@namedef{scr@\scr@dsc@current @afterskip}{\scr@part@afterskip}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}%
+ {\usekomafont{part}}%
+ {\newkomafont{\scr@dsc@current}{\usekomafont{part}}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current prefix}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{number font}
- {prefixfont}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {number font}{prefixfont}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {number font}{prefixfont}%
+ {\usekomafont{partprefix}}%
+ {\newkomafont{\scr@dsc@current prefix}{\usekomafont{partprefix}}}%
+ }%
}{}%
}
\newif\ifscr@dsc@parametersonly
@@ -3413,13 +3468,14 @@
\RelaxFamilyKey[.dsc]{KOMAarg}{level}%
\RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}%
\begingroup
+ \def\local@endgroup{\endgroup}%
\scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
}{}%
\@nameuse{scr@dsc@style@%
\@nameuse{scr@\scr@dsc@current @style}%
@neededoptionstest}%
- \endgroup
+ \local@endgroup
\@firstofone{%
\@ifundefined{c@#2}{\newcounter{#2}}{}%
\ifx\scr@local@counterwithout\relax
@@ -3500,8 +3556,18 @@
Please use option `#3' to declare the #2.\MessageBreak
If you'll continue, declaration will be ignored%
}%
+ \let\local@endgroup\endgroup
\aftergroup\@gobbletwo
}
+\newcommand*{\scr@declaresectioncommandwarning}[5]{%
+ \ClassInfo{\KOMAClassName}{%
+ #2 of \expandafter\string\csname #1\endcsname\space unknown.\MessageBreak
+ You should use option `#3' if you\MessageBreak
+ do not want to use the default value\MessageBreak
+ `\detokenize{#4}'%
+ }%
+ \l@addto@macro\local@endgroup{#5}%
+}
\newcommand*{\DeclareNewSectionCommand}[2][]{%
\@ifundefined{#2}{%
\DeclareSectionCommand[{#1}]{#2}%
@@ -4010,7 +4076,8 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4098,15 +4165,24 @@
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
\newcommand*{\scr@package@not@recommended}[2]{%
- \BeforePackage{#1}{%
- \ClassWarning{\KOMAClassName}{%
- Usage of package `#1' together\MessageBreak
- with a KOMA-Script class is not recommended.\MessageBreak
- \if\relax\detokenize{#2}\relax\else
- I'd suggest to use #2.\MessageBreak
- \fi
- Nevertheless, using requested\MessageBreak
- package `#1'%
+ \scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
+ \@firstofone
+ }{%
+ \edef\reserved@a{%
+ \noexpand\in@{#1}{\class@shoulddisablepackagewarning@list}}%
+ \reserved@a
+ \ifin@\expandafter\@gobble\else\expandafter\@firstofone\fi
+ }{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
}%
}%
}%
@@ -4119,7 +4195,13 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
- package `scrlayer-scrpage'}
+ package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
+ they support KOMA-Script classes.\MessageBreak
+ With `fancyhdr' several features of class `\KOMAClassName'\MessageBreak
+ like options `headsepline', `footsepline' or command\MessageBreak
+ `\string\MakeMarkcase' and the commands `\string\setkomafont' and\MessageBreak
+ `\string\addtokomafont' for the page style elements need\MessageBreak
+ explicite user intervention to work}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
@@ -4284,7 +4366,8 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -4379,7 +4462,8 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -5069,7 +5153,8 @@
}{%
\end@dblfloat
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -5226,7 +5311,8 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
\ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
@@ -5372,7 +5458,8 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{\ext@table}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\refname{References}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -5457,7 +5544,8 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -5503,7 +5591,8 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -5662,7 +5751,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 652c166e450..628817a715d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -13,7 +13,7 @@
%% scrkernel-language.dtx (with options: `package,body,base')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2002-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,9 +43,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,21 +67,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (prepare)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2017/04/13 v3.23 KOMA-Script
- package (%
+ 2017/09/07 v3.24 KOMA-Script
+ package
+ (%
KOMA-Script-independent
- basics and keyval usage)]
+ basics and keyval usage)]
\begingroup
\def\reserved@b{}%
\def\reserved@a#1{%
@@ -429,7 +431,8 @@
\long\def\l@addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (option)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\dont@let@as@internal@defined}{/}
\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse
\DefineFamily{KOMA}
@@ -446,12 +449,14 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrlfile.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{scrlfile}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (body)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -1232,6 +1237,26 @@
{#1}%
\endgroup
}
+\newcommand*{\IfRTL}{%
+ \scr@ifundefinedorrelax{if@RTL}{\@secondoftwo}{%
+ \expandafter\ifx\csname if@RTL\expandafter\endcsname
+ \csname iftrue\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }
+}
+\newcommand*{\IfLTR}{%
+ \scr@ifundefinedorrelax{if@RTL}{\@firstoftwo}{%
+ \expandafter\ifx\csname if@RTL\expandafter\endcsname
+ \csname iftrue\endcsname
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }
+}
\providecommand*{\PackageInfoNoLine}[2]{%
\PackageInfo{#1}{#2\@gobble}%
}
@@ -1895,7 +1920,8 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: body)
\newcommand*{\defcaptionname}{%
\kernel@ifstar\scr@def@scaptionname\scr@def@captionname
}
@@ -2315,7 +2341,7 @@
\reserved@b
}%
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index a691522d931..b322c71ca18 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -15,7 +15,7 @@
%% scrkernel-miscellaneous.dtx (with options: `class,book,option')
%% scrkernel-language.dtx (with options: `class,book,option')
%% scrkernel-fonts.dtx (with options: `class,book,option')
-%% scrkernel-typearea.dtx (with options: `class,book,option')
+%% scrkernel-typearea.dtx (with options: `class,book,options')
%% scrkernel-paragraphs.dtx (with options: `class,book,option')
%% scrkernel-title.dtx (with options: `class,book,option')
%% scrkernel-tocstyle.dtx (with options: `class,book,option')
@@ -51,7 +51,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -81,9 +81,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -105,7 +105,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -120,13 +120,15 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
document class (\ClassName)%
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{tocbasic}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
@@ -134,9 +136,9 @@
\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrighttrue
@@ -212,7 +214,8 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
\@namedef{scr@v@first}{0}
@@ -279,9 +282,12 @@
\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
+\@namedef{scr@v@3.24}{16}
\@namedef{scr@v@last}{16}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -354,7 +360,8 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -380,8 +387,10 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*\@ptsize{%
11%
}
@@ -466,7 +475,57 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: options)
+\KOMA@key{twoside}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @twoside%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twoside\flushbottom
+ \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
+}
+\KOMAExecuteOptions{twoside=true}
+\KOMA@DeclareStandardOption%
+ {oneside}{twoside=false}
+\KOMA@key{twocolumn}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi}%
+ \fi
+}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+}
+\KOMAExecuteOptions{twocolumn=false}
+\KOMA@DeclareStandardOption%
+ {onecolumn}{twocolumn=false}
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -524,59 +583,10 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{twoside}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
- \ifstr{#1}{semi}{%
- \@twosidetrue
- \FamilyKeyStateProcessed
- }{%
- \def\FamilyElseValue{, `semi'}%
- \KOMA@set@ifkey{twoside}{%
- @twoside%
- }{#1}%
- }%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@twoside\flushbottom
- \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
- \fi
- \KOMA@kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
- \fi
-}
-\KOMAExecuteOptions{twoside=true}
-\KOMA@DeclareStandardOption%
- {oneside}{twoside=false}
-\KOMA@key{twocolumn}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
- \if@atdocument\expandafter\@firstofone
- \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
- {\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi}%
- \fi
-}
-\AtEndOfClass{%
- \expandafter\ifnum\scr@v@is@lt{3.17}%
- \if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi
-}
-\KOMAExecuteOptions{twocolumn=false}
-\KOMA@DeclareStandardOption%
- {onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: option
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -741,7 +751,8 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -772,9 +783,9 @@
}{titlepage}{\if@titlepage true\else false\fi}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1036,7 +1047,8 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
@@ -1140,7 +1152,8 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1274,7 +1287,8 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -1344,7 +1358,8 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1608,7 +1623,8 @@
\BeforeTOCHead{\@chaptertolistsfalse}
\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1782,7 +1798,8 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
\expandafter\section
@@ -1865,19 +1882,23 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body)
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2358,12 +2379,14 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: body)
\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 2617 2017-04-03 13:56:55Z kohm $ (body)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2407,8 +2430,8 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: body
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -2536,7 +2559,8 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2843,10 +2867,10 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2860,7 +2884,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -2880,17 +2904,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -3433,68 +3457,155 @@
}
\newcommand*{\scr@dsc@style@section@neededoptionstest}{%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {section indent}{indent}{0pt}%
+ {\@namedef{scr@\scr@dsc@current @sectionindent}{0pt}}%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before section skip}
- {beforeskip}%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before section skip}{beforeskip}%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after section skip}
- {afterskip}%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after section skip}{afterskip}%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
- }{}%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {font}{font}{\normalsize}%
+ {\newkomafont{\scr@dsc@current}{\normalsize}}%
+ }%
}
\newcommand*{\scr@dsc@style@chapter@neededoptionstest}{%
\scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style}
- {pagestyle}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ {\chapterpagestyle}%
+ {\@namedef{\scr@dsc@current pagestyle}{\chapterpagestyle}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{inner chapter skip}
- {innerskip}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {inner chapter skip}{innerskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {inner chapter skip}{innerskip}%
+ {\scr@chapter@innerskip}%
+ {\@namedef{scr@\scr@dsc@current @innerskip}{\scr@chapter@innerskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before chapter skip}
- {beforeskip}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before chapter skip}{beforeskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {before chapter skip}{beforeskip}%
+ {\scr@chapter@beforeskip}%
+ {\@namedef{scr@\scr@dsc@current @beforeskip}{\scr@chapter@beforeskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after chaper skip}
- {afterskip}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after chaper skip}{afterskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {after chaper skip}{afterskip}%
+ {\scr@chapter@afterskip}%
+ {\@namedef{scr@\scr@dsc@current @afterskip}{\scr@chapter@afterskip}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
- }{}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {font}{font}%
+ {\usekomafont{chapter}}%
+ {\newkomafont{\scr@dsc@current}{\usekomafont{chapter}}}%
+ }%
+ }%
\IfExistskomafont{\scr@dsc@current prefix}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{prefix line font}
- {prefixfont}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {prefix line font}{prefixfont}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {prefix line font}{prefixfont}%
+ {\usekomafont{chapterprefix}}%
+ {\newkomafont{\scr@dsc@current prefix}{\usekomafont{chapterprefix}}}%
+ }%
}{}%
}
\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
\scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style}
- {pagestyle}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ {\partpagestyle}%
+ {\@namedef{\scr@dsc@current pagestyle}{\partpagestyle}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{inner part skip}
- {innerskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {inner part skip}{innerskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {inner part skip}{innerskip}%
+ {\scr@part@innerskip}%
+ {\@namedef{scr@\scr@dsc@current @innerskip}{\scr@part@innerskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before part skip}
- {beforeskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before part skip}{beforeskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {before part skip}{beforeskip}%
+ {\scr@part@beforeskip}%
+ {\@namedef{scr@\scr@dsc@current @beforeskip}{\scr@part@beforeskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after part skip}
- {afterskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after part skip}{afterskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {after part skip}{afterskip}%
+ {\scr@part@afterskip}%
+ {\@namedef{scr@\scr@dsc@current @afterskip}{\scr@part@afterskip}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}%
+ {\usekomafont{part}}%
+ {\newkomafont{\scr@dsc@current}{\usekomafont{part}}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current prefix}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{number font}
- {prefixfont}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {number font}{prefixfont}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {number font}{prefixfont}%
+ {\usekomafont{partprefix}}%
+ {\newkomafont{\scr@dsc@current prefix}{\usekomafont{partprefix}}}%
+ }%
}{}%
}
\newif\ifscr@dsc@parametersonly
@@ -3660,13 +3771,14 @@
\RelaxFamilyKey[.dsc]{KOMAarg}{level}%
\RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}%
\begingroup
+ \def\local@endgroup{\endgroup}%
\scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
}{}%
\@nameuse{scr@dsc@style@%
\@nameuse{scr@\scr@dsc@current @style}%
@neededoptionstest}%
- \endgroup
+ \local@endgroup
\@firstofone{%
\@ifundefined{c@#2}{\newcounter{#2}}{}%
\ifx\scr@local@counterwithout\relax
@@ -3747,8 +3859,18 @@
Please use option `#3' to declare the #2.\MessageBreak
If you'll continue, declaration will be ignored%
}%
+ \let\local@endgroup\endgroup
\aftergroup\@gobbletwo
}
+\newcommand*{\scr@declaresectioncommandwarning}[5]{%
+ \ClassInfo{\KOMAClassName}{%
+ #2 of \expandafter\string\csname #1\endcsname\space unknown.\MessageBreak
+ You should use option `#3' if you\MessageBreak
+ do not want to use the default value\MessageBreak
+ `\detokenize{#4}'%
+ }%
+ \l@addto@macro\local@endgroup{#5}%
+}
\newcommand*{\DeclareNewSectionCommand}[2][]{%
\@ifundefined{#2}{%
\DeclareSectionCommand[{#1}]{#2}%
@@ -4753,7 +4875,8 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4847,15 +4970,24 @@
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
\newcommand*{\scr@package@not@recommended}[2]{%
- \BeforePackage{#1}{%
- \ClassWarning{\KOMAClassName}{%
- Usage of package `#1' together\MessageBreak
- with a KOMA-Script class is not recommended.\MessageBreak
- \if\relax\detokenize{#2}\relax\else
- I'd suggest to use #2.\MessageBreak
- \fi
- Nevertheless, using requested\MessageBreak
- package `#1'%
+ \scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
+ \@firstofone
+ }{%
+ \edef\reserved@a{%
+ \noexpand\in@{#1}{\class@shoulddisablepackagewarning@list}}%
+ \reserved@a
+ \ifin@\expandafter\@gobble\else\expandafter\@firstofone\fi
+ }{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
}%
}%
}%
@@ -4868,7 +5000,13 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
- package `scrlayer-scrpage'}
+ package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
+ they support KOMA-Script classes.\MessageBreak
+ With `fancyhdr' several features of class `\KOMAClassName'\MessageBreak
+ like options `headsepline', `footsepline' or command\MessageBreak
+ `\string\MakeMarkcase' and the commands `\string\setkomafont' and\MessageBreak
+ `\string\addtokomafont' for the page style elements need\MessageBreak
+ explicite user intervention to work}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
@@ -5033,7 +5171,8 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -5133,7 +5272,8 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -5835,7 +5975,8 @@
}{%
\end@dblfloat
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -5993,7 +6134,8 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
\ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
@@ -6145,7 +6287,8 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{\ext@table}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -6230,7 +6373,8 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -6278,7 +6422,8 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -6437,7 +6582,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 642bfc020bf..122a98fb523 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +41,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,22 +65,24 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(day of the week)%
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
-%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
\newcommand*{\@GaussYear}[3]{%
@@ -204,8 +206,12 @@
{Thursday}{Friday}{Saturday}{Sunday}
\newdaylanguage{UKenglish}{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{usenglish}{Monday}{Tuesday}{Wednesday}
+ {Thursday}{Friday}{Saturday}{Sunday}
\newdaylanguage{acadian}{Lundi}{Mardi}{Mercredi}
{Jeudi}{Vendredi}{Samedi}{Dimanche}
\newdaylanguage{canadien}{Lundi}{Mardi}{Mercredi}
@@ -242,7 +248,7 @@
* Local config file scrdate.cfg used^^J%
*************************************}}
{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
index a1592e35f5f..ccb4e42cc74 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls
@@ -1,6 +1,6 @@
% ======================================================================
% scrdoc.dtx
-% Copyright (c) Markus Kohm, 2002-2016
+% Copyright (c) Markus Kohm, 2002-2017
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -18,7 +18,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrdoc.dtx
-% Copyright (c) Markus Kohm, 2002-2016
+% Copyright (c) Markus Kohm, 2002-2017
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -195,6 +195,11 @@
\MakePrivateLetters \m@cro@{6}}
\long\def\m@cro@#1#2{\endgroup \topsep\MacroTopsep \trivlist
\edef\saved@macroname{\string#2}%
+ \ifcase #1
+ \edef\saved@indexname{\expandafter\@gobble\string#2}%
+ \else
+ \let\saved@indexname\saved@macroname
+ \fi
\def\makelabel##1{\llap{##1}}%
\if@inlabel
\let\@tempa\@empty \count@\macro@cnt
@@ -248,6 +253,13 @@
\let\endCounter\endmacro
\let\endKOMAvar\endmacro
+% Some new command
+\newcommand*{\File}[1]{\texttt{\mbox{#1}}}
+\newcommand*{\Class}{\File}
+\newcommand*{\Package}{\File}
+\newcommand*{\Macro}{\cs}
+\newcommand*{\Option}{\File}
+
% The new names we need
\providecommand*{\EnvName}{Umgebung}% This is german
\providecommand*{\EnvsName}{Umgebungen}% This is german
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 721e5e0024e..12cc37982a7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -33,7 +33,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -63,9 +63,10 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrextend.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: preidentify)
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
\PackageWarning{scrextend}{%
@@ -77,7 +78,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -99,15 +100,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrextend.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: prepare)
\ProvidesPackage{scrextend}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr@ext@activate}[1]{%
@@ -131,11 +133,14 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: prepare)
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
\@namedef{scr@v@first}{0}
@@ -202,8 +207,10 @@
\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
+\@namedef{scr@v@3.24}{16}
\@namedef{scr@v@last}{16}
-%%% From File: $Id: scrextend.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
\AtEndOfPackage{%
@@ -226,7 +233,8 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
\def\scr@compatibility{0}%
@@ -280,7 +288,8 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -307,7 +316,8 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
@@ -343,7 +353,8 @@
scrextend.\scr@pkgextension
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
\expandafter\newif\csname if@titlepage\endcsname
@@ -386,9 +397,10 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -469,8 +481,10 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -540,13 +554,17 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% (run: execoption)
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
%%% (run: execoption)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body)
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -902,7 +920,8 @@
because I do not change it%
}%
}
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -1213,11 +1232,12 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: body)
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: body)
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
\@restonecolfalse
@@ -1301,12 +1321,15 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand\deffootnote[4][]{%
\expandafter\ifnum\scr@v@is@ge{3.22}\relax
\long\def\@makefntext##1{%
@@ -1437,7 +1460,8 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
\list{}{\settowidth{\labelwidth}{{%
@@ -1515,7 +1539,7 @@
}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index ad3ddf4786f..3cb03ddd39d 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,9 +40,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,19 +64,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: identify)
\ProvidesPackage{scrfontsizes}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package (font size file generator)]
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
\ifstr{#1}{scrsize}{%
@@ -363,7 +366,7 @@
\immediate\closeout\@fontfile
}
\@onlypreamble\generatefontfile
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 7664ae025c0..f21b8c47bc1 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +41,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,20 +65,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
%%% using: package,option
\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
\KOMAExecuteOptions{hyperref=true}%
@@ -97,7 +99,7 @@
\KOMA@ifkey{lscape}{@scrhack@lscape}%
\KOMAExecuteOptions{lscape=true}%
\KOMAProcessOptions\relax
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
%%% using: package,body
\newcommand{\scr@ifexpected}[2]{%
\begingroup
@@ -199,7 +201,7 @@
}%
\fi
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index c89fe14cac9..ed9a3d30960 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -7,7 +7,7 @@
%% scrjura.dtx (with options: `package')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2007-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -37,14 +37,14 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrjura.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: scrjura.dtx 2649 2017-05-29 09:39:43Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}[%
- 2017/02/23 v0.9i KOMA-Script
- for jurists
- (package)%
+ 2017/09/07 v3.24 KOMA-Script
+ package
+ (for jurists)
]
\@ifpackageloaded{hyperref}{%
\PackageError{scrjura}{Package hyperref already loaded}{%
@@ -1017,10 +1017,14 @@
\providecaptionname{german,ngerman,austrian,naustrian}\parshortname{Abs.}%
\providecaptionname{german,ngerman,austrian,naustrian}\sentencename{Satz}%
\providecaptionname{german,ngerman,austrian,naustrian}\sentenceshortname{S.}%
- \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\parname{paragraph}%
- \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\parshortname{par.}%
- \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\sentencename{sentence}%
- \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\sentenceshortname{sent.}%
+ \providecaptionname{english,american,british,canadian,%
+ USenglish,UKenglish,usenglish,ukenglish}\parname{paragraph}%
+ \providecaptionname{english,american,british,canadian,%
+ USenglish,UKenglish,usenglish,ukenglish}\parshortname{par.}%
+ \providecaptionname{english,american,british,canadian,%
+ USenglish,UKenglish,usenglish,ukenglish}\sentencename{sentence}%
+ \providecaptionname{english,american,british,canadian,%
+ USenglish,UKenglish,usenglish,ukenglish}\sentenceshortname{sent.}%
}
\providecommand*{\parname}{\scrjura@lang@error{\parname}}
\providecommand*{\parshortname}{\scrjura@lang@error{\parshortname}}
@@ -1032,9 +1036,9 @@
}{%
Currently scrjura only supports languages `german', `ngerman',
`austrian',\MessageBreak
- `naustrian', `english', `american', `british', `canadian', `USenglish',
- and\MessageBreak
- `UKenglish'.\MessageBreak
+ `naustrian', `english', `american', `british', `canadian',
+ `USenglish',\MessageBreak
+ `UKenglish', `usenglish`, and `ukenglish'.\MessageBreak
It seems, that you are using another language (maybe `\languagename') or
that\MessageBreak
your language selection isn't compatible to package `babel'.\MessageBreak
@@ -1070,7 +1074,7 @@
}%
\fi
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 6662cc5a994..7eafbe65746 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -13,7 +13,7 @@
%% scrkernel-fonts.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,9 +43,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,21 +67,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (prepare)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2017/04/13 v3.23 KOMA-Script
- package (%
+ 2017/09/07 v3.24 KOMA-Script
+ package
+ (%
KOMA-Script-dependent
- basics and keyval usage)]
+ basics and keyval usage)]
\RequirePackage{scrbase}[\KOMAScriptVersion]
\newcommand*{\KOMA@key}[1][.\@currname.\@currext]{%
\DefineFamilyMember[{#1}]{KOMA}%
@@ -241,14 +243,17 @@
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (option)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrlfile.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{scrlfile}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (body)
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
}
@@ -415,7 +420,8 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\IfExistskomafont}[1]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
@@ -513,15 +519,19 @@
\newcommand*{\usesizeofkomafont}[1]{%
\begingroup
\scr@prepareforkomafont
+ \def\selectfont{%
+ \global\let\g@scr@f@size\f@size
+ \global\let\g@scr@f@baselineskip\f@baselineskip
+ \global\let\g@scr@f@linespread\f@linespread
+ }%
+ \selectfont
\sbox\@tempboxa{%
- \usekomafont{#1}{%
- \xdef\g@scr@usefont{%
- \noexpand\fontsize{\f@size}{\f@baselineskip}\noexpand\selectfont
- }%
- }%
+ \usekomafont{#1}{\relax}%
}%
\endgroup
- \g@scr@usefont
+ \linespread{\g@scr@f@linespread}%
+ \fontsize{\g@scr@f@size}{\g@scr@f@baselineskip}%
+ \selectfont
}
\newcommand*{\usefamilyofkomafont}{\use@ofkomafont{family}}
\newcommand*{\useseriesofkomafont}{\use@ofkomafont{series}}
@@ -530,53 +540,59 @@
\newcommand*{\usefontofkomafont}[1]{%
\begingroup
\scr@prepareforkomafont
+ \def\selectfont{%
+ \global\let\g@scr@f@encoding\f@encoding
+ \global\let\g@scr@f@family\f@family
+ \global\let\g@scr@f@series\f@series
+ \global\let\g@scr@f@shape\f@shape
+ \global\let\g@scr@f@size\f@size
+ \global\let\g@scr@f@baselineskip\f@baselineskip
+ \global\let\g@scr@f@linespread\f@linespread
+ }%
+ \selectfont
\sbox\@tempboxa{%
- \usekomafont{#1}{%
- \xdef\g@scr@usefont{%
- \noexpand\fontsize{\f@size}{\f@baselineskip}%
- \noexpand\usefont{\f@encoding}{\f@family}{\f@series}{\f@shape}%
- }%
- }%
+ \usekomafont{#1}{\relax}%
}%
\endgroup
- \g@scr@usefont
+ \linespread{\g@scr@f@linespread}%
+ \fontsize{\g@scr@f@size}{\g@scr@f@baselineskip}%
+ \usefont{\g@scr@f@encoding}{\g@scr@f@family}{\g@scr@f@series}{\g@scr@f@shape}%
}
\newcommand*{\use@ofkomafont}[2]{%
\begingroup
\scr@prepareforkomafont
+ \def\selectfont{%
+ \global\expandafter\let\csname g@scr@f@#1\expandafter\endcsname
+ \csname f@#1\endcsname
+ }%
+ \selectfont
\sbox\@tempboxa{%
- \usekomafont{#2}{%
- \xdef\g@scr@usefont{%
- \expandafter\noexpand
- \csname font#1\endcsname{\csname f@#1\endcsname}\noexpand\selectfont
- }%
- }%
+ \usekomafont{#2}{\relax}%
}%
\endgroup
- \g@scr@usefont
-}
-\newcommand*{\g@scr@usefont}{%
- \PackageError{scrkbase}{%
- undefined usage of \string\g@scr@usefont
- }{%
- \string\g@scr@usefont\space is an internal macro of KOMA-Script and
- should\MessageBreak
- not be used this way.\MessageBreak
- This may be an internal error of KOMA-Script, a mistake of a package
- author,\MessageBreak
- or a mistake of the user.%
- }%
-}
+ \@nameuse{font#1}{\csname g@scr@f@#1\endcsname}%
+ \selectfont
+}
+\newcommand*{\g@scr@f@encoding}{}\let\g@scr@f@encoding\f@encoding
+\newcommand*{\g@scr@f@family}{}\let\g@scr@f@family\f@family
+\newcommand*{\g@scr@f@series}{}\let\g@scr@f@series\f@series
+\newcommand*{\g@scr@f@shape}{}\let\g@scr@f@shape\f@shape
+\newcommand*{\g@scr@f@size}{}\let\g@scr@f@size\f@size
+\newcommand*{\g@scr@f@baselineskip}{}\let\g@scr@f@baselineskip\f@baselineskip
+\newcommand*{\g@scr@f@linespread}{}\let\g@scr@f@linespread\f@linespread
\newcommand*{\scr@komafontrelaxlist}{%
\do\normalcolor
- \do\uppercase \do\lowercase \do\MakeUppercase \do\MakeLowercase
}
\newcommand*{\scr@komafontgobblelist}{%
\do\color
}
+\newcommand*{\scr@komafontonearglist}{%
+ \do\MakeUppercase \do\MakeLowercase
+}
\newcommand*{\scr@prepareforkomafont}{%
\long\def\do##1{\let##1\relax}\scr@komafontrelaxlist
\long\def\do##1{\let##1\@gobble}\scr@komafontgobblelist
+ \long\def\do##1{\let##1\@firstofone}\scr@komafontonearglist
}
\newcommand*{\addtokomafontrelaxlist}[1]{%
\l@addto@macro\scr@komafontrelaxlist{\do#1}%
@@ -584,6 +600,9 @@
\newcommand*{\addtokomafontgobblelist}[1]{%
\l@addto@macro\scr@komafontgobblelist{\do#1}%
}
+\newcommand*{\addtokomafontonearglist}[1]{%
+ \l@addto@macro\scr@komafontonearglist{\do#1}%
+}
\newcommand*{\newkomafont}[3][\relax]{%
\expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
\expandafter\expandafter\expandafter\newcommand
@@ -600,7 +619,7 @@
#2%
}%
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
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 341c33f9d38..b703bc78cb3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -14,7 +14,7 @@
%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2013-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2013-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,15 +44,17 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (identify)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 2017/02/08 v0.1.2583 KOMA-Script
+ 2017/08/11 v0.1.2670 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -63,7 +65,8 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (init)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
\scr@ifundefinedorrelax{savepos}{%
@@ -95,7 +98,8 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -218,6 +222,7 @@
\FamilyKeyStateProcessed
\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}%
}
+\KOMA@ifkey{singlespacing}{@ps@singlespacing}
\KOMA@key{deactivatepagestylelayers}[true]{%
\KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}%
\KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
@@ -236,11 +241,13 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (options)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: 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 2562 2016-12-07 09:15:31Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
@@ -311,7 +318,8 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (body)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
\@ifundefined{slnc@#2@box}{%
@@ -659,7 +667,9 @@
}%
\long\def\slnc@note##1##2##3##4{%
\let\PackageInfo\PackageWarning
+ \typeout{TRACE (slnc): ##2<=\theslncpage?}%
\ifnum ##2>\value{slncpage}\relax
+ \typeout{TRACE (slnc): no: unprocess note}%
\expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{%
\slnc@note{##1}{##2}{##3}{##4}%
}%
@@ -932,6 +942,13 @@
\edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
\edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
}%
+ \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label},
+ abspage=\the\value{slncpage}, until page=\slnc@cmp@value,
+ process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}%
+ \ifvmode\ifdim \pagetotal<\topskip
+ \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}%
+ \typeout{TRACE (slnc): until page=\slnc@cmp@value}%
+ \fi\fi
\ifnum \reserved@a=\z@
\ifvmode
\ifdim \pagetotal<\topskip
@@ -968,6 +985,7 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
+ \typeout{TRACE (slnc): add \string\clearpage}%
\clearpage
\expandafter\ifcase \slnc@voidtest{#1}%
\begingroup
@@ -1045,7 +1063,14 @@
\edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
\edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
}%
- \ifcase \reserved@a\relax
+ \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label},
+ abspage=\theslncpage, until page=\slnc@cmp@value,
+ process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}%
+ \ifvmode\ifdim \pagetotal<\topskip
+ \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}%
+ \typeout{TRACE (slnc): until page=\slnc@cmp@value}%
+ \fi\fi
+ \ifnum \reserved@a=\z@
\ifvmode
\ifdim \pagetotal<\topskip
\else
@@ -1082,6 +1107,7 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
+ \typeout{TRACE (slnc): add \string\clearpage}%
\clearpage
\begingroup
\def\@elt##1{+\slnc@voidtest{##1}}%
@@ -1264,13 +1290,15 @@
\@esphack
}%
}
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: final)
\DeclareNoteColumn{marginpar}
\let\reserved@a\clearpage
\def\clearpage{%
\ifslnc@autoclearnotecolumns\clearnotecolumns\relax\fi
}%
\expandafter\g@addto@macro\expandafter\clearpage\expandafter{\reserved@a}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
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 a8fc3f2fae7..b8d1ac3b452 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,15 +43,17 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify)
+%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -62,7 +64,8 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
+%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% (run: init)
\AtEndOfPackage{%
\sls@auto@pagestyleset%
}
@@ -78,7 +81,8 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: options)
\KOMA@key{markcase}{%
\scrlayer@AtEndOfPackage{%
\begingroup
@@ -203,6 +207,7 @@
\FamilyKeyStateProcessed
\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}%
}
+\KOMA@ifkey{singlespacing}{@ps@singlespacing}
\KOMA@key{deactivatepagestylelayers}[true]{%
\KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}%
\KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
@@ -221,7 +226,8 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (options)
+%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% (run: options)
\KOMA@key{headwidth}{%
\begingroup
\sls@split@at@iicolons#1:::\@nil
@@ -706,7 +712,8 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}%
\scrlayer@AddCsToInterface{sls@leavevmode@linetrue}
\scrlayer@AddCsToInterface{sls@leavevmode@linefalse}
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
@@ -777,7 +784,8 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (body)
+%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% (run: body)
\scrlayerAddToInterface\setheadwidth{%
\newcommand*{\setheadwidth}[2][]{%
\KOMAoptions{headwidth=#2:#1}%
@@ -901,26 +909,62 @@
\scrlayer@AddCsToInterface{scr@fnt@footbotline}%
}{}
\AtBeginDocument{%
- \ifdim \headheight <\baselineskip
+ \ifdim \headheight
+ <\if@ps@singlespacing\f@baselineskip\else\baselineskip\fi\relax
\PackageWarningNoLine{scrlayer-scrpage}{Very small head height
detected!\MessageBreak
Using scrlayer-scrpage the head height\MessageBreak
should be at least \string\baselineskip, which is\MessageBreak
- \the\baselineskip\space currently.\MessageBreak
+ \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi\space
+ currently.\MessageBreak
But head height is currently
\the\headheight\space only.\MessageBreak
You may use\MessageBreak
\@ifpackageloaded{geometry}{%
- geometry option `head=\the\baselineskip'%
+ geometry option
+ `head=\if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi'%
}{%
\@ifpackageloaded{typearea}{%
- typearea option `headheight=\the\baselineskip'%
+ typearea option `headheight=%
+ \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi'%
}{%
- \string\setlength{\string\headheight}{\the\baselineskip}%
+ \string\setlength{\string\headheight}%
+ {\if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi}%
}%
}\MessageBreak
+ \if@ps@singlespacing\else\ifdim \headheight<\f@baselineskip\else
+ or load package `scrlayer-scrpage' with\MessageBreak
+ option `singlespacing=true'\MessageBreak
+ \fi\fi
to avoid this warning%
}%
+ \else
+ \ifdim \footheight
+ <\if@ps@singlespacing\f@baselineskip\else\baselineskip\fi\relax
+ \PackageWarningNoLine{scrlayer-scrpage}{Very small foot height
+ detected!\MessageBreak
+ Using scrlayer-scrpage the foot height\MessageBreak
+ should be at least \string\baselineskip, which is\MessageBreak
+ \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi\space
+ currently.\MessageBreak
+ But foot height is currently
+ \the\footheight\space only.\MessageBreak
+ You may use\MessageBreak
+ \@ifpackageloaded{typearea}{%
+ typearea option `footheight=%
+ \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi'%
+ }{%
+ \string\setlength{\string\footheight}%
+ {\if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi}%
+ }%
+ \MessageBreak
+ \if@ps@singlespacing\else\ifdim \footheight<\f@baselineskip\else
+ or load package `scrlayer-scrpage' with\MessageBreak
+ option `singlespacing=true'\MessageBreak
+ \fi\fi
+ to avoid this warning%
+ }%
+ \fi
\fi
}
\scrlayerAddToInterface\defpagestyle{%
@@ -1546,48 +1590,48 @@
\newcommand*{\sls@def@pair@page@style@member}[1]{%
\defpagestyle{#1}{%
{%
- \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright
\strut\@nameuse{sls@ps@#1@even@left@head}\strut}}%
\parbox{\sls@headwidth}{\centering
\strut\@nameuse{sls@ps@#1@even@middle@head}\strut}%
- \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft
\strut\@nameuse{sls@ps@#1@even@right@head}\strut}}%
}{%
- \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright
\strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}%
\parbox{\sls@headwidth}{\centering
\strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}%
- \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft
\strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}%
}{%
- \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright
\strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}%
\parbox{\sls@headwidth}{\centering
\strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}%
- \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft
\strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}%
}%
}{%
{%
- \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright
\strut\@nameuse{sls@ps@#1@even@left@foot}\strut}}%
\parbox{\sls@footwidth}{\centering
\strut\@nameuse{sls@ps@#1@even@middle@foot}\strut}%
- \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft
\strut\@nameuse{sls@ps@#1@even@right@foot}\strut}}%
}{%
- \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright
\strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}%
\parbox{\sls@footwidth}{\centering
\strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}%
- \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft
\strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}%
}{%
- \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright
\strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}%
\parbox{\sls@footwidth}{\centering
\strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}%
- \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft
\strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}%
}%
}%
@@ -1867,7 +1911,7 @@
\scrlayerAddCsToInterface{ps@plain.useheadings}{%
\@namedef{ps@plain.useheadings}{\@nameuse{ps@plain.scrheadings}}%
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index 9ad1eee2b26..a0edae04e4c 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,15 +41,17 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (identify)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: init)
\RequirePackage{scrkbase}[2013/03/05]
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -113,7 +115,8 @@
\setlength{\footheight}{\baselineskip}
\fi
}
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -273,11 +276,13 @@
}
\newcommand*{\@ps@foregroundhook}{}
\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{}
+\KOMA@ifkey{singlespacing}{@ps@singlespacing}
\KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
\newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty}
@@ -1116,7 +1121,7 @@
\if t\layervalign -\ht\strutbox
\else
\if b\layervalign -\dimexpr\layerheight-\dp\strutbox\relax
- \else -.5\dimexpr \layerheight+\ht\strutbox-\dp\strutbox\relax
+ \else -.5\dimexpr\layerheight+\ht\strutbox-\dp\strutbox\relax
\fi
\fi})
\setlength{\unitlength}{1mm}%
@@ -1271,6 +1276,7 @@
\renewcommand*{\@oddhead}{%
\begingroup
\let\headmark\rightmark
+ \if@ps@singlespacing\linespread{1}\selectfont\fi
\@nameuse{@ps@@everystyle@@hook}%
\@nameuse{@ps@#1@hook}%
\@nameuse{@ps@@everystyle@@\if@twoside two\else one\fi sidehook}%
@@ -1301,6 +1307,7 @@
\renewcommand*{\@evenhead}{%
\begingroup
\let\headmark\leftmark
+ \if@ps@singlespacing\linespread{1}\selectfont\fi
\@nameuse{@ps@@everystyle@@hook}%
\@nameuse{@ps@#1@hook}%
\@nameuse{@ps@@everystyle@@twosidehook}%
@@ -1331,6 +1338,7 @@
\renewcommand*{\@oddfoot}{%
\begingroup
\let\headmark\rightmark
+ \if@ps@singlespacing\linespread{1}\selectfont\fi
\@nameuse{@ps@@everystyle@@hook}%
\@nameuse{@ps@#1@hook}%
\@nameuse{@ps@@everystyle@@\if@twoside two\else one\fi sidehook}%
@@ -1365,6 +1373,7 @@
\renewcommand*{\@evenfoot}{%
\begingroup
\let\headmark\leftmark
+ \if@ps@singlespacing\linespread{1}\selectfont\fi
\@nameuse{@ps@@everystyle@@hook}%
\@nameuse{@ps@#1@hook}%
\@nameuse{@ps@@everystyle@@twosidehook}%
@@ -1466,10 +1475,10 @@
}
\def\scr@@layerbox(#1,#2)(#3,#4)[#5]#6{%
\begingroup
- \edef\layerxoffset{#1}%
- \edef\layeryoffset{#2}%
- \edef\layerwidth{#3}%
- \edef\layerheight{#4}%
+ \protected@edef\layerxoffset{\noexpand\dimexpr #1\relax}%
+ \protected@edef\layeryoffset{\noexpand\dimexpr #2\relax}%
+ \protected@edef\layerwidth{\noexpand\dimexpr #3\relax}%
+ \protected@edef\layerheight{\noexpand\dimexpr #4\relax}%
\def\layervalign{t}%
\def\layerhalign{l}%
\edef\reserved@b{#5}%
@@ -1502,9 +1511,10 @@
\parbox[t][\z@][t]{\z@}{%
\vskip\layeryoffset
\if b\layervalign\vskip-\layerheight\fi
- \if c\layervalign\vskip-.5\dimexpr\layerheight\relax\fi
- \makebox[\z@][l]{%
+ \if c\layervalign\vskip-.5\layerheight\fi
+ \makebox[\z@][\IfRTL{r}{l}]{%
\hskip\layerxoffset
+ \IfRTL{\hskip\layerwidth}{}%
\makebox[\z@][\layerhalign]{%
\parbox[\layervalign][\layerheight][\layervalign]{\layerwidth}{%
\vskip\z@\strut{%
@@ -1537,8 +1547,8 @@
\long\def\putLR##1{\put(\LenToUnit{\layerwidth},0){##1}}%
\long\def\putUR##1{\put(\LenToUnit{\layerwidth},%
\LenToUnit{\layerheight}){##1}}%
- \long\def\putC##1{\put(\LenToUnit{.5\dimexpr\layerwidth\relax},%
- \LenToUnit{.5\dimexpr\layerheight\relax}){##1}}%
+ \long\def\putC##1{\put(\LenToUnit{.5\layerwidth},%
+ \LenToUnit{.5\layerheight}){##1}}%
#1%
\end{picture}%
}
@@ -2162,10 +2172,11 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (final)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index f70162b37ca..fc50677cf69 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -30,7 +30,7 @@
%% scrkernel-circularletters.dtx (with options: `package,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -60,9 +60,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -84,18 +84,21 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
letter package extending any KOMA-Script class%
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: init)
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
Cannot detect any KOMA-Script class.\MessageBreak
@@ -141,7 +144,8 @@
\endgroup
\let\do@renewforletter@list\@empty
}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
\@namedef{scr@v@first}{0}
@@ -208,99 +212,14 @@
\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
+\@namedef{scr@v@3.24}{16}
\@namedef{scr@v@last}{16}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init)
-\providecommand*{\PaperNameToSize}[2][warning]{%
- \ifstr{#2}{letter}{%
- \setlength\paperheight{11in}%
- \setlength\paperwidth {8.5in}%
- }{%
- \ifstr{#2}{legal}{%
- \setlength\paperheight{14in}%
- \setlength\paperwidth {8.5in}%
- }{%
- \ifstr{#2}{executive}{%
- \setlength\paperheight{10.5in}%
- \setlength\paperwidth {7.25in}%
- }{%
- \ifstr{#2}{}{%
- \ISO@PaperNameToSize[#1]{}{}\@nil
- }{%
- \edef\reserved@a{\noexpand\ISO@PaperNameToSize[#1]#2 \noexpand\@nil}%
- \reserved@a
- }%
- }%
- }%
- }%
-}
-\scr@ifundefinedorrelax{ISO@PaperNameToSize}{%
- \def\ISO@PaperNameToSize[#1]#2#3\@nil{%
- \lowercase{\edef\reserved@a{#2}}%
- \@tempswafalse
- \if \reserved@a a%
- \ifnumber{#3}{%
- \setlength{\paperwidth}{841sp}%
- \setlength{\paperheight}{1189sp}%
- \@tempswatrue
- }{}%
- \else
- \if \reserved@a b%
- \ifnumber{#3}{%
- \setlength{\paperwidth}{1000sp}%
- \setlength{\paperheight}{1414sp}%
- \@tempswatrue
- }{}%
- \else
- \if \reserved@a c%
- \ifnumber{#3}{%
- \setlength{\paperwidth}{917sp}%
- \setlength{\paperheight}{1297sp}%
- \@tempswatrue
- }{}%
- \else
- \if \reserved@a d%
- \ifnumber{#3}{%
- \setlength{\paperwidth}{771sp}%
- \setlength{\paperheight}{1090sp}%
- \@tempswatrue
- }{}%
- \fi
- \fi
- \fi
- \fi
- \if@tempswa
- \@tempcnta=#3\relax
- \@whilenum\@tempcnta>\z@
- \do{\setlength{\@tempdima}{\paperwidth}%
- \setlength{\paperwidth}{.5\paperheight}%
- \setlength{\paperheight}{\@tempdima}%
- \advance\@tempcnta by\m@ne
- }%
- \multiply\paperwidth by186468
- \multiply\paperheight by186468
- \else
- \scr@ifundefinedorrelax{scr@UnknownPaperSize@#1}{%
- \scr@UnknownPaperSize@error{#2#3}%
- }{%
- \@nameuse{scr@UnknownPaperSize@#1}{#2#3}%
- }%
- \fi
- }%
-}{}
-\providecommand*{\ProvideUnknownPaperSizeError}[1]{%
- \expandafter\providecommand\expandafter*%
- \csname scr@UnknownPaperSize@#1\endcsname[1]%
-}
-\ProvideUnknownPaperSizeError{error}{%
- \PackageError{%
- scrletter%
- }{Unknown paper size #1}{%
- \string\paperwidth\space and \string\paperheight\space stay unchanged,
- because of unknown paper size.%
- }%
-}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: init)
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter
@@ -317,7 +236,8 @@
}
\AtEndOfPackage
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: option)
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
@@ -332,11 +252,16 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
@@ -855,12 +780,17 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{symbolicnames}{false}%
-%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -1032,7 +962,8 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: body)
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\PackageInfo{scrletter%
@@ -1058,49 +989,69 @@
}%
}{}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\yourrefname{Your ref.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\yourrefname{Your ref.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\yourmailname{Your letter of}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\yourmailname{Your letter of}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\myrefname{Our ref.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\myrefname{Our ref.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\customername{Customer no.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\customername{Customer no.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\invoicename{Invoice no.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\invoicename{Invoice no.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\subjectname{Subject}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\subjectname{Subject}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\ccname{cc}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\ccname{cc}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\enclname{encl}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\enclname{encl}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\headtoname{To}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\headtoname{To}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\headfromname{From}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\headfromname{From}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\datename{Date}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\datename{Date}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\pagename{Page}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\pagename{Page}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\phonename{Phone}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\phonename{Phone}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\mobilephonename{Mobile phone}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\mobilephonename{Mobile phone}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\faxname{Fax}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\faxname{Fax}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\emailname{Email}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\emailname{Email}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\wwwname{Url}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\wwwname{Url}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\bankname{Bank account}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\bankname{Bank account}%
\g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
\g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
\g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{newzealand}{\number\day/\number\month/\number\year}%
- \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
\g@addnumerical@date{UKenglish}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{ukenglish}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
+ \g@addnumerical@date{usenglish}{\number\month/\number\day/\number\year}%
\providecaptionname{german,ngerman,austrian,naustrian,%
swissgerman,nswissgerman}\yourrefname{Ihr Zeichen}%
\providecaptionname{german,ngerman,austrian,naustrian,%
@@ -1430,11 +1381,21 @@
\@nameuse{extrasUKenglish}%
\@nameuse{dateUKenglish}%
\fi\fi
+ \ifx\l@ukenglish\undefined\else\ifnum\language=\l@ukenglish
+ \@nameuse{captionsukenglish}%
+ \@nameuse{extrasukenglish}%
+ \@nameuse{dateukenglish}%
+ \fi\fi
\ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish
\@nameuse{captionsUSenglish}%
\@nameuse{extrasUSenglish}%
\@nameuse{dateUSenglish}%
\fi\fi
+ \ifx\l@usenglish\undefined\else\ifnum\language=\l@usenglish
+ \@nameuse{captionsusenglish}%
+ \@nameuse{extrasusenglish}%
+ \@nameuse{dateusenglish}%
+ \fi\fi
\ifx\l@austrian\undefined\else\ifnum\language=\l@austrian
\@nameuse{captionsaustrian}%
\@nameuse{extrasaustrian}%
@@ -1560,19 +1521,20 @@
}{%
used language is `\languagename'.\MessageBreak
Supported languages are: `english', `UKenglish',\MessageBreak
- `british', `american', `USenglish', `australian`,\MessageBreak
- `canadian', `newzealand',\MessageBreak
+ `ukenglish', `british', `american', `USenglish',\MessageBreak
+ `usenglish', `australian`,`canadian', `newzealand',\MessageBreak
`german', `ngerman', `austrian', `naustrian',\MessageBreak
`swissgerman', `nswissgermsn',\MessageBreak
`acadian', `canadien', `francais', `french', \MessageBreak
`dutch', `italian', `spanish', `polish',\MessageBreak
`croatian', `finnish', `norsk', `swedish',\MessageBreak
- `czech'. `slovak'
+ `czech', `slovak'%
}%
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
@@ -1698,7 +1660,8 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -1753,7 +1716,8 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{%
\letterpagemark
}{%
@@ -1784,7 +1748,8 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newkomavar{firsthead}
\setkomavar{firsthead}{%
\parbox[b]{\useplength{firstheadwidth}}%
@@ -3048,7 +3013,8 @@
}%
\scr@saved@date{#1}%
}
-%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
\newcommand*{\adrchar}{\addrchar}
@@ -3059,7 +3025,7 @@
\expandafter\def\csname #9\endcsname{#2 #1\\#3}%
\fi \fi}
\newcommand*{\addrchar}[1]{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index b9bcd9ada39..6797b1835b2 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -37,15 +37,13 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlfile.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\ProvidesPackage{scrlfile}[%
- 2017/04/13 v3.23 KOMA-Script
- package (loading files)]
-\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
- ^^J\@spaces\@spaces\@spaces\@spaces\space\space
- Copyright (C) Markus Kohm^^J}
+ 2017/09/07 v3.24 KOMA-Script
+ package
+ (loading files)]
\ExecuteOptions{}
\ProcessOptions\relax
\CheckCommand{\InputIfFileExists}[2]{%
@@ -484,7 +482,7 @@
\endgroup
\if@nobreak\ifvmode\nobreak\fi\fi
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 791aeab5d25..7ffb45cfa26 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -15,7 +15,7 @@
%% scrkernel-fonts.dtx (with options: `class,letter,option')
%% scrkernel-variables.dtx (with options: `class,letter,option')
%% scrkernel-pseudolengths.dtx (with options: `class,letter,option')
-%% scrkernel-typearea.dtx (with options: `class,letter,option')
+%% scrkernel-typearea.dtx (with options: `class,letter,options')
%% scrkernel-paragraphs.dtx (with options: `class,letter,option')
%% scrkernel-pagestyles.dtx (with options: `class,letter,option')
%% scrkernel-floats.dtx (with options: `class,letter,option')
@@ -41,7 +41,7 @@
%% scrkernel-circularletters.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -71,9 +71,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -110,11 +110,14 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
document class (\ClassName)%
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
\@namedef{scr@v@first}{0}
@@ -181,9 +184,12 @@
\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
+\@namedef{scr@v@3.24}{16}
\@namedef{scr@v@last}{16}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
\def\scr@compatibility{0}%
@@ -232,7 +238,8 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -256,7 +263,8 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter
@@ -273,7 +281,8 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: option)
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
@@ -288,7 +297,8 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*\@ptsize{%
12%
}
@@ -373,9 +383,59 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option)
+%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: options)
+\KOMA@key{twoside}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @twoside%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \raggedbottom
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
+}
+\KOMAExecuteOptions{twoside=false}
+\KOMA@DeclareStandardOption%
+ {oneside}{twoside=false}
+\KOMA@key{twocolumn}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi}%
+ \fi
+}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \raggedbottom
+ \fi
+}
+\KOMAExecuteOptions{twocolumn=false}
+\KOMA@DeclareStandardOption%
+ {onecolumn}{twocolumn=false}
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -433,58 +493,11 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{twoside}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
- \ifstr{#1}{semi}{%
- \@twosidetrue
- \FamilyKeyStateProcessed
- }{%
- \def\FamilyElseValue{, `semi'}%
- \KOMA@set@ifkey{twoside}{%
- @twoside%
- }{#1}%
- }%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \expandafter\ifnum\scr@v@is@ge{3.17}%
- \raggedbottom
- \fi
- \KOMA@kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
- \fi
-}
-\KOMAExecuteOptions{twoside=false}
-\KOMA@DeclareStandardOption%
- {oneside}{twoside=false}
-\KOMA@key{twocolumn}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
- \if@atdocument\expandafter\@firstofone
- \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
- {\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi}%
- \fi
-}
-\AtEndOfClass{%
- \expandafter\ifnum\scr@v@is@lt{3.17}%
- \raggedbottom
- \fi
-}
-\KOMAExecuteOptions{twocolumn=false}
-\KOMA@DeclareStandardOption%
- {onecolumn}{twocolumn=false}
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: option
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -649,7 +662,8 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
@@ -753,8 +767,10 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -824,8 +840,10 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
@@ -1374,13 +1392,16 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{symbolicnames}{false}%
-%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1392,7 +1413,8 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -1866,7 +1888,8 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: body)
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
@@ -1928,15 +1951,24 @@
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
\newcommand*{\scr@package@not@recommended}[2]{%
- \BeforePackage{#1}{%
- \ClassWarning{\KOMAClassName}{%
- Usage of package `#1' together\MessageBreak
- with a KOMA-Script class is not recommended.\MessageBreak
- \if\relax\detokenize{#2}\relax\else
- I'd suggest to use #2.\MessageBreak
- \fi
- Nevertheless, using requested\MessageBreak
- package `#1'%
+ \scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
+ \@firstofone
+ }{%
+ \edef\reserved@a{%
+ \noexpand\in@{#1}{\class@shoulddisablepackagewarning@list}}%
+ \reserved@a
+ \ifin@\expandafter\@gobble\else\expandafter\@firstofone\fi
+ }{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
}%
}%
}%
@@ -1949,7 +1981,13 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
- package `scrlayer-scrpage'}
+ package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
+ they support KOMA-Script classes.\MessageBreak
+ With `fancyhdr' several features of class `\KOMAClassName'\MessageBreak
+ like options `headsepline', `footsepline' or command\MessageBreak
+ `\string\MakeMarkcase' and the commands `\string\setkomafont' and\MessageBreak
+ `\string\addtokomafont' for the page style elements need\MessageBreak
+ explicite user intervention to work}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
@@ -1959,7 +1997,8 @@
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage'}
\scr@package@not@recommended{minitoc}{}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -2133,7 +2172,8 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: body)
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\ClassInfo{scrlttr2%
@@ -2159,49 +2199,69 @@
}%
}{}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\yourrefname{Your ref.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\yourrefname{Your ref.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\yourmailname{Your letter of}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\yourmailname{Your letter of}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\myrefname{Our ref.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\myrefname{Our ref.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\customername{Customer no.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\customername{Customer no.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\invoicename{Invoice no.}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\invoicename{Invoice no.}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\subjectname{Subject}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\subjectname{Subject}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\ccname{cc}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\ccname{cc}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\enclname{encl}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\enclname{encl}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\headtoname{To}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\headtoname{To}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\headfromname{From}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\headfromname{From}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\datename{Date}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\datename{Date}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\pagename{Page}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\pagename{Page}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\phonename{Phone}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\phonename{Phone}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\mobilephonename{Mobile phone}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\mobilephonename{Mobile phone}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\faxname{Fax}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\faxname{Fax}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\emailname{Email}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\emailname{Email}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\wwwname{Url}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\wwwname{Url}%
\providecaptionname{american,australian,british,canadian,%
- english,newzealand,UKenglish,USenglish}\bankname{Bank account}%
+ english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\bankname{Bank account}%
\g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
\g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
\g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{newzealand}{\number\day/\number\month/\number\year}%
- \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
\g@addnumerical@date{UKenglish}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{ukenglish}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
+ \g@addnumerical@date{usenglish}{\number\month/\number\day/\number\year}%
\providecaptionname{german,ngerman,austrian,naustrian,%
swissgerman,nswissgerman}\yourrefname{Ihr Zeichen}%
\providecaptionname{german,ngerman,austrian,naustrian,%
@@ -2531,11 +2591,21 @@
\@nameuse{extrasUKenglish}%
\@nameuse{dateUKenglish}%
\fi\fi
+ \ifx\l@ukenglish\undefined\else\ifnum\language=\l@ukenglish
+ \@nameuse{captionsukenglish}%
+ \@nameuse{extrasukenglish}%
+ \@nameuse{dateukenglish}%
+ \fi\fi
\ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish
\@nameuse{captionsUSenglish}%
\@nameuse{extrasUSenglish}%
\@nameuse{dateUSenglish}%
\fi\fi
+ \ifx\l@usenglish\undefined\else\ifnum\language=\l@usenglish
+ \@nameuse{captionsusenglish}%
+ \@nameuse{extrasusenglish}%
+ \@nameuse{dateusenglish}%
+ \fi\fi
\ifx\l@austrian\undefined\else\ifnum\language=\l@austrian
\@nameuse{captionsaustrian}%
\@nameuse{extrasaustrian}%
@@ -2661,19 +2731,20 @@
}{%
used language is `\languagename'.\MessageBreak
Supported languages are: `english', `UKenglish',\MessageBreak
- `british', `american', `USenglish', `australian`,\MessageBreak
- `canadian', `newzealand',\MessageBreak
+ `ukenglish', `british', `american', `USenglish',\MessageBreak
+ `usenglish', `australian`,`canadian', `newzealand',\MessageBreak
`german', `ngerman', `austrian', `naustrian',\MessageBreak
`swissgerman', `nswissgermsn',\MessageBreak
`acadian', `canadien', `francais', `french', \MessageBreak
`dutch', `italian', `spanish', `polish',\MessageBreak
`croatian', `finnish', `norsk', `swedish',\MessageBreak
- `czech'. `slovak'
+ `czech', `slovak'%
}%
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
@@ -2799,7 +2870,8 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -2854,7 +2926,8 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2865,8 +2938,8 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: body
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
@@ -2992,7 +3065,8 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3088,11 +3162,13 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -3249,7 +3325,8 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
\setlength{\leftmarginiii}{1.87em}
@@ -3399,7 +3476,8 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -4725,7 +4803,8 @@
}%
\scr@saved@date{#1}%
}
-%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
\newcommand*{\adrchar}{\addrchar}
@@ -4736,7 +4815,7 @@
\expandafter\def\csname #9\endcsname{#2 #1\\#3}%
\fi \fi}
\newcommand*{\addrchar}[1]{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 07b4a16359e..a25ea958470 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% scrpage.dtx (with options: `scrpage,v2')
+%% scrpage.dtx (with options: `scrpage')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -37,13 +37,19 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrpage.dtx 2428 2016-04-12 10:31:07Z kohm $
+%%% From File: $Id: scrpage.dtx 2640 2017-05-08 09:36:55Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2017/04/13 v3.23 KOMA-Script
- package (page head and foot)]
+ 2017/09/07 v3.24 KOMA-Script
+ package
+ (page head and foot)]
+\PackageWarning{scrpage2}{usage of obsolete package!\MessageBreak
+ Package `scrpage2' is obsolete.\MessageBreak
+ You should not longer use package `scrpage2'.\MessageBreak
+ You should replace usage of package `scrpage2'\MessageBreak
+ by `scrlayer-scrpage'}
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
\ifin@
@@ -1073,7 +1079,7 @@
into the preamble of your document.\MessageBreak
A better solution would be to use typearea package}%
\fi\fi}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index efa6016aded..26b6b68c5bc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -15,7 +15,7 @@
%% scrkernel-miscellaneous.dtx (with options: `class,report,option')
%% scrkernel-language.dtx (with options: `class,report,option')
%% scrkernel-fonts.dtx (with options: `class,report,option')
-%% scrkernel-typearea.dtx (with options: `class,report,option')
+%% scrkernel-typearea.dtx (with options: `class,report,options')
%% scrkernel-paragraphs.dtx (with options: `class,report,option')
%% scrkernel-title.dtx (with options: `class,report,option')
%% scrkernel-tocstyle.dtx (with options: `class,report,option')
@@ -51,7 +51,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,report,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -81,9 +81,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -105,7 +105,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -120,13 +120,15 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
document class (\ClassName)%
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{tocbasic}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
@@ -134,9 +136,9 @@
\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrightfalse
@@ -212,7 +214,8 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
\@namedef{scr@v@first}{0}
@@ -279,9 +282,12 @@
\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
+\@namedef{scr@v@3.24}{16}
\@namedef{scr@v@last}{16}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -355,7 +361,8 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -381,8 +388,10 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*\@ptsize{%
11%
}
@@ -467,7 +476,57 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: options)
+\KOMA@key{twoside}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @twoside%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twoside\flushbottom
+ \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
+}
+\KOMAExecuteOptions{twoside=false}
+\KOMA@DeclareStandardOption%
+ {oneside}{twoside=false}
+\KOMA@key{twocolumn}[true]{%
+ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \if@atdocument\expandafter\@firstofone
+ \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
+ {\expandafter\AtEndOfClass}\fi
+ {\expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi}%
+ \fi
+}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+}
+\KOMAExecuteOptions{twocolumn=false}
+\KOMA@DeclareStandardOption%
+ {onecolumn}{twocolumn=false}
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -525,59 +584,10 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{twoside}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
- \ifstr{#1}{semi}{%
- \@twosidetrue
- \FamilyKeyStateProcessed
- }{%
- \def\FamilyElseValue{, `semi'}%
- \KOMA@set@ifkey{twoside}{%
- @twoside%
- }{#1}%
- }%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@twoside\flushbottom
- \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
- \fi
- \KOMA@kav@xreplacevalue{.%
- \KOMAClassFileName
- }{twoside}{#1}%
- \fi
-}
-\KOMAExecuteOptions{twoside=false}
-\KOMA@DeclareStandardOption%
- {oneside}{twoside=false}
-\KOMA@key{twocolumn}[true]{%
- \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.%
- \KOMAClassFileName
- }{twocolumn}{@twocolumn}%
- \if@atdocument\expandafter\@firstofone
- \else\@ifpackageloaded{typearea}{\expandafter\@firstofone}
- {\expandafter\AtEndOfClass}\fi
- {\expandafter\ifnum\scr@v@is@ge{3.17}%
- \if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi}%
- \fi
-}
-\AtEndOfClass{%
- \expandafter\ifnum\scr@v@is@lt{3.17}%
- \if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
- \fi
-}
-\KOMAExecuteOptions{twocolumn=false}
-\KOMA@DeclareStandardOption%
- {onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: option
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -742,7 +752,8 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -776,9 +787,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1040,7 +1051,8 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
@@ -1144,7 +1156,8 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1278,7 +1291,8 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -1348,7 +1362,8 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1612,7 +1627,8 @@
\BeforeTOCHead{\@chaptertolistsfalse}
\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1786,7 +1802,8 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
\expandafter\section
@@ -1869,19 +1886,23 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body)
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2355,12 +2376,14 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% (run: body)
\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 2617 2017-04-03 13:56:55Z kohm $ (body)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2404,8 +2427,8 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
-%%% run: body
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -2533,7 +2556,8 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2874,10 +2898,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2891,7 +2915,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -2911,17 +2935,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -3464,68 +3488,155 @@
}
\newcommand*{\scr@dsc@style@section@neededoptionstest}{%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {section indent}{indent}{0pt}%
+ {\@namedef{scr@\scr@dsc@current @sectionindent}{0pt}}%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before section skip}
- {beforeskip}%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before section skip}{beforeskip}%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after section skip}
- {afterskip}%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after section skip}{afterskip}%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
- }{}%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {font}{font}{\normalsize}%
+ {\newkomafont{\scr@dsc@current}{\normalsize}}%
+ }%
}
\newcommand*{\scr@dsc@style@chapter@neededoptionstest}{%
\scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style}
- {pagestyle}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ {\chapterpagestyle}%
+ {\@namedef{\scr@dsc@current pagestyle}{\chapterpagestyle}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{inner chapter skip}
- {innerskip}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {inner chapter skip}{innerskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {inner chapter skip}{innerskip}%
+ {\scr@chapter@innerskip}%
+ {\@namedef{scr@\scr@dsc@current @innerskip}{\scr@chapter@innerskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before chapter skip}
- {beforeskip}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before chapter skip}{beforeskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {before chapter skip}{beforeskip}%
+ {\scr@chapter@beforeskip}%
+ {\@namedef{scr@\scr@dsc@current @beforeskip}{\scr@chapter@beforeskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after chaper skip}
- {afterskip}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after chaper skip}{afterskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {after chaper skip}{afterskip}%
+ {\scr@chapter@afterskip}%
+ {\@namedef{scr@\scr@dsc@current @afterskip}{\scr@chapter@afterskip}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
- }{}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {font}{font}%
+ {\usekomafont{chapter}}%
+ {\newkomafont{\scr@dsc@current}{\usekomafont{chapter}}}%
+ }%
+ }%
\IfExistskomafont{\scr@dsc@current prefix}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{prefix line font}
- {prefixfont}%
+ \ifstr{\scr@dsc@current}{chapter}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {prefix line font}{prefixfont}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {prefix line font}{prefixfont}%
+ {\usekomafont{chapterprefix}}%
+ {\newkomafont{\scr@dsc@current prefix}{\usekomafont{chapterprefix}}}%
+ }%
}{}%
}
\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
\scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style}
- {pagestyle}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {initial page style}{pagestyle}%
+ {\partpagestyle}%
+ {\@namedef{\scr@dsc@current pagestyle}{\partpagestyle}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{inner part skip}
- {innerskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {inner part skip}{innerskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {inner part skip}{innerskip}%
+ {\scr@part@innerskip}%
+ {\@namedef{scr@\scr@dsc@current @innerskip}{\scr@part@innerskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{before part skip}
- {beforeskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {before part skip}{beforeskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {before part skip}{beforeskip}%
+ {\scr@part@beforeskip}%
+ {\@namedef{scr@\scr@dsc@current @beforeskip}{\scr@part@beforeskip}}%
+ }%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{after part skip}
- {afterskip}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {after part skip}{afterskip}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {after part skip}{afterskip}%
+ {\scr@part@afterskip}%
+ {\@namedef{scr@\scr@dsc@current @afterskip}{\scr@part@afterskip}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}%
+ {\usekomafont{part}}%
+ {\newkomafont{\scr@dsc@current}{\usekomafont{part}}}%
+ }%
}{}%
\IfExistskomafont{\scr@dsc@current prefix}{}{%
- \scr@declaresectioncommanderror{\scr@dsc@current}{number font}
- {prefixfont}%
+ \ifstr{\scr@dsc@current}{part}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}%
+ {number font}{prefixfont}%
+ }{%
+ \scr@declaresectioncommandwarning{\scr@dsc@current}%
+ {number font}{prefixfont}%
+ {\usekomafont{partprefix}}%
+ {\newkomafont{\scr@dsc@current prefix}{\usekomafont{partprefix}}}%
+ }%
}{}%
}
\newif\ifscr@dsc@parametersonly
@@ -3691,13 +3802,14 @@
\RelaxFamilyKey[.dsc]{KOMAarg}{level}%
\RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}%
\begingroup
+ \def\local@endgroup{\endgroup}%
\scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
}{}%
\@nameuse{scr@dsc@style@%
\@nameuse{scr@\scr@dsc@current @style}%
@neededoptionstest}%
- \endgroup
+ \local@endgroup
\@firstofone{%
\@ifundefined{c@#2}{\newcounter{#2}}{}%
\ifx\scr@local@counterwithout\relax
@@ -3778,8 +3890,18 @@
Please use option `#3' to declare the #2.\MessageBreak
If you'll continue, declaration will be ignored%
}%
+ \let\local@endgroup\endgroup
\aftergroup\@gobbletwo
}
+\newcommand*{\scr@declaresectioncommandwarning}[5]{%
+ \ClassInfo{\KOMAClassName}{%
+ #2 of \expandafter\string\csname #1\endcsname\space unknown.\MessageBreak
+ You should use option `#3' if you\MessageBreak
+ do not want to use the default value\MessageBreak
+ `\detokenize{#4}'%
+ }%
+ \l@addto@macro\local@endgroup{#5}%
+}
\newcommand*{\DeclareNewSectionCommand}[2][]{%
\@ifundefined{#2}{%
\DeclareSectionCommand[{#1}]{#2}%
@@ -4755,7 +4877,8 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4845,15 +4968,24 @@
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
\newcommand*{\scr@package@not@recommended}[2]{%
- \BeforePackage{#1}{%
- \ClassWarning{\KOMAClassName}{%
- Usage of package `#1' together\MessageBreak
- with a KOMA-Script class is not recommended.\MessageBreak
- \if\relax\detokenize{#2}\relax\else
- I'd suggest to use #2.\MessageBreak
- \fi
- Nevertheless, using requested\MessageBreak
- package `#1'%
+ \scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
+ \@firstofone
+ }{%
+ \edef\reserved@a{%
+ \noexpand\in@{#1}{\class@shoulddisablepackagewarning@list}}%
+ \reserved@a
+ \ifin@\expandafter\@gobble\else\expandafter\@firstofone\fi
+ }{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
}%
}%
}%
@@ -4866,7 +4998,13 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
- package `scrlayer-scrpage'}
+ package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
+ they support KOMA-Script classes.\MessageBreak
+ With `fancyhdr' several features of class `\KOMAClassName'\MessageBreak
+ like options `headsepline', `footsepline' or command\MessageBreak
+ `\string\MakeMarkcase' and the commands `\string\setkomafont' and\MessageBreak
+ `\string\addtokomafont' for the page style elements need\MessageBreak
+ explicite user intervention to work}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
@@ -5031,7 +5169,8 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -5129,7 +5268,8 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -5823,7 +5963,8 @@
}{%
\end@dblfloat
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -5981,7 +6122,8 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
\ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
@@ -6133,7 +6275,8 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{\ext@table}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -6218,7 +6361,8 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -6266,7 +6410,8 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -6425,7 +6570,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 39bde5bb12b..3cf92f47737 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: 10pt)
\ProvidesFile{%
scrsize10pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +150,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index 4115099f784..a1c3dce27c8 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: 11pt)
+%%% (run: 12pt)
\ProvidesFile{%
scrsize11pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +151,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index 2df24119358..593faa7179f 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
\ProvidesFile{%
scrsize12pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index a26b65d2dae..3ffb75332ed 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +41,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,26 +65,28 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(time of LaTeX run)%
]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
\newif\if@Hxii
\KOMA@ifkey{12h}{@Hxii}
\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
\def\thistime{%
\kernel@ifstar
{\let\@tempif\iffalse\@thistime}
@@ -98,7 +100,7 @@
\the\@tempcnta{#1}\@tempif\ifnum\@tempcntb<10 0\fi\fi\the\@tempcntb%
\endgroup}
\newcommand*{\settime}[1]{\renewcommand*{\@thistime}[1][]{#1}}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
index 7a6ea041b53..228c6995505 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
@@ -7,7 +7,7 @@
%% scrwfile.dtx (with options: `package,trace,scrwfile,identify,option,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2010-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2010-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -37,7 +37,7 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
%%% From File: $Id: scrwfile.dtx 1805 2014-10-13 08:55:20Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
@@ -233,7 +233,7 @@
\iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}%
}%
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
index 233af5170ff..e8662621bc2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,setspace,identify')
%% scrhack.dtx (with options: `hack,setspace,body')
%%
-%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,9 +38,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\ProvidesFile{setspace.hak}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(hacking package
setspace)%
]
-%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $
+%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
\scr@ifexpected{\onehalfspacing}{%
\long\def\onehalfspacing{%
\setstretch{1.25}% default
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 5830a69d488..ef485afa64f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -20,7 +20,7 @@
%% tocbasic.dtx (with options: `package,exit')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -50,26 +50,26 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2017/04/13 v3.23 KOMA-Script
+ 2017/09/07 v3.24 KOMA-Script
package
(handling toc-files)%
]
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: prepare)
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\RequirePackage{scrbase}
\newcommand*{\tb@listoftocs}{}
@@ -977,7 +977,7 @@
}%
}
\newcommand*{\tb@nt@autofloattype}{16}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\newcommand*{\scr@numberline}[1]{%
\numberline@box{%
@@ -1362,10 +1362,10 @@
\expandafter\let\csname scr@dte@#2@init\expandafter\endcsname
\csname scr@dte@#1@init\endcsname
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: style,gobble)
\DeclareTOCEntryStyle{gobble}{}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: style,dottedtocline)
\DeclareTOCEntryStyle{dottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1494,7 +1494,7 @@
\@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}%
{\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: style,undottedtocline)
\DeclareTOCEntryStyle{undottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1650,7 +1650,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: style, largetocline)
\DeclareTOCEntryStyle{largetocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1760,7 +1760,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: style,tocline)
\DeclareTOCEntryStyle{tocline}[{%
\DefineTOCEntryLengthOption{beforeskip}%
@@ -2192,10 +2192,10 @@
\mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
mu$}\hfill
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
-%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: exit)
\AtBeginDocument{%
\@ifundefined{MakeMarkcase}{%
@@ -2206,7 +2206,7 @@
}%
}{}%
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 807a7a86eb6..13ce7adbe4f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -940,7 +940,7 @@
}{%
\PackageInfo{tocstyle}{no tocstyle.cfg found}%
}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 05e7d17c530..f4640a772bf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -9,13 +9,14 @@
%% scrkernel-basics.dtx (with options: `load')
%% scrkernel-compatibility.dtx (with options: `package,typearea,init')
%% scrkernel-typearea.dtx (with options: `package,typearea,init')
-%% scrkernel-typearea.dtx (with options: `package,typearea,option')
%% scrkernel-compatibility.dtx (with options: `package,typearea,option')
-%% scrkernel-typearea.dtx (with options: `package,typearea,body')
+%% scrkernel-typearea.dtx (with options: `package,typearea,options')
%% scrkernel-compatibility.dtx (with options: `package,typearea,body')
+%% scrkernel-typearea.dtx (with options: `package,typearea,body')
+%% scrkernel-typearea.dtx (with options: `package,typearea,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,9 +46,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -69,19 +70,24 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (identify)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2017/04/13 v3.23 KOMA-Script
- package (type area)]
+ 2017/09/07 v3.24 KOMA-Script
+ package
+ (type area)]
+%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -149,8 +155,69 @@
\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
+\@namedef{scr@v@3.24}{16}
\@namedef{scr@v@last}{16}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: init)
+\providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}}
+\providecommand\ta@divlistelse{1}
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: option)
+\KOMA@key{version}[last]{%
+ \scr@ifundefinedorrelax{scr@v@#1}{%
+ \def\scr@compatibility{0}%
+ \PackageWarningNoLine{%
+ typearea%
+ }{%
+ You have set option `version' to value `#1', but\MessageBreak
+ this value of version is not supported.\MessageBreak
+ Because of this, version was set to `first'%
+ }%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ typearea.\scr@pkgextension
+ }{version}{first}%
+ }{%
+ \PackageInfoNoLine{%
+ typearea%
+ }{%
+ Switching compatibility level to `#1'%
+ }%
+ \edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ typearea.\scr@pkgextension
+ }{version}{#1}%
+ }%
+}
+\AtEndOfPackage{%
+ \KOMA@key{version}[]{%
+ \PackageError{%
+ typearea%
+ }{%
+ Option `version' too late%
+ }{%
+ Option `version' may be set only while loading the
+ package.\MessageBreak
+ But you've tried to set it up later.%
+ }%
+ \FamilyKeyStateProcessed
+ }%
+}
+\newcommand*{\scr@ta@v@is@lt}[1]{%
+ \scr@ta@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@gt}[1]{%
+ \scr@ta@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@le}[1]{%
+ \numexpr\scr@ta@compatibility-\@ne <\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@ge}[1]{%
+ \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: options)
\providecommand*{\PaperNameToSize}[2][warning]{%
\ifstr{#2}{letter}{%
\setlength\paperheight{11in}%
@@ -259,268 +326,172 @@
}%
}
\ProvideUnknownPaperSizeError{ignore}{}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option)
-\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
-\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
-\newlength{\ta@bcor}
-\newcount\ta@div
-\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
-\newcommand*{\@@BCOR}{}
-\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
- \ifstr{#1}{}{%
- \ifstr{#3}{BCOR}{%
- \ifdimen{#2}{%
- \KOMA@UseDeprecatedOption{%
- \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}%
- }{\scr@pti@nerr@r}%
- }{\scr@pti@nerr@r}%
- }{\scr@pti@nerr@r}%
-}
-\newcommand*{\@DIV}{\expandafter\@@DIV\CurrentOption DIVDIV\@@DIV}
-\newcommand*{\@@DIV}{}
-\def\@@DIV #1DIV#2DIV#3\@@DIV{%
- \edef\@tempa{#1}\ifx\@tempa\@empty
- \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
- \ifnumber{#2}{%
- \KOMA@UseDeprecatedOption{%
- \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}%
- }{\scr@pti@nerr@r}%
- \else\scr@pti@nerr@r\fi
- \else\@BCOR\fi
-}
-\newcommand{\@headlines}{%
- \expandafter\@@headlines\CurrentOption headlines\@@headlines%
-}
-\newcommand*{\@@headlines}{}
-\def\@@headlines #1headlines#2\@@headlines{
- \edef\@tempa{#2}\edef\@tempb{headlines}\ifx\@tempa\@tempb
- \setlength{\@tempdima}{#1\baselineskip}%
- \def\ta@hh{#1\baselineskip}%
- \else\@DIV\fi
-}
-\newcommand\isopaper[2][a]{%
- \ISO@PaperNameToSize[typearea]#1#2\@nil
- \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
- \scr@setpaperorientation
- \else
- \if@landscape\scr@switchpapersizes\fi
- \fi
-}
-\ProvideUnknownPaperSizeError{typearea}{%
- \PackageError{typearea}{%
- Unknown ISO/DIN-papersize-letter #1%
+\KOMA@DeclareStandardOption[typearea]{a4paper}{paper=a4}
+\KOMA@DeclareStandardOption[typearea]{a5paper}{paper=a5}
+\KOMA@DeclareStandardOption[typearea]{b5paper}{paper=b5}
+\KOMA@DeclareStandardOption[typearea]{letterpaper}{paper=letter}
+\KOMA@DeclareStandardOption[typearea]{legalpaper}{paper=legal}
+\KOMA@DeclareStandardOption[typearea]{executivepaper}{paper=executive}
+\KOMA@DeclareStandardOption[typearea]{landscape}{paper=landscape}
+\KOMA@DeclareStandardOption[typearea]{portrait}{paper=portrait}
+\KOMA@key{paper}{%
+ \ifstr{#1}{seascape}{%
+ \@seascapetrue
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
+ \@landscapetrue
+ \scr@setpaperorientation
+ \else
+ \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}%
}{%
- There are only four defined paper scalings:\MessageBreak
- a = ISO/DIN-A, b = ISO/DIN-B, c = ISO/DIN-C,
- d = ISO/DIN-D\MessageBreak
- Read KOMA-Script-documentation for further information.%
- }%
- \setlength{\paperwidth}{841sp}%
- \setlength{\paperheight}{1189sp}%
-}
-\newcommand*\scr@setpaperorientation{%
- \ifdim\paperheight>\paperwidth
- \if@landscape\scr@switchpapersizes\fi
- \else
- \if@landscape\else\scr@switchpapersizes\fi
- \fi
-}
-\newcommand*\scr@switchpapersizes{%
- \@tempdima\paperwidth\paperwidth\paperheight\paperheight\@tempdima
-}
-\newcommand*{\iso@paper}[1]{\expandafter\iso@@paper#1\@nil}
-\newcommand*{\iso@@paper}{}
-\def\iso@@paper#1#2\@nil{%
- \@tempswafalse
- \if #1a\@tempswatrue
- \else\if #1A\@tempswatrue
- \else\if #1b\@tempswatrue
- \else\if #1B\@tempswatrue
- \else\if #1c\@tempswatrue
- \else\if #1C\@tempswatrue
- \else\if #1d\@tempswatrue
- \else\if #1D\@tempswatrue
- \fi\fi\fi\fi\fi\fi\fi\fi
- \if@tempswa
- \ifnumber{#2}{\isopaper[#1]{#2}}{\@tempswafalse}%
- \fi
-}
-\newcommand*{\x@paper}{%
- \expandafter\x@@paper\CurrentOption paper\x@@paper%
-}
-\newcommand*{\x@@paper}{}
-\def\x@@paper #1#2paper#3\x@@paper{%
- \ifstr{#3}{paper}{%
- \ifnumber{#2}{%
- \ifstr{#1}{a}{%
- \isopaper[a]{#2}%
+ \ifstr{#1}{landscape}{%
+ \@seascapefalse
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
+ \@landscapetrue
+ \scr@setpaperorientation
+ \else
+ \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}%
+ }{%
+ \ifstr{#1}{portrait}{%
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
+ \@landscapefalse
+ \scr@setpaperorientation
+ \else
+ \if@landscape\scr@switchpapersizes\@landscapefalse\fi
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}%
}{%
- \ifstr{#1}{b}{%
- \isopaper[b]{#2}%
+ \ifstr{#1}{letter}{%
+ \if@landscape
+ \setlength\paperheight{8.5in}%
+ \setlength\paperwidth {11in}%
+ \else
+ \setlength\paperheight{11in}%
+ \setlength\paperwidth {8.5in}%
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{letter}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
}{%
- \ifstr{#1}{c}{%
- \isopaper[c]{#2}%
+ \ifstr{#1}{legal}{%
+ \if@landscape
+ \setlength\paperheight{8.5in}%
+ \setlength\paperwidth {14in}%
+ \else
+ \setlength\paperheight{14in}%
+ \setlength\paperwidth {8.5in}%
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{legal}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
}{%
- \ifstr{#1}{d}{%
- \isopaper[d]{#2}%
- }{\scr@pti@nerr@r}%
+ \ifstr{#1}{executive}{%
+ \if@landscape
+ \setlength\paperheight{7.25in}%
+ \setlength\paperwidth {10.5in}%
+ \else
+ \setlength\paperheight{10.5in}%
+ \setlength\paperwidth {7.25in}%
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
+ }{%
+ \iso@paper{#1}%
+ \if@tempswa
+ \FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{#1}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
+ \else
+ \expandafter\maybe@pair#1::\@nil
+ \if@tempswa
+ \FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \expandafter\ifnum \scr@ta@v@is@lt{3.01b}\relax
+ \PackageWarningNoLine{typearea}{%
+ You may have to exchange height and width!\MessageBreak
+ Until KOMA-Script version 3.01b the semantic\MessageBreak
+ of option `paper' was `paper=height:width'\MessageBreak
+ instead of `paper=width:height'.\MessageBreak
+ I've switched back to that old interpretation\MessageBreak
+ because of the given compatiblity settings}%
+ \setlength\paperwidth{\@tempb}%
+ \setlength\paperheight{\@tempa}%
+ \else
+ \setlength\paperwidth{\@tempa}%
+ \setlength\paperheight{\@tempb}%
+ \fi
+ \expandafter\ifnum \scr@ta@v@is@lt{3.22}\relax
+ \if@landscape
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}%
+ \else
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}%
+ \fi
+ \else
+ \scr@setpaperorientation
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \the\paperwidth:\the\paperheight}%
+ \fi
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
+ \else
+ \KOMA@unknown@keyval{paper}{#1}{%
+ `letter', `legal', `executive', `a'<nr>, `b'<nr>,
+ `c'<nr>, `d'<nr>,\MessageBreak
+ <width>`:'<height>, `landscape' and `portrait'%
+ }%
+ \fi
+ \fi
+ }%
}%
}%
}%
- }{\scr@pti@nerr@r}%
- }{%
- \@headlines
- }%
-}
-\newcommand*{\scr@pti@nerr@r}{
- \@unknownoptionerror
-}
-\KOMA@key{headlines}{%
- \begingroup
- \setlength{\@tempdima}{#1\baselineskip}%
- \endgroup
- \def\ta@hh{#1\baselineskip}%
- \FamilyKeyStateProcessed
- \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headlines}{#1}%
- \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1\baselineskip}%
-}
-\KOMA@key{footlines}{%
- \begingroup
- \setlength{\@tempdima}{#1\baselineskip}%
- \endgroup
- \def\ta@fh{#1\baselineskip}%
- \FamilyKeyStateProcessed
- \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footlines}{#1}%
- \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1\baselineskip}%
-}
-\KOMA@key{headheight}{%
- \begingroup
- \setlength{\@tempdima}{#1}%
- \endgroup
- \def\ta@hh{#1}%
- \FamilyKeyStateProcessed
- \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1}%
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{headlines}%
-}
-\KOMA@key{footheight}{%
- \begingroup
- \setlength{\@tempdima}{#1}%
- \endgroup
- \def\ta@fh{#1}%
- \FamilyKeyStateProcessed
- \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1}%
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{footlines}%
-}
-\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
-\KOMA@ifkey{headinclude}{@hincl}
-\KOMA@DeclareDeprecatedOption[typearea]{headexclude}{headinclude=false}
-\KOMA@key{headsepline}[true]{%
- \KOMA@set@ifkey{headinclude}{@hincl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{headinclude}{@hincl}%
- \fi
-}
-\newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl}
-\KOMA@ifkey{footinclude}{@fincl}
-\KOMA@DeclareDeprecatedOption[typearea]{footexclude}{footinclude=false}
-\KOMA@key{footsepline}[true]{%
- \KOMA@set@ifkey{footinclude}{@fincl}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{footinclude}{@fincl}%
- \fi
-}
-\KOMA@ifkey{mpinclude}{@mincl}
-\KOMA@DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false}
-\KOMA@key{BCOR}{%
- \ifstr{#1}{current}{}{%
- \setlength{\ta@bcor}{#1}%
- }%
- \FamilyKeyStateProcessed
- \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}%
-}
-\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
- \def\@tempb{current}\ifx\@tempa\@tempb\else
- \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=\z@ \else
- \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=\tw@ \else
- \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=\thr@@ \else
- \ta@div=\@tempa
- \fi
- \fi
- \fi
- \fi
- \FamilyKeyStateProcessed
- \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{#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}
-\newif\if@semitwoside
-\g@addto@macro\@twosidetrue\@semitwosidefalse
-\g@addto@macro\@twosidefalse\@semitwosidefalse
-\KOMA@key{twoside}[true]{%
- \if@atdocument\if@twoside
- \scr@ifundefinedorrelax{cleardoubleoddpage}{%
- \cleardoublepage
- }{%
- \cleardoubleoddpage
- }%
- \else\clearpage\fi\fi
- \ifstr{#1}{semi}{%
- \@twosidetrue
- \@semitwosidetrue
- \FamilyKeyStateProcessed
- }{%
- \def\FamilyElseValue{, `semi'}%
- \KOMA@set@ifkey{twoside}{%
- @twoside%
- }{#1}%
+ }%
}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@xreplacevalue{.%
- typearea.\scr@pkgextension
- }{twoside}{#1}%
- \if@twoside
- \if@semitwoside
- \@mparswitchfalse
- \else
- \@mparswitchtrue
- \fi
- \else
- \@mparswitchfalse
- \fi%
- \csname recalctypearea\endcsname
- \fi
-}
-\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twoside}{%
- \if@twoside true\else false\fi
}
-\KOMA@DeclareStandardOption%
- [typearea]%
- {oneside}{twoside=false}
-\KOMA@key{twocolumn}[true]{%
- \if@atdocument\clearpage\fi
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \KOMA@kav@replacebool{.%
- typearea.\scr@pkgextension
- }{twocolumn}{@twocolumn}%
- \csname recalctypearea\endcsname
+\newif\if@seascape
+\newif\if@landscape
+\newcommand*{\maybe@pair}{}
+\def\maybe@pair#1:#2:#3\@nil{%
+ \edef\@tempa{#1}\edef\@tempb{#2}%
+ \ifx\@tempa\@empty\@tempswafalse\else
+ \ifx\@tempb\@empty\@tempswafalse\else\@tempswatrue\fi
\fi
}
-\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twocolumn}{%
- \if@twocolumn true\else false\fi
-}
-\KOMA@DeclareStandardOption%
- [typearea]%
- {onecolumn}{twocolumn=false}
+\KOMA@ifkey{usegeometry}{@ta@usegeometry}
\KOMA@key{pagesize}[auto]{%
\KOMA@set@ncmdkey{pagesize}{@pagesizelast}{%
{off}{-1},{no}{-1},{false}{-1},%
@@ -623,7 +594,7 @@
}{}%
}%
}
-\newcommand{\set@pdftexpagesize}{%
+\newcommand*{\set@pdftexpagesize}{%
\scr@ifundefinedorrelax{pdfpagewidth}{%
\scr@ifundefinedorrelax{pagewidth}{}{\pagewidth=\paperwidth}%
}{\pdfpagewidth=\paperwidth}%
@@ -631,7 +602,7 @@
\scr@ifundefinedorrelax{pageheight}{}{\pageheight=\paperheight}%
}{\pdfpageheight=\paperheight}%
}
-\newcommand{\set@dvipspagesize}{%
+\newcommand*{\set@dvipspagesize}{%
\begingroup
\@tempswafalse
\scr@ifdvioutput{\@tempswatrue}{%
@@ -665,7 +636,7 @@
\endgroup
\fi
}
-\newcommand{\setnot@dvipspagesize}{%
+\newcommand*{\setnot@dvipspagesize}{%
\scr@ifdvioutput{%
\PackageWarning{%
typearea%
@@ -684,7 +655,7 @@
}%
}{}%
}
-\newcommand{\set@vtexpagesize}{%
+\newcommand*{\set@vtexpagesize}{%
\ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
\ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
}
@@ -707,229 +678,275 @@
\KOMA@DeclareStandardOption[typearea]{pdftex}{%
pagesize=pdftex%
}
-\KOMA@DeclareStandardOption[typearea]{a4paper}{paper=a4}
-\KOMA@DeclareStandardOption[typearea]{a5paper}{paper=a5}
-\KOMA@DeclareStandardOption[typearea]{b5paper}{paper=b5}
-\KOMA@DeclareStandardOption[typearea]{letterpaper}{paper=letter}
-\KOMA@DeclareStandardOption[typearea]{legalpaper}{paper=legal}
-\KOMA@DeclareStandardOption[typearea]{executivepaper}{paper=executive}
-\KOMA@DeclareStandardOption[typearea]{landscape}{paper=landscape}
-\KOMA@DeclareStandardOption[typearea]{portrait}{paper=portrait}
-\KOMA@key{paper}{%
- \ifstr{#1}{seascape}{%
- \@seascapetrue
- \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
- \@landscapetrue
- \scr@setpaperorientation
- \else
- \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi
- \fi
+\newif\if@semitwoside
+\g@addto@macro\@twosidetrue\@semitwosidefalse
+\g@addto@macro\@twosidefalse\@semitwosidefalse
+\KOMA@key{twoside}[true]{%
+ \if@atdocument\if@twoside
+ \scr@ifundefinedorrelax{cleardoubleoddpage}{%
+ \cleardoublepage
+ }{%
+ \cleardoubleoddpage
+ }%
+ \else\clearpage\fi\fi
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
+ \@semitwosidetrue
\FamilyKeyStateProcessed
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}%
}{%
- \ifstr{#1}{landscape}{%
- \@seascapefalse
- \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
- \@landscapetrue
- \scr@setpaperorientation
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @twoside%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ typearea.\scr@pkgextension
+ }{twoside}{#1}%
+ \if@twoside
+ \if@semitwoside
+ \@mparswitchfalse
\else
- \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi
+ \@mparswitchtrue
\fi
- \FamilyKeyStateProcessed
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}%
- }{%
- \ifstr{#1}{portrait}{%
- \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
- \@landscapefalse
- \scr@setpaperorientation
- \else
- \if@landscape\scr@switchpapersizes\@landscapefalse\fi
- \fi
- \FamilyKeyStateProcessed
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
- \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}%
- }{%
- \ifstr{#1}{letter}{%
- \if@landscape
- \setlength\paperheight{8.5in}%
- \setlength\paperwidth {11in}%
- \else
- \setlength\paperheight{11in}%
- \setlength\paperwidth {8.5in}%
- \fi
- \FamilyKeyStateProcessed
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{letter}%
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
- \if@seascape seascape\else
- \if@landscape landscape\else portrait\fi\fi
- }%
- }{%
- \ifstr{#1}{legal}{%
- \if@landscape
- \setlength\paperheight{8.5in}%
- \setlength\paperwidth {14in}%
- \else
- \setlength\paperheight{14in}%
- \setlength\paperwidth {8.5in}%
- \fi
- \FamilyKeyStateProcessed
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{legal}%
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
- \if@seascape seascape\else
- \if@landscape landscape\else portrait\fi\fi
- }%
- }{%
- \ifstr{#1}{executive}{%
- \if@landscape
- \setlength\paperheight{7.25in}%
- \setlength\paperwidth {10.5in}%
- \else
- \setlength\paperheight{10.5in}%
- \setlength\paperwidth {7.25in}%
- \fi
- \FamilyKeyStateProcessed
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}%
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
- \if@seascape seascape\else
- \if@landscape landscape\else portrait\fi\fi
- }%
- }{%
- \iso@paper{#1}%
- \if@tempswa
- \FamilyKeyStateProcessed
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{#1}%
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
- \if@seascape seascape\else
- \if@landscape landscape\else portrait\fi\fi
- }%
- \else
- \expandafter\maybe@pair#1::\@nil
- \if@tempswa
- \FamilyKeyStateProcessed
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
- \expandafter\ifnum \scr@ta@v@is@lt{3.01b}\relax
- \PackageWarningNoLine{typearea}{%
- You may have to exchange height and width!\MessageBreak
- Until KOMA-Script version 3.01b the semantic\MessageBreak
- of option `paper' was `paper=height:width'\MessageBreak
- instead of `paper=width:height'.\MessageBreak
- I've switched back to that old interpretation\MessageBreak
- because of the given compatiblity settings}%
- \setlength\paperwidth{\@tempb}%
- \setlength\paperheight{\@tempa}%
- \else
- \setlength\paperwidth{\@tempa}%
- \setlength\paperheight{\@tempb}%
- \fi
- \expandafter\ifnum \scr@ta@v@is@lt{3.22}\relax
- \if@landscape
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}%
- \else
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}%
- \fi
- \else
- \scr@setpaperorientation
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
- \the\paperwidth:\the\paperheight}%
- \fi
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
- \if@seascape seascape\else
- \if@landscape landscape\else portrait\fi\fi
- }%
- \else
- \KOMA@unknown@keyval{paper}{#1}{%
- `letter', `legal', `executive', `a'<nr>, `b'<nr>,
- `c'<nr>, `d'<nr>,\MessageBreak
- <width>`:'<height>, `landscape' and `portrait'%
- }%
- \fi
- \fi
- }%
- }%
- }%
- }%
- }%
- }%
-}
-\newif\if@seascape
-\newif\if@landscape
-\newcommand*{\maybe@pair}{}
-\def\maybe@pair#1:#2:#3\@nil{%
- \edef\@tempa{#1}\edef\@tempb{#2}%
- \ifx\@tempa\@empty\@tempswafalse\else
- \ifx\@tempb\@empty\@tempswafalse\else\@tempswatrue\fi
+ \else
+ \@mparswitchfalse
+ \fi%
+ \csname recalctypearea\endcsname
\fi
}
-\KOMA@ifkey{usegeometry}{@ta@usegeometry}
-\DeclareOption*{%
- \x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option)
-\KOMA@key{version}[last]{%
- \scr@ifundefinedorrelax{scr@v@#1}{%
- \def\scr@compatibility{0}%
- \PackageWarningNoLine{%
- typearea%
- }{%
- You have set option `version' to value `#1', but\MessageBreak
- this value of version is not supported.\MessageBreak
- Because of this, version was set to `first'%
- }%
- \FamilyKeyStateProcessed
- \KOMA@kav@replacevalue{.%
+\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twoside}{%
+ \if@twoside true\else false\fi
+}
+\KOMA@DeclareStandardOption%
+ [typearea]%
+ {oneside}{twoside=false}
+\KOMA@key{twocolumn}[true]{%
+ \if@atdocument\clearpage\fi
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
typearea.\scr@pkgextension
- }{version}{first}%
- }{%
- \PackageInfoNoLine{%
- typearea%
- }{%
- Switching compatibility level to `#1'%
- }%
- \edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}%
+ }{twocolumn}{@twocolumn}%
+ \csname recalctypearea\endcsname
+ \fi
+}
+\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twocolumn}{%
+ \if@twocolumn true\else false\fi
+}
+\KOMA@DeclareStandardOption%
+ [typearea]%
+ {onecolumn}{twocolumn=false}
+\KOMA@key{headlines}{%
+ \begingroup
+ \setlength{\@tempdima}{#1\baselineskip}%
+ \endgroup
+ \def\ta@hh{#1\baselineskip}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headlines}{#1}%
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1\baselineskip}%
+}
+\KOMA@key{footlines}{%
+ \begingroup
+ \setlength{\@tempdima}{#1\baselineskip}%
+ \endgroup
+ \def\ta@fh{#1\baselineskip}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footlines}{#1}%
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1\baselineskip}%
+}
+\KOMA@key{headheight}{%
+ \begingroup
+ \setlength{\@tempdima}{#1}%
+ \endgroup
+ \def\ta@hh{#1}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{headlines}%
+}
+\KOMA@key{footheight}{%
+ \begingroup
+ \setlength{\@tempdima}{#1}%
+ \endgroup
+ \def\ta@fh{#1}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{footlines}%
+}
+\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
+\KOMA@ifkey{headinclude}{@hincl}
+\KOMA@DeclareDeprecatedOption[typearea]{headexclude}{headinclude=false}
+\KOMA@key{headsepline}[true]{%
+ \KOMA@set@ifkey{headinclude}{@hincl}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{headinclude}{@hincl}%
+ \fi
+}
+\newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl}
+\KOMA@ifkey{footinclude}{@fincl}
+\KOMA@DeclareDeprecatedOption[typearea]{footexclude}{footinclude=false}
+\KOMA@key{footsepline}[true]{%
+ \KOMA@set@ifkey{footinclude}{@fincl}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{footinclude}{@fincl}%
+ \fi
+}
+\KOMA@ifkey{mpinclude}{@mincl}
+\KOMA@DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false}
+\newlength{\ta@bcor}
+\newcount\ta@div
+\KOMA@key{BCOR}{%
+ \ifstr{#1}{current}{}{%
+ \setlength{\ta@bcor}{#1}%
+ }%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}%
+}
+\AtEndOfPackage{%
+ \KOMA@key{BCOR}{%
+ \typearea[{#1}]{last}
\FamilyKeyStateProcessed
- \KOMA@kav@xreplacevalue{.%
- typearea.\scr@pkgextension
- }{version}{#1}%
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}%
}%
}
+\KOMA@key{DIV}[calc]{%
+ \edef\@tempa{#1}%
+ \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv\fi
+ \def\@tempb{current}\ifx\@tempa\@tempb\else
+ \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=\z@ \else
+ \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=\tw@ \else
+ \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=\thr@@ \else
+ \ta@div=\@tempa
+ \fi
+ \fi
+ \fi
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{#1}%
+}
\AtEndOfPackage{%
- \KOMA@key{version}[]{%
- \PackageError{%
- typearea%
- }{%
- Option `version' too late%
- }{%
- Option `version' may be set only while loading the
- package.\MessageBreak
- But you've tried to set it up later.%
- }%
+ \KOMA@key{DIV}{%
+ \typearea[current]{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{#1}%
}%
}
-\newcommand*{\scr@ta@v@is@lt}[1]{%
- \scr@ta@compatibility<\@nameuse{scr@v@#1}
+\KOMA@ifkey{areasetadvanced}{@areasetadvanced}
+\KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc}
+\KOMA@DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic}
+\newcommand\isopaper[2][a]{%
+ \ISO@PaperNameToSize[typearea]#1#2\@nil
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
+ \scr@setpaperorientation
+ \else
+ \if@landscape\scr@switchpapersizes\fi
+ \fi
}
-\newcommand*{\scr@ta@v@is@gt}[1]{%
- \scr@ta@compatibility>\@nameuse{scr@v@#1}
+\ProvideUnknownPaperSizeError{typearea}{%
+ \PackageError{typearea}{%
+ Unknown ISO/DIN-papersize-letter #1%
+ }{%
+ There are only four defined paper scalings:\MessageBreak
+ a = ISO/DIN-A, b = ISO/DIN-B, c = ISO/DIN-C,
+ d = ISO/DIN-D\MessageBreak
+ Read KOMA-Script-documentation for further information.%
+ }%
+ \setlength{\paperwidth}{841sp}%
+ \setlength{\paperheight}{1189sp}%
}
-\newcommand*{\scr@ta@v@is@le}[1]{%
- \numexpr\scr@ta@compatibility-\@ne <\@nameuse{scr@v@#1}
+\newcommand*\scr@setpaperorientation{%
+ \ifdim\paperheight>\paperwidth
+ \if@landscape\scr@switchpapersizes\fi
+ \else
+ \if@landscape\else\scr@switchpapersizes\fi
+ \fi
}
-\newcommand*{\scr@ta@v@is@ge}[1]{%
- \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
+\newcommand*\scr@switchpapersizes{%
+ \@tempdima\paperwidth\paperwidth\paperheight\paperheight\@tempdima
+}
+\newcommand*{\iso@paper}[1]{\expandafter\iso@@paper#1\@nil}
+\newcommand*{\iso@@paper}{}
+\def\iso@@paper#1#2\@nil{%
+ \@tempswafalse
+ \if #1a\@tempswatrue
+ \else\if #1A\@tempswatrue
+ \else\if #1b\@tempswatrue
+ \else\if #1B\@tempswatrue
+ \else\if #1c\@tempswatrue
+ \else\if #1C\@tempswatrue
+ \else\if #1d\@tempswatrue
+ \else\if #1D\@tempswatrue
+ \fi\fi\fi\fi\fi\fi\fi\fi
+ \if@tempswa
+ \ifnumber{#2}{\isopaper[#1]{#2}}{\@tempswafalse}%
+ \fi
+}
+\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
+\newcommand*{\@@BCOR}{}
+\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
+ \ifstr{#1}{}{%
+ \ifstr{#3}{BCOR}{%
+ \ifdimen{#2}{%
+ \KOMA@UseDeprecatedOption{%
+ \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}%
+ }{\scr@pti@nerr@r}%
+ }{\scr@pti@nerr@r}%
+ }{\scr@pti@nerr@r}%
+}
+\newcommand*{\@DIV}{\expandafter\@@DIV\CurrentOption DIVDIV\@@DIV}
+\newcommand*{\@@DIV}{}
+\def\@@DIV #1DIV#2DIV#3\@@DIV{%
+ \edef\@tempa{#1}\ifx\@tempa\@empty
+ \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
+ \ifnumber{#2}{%
+ \KOMA@UseDeprecatedOption{%
+ \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}%
+ }{\scr@pti@nerr@r}%
+ \else\scr@pti@nerr@r\fi
+ \else\@BCOR\fi
}
-%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body)
+\newcommand{\@headlines}{%
+ \expandafter\@@headlines\CurrentOption headlines\@@headlines%
+}
+\newcommand*{\@@headlines}{}
+\def\@@headlines #1headlines#2\@@headlines{
+ \edef\@tempa{#2}\edef\@tempb{headlines}\ifx\@tempa\@tempb
+ \setlength{\@tempdima}{#1\baselineskip}%
+ \def\ta@hh{#1\baselineskip}%
+ \else\@DIV\fi
+}
+\newcommand*{\x@paper}{%
+ \expandafter\x@@paper\CurrentOption paper\x@@paper%
+}
+\newcommand*{\x@@paper}{}
+\def\x@@paper #1#2paper#3\x@@paper{%
+ \ifstr{#3}{paper}{%
+ \ifnumber{#2}{%
+ \ifstr{#1}{a}{%
+ \isopaper[a]{#2}%
+ }{%
+ \ifstr{#1}{b}{%
+ \isopaper[b]{#2}%
+ }{%
+ \ifstr{#1}{c}{%
+ \isopaper[c]{#2}%
+ }{%
+ \ifstr{#1}{d}{%
+ \isopaper[d]{#2}%
+ }{\scr@pti@nerr@r}%
+ }%
+ }%
+ }%
+ }{\scr@pti@nerr@r}%
+ }{%
+ \@headlines
+ }%
+}
+\newcommand*{\scr@pti@nerr@r}{
+ \@unknownoptionerror
+}
+\DeclareOption*{%
+ \x@paper}
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -949,8 +966,72 @@
\KOMAExecuteOptions{twoside=false}
\fi
\KOMAProcessOptions\relax
-\providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}}
-\providecommand\ta@divlistelse{1}
+%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: body)
+\newcommand*{\ta@divfor}[1]{%
+ \if@mincl
+ \PackageInfo{typearea}{%
+ With option `mpinclude' there are no predefined\MessageBreak
+ DIV values. Using DIV calculation for good line\MessageBreak
+ width%
+ }%
+ \ta@div=\tw@
+ \else
+ \xdef\@tempa{\ta@divlist{}}%
+ \@tempdima=#1pt
+ \addtolength{\@tempdima}{.5\p@}%
+ \divide\@tempdima by\p@
+ \setlength{\@tempdimb}{\@tempdima}%
+ \multiply\@tempdimb by\p@
+ \ifdim \@tempdimb=#1pt
+ \ta@div=#1\relax
+ \@whilenum \ta@div >-9 \do {%
+ \ifx\@tempa\empty
+ \else \xdef\@tempa{\expandafter\@cdr\@tempa\@nil}\fi
+ \advance\ta@div by-1
+ }%
+ \else
+ \let\@tempa\empty
+ \fi
+ \ifx\@tempa\empty
+ \setlength{\@tempdima}{#1\p@}%
+ \addtolength{\@tempdima}{10\p@}%
+ \PackageWarningNoLine{typearea}{%
+ DIV for \the\@tempdima\space and used papersize\MessageBreak
+ not defined!\MessageBreak
+ Using DIV=\ta@divlistelse
+ }%
+ \ta@div=\ta@divlistelse\relax
+ \else
+ \xdef\@tempa{\expandafter\@car\@tempa\@nil}%
+ \ifx\@tempa\empty
+ \ta@div=\ta@divlistelse\relax
+ \else
+ \ta@div=\@tempa\relax
+ \fi
+ \fi
+ \fi
+}
+\newcommand*\SetDIVList[1]{%
+ \PackageWarning{typearea}{\string\SetDIVList\space is
+ deprecated!\MessageBreak
+ This command supports only integer font sizes\MessageBreak
+ in pt equal or greater than 10pt.\MessageBreak
+ Since version 2.6 the command is implemented\MessageBreak
+ for compatibility only. You should not use it\MessageBreak
+ any longer}%
+ \def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
+\newcommand*\SetXDIVList[1]{%
+ \PackageWarning{typearea}{\string\SetXDIVList\space is
+ deprecated!\MessageBreak
+ This command supports only integer font sizes\MessageBreak
+ in pt equal or greater than 10pt.\MessageBreak
+ Since version 3.0 the command is implemented\MessageBreak
+ for compatibility only. You should not use it\MessageBreak
+ any longer}%
+ \def\ta@divlist{#1}}
\newlength{\ta@hblk}
\newlength{\ta@vblk}
\newlength{\ta@temp}
@@ -1086,10 +1167,6 @@
\kernel@ifstar \l@addto@macro \g@addto@macro \@typearea@end
}
\newcommand*{\@typearea@end}{}
-\newcommand*{\AfterSettingArea}{%
- \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end
-}
-\newcommand*{\@areaset@end}{}
\newcommand*{\activateareas}{%
\if@atdocument
\PackageInfo{typearea}{%
@@ -1167,125 +1244,6 @@
\fi
}
\newcommand*{\scr@geometryargs}{}
-\newcommand*{\scr@grouplevel@test}[1]{%
- \ifcase\currentgrouptype\else
- \PackageWarning{typearea}{%
- \string#1\space used at group level
- \the\currentgrouplevel.\MessageBreak
- Using \string#1\space inside any group, e.g.\MessageBreak
- environments, math mode, boxes, etc. may result in\MessageBreak
- many type setting problems.\MessageBreak
- You should move the command \string#1\MessageBreak
- outside all groups%
- }%
- \fi
-}
-\newcommand*{\storeareas}[1]{%
- \edef\reserved@a{%
- \noexpand\newcommand*{\unexpanded{#1}}{%
- \noexpand\scr@grouplevel@test\unexpanded{#1}%
- \noexpand\csname scr@storeareas@before@hook\noexpand\endcsname
- \unexpanded\expandafter\expandafter\expandafter{%
- \csname scr@storeareas@before@current@hook\endcsname}%
- \noexpand\paperheight=\the\paperheight\space
- \noexpand\paperwidth=\the\paperwidth\space
- \noexpand\topmargin=\the\topmargin\space
- \noexpand\headheight=\the\headheight\space
- \noexpand\headsep=\the\headsep\space
- \noexpand\textheight=\the\textheight\space
- \noexpand\vsize=\the\vsize\space
- \noexpand\footskip=\the\footskip\space
- \noexpand\@colht=\the\@colht\space
- \noexpand\@colroom=\the\@colroom\space
- \noexpand\textwidth=\the\textwidth\space
- \noexpand\columnwidth=\the\columnwidth\space
- \noexpand\hsize=\the\hsize\space
- \noexpand\oddsidemargin=\the\oddsidemargin\space
- \noexpand\evensidemargin=\if@twoside
- \the\evensidemargin
- \else
- \the\oddsidemargin
- \fi\space
- \noexpand\linewidth=\the\linewidth\space
- \noexpand\maxdepth=\the\maxdepth\space
- \scr@ifundefinedorrelax{@pagesizelast}{}{%
- \noexpand\KOMAoptions{pagesize=\@pagesizelast}}%
- \noexpand\ta@div=\the\ta@div\space
- \noexpand\ta@bcor=\the\ta@bcor\space
- \noexpand\def\noexpand\@lastdiv{\@lastdiv}%
- \noexpand\marginparsep=\the\marginparsep\space
- \noexpand\marginparwidth=\the\marginparwidth\space
- \noexpand\def
- \expandafter\noexpand\csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname{%
- \unexpanded\expandafter\expandafter\expandafter{%
- \csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname}%
- }%
- \unexpanded\expandafter\expandafter\expandafter{%
- \csname scr@storeareas@after@current@hook\endcsname}%
- \noexpand\csname scr@storeareas@after@hook\noexpand\endcsname
- }%
- }%
- \reserved@a
-}
-\newcommand*{\BeforeRestoreareas}{%
- \kernel@ifstar{\scr@storeareashook{before@current}}%
- {\scr@storeareashook{before}}%
-}
-\newcommand*{\AfterRestoreareas}{%
- \kernel@ifstar{\scr@storeareashook{after@current}}%
- {\scr@storeareashook{after}}%
-}
-\newcommand*{\scr@storeareashook}[2]{%
- \expandafter\l@addto@macro\csname scr@storeareas@#1@hook\endcsname{#2}%
-}
-\newcommand*{\scr@storeareas@before@hook}{}
-\newcommand*{\scr@storeareas@before@current@hook}{}
-\newcommand*{\scr@storeareas@after@hook}{}
-\newcommand*{\scr@storeareas@after@current@hook}{}
-\newcommand*{\ta@divfor}[1]{%
- \if@mincl
- \PackageInfo{typearea}{%
- With option `mpinclude' there are no predefined\MessageBreak
- DIV values. Using DIV calculation for good line\MessageBreak
- width%
- }%
- \ta@div=\tw@
- \else
- \xdef\@tempa{\ta@divlist{}}%
- \@tempdima=#1pt
- \addtolength{\@tempdima}{.5\p@}%
- \divide\@tempdima by\p@
- \setlength{\@tempdimb}{\@tempdima}%
- \multiply\@tempdimb by\p@
- \ifdim \@tempdimb=#1pt
- \ta@div=#1\relax
- \@whilenum \ta@div >-9 \do {%
- \ifx\@tempa\empty
- \else \xdef\@tempa{\expandafter\@cdr\@tempa\@nil}\fi
- \advance\ta@div by-1
- }%
- \else
- \let\@tempa\empty
- \fi
- \ifx\@tempa\empty
- \setlength{\@tempdima}{#1\p@}%
- \addtolength{\@tempdima}{10\p@}%
- \PackageWarningNoLine{typearea}{%
- DIV for \the\@tempdima\space and used papersize\MessageBreak
- not defined!\MessageBreak
- Using DIV=\ta@divlistelse
- }%
- \ta@div=\ta@divlistelse\relax
- \else
- \xdef\@tempa{\expandafter\@car\@tempa\@nil}%
- \ifx\@tempa\empty
- \ta@div=\ta@divlistelse\relax
- \else
- \ta@div=\@tempa\relax
- \fi
- \fi
- \fi
-}
\newcommand*\typearea[2][\z@]{%
\scr@grouplevel@test\typearea
\edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else
@@ -1515,6 +1473,81 @@
}%
}
\AtEndOfPackage{\newcommand*{\recalctypearea}{\typearea[current]{last}}}
+\newcommand*{\scr@grouplevel@test}[1]{%
+ \ifcase\currentgrouptype\else
+ \PackageWarning{typearea}{%
+ \string#1\space used at group level
+ \the\currentgrouplevel.\MessageBreak
+ Using \string#1\space inside any group, e.g.\MessageBreak
+ environments, math mode, boxes, etc. may result in\MessageBreak
+ many type setting problems.\MessageBreak
+ You should move the command \string#1\MessageBreak
+ outside all groups%
+ }%
+ \fi
+}
+\newcommand*{\storeareas}[1]{%
+ \edef\reserved@a{%
+ \noexpand\newcommand*{\unexpanded{#1}}{%
+ \noexpand\scr@grouplevel@test\unexpanded{#1}%
+ \noexpand\csname scr@storeareas@before@hook\noexpand\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@storeareas@before@current@hook\endcsname}%
+ \noexpand\paperheight=\the\paperheight\space
+ \noexpand\paperwidth=\the\paperwidth\space
+ \noexpand\topmargin=\the\topmargin\space
+ \noexpand\headheight=\the\headheight\space
+ \noexpand\headsep=\the\headsep\space
+ \noexpand\textheight=\the\textheight\space
+ \noexpand\vsize=\the\vsize\space
+ \noexpand\footskip=\the\footskip\space
+ \noexpand\@colht=\the\@colht\space
+ \noexpand\@colroom=\the\@colroom\space
+ \noexpand\textwidth=\the\textwidth\space
+ \noexpand\columnwidth=\the\columnwidth\space
+ \noexpand\hsize=\the\hsize\space
+ \noexpand\oddsidemargin=\the\oddsidemargin\space
+ \noexpand\evensidemargin=\if@twoside
+ \the\evensidemargin
+ \else
+ \the\oddsidemargin
+ \fi\space
+ \noexpand\linewidth=\the\linewidth\space
+ \noexpand\maxdepth=\the\maxdepth\space
+ \scr@ifundefinedorrelax{@pagesizelast}{}{%
+ \noexpand\KOMAoptions{pagesize=\@pagesizelast}}%
+ \noexpand\ta@div=\the\ta@div\space
+ \noexpand\ta@bcor=\the\ta@bcor\space
+ \noexpand\def\noexpand\@lastdiv{\@lastdiv}%
+ \noexpand\marginparsep=\the\marginparsep\space
+ \noexpand\marginparwidth=\the\marginparwidth\space
+ \noexpand\def
+ \expandafter\noexpand\csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname{%
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname}%
+ }%
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@storeareas@after@current@hook\endcsname}%
+ \noexpand\csname scr@storeareas@after@hook\noexpand\endcsname
+ }%
+ }%
+ \reserved@a
+}
+\newcommand*{\BeforeRestoreareas}{%
+ \kernel@ifstar{\scr@storeareashook{before@current}}%
+ {\scr@storeareashook{before}}%
+}
+\newcommand*{\AfterRestoreareas}{%
+ \kernel@ifstar{\scr@storeareashook{after@current}}%
+ {\scr@storeareashook{after}}%
+}
+\newcommand*{\scr@storeareashook}[2]{%
+ \expandafter\l@addto@macro\csname scr@storeareas@#1@hook\endcsname{#2}%
+}
+\newcommand*{\scr@storeareas@before@hook}{}
+\newcommand*{\scr@storeareas@before@current@hook}{}
+\newcommand*{\scr@storeareas@after@hook}{}
+\newcommand*{\scr@storeareas@after@current@hook}{}
\newcommand*\areaset[3][\z@]{%
\edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else
\setlength{\ta@bcor}{#1}%
@@ -1644,9 +1677,14 @@
}%
\fi
}
+\newcommand*{\AfterSettingArea}{%
+ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end
+}
+\newcommand*{\@areaset@end}{}
+%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% (run: final)
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body)
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index ae01cabc216..8ab3a8208fa 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-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,9 +39,9 @@
%% 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/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,10 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: head)
\ProvidesFile{%
visualize%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +80,8 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\RequirePackage{eso-pic}
\newcommand*{\showfields}[1]{%
\AtBeginLetter{%
@@ -574,7 +576,8 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% (run: body)
\endinput
%%
%% End of file `visualize.lco'.