summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/lscape.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/nomencl.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls674
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty65
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls691
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty149
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty65
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty46
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty82
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty75
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty84
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls138
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls691
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/setspace.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty95
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty50
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco10
45 files changed, 2156 insertions, 1011 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index f70f5a1e05b..e8e13235916 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
DIN%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 18ece2c6bee..b5bed8a4998 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
DINmtext%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index cb8d6a94f3c..67a7b7d74c5 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
KOMAold%
@@ -80,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
@@ -206,7 +206,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z 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 83cb01499cb..9eccfcc0698 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: Kaku,LATE,LOW,head)
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 5b8e12ea3bd..309714982b3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
NF%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index 351ddb20e0f..9ffe019f699 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: Ni,EARLY,HIGH,head)
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index 43816bfb54f..d6e6b62bffa 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: Ni,EARLY,LOW,head)
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index 48c640a3eb5..17d32728e83 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: Ni,LATE,HIGH,head)
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index 2b420f04dfc..fad48bbd564 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: Ni,LATE,LOW,head)
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 1c7fec2bc98..066539ced90 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: Ni,RIGHT,LOW,head)
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index fb9117ef8a2..012c166fa8c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
SN%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index e1b6fdb6a6b..23c1ccbe9e7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
SNleft%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index c6375b2e329..4a5e44aa104 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index 08a9e1fefbe..c0006adb0b9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9DW
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index b9e36639195..e010a9ccce3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\ProvidesFile{float.hak}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(hacking package
float)%
]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\scr@ifexpected{\newfloat}{%
\long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3}
\let\float@do=\relax
@@ -133,7 +133,9 @@
\@ifundefined{ext@#1}{\float@error{#1}}{%
\@ifundefined{l@#1}{\expandafter\let\csname l@#1\endcsname\l@figure
\@ifundefined{l@#1}{%
- \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}}{}%
+ \DeclareTOCStyleEntry[level=1,numwidth=2.3em,indent=1.5em]
+ {default}{#1}%
+ }{}%
}{}%
\listoftoc[{#2}]{\csname ext@#1\endcsname}%
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index d2a8fccb7f8..1e66c9de83b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(hacking package
floatrow)%
]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\scr@ifexpected{\DeclareNewFloatType}{%
\long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}%
\expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
@@ -106,7 +106,7 @@
{\expandafter\noexpand\csname #1name\endcsname\nobreakspace
\expandafter\noexpand\csname the#1\endcsname}%
\@namedef{the#1}{\arabic{#1}}\flnew@ext{lo#1}\@namedef{fps@#1}{tbp}%
- \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}%
+ \DeclareTOCStyleEntry[level=1,numwidth=2.3em,indent=1.5em]{default}{#1}%
\caption@setkeys[floatrow]{newfloat}{#2}\let\FR@tmp=\relax
\xdef\@tempa{\noexpand\flrow@types{\the\flrow@types \FR@tmp{#1}}}%
\@tempa
@@ -120,7 +120,9 @@
\@ifundefined{ext@#1}{\flrow@error{Unknown float style `#1'}}{%
\@ifundefined{l@#1}{\expandafter\let\csname l@#1\endcsname\l@figure
\@ifundefined{l@#1}{%
- \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}}{}%
+ \DeclareTOCStyleEntry[level=1,numwidth=2.3em,indent=1.5em]
+ {default}{#1}%
+ }{}%
}{}%
\listoftoc[{#2}]{\csname ext@#1\endcsname}%
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index 059f2ba1f38..cac76c4a261 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(hacking package
hyperref)%
]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z 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 1ac8e53d29c..bfd6a9a3ff8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\ProvidesFile{listings.hak}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(hacking package
listings)%
]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z 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 f45a249ed17..fd43e0011a3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\ProvidesFile{lscape.hak}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(hacking package
lscape)%
]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z 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 8c469101e89..39bff7b8ea1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\ProvidesFile{nomencl.hak}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(hacking package
nomencl)%
]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\RequirePackage{tocbasic}
\addtotoclist[nomencl]{nlo}
\addtotoclist[nomencl]{nls}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index b15559e50bb..df44db28ee8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -43,6 +43,7 @@
%% scrkernel-sections.dtx (with options: `class,article,body')
%% scrkernel-miscellaneous.dtx (with options: `class,article,body')
%% scrkernel-pagestyles.dtx (with options: `class,article,body')
+%% scrlayer.dtx (with options: `class,article,body')
%% scrkernel-floats.dtx (with options: `class,article,body')
%% scrkernel-footnotes.dtx (with options: `class,article,body')
%% scrkernel-listsof.dtx (with options: `class,article,body')
@@ -83,7 +84,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -105,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -120,23 +121,21 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
\RequirePackage{tocbasic}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 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 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: prepare)
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -188,7 +187,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -257,10 +256,11 @@
\@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 2661 2017-07-24 19:45:16Z kohm $
+\@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@last}{17}
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
@@ -335,7 +335,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -344,11 +344,17 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
@@ -356,6 +362,29 @@
\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
+\KOMA@key{overfullrule}[true]{%
+ \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{\z@}%
+ \fi
+ \fi
+}
+\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
@@ -364,7 +393,7 @@
}
%%% 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 $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
\newcommand*\@ptsize{%
11%
@@ -450,7 +479,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -560,7 +589,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -713,7 +742,7 @@
\fi
\else
\endgroup
- \FamilyKeyStateUnkownValue
+ \FamilyKeyStateUnknownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -726,7 +755,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: option)
\newif\if@titlepage
\@titlepagefalse
@@ -761,9 +790,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: option)
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -994,7 +1023,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1200,7 +1229,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
@@ -1283,9 +1312,10 @@
{flat}{3},{left}{3},%
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
- {entryprefix}{6},
- {indenttextentries}{7},{indentunnumbered}{7},{numberline}{7},%
- {leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
+ {standardlevel}{6},
+ {entryprefix}{7},
+ {indenttextentries}{8},{indentunnumbered}{8},{numberline}{8},%
+ {leftaligntextentries}{9},{leftalignunnumbered}{9},{nonumberline}{9}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax % notoc
@@ -1359,6 +1389,7 @@
\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{standardlevel}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
@@ -1366,6 +1397,15 @@
\AtAddToTocList[float]{%
\setuptoc{\@currext}{leveldown}%
}%
+ \or% standardlevel
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{standardlevel}%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{leveldown}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{leveldown}%
+ }%
\or% entryprefix
\KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
@@ -1418,7 +1458,7 @@
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2769 2017-12-03 10:56:06Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
@@ -1481,21 +1521,16 @@
\renewcommand*{\newblock}{\hskip .11em\@plus.33em\@minus.07em}%
}
\scr@bibstyle@oldstyle
-\newcommand*\bib@heading{%
+\newcommand*{\bib@heading}{%
+ \bibliography@heading{\refname}%
+}
+\newcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \subsection*{\refname}%
- \scr@ifundefinedorrelax{@mkright}{%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\refname}}\fi
- }{%
- \@mkright{\MakeMarkcase{\refname}}%
- }%
+ \subsection*{#1}%
+ \@mkright{\MakeMarkcase{#1}}%
\else
- \section*{\refname}%
- \scr@ifundefinedorrelax{@mkdouble}{%
- \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
- }{%
- \@mkdouble{\MakeMarkcase{\refname}}%
- }%
+ \section*{#1}%
+ \@mkdouble{\MakeMarkcase{#1}}%
\fi
}%
\newif\ifbib@leveldown
@@ -1518,13 +1553,13 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \subsection*{\refname}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\refname}}\fi
+ \subsection*{##1}%
+ \@mkright{\MakeMarkcase{##1}}%
\else
- \section*{\refname}%
- \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
+ \section*{##1}%
+ \@mkdouble{\MakeMarkcase{##1}}%
\fi
}%
\or% totoc
@@ -1536,17 +1571,16 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
\subsection*{%
- \expandafter\addxcontentsline\expandafter{\ext@toc}%
- {subsection}{\refname}%
- \refname
+ \addsubsectiontocentry{}{##1}%
+ ##1%
}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\refname}}\fi
+ \@mkright{\MakeMarkcase{##1}}%
\else
- \addsec{\refname}
- \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
+ \addsec{##1}%
+ \@mkdouble{\MakeMarkcase{##1}}%
\fi
}%
\or% numbered
@@ -1558,13 +1592,12 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \subsection{\refname}%
+ \subsection{##1}%
\else
- \section{\refname}%
- \@mkboth{\MakeMarkcase{\sectionmarkformat \refname}}%
- {\MakeMarkcase{\sectionmarkformat \refname}}%
+ \section{##1}%
+ \@mkdouble{\MakeMarkcase{\sectionmarkformat ##1}}%
\fi
}
\or% leveldown
@@ -1590,7 +1623,7 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2782 2017-12-04 07:47:52Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
@@ -1604,7 +1637,8 @@
\KOMA@set@ncmdkey{index}{@tempa}{%
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1},%
- {numbered}{2},{totocnumbered}{2},%
+ {numbered}{2},{totocnumbered}{2},{numberedtotoc}{2},{tocnumbered}{2},%
+ {numberedtoc}{2},%
{leveldown}{3},%
{standardlevel}{4}%
}{#1}%
@@ -1676,19 +1710,19 @@
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% 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 $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2169,7 +2203,7 @@
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 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2214,7 +2248,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -2343,12 +2377,16 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
}}%
+\newcommand*{\@frontispiece}{}%
+\newcommand{\frontispiece}[1]{\gdef\@frontispiece{%
+ #1%
+}}%
\newcommand*{\@titlehead}{}%
\newcommand{\titlehead}[1]{\gdef\@titlehead{%
#1%
@@ -2438,8 +2476,20 @@
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
- \ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty
+ \else
+ \if@twoside\mbox{}\next@tpage\fi
+ \noindent\@frontispiece\next@tdpage
+ \fi
+ \else
+ \noindent\@extratitle
+ \ifx\@frontispiece\@empty
+ \else
+ \next@tpage
+ \noindent\@frontispiece
+ \fi
+ \next@tdpage
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
@@ -2522,20 +2572,46 @@
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \ifx\@extratitle\@empty\else
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
\@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
\next@tdpage
\fi
\@maketitle
\else
- \ifx\@extratitle\@empty\else
- \twocolumn[\@makeextratitle]\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
+ \twocolumn[\@makeextratitle]%
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \twocolumn[\@makefrontispiece]%
+ \next@tdpage
\fi
\twocolumn[\@maketitle]%
\fi
\else
- \ifx\@extratitle\@empty\else
- \@makeextratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else \mbox{}\fi
+ \else
+ \@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
+ \next@tdpage
\fi
\@maketitle
\fi
@@ -2554,6 +2630,7 @@
\global\let\@title\@empty
\global\let\@subtitle\@empty
\global\let\@extratitle\@empty
+ \global\let\@frontispiece\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
\global\let\@publishers\@empty
@@ -2578,6 +2655,11 @@
\noindent\@extratitle\par
\fi
}
+\newcommand*{\@makefrontispiece}{%
+ \ifx\@frontispiece\@empty \else
+ \noindent\@frontispiece\par
+ \fi
+}
\newcommand*{\@maketitle}{%
\global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -2684,10 +2766,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2701,7 +2783,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -2721,17 +2803,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z 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 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{3}
\newcommand*{\ifnumbered}[1]{%
@@ -3570,29 +3652,54 @@
}
\newcommand*{\DeclareNewSectionCommand}[2][]{%
\@ifundefined{#2}{%
- \DeclareSectionCommand[{#1}]{#2}%
+ \@tempswatrue
+ \let\reserved@b\@empty
+ \@for \reserved@a:=the#2,#2mark,#2format,#2markformat\do{%
+ \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{%
+ \@tempswafalse
+ \edef\reserved@b{\expandafter\string\csname \reserved@a\endcsname}%
+ }
+ }
+ \if@tempswa
+ \DeclareSectionCommand[{#1}]{#2}%
+ \else
+ \ClassError{\KOMAClassName}{%
+ command `\reserved@b` already defined%
+ }{%
+ You've tried to define the section command `\expandafter\string\csname
+ #2\endcsname` newly.\MessageBreak
+ Such a section command needs an additional new command
+ `\reserved@b`,\MessageBreak
+ but this already exists. So you cannot define
+ `\expandafter\string\csname #2\endcsname` newly.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be ignored.%
+ }%
+ \fi
}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #1\endcsname` already defined%
+ command `\expandafter\string\csname #2\endcsname` already defined%
}{%
You've tried to define the section command `\expandafter\string\csname
- #1\endcsname` newly,\MessageBreak
- but a command, token, box or length with this name already
+ #2\endcsname` newly,\MessageBreak
+ but a command or something else with this name already
exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\RedeclareSectionCommand,\MessageBreak
or \string\ProvideSectionCommand.\MessageBreak
- If you'll continue, the command will be irgnored.%
+ If you'll continue, the command will be ignored.%
}%
}%
}
\newcommand*{\RedeclareSectionCommand}[2][]{%
\@ifundefined{#2}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #1\endcsname` not defined%
+ command `\expandafter\string\csname #2\endcsname` not defined%
}{%
You've tried to re-define the section command `\expandafter\string\csname
- #1\endcsname`,\MessageBreak
+ #2\endcsname`,\MessageBreak
but a command with this name does not exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\DeclareNewSectionCommand,\MessageBreak
@@ -3820,20 +3927,27 @@
}%
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+ \def\IfUseNumber{\ifnumbered{#1}}%
\raggedpart
- \interlinepenalty \@M
- \normalfont\sectfont\nobreak
- \ifnumbered{#1}{%
- \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
- \partheadmidvskip
- }{}%
- \usekomafont{part}{\nobreak #3}\strut
- \expandafter\ifx\csname #1mark\endcsname\@gobble
- \@mkboth{}{}%
- \else
- \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
- \fi
- \par
+ \normalfont\usekomafont{disposition}{\nobreak
+ \IfUseNumber{%
+ \partlineswithprefixformat{#1}{%
+ \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
+ \partheadmidvskip
+ }{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#3\strut\@@par}%
+ }%
+ }{%
+ \partlineswithprefixformat{#1}{}{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#3\strut\@@par}%
+ }
+ }%
+ \expandafter\ifx\csname #1mark\endcsname\@gobble
+ \@mkboth{}{}%
+ \else
+ \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
+ \fi
+ }%
\endgroup
\nobreak
\@tempskipa=\glueexpr\@nameuse{scr@#1@afterskip}\relax\relax
@@ -3848,10 +3962,15 @@
\endgroup
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+ \let\IfUseNumber\@secondoftwo
\raggedpart
- \interlinepenalty \@M
- \normalfont
- \sectfont\nobreak\usekomafont{#1}{\nobreak #2}\strut\@mkboth{}{}\par
+ \normalfont\usekomafont{disposition}{%
+ \nobreak
+ \partlineswithprefixformat{#1}{}{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#2\strut\@@par}%
+ }%
+ \@mkboth{}{}%
+ }%
\endgroup
\nobreak
\@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax
@@ -3859,6 +3978,9 @@
\partheadendvskip
\@afterheading
}
+\newcommand{\partlineswithprefixformat}[3]{%
+ #2#3%
+}
\newcommand*{\hy@insteadofrefstepcounter}[1]{}
\let\hy@insteadofrefstepcounter\@gobble
\BeforePackage{hyperref}{%
@@ -4076,7 +4198,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -4158,12 +4280,21 @@
\expandafter\@secondoftwo
\fi
}
-\DeclareRobustCommand*\textsubscript[1]{%
- \@textsubscript{\selectfont#1}%
+\scr@ifundefinedorrelax{textsubscript}{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+}{%
+ \scr@ifundefinedorrelax{textsubscript }{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+ }{}%
}
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
+\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
\newcommand*{\scr@package@not@recommended}[2]{%
\scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
\@firstofone
@@ -4190,9 +4321,6 @@
option\MessageBreak
`cleardoublepage' with one of it's\MessageBreak
several values}
-\scr@package@not@recommended{parskip}{%
- option\MessageBreak
- `parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
@@ -4202,15 +4330,26 @@
`\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{minitoc}{}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{titleps}{%
+ package `scrlayer-scrpage'}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
KOMA-Script features, i.e., option `headings' and\MessageBreak
the extended optional argument of the section\MessageBreak
commands}
-\scr@package@not@recommended{titleps}{%
- package `scrlayer-scrpage'}
-\scr@package@not@recommended{minitoc}{}
+\scr@package@not@recommended{tocbibind}{%
+ options like `listof=totoc'\MessageBreak
+ or `bibliography=totoc', or commands like\MessageBreak
+ `\string\setuptoc{toc}{totoc}' instead of this package,\MessageBreak
+ because it breaks several KOMA-Script features of\MessageBreak
+ the list of figures, list of tables, bibliography,\MessageBreak
+ index and the running head%
+}
\BeforePackage{minitoc}{%
\let\scr@mt@saved@sect\@sect
}
@@ -4462,7 +4601,60 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
+%%% (run: body)
+\providecommand*{\@mkleft}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markleft
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \ClassWarning{\KOMAClassName}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkleft.\MessageBreak
+ Nevertheless, \string\markleft\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markleft
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkright}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markright
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \ClassWarning{\KOMAClassName}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkright.\MessageBreak
+ Nevertheless, \string\markright\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markright
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkdouble}[1]{%
+ \@mkboth{#1}{#1}%
+}
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -4944,6 +5136,22 @@
\hb@xt@\hsize{%
\cap@left
\vbox{\hsize\cap@width\linewidth\hsize
+ \scr@ifundefinedorrelax{@captype}{%
+ \ClassWarning{\KOMAClassName}{%
+ `\string\caption' outside float.\MessageBreak
+ Seems you are using `\string\caption' outside a
+ float.\MessageBreak
+ Maybe you are using a package that uses
+ `\string\@makecaption'\MessageBreak
+ without setting `\string\@captype' before.\MessageBreak
+ Because I cannot detect the caption type, I'm using\MessageBreak
+ the empty one.%
+ }%
+ \let\@captype\@empty
+ }{}%
+ \scr@ifundefinedorrelax{ragged\@captype caption}{\raggedcaption}{%
+ \@nameuse{ragged\@captype caption}%
+ }%
\ifdofullc@p
\@hangfrom{%
\strut
@@ -4955,7 +5163,7 @@
}%
}%
}%
- {\usekomafont{caption}{#3\unskip\strut\par}}%
+ {\usekomafont{caption}{#3\scr@endstrut\par}}%
\else
\ifdim\cap@indent<\z@
\strut
@@ -4965,7 +5173,7 @@
}%
}%
\noindent{\usekomafont{caption}{%
- \hspace*{-\cap@indent}#3\unskip\strut\par
+ \hspace*{-\cap@indent}#3\scr@endstrut\par
}}%
\else
\if@capbreak
@@ -4976,7 +5184,7 @@
}%
}%
\noindent\@hangfrom{\hspace*{\cap@indent}}%
- {\usekomafont{caption}{#3\unskip\strut\par}}%
+ {\usekomafont{caption}{#3\scr@endstrut\par}}%
\else
\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
{%
@@ -4984,7 +5192,7 @@
\scr@smashdp{%
#1{\usekomafont{captionlabel}{#2\captionformat}}%
}%
- {\usekomafont{caption}{#3\unskip\strut}\par}%
+ {\usekomafont{caption}{#3\scr@endstrut}\par}%
}%
\fi
\fi
@@ -4995,6 +5203,127 @@
}%
}\kern-\dp\strutbox
}
+\newcommand*\setcaptionalignment{%
+ \kernel@ifnextchar [%]
+ {\@setcaptionalignment}
+ {%
+ \scr@ifundefinedorrelax{@captype}{\@setcaptionalignment}{%
+ \edef\reserved@a{\noexpand\@setcaptionalignment[{\@captype}]}\reserved@a
+ }%
+ }%
+}%
+\newcommand*\@setcaptionalignment[2][]{%
+ \IfArgIsEmpty{#1}{}{%
+ \expandafter\ifnum
+ \scr@ifundefinedorrelax{#1}{0}{\scr@ifundefinedorrelax{end#1}{0}{1}}=0
+ \ClassWarning{\KOMAClassName}{%
+ float type `#1' defined not yet,\MessageBreak
+ but setting ragged mode for captions of\MessageBreak
+ float type `#1'%
+ }%
+ \fi
+ }%
+ \def\reserved@a{#2}%
+ \ifstr{\reserved@a}{j}{%
+ \expandafter\let\csname ragged#1caption\endcsname\@empty
+ }{%
+ \ifstr{\reserved@a}{l}{%
+ \scr@ifundefinedorrelax{LaTeXraggedright}{%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedright
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedright
+ }%
+ }{%
+ \ifstr{\reserved@a}{r}{%
+ \scr@ifundefinedorrelax{LaTeXraggedleft}{%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedleft
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedleft
+ }%
+ }{%
+ \ifstr{\reserved@a}{c}{%
+ \scr@ifundefinedorrelax{LaTeXcentering}{%
+ \expandafter\let\csname ragged#1caption\endcsname\centering
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXcentering
+ }%
+ }{%
+ \ifstr{\reserved@a}{J}{%
+ \scr@ifundefinedorrelax{justifying}{%
+ \scr@caption@raggede@warning{J}{\justifying}%
+ \expandafter\let\csname ragged#1caption\endcsname\@empty
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\justifying
+ }%
+ }{%
+ \ifstr{\reserved@a}{L}{%
+ \scr@ifundefinedorrelax{RaggedRight}{%
+ \scr@caption@raggede@warning{L}{\RaggedRight}%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedright
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\RaggedRight
+ }%
+ }{%
+ \ifstr{\reserved@a}{R}{%
+ \scr@ifundefinedorrelax{RaggedLeft}{%
+ \scr@caption@raggede@warning{R}{\RaggedLeft}%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedleft
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\RaggedLeft
+ }%
+ }{%
+ \ifstr{\reserved@a}{C}{%
+ \scr@ifundefinedorrelax{Centering}{%
+ \scr@caption@raggede@warning{C}{\Centering}%
+ \expandafter\let\csname ragged#1caption\endcsname\centering
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\Centering
+ }%
+ }{%
+ \ifstr{\reserved@a}{}{%
+ \expandafter\let\csname ragged#1caption\endcsname\relax
+ }{%
+ \ClassError{\KOMAClassName}{unknown alignment char `#2'}{%
+ \string\setcaptionalignment\space supports
+ only:\MessageBreak
+ \space\space c - centered captions,\MessageBreak
+ \space\space j - justified captions,\MessageBreak
+ \space\space l - left align captions,\MessageBreak
+ \space\space r - right aligned captions,\MessageBreak
+ \space\space C - centered captions with
+ `ragged2e',\MessageBreak
+ \space\space J - justified captions with
+ `ragged2e',\MessageBreak
+ \space\space L - left align captions with
+ `ragged2e',\MessageBreak
+ \space\space R - right aligned captions with
+ `ragged2e',\MessageBreak
+ or an empty argument to remove special
+ alignment.\MessageBreak
+ If you'd continue, I'd not change the alignment.%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}
+\newcommand*{\scr@caption@raggede@warning}[2]{%
+ \begingroup
+ \lowercase{\def\reserved@a{#1}}%
+ \ClassWarning{\KOMAClassName}{%
+ `\string#2' undefined!\MessageBreak
+ To avoid replacing caption alignment `#1' by `\reserved@a'\MessageBreak
+ you should load package `ragged2e' before using\MessageBreak
+ `\string\setcaptionalignment'%
+ }%
+ \endgroup
+}
+\newcommand*\raggedcaption{}
\newcommand*{\scr@caption@before@longtable@warning}[1]{%
\ClassWarning{\KOMAClassName}{%
you've loaded package `#1' before package\MessageBreak
@@ -5023,6 +5352,7 @@
}%
\LT@mcol\LT@cols c{%
\hbox to\z@{\hss\parbox[t]\linewidth{%
+ \def\@captype{table}%
\@@makecaption{#1}{#2}{#3}%
\endgraf
\if@captionabove
@@ -5095,64 +5425,30 @@
}
\newcommand*\figurename{Figure}
\newcommand*\tablename{Table}
-\newcounter{figure}
-\renewcommand*\thefigure{%
- \@arabic\c@figure
-}
-\newcommand*{\figureformat}{%
- \figurename~\thefigure%
-}
-\newcommand*{\fps@figure}{tbp}
-\newcommand*{\ftype@figure}{1}
-\newcommand*{\ext@figure}{lof}
-\newcommand*{\fnum@figure}{\figureformat}
-\newenvironment{figure}{%
- \def\caption{%
+\DeclareNewTOC[%
+ type=figure,
+ float,
+ floatpos=tbp,
+ floattype=1,
+ tocentryindent=1.5em,
+ tocentrynumwidth=2.3em,
+ atbegin=\def\caption{%
\if@figurecaptionabove\expandafter\captionabove
\else\expandafter\captionbelow\fi
- }%
- \@float{figure}%
-}{%
- \end@float
-}
-\newenvironment{figure*}{%
- \def\caption{%
- \if@figurecaptionabove\expandafter\captionabove
- \else\expandafter\captionbelow\fi
- }%
- \@dblfloat{figure}%
-}{%
- \end@dblfloat
-}
-\newcounter{table}
-\renewcommand*\thetable{%
- \@arabic\c@table
-}
-\newcommand*{\tableformat}{%
- \tablename~\thetable%
-}
-\newcommand*{\fps@table}{tbp}
-\newcommand*{\ftype@table}{2}
-\newcommand*{\ext@table}{lot}
-\newcommand*{\fnum@table}{\tableformat}
-\newenvironment{table}{%
- \def\caption{%
- \if@tablecaptionabove\expandafter\captionabove
- \else\expandafter\captionbelow\fi
- }%
- \@float{table}%
-}{%
- \end@float
-}
-\newenvironment{table*}{%
- \def\caption{%
+ }
+]{lof}
+\DeclareNewTOC[%
+ type=table,
+ float,
+ floatpos=tbp,
+ floattype=2,
+ tocentryindent=1.5em,
+ tocentrynumwidth=2.3em,
+ atbegin=\def\caption{%
\if@tablecaptionabove\expandafter\captionabove
\else\expandafter\captionbelow\fi
- }%
- \@dblfloat{table}%
-}{%
- \end@dblfloat
-}
+ }
+]{lot}
%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
@@ -5311,7 +5607,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -5353,13 +5649,11 @@
\def\do@endgroup{\endgroup}%
\def\do##1{%
\scr@ifundefinedorrelax{scr@tso@##1@numwidth}{}{%
- \typeout{Setting numwidth of `##1' to \last@l@number}%
\l@addto@macro\do@endgroup{%
\@namedef{scr@tso@##1@numwidth}{\last@l@number}%
}%
}%
\scr@ifundefinedorrelax{scr@tso@##1@indent}{}{%
- \typeout{Setting indent of `##1' to \string\z@}%
\l@addto@macro\do@endgroup{%
\@namedef{scr@tso@##1@indent}{\z@}%
}%
@@ -5448,17 +5742,13 @@
}%
\global\let\scr@float@addtolists@warning\relax
}
-\newcommand*\listfigurename{List of Figures}
-\newcommand*\listoflofname{\listfigurename}
-\newcommand*\listoflofentryname{\figurename}
-\newcommand*\listtablename{List of Tables}
-\newcommand*\listoflotname{\listtablename}
-\newcommand*\listoflotentryname{\tablename}
-\newcommand*\listoffigures{\listoftoc{\ext@figure}}
-\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 2640 2017-05-08 09:36:55Z kohm $
+\renewcommand*\listfigurename{List of Figures}
+\renewcommand*\listoflofname{\listfigurename}
+\renewcommand*\listoflofentryname{\figurename}
+\renewcommand*\listtablename{List of Tables}
+\renewcommand*\listoflotname{\listtablename}
+\renewcommand*\listoflotentryname{\tablename}
+%%% From File: $Id: scrkernel-bibliography.dtx 2769 2017-12-03 10:56:06Z kohm $
%%% (run: body)
\newcommand*\refname{References}
\newcommand*{\bibpreamble}{\relax}
@@ -5544,7 +5834,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2782 2017-12-04 07:47:52Z kohm $
%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
@@ -5553,17 +5843,9 @@
\twocolumn[%
\idx@@heading{\indexname}]%
\ifidx@leveldown
- \scr@ifundefinedorrelax{@mkright}{%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\indexname}}\fi
- }{%
- \@mkright{\MakeMarkcase{\indexname}}%
- }%
+ \@mkright{\MakeMarkcase{\indexname}}%
\else
- \scr@ifundefinedorrelax{@mkdouble}{%
- \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
- }{%
- \@mkdouble{\MakeMarkcase{\indexname}}%
- }%
+ \@mkdouble{\MakeMarkcase{\indexname}}%
\fi
}
\newenvironment{theindex}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 628817a715d..400505151ed 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,19 +67,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(%
KOMA-Script-independent
@@ -431,7 +431,7 @@
\long\def\l@addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: option)
\newcommand*{\dont@let@as@internal@defined}{/}
\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse
@@ -453,9 +453,9 @@
%%% (run: option)
%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{scrlfile}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: body)
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
@@ -1528,19 +1528,39 @@
}
\newcommand*{\scr@key@run@errors}{}
\newcommand*{\scr@execute@elseoption}[1]{%
+ \begingroup
\protected@edef\reserved@a{%
- \noexpand\def\noexpand\scr@key@name{@else@}%
+ \unexpanded{%
+ \endgroup
+ \let\scr@key@name@else\scr@key@name
+ \let\scr@key@value@else\scr@key@value
+ \def\scr@key@name{@else@}%
+ }%
\noexpand\def\noexpand\scr@key@value{%
\unexpanded\expandafter{\scr@key@atlist}}%
\noexpand\def\noexpand\scr@key@atlist{%
@else@={\unexpanded\expandafter{\scr@key@atlist}}}%
\noexpand\scr@execute@option{#1}%
- \noexpand\def\noexpand\scr@key@atlist{
+ \noexpand\def\noexpand\scr@key@atlist{%
\unexpanded\expandafter{\scr@key@atlist}}%
\noexpand\def\noexpand\scr@key@name{%
\unexpanded\expandafter{\scr@key@name}}%
\noexpand\def\noexpand\scr@key@value{%
\unexpanded\expandafter{\scr@key@value}}%
+ \scr@ifundefinedorrelax{scr@key@name@else}{%
+ \unexpanded{\let\scr@key@name@else\relax}%
+ }{%
+ \noexpand\def\noexpand\scr@key@name@else{%
+ \unexpanded\expandafter{\scr@key@name@else}%
+ }%
+ }
+ \scr@ifundefinedorrelax{scr@key@value@else}{%
+ \unexpanded{\let\scr@key@value@else\relax}%
+ }{%
+ \noexpand\def\noexpand\scr@key@value@else{%
+ \unexpanded\expandafter{\scr@key@value@else}%
+ }%
+ }%
}\reserved@a
}
\newif\ifscr@key@found@
@@ -1886,13 +1906,15 @@
\let\reserved@b=\@empty
\@tempswafalse
\@for\@valuelist:=#4\do{%
- \if@tempswa\else
- \edef\reserved@c{\expandafter\@firstoftwo\@valuelist}%
- \edef\reserved@a{\reserved@a\reserved@b`\reserved@c'}%
- \edef\reserved@b{, }%
- \ifx\reserved@c\@searched
- \@tempswatrue
- \edef\reserved@a{\expandafter\@secondoftwo\@valuelist}%
+ \ifx\@valuelist\@empty\else
+ \if@tempswa\else
+ \edef\reserved@c{\expandafter\@firstoftwo\@valuelist}%
+ \edef\reserved@a{\reserved@a\reserved@b`\reserved@c'}%
+ \edef\reserved@b{, }%
+ \ifx\reserved@c\@searched
+ \@tempswatrue
+ \edef\reserved@a{\expandafter\@secondoftwo\@valuelist}%
+ \fi
\fi
\fi
}%
@@ -1920,6 +1942,17 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
+\newcommand*{\FamilyCSKey}[3][.\@currname.\@currext]{%
+ \kernel@ifnextchar [%]
+ {\Family@@CS@@Key{#1}{#2}{#3}}{\Family@CS@Key{#1}{#2}{#3}}%
+}
+\newcommand*{\Family@@CS@@Key}{}
+\long\def\Family@@String@@Key#1#2#3[#4]#5{%
+ \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\@namedef{#5}{##1}}%
+}
+\newcommand{\Family@CS@Key}[4]{%
+ \DefineFamilyKey[{#1}]{#2}{#3}{\@namedef{#4}{##1}\FamilyKeyStateProcessed}%
+}
%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $
%%% (run: body)
\newcommand*{\defcaptionname}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index b322c71ca18..219da414183 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -43,6 +43,7 @@
%% scrkernel-sections.dtx (with options: `class,book,body')
%% scrkernel-miscellaneous.dtx (with options: `class,book,body')
%% scrkernel-pagestyles.dtx (with options: `class,book,body')
+%% scrlayer.dtx (with options: `class,book,body')
%% scrkernel-floats.dtx (with options: `class,book,body')
%% scrkernel-footnotes.dtx (with options: `class,book,body')
%% scrkernel-listsof.dtx (with options: `class,book,body')
@@ -83,7 +84,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -105,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -120,25 +121,23 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
\RequirePackage{tocbasic}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
-\addtotoclist[float]{lof}
-\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrighttrue
@@ -214,7 +213,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -283,10 +282,11 @@
\@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 2661 2017-07-24 19:45:16Z kohm $
+\@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@last}{17}
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
@@ -360,7 +360,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -369,11 +369,17 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
@@ -381,6 +387,29 @@
\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
+\KOMA@key{overfullrule}[true]{%
+ \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{\z@}%
+ \fi
+ \fi
+}
+\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
@@ -389,7 +418,7 @@
}
%%% 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 $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
\newcommand*\@ptsize{%
11%
@@ -475,7 +504,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -585,7 +614,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -738,7 +767,7 @@
\fi
\else
\endgroup
- \FamilyKeyStateUnkownValue
+ \FamilyKeyStateUnknownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -751,7 +780,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: option)
\newif\if@titlepage
\@titlepagetrue
@@ -783,9 +812,9 @@
}{titlepage}{\if@titlepage true\else false\fi}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1152,7 +1181,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1358,7 +1387,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
@@ -1441,13 +1470,14 @@
{flat}{3},{left}{3},%
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
- {entryprefix}{6},
- {indenttextentries}{7},{indentunnumbered}{7},{numberline}{7},%
- {leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
- {chapterentry}{9},{withchapterentry}{9},%
- {nochaptergap}{10},{ignorechapter}{10},%
- {chaptergapsmall}{11},{smallchaptergap}{11},%
- {chaptergapline}{12},{onelinechaptergap}{12}%
+ {standardlevel}{6},
+ {entryprefix}{7},
+ {indenttextentries}{8},{indentunnumbered}{8},{numberline}{8},%
+ {leftaligntextentries}{9},{leftalignunnumbered}{9},{nonumberline}{9}%
+ ,{chapterentry}{10},{withchapterentry}{10},%
+ {nochaptergap}{11},{ignorechapter}{11},%
+ {chaptergapsmall}{12},{smallchaptergap}{12},%
+ {chaptergapline}{13},{onelinechaptergap}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax % notoc
@@ -1521,6 +1551,7 @@
\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{standardlevel}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
@@ -1528,6 +1559,15 @@
\AtAddToTocList[float]{%
\setuptoc{\@currext}{leveldown}%
}%
+ \or% standardlevel
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{standardlevel}%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{leveldown}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{leveldown}%
+ }%
\or% entryprefix
\KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
@@ -1623,7 +1663,7 @@
\BeforeTOCHead{\@chaptertolistsfalse}
\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2769 2017-12-03 10:56:06Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
@@ -1686,21 +1726,16 @@
\renewcommand*{\newblock}{\hskip .11em\@plus.33em\@minus.07em}%
}
\scr@bibstyle@oldstyle
-\newcommand*\bib@heading{%
+\newcommand*{\bib@heading}{%
+ \bibliography@heading{\bibname}%
+}
+\newcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \section*{\bibname}%
- \scr@ifundefinedorrelax{@mkright}{%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi
- }{%
- \@mkright{\MakeMarkcase{\bibname}}%
- }%
+ \section*{#1}%
+ \@mkright{\MakeMarkcase{#1}}%
\else
- \chapter*{\bibname}%
- \scr@ifundefinedorrelax{@mkdouble}{%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
- }{%
- \@mkdouble{\MakeMarkcase{\bibname}}%
- }%
+ \chapter*{#1}%
+ \@mkdouble{\MakeMarkcase{#1}}%
\fi
}%
\newif\ifbib@leveldown
@@ -1723,13 +1758,13 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \section*{\bibname}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \section*{##1}%
+ \@mkright{\MakeMarkcase{##1}}%
\else
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \chapter*{##1}%
+ \@mkdouble{\MakeMarkcase{##1}}%
\fi
}%
\or% totoc
@@ -1741,16 +1776,16 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \addsec{\bibname}
+ \addsec{##1}%
\else
\if@chaptertolists
- \@chaptertolistsfalse\addchap{\bibname}\@chaptertoliststrue
+ \@chaptertolistsfalse\addchap{##1}\@chaptertoliststrue
\else
- \addchap{\bibname}
+ \addchap{##1}%
\fi
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \@mkdouble{\MakeMarkcase{##1}}%
\fi
}%
\or% numbered
@@ -1762,17 +1797,16 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \section{\bibname}%
+ \section{##1}%
\else
\if@chaptertolists
- \@chaptertolistsfalse\chapter{\bibname}\@chaptertoliststrue
+ \@chaptertolistsfalse\chapter{##1}\@chaptertoliststrue
\else
- \chapter{\bibname}
+ \chapter{##1}
\fi
- \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
- {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \@mkdouble{\MakeMarkcase{\chaptermarkformat ##1}}%
\fi
}
\or% leveldown
@@ -1798,7 +1832,7 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2782 2017-12-04 07:47:52Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
@@ -1812,7 +1846,8 @@
\KOMA@set@ncmdkey{index}{@tempa}{%
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1},%
- {numbered}{2},{totocnumbered}{2},%
+ {numbered}{2},{totocnumbered}{2},{numberedtotoc}{2},{tocnumbered}{2},%
+ {numberedtoc}{2},%
{leveldown}{3},%
{standardlevel}{4}%
}{#1}%
@@ -1884,20 +1919,20 @@
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% 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 $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2385,7 +2420,7 @@
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 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2430,7 +2465,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -2559,12 +2594,16 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
}}%
+\newcommand*{\@frontispiece}{}%
+\newcommand{\frontispiece}[1]{\gdef\@frontispiece{%
+ #1%
+}}%
\newcommand*{\@titlehead}{}%
\newcommand{\titlehead}[1]{\gdef\@titlehead{%
#1%
@@ -2654,8 +2693,20 @@
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
- \ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty
+ \else
+ \if@twoside\mbox{}\next@tpage\fi
+ \noindent\@frontispiece\next@tdpage
+ \fi
+ \else
+ \noindent\@extratitle
+ \ifx\@frontispiece\@empty
+ \else
+ \next@tpage
+ \noindent\@frontispiece
+ \fi
+ \next@tdpage
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
@@ -2738,20 +2789,46 @@
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \ifx\@extratitle\@empty\else
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
\@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
\next@tdpage
\fi
\@maketitle
\else
- \ifx\@extratitle\@empty\else
- \twocolumn[\@makeextratitle]\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
+ \twocolumn[\@makeextratitle]%
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \twocolumn[\@makefrontispiece]%
+ \next@tdpage
\fi
\twocolumn[\@maketitle]%
\fi
\else
- \ifx\@extratitle\@empty\else
- \@makeextratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else \mbox{}\fi
+ \else
+ \@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
+ \next@tdpage
\fi
\@maketitle
\fi
@@ -2770,6 +2847,7 @@
\global\let\@title\@empty
\global\let\@subtitle\@empty
\global\let\@extratitle\@empty
+ \global\let\@frontispiece\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
\global\let\@publishers\@empty
@@ -2794,6 +2872,11 @@
\noindent\@extratitle\par
\fi
}
+\newcommand*{\@makefrontispiece}{%
+ \ifx\@frontispiece\@empty \else
+ \noindent\@frontispiece\par
+ \fi
+}
\newcommand*{\@maketitle}{%
\global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -2867,10 +2950,10 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2884,7 +2967,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -2904,17 +2987,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z 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 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -3873,29 +3956,54 @@
}
\newcommand*{\DeclareNewSectionCommand}[2][]{%
\@ifundefined{#2}{%
- \DeclareSectionCommand[{#1}]{#2}%
+ \@tempswatrue
+ \let\reserved@b\@empty
+ \@for \reserved@a:=the#2,#2mark,#2format,#2markformat\do{%
+ \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{%
+ \@tempswafalse
+ \edef\reserved@b{\expandafter\string\csname \reserved@a\endcsname}%
+ }
+ }
+ \if@tempswa
+ \DeclareSectionCommand[{#1}]{#2}%
+ \else
+ \ClassError{\KOMAClassName}{%
+ command `\reserved@b` already defined%
+ }{%
+ You've tried to define the section command `\expandafter\string\csname
+ #2\endcsname` newly.\MessageBreak
+ Such a section command needs an additional new command
+ `\reserved@b`,\MessageBreak
+ but this already exists. So you cannot define
+ `\expandafter\string\csname #2\endcsname` newly.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be ignored.%
+ }%
+ \fi
}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #1\endcsname` already defined%
+ command `\expandafter\string\csname #2\endcsname` already defined%
}{%
You've tried to define the section command `\expandafter\string\csname
- #1\endcsname` newly,\MessageBreak
- but a command, token, box or length with this name already
+ #2\endcsname` newly,\MessageBreak
+ but a command or something else with this name already
exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\RedeclareSectionCommand,\MessageBreak
or \string\ProvideSectionCommand.\MessageBreak
- If you'll continue, the command will be irgnored.%
+ If you'll continue, the command will be ignored.%
}%
}%
}
\newcommand*{\RedeclareSectionCommand}[2][]{%
\@ifundefined{#2}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #1\endcsname` not defined%
+ command `\expandafter\string\csname #2\endcsname` not defined%
}{%
You've tried to re-define the section command `\expandafter\string\csname
- #1\endcsname`,\MessageBreak
+ #2\endcsname`,\MessageBreak
but a command with this name does not exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\DeclareNewSectionCommand,\MessageBreak
@@ -4256,21 +4364,28 @@
}%
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+ \def\IfUseNumber{\ifnumbered{#1}}%
\raggedpart
- \interlinepenalty \@M
- \normalfont\sectfont\nobreak
- \ifnumbered{#1}{%
- \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
- \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
- \partheadmidvskip
- }{}%
- \usekomafont{part}{\nobreak #3}\strut
- \expandafter\ifx\csname #1mark\endcsname\@gobble
- \@mkboth{}{}%
- \else
- \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
- \fi
- \par
+ \normalfont\usekomafont{disposition}{\nobreak
+ \IfUseNumber{%
+ \partlineswithprefixformat{#1}{%
+ \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
+ \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
+ \partheadmidvskip
+ }{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#3\strut\@@par}%
+ }%
+ }{%
+ \partlineswithprefixformat{#1}{}{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#3\strut\@@par}%
+ }
+ }%
+ \expandafter\ifx\csname #1mark\endcsname\@gobble
+ \@mkboth{}{}%
+ \else
+ \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
+ \fi
+ }%
\endgroup
\@nameuse{@end#1}%
}
@@ -4281,13 +4396,21 @@
\endgroup
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+ \let\IfUseNumber\@secondoftwo
\raggedpart
- \interlinepenalty \@M
- \normalfont
- \sectfont\nobreak\usekomafont{#1}{\nobreak #2}\strut\@mkboth{}{}\par
+ \normalfont\usekomafont{disposition}{%
+ \nobreak
+ \partlineswithprefixformat{#1}{}{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#2\strut\@@par}%
+ }%
+ \@mkboth{}{}%
+ }%
\endgroup
\@nameuse{@end#1}%
}
+\newcommand{\partlineswithprefixformat}[3]{%
+ #2#3%
+}
\newcommand*{\scr@@endpart}[1]{%
\vbox to\z@{\use@preamble{#1@u}\vss}%
\@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax
@@ -4540,7 +4663,7 @@
\chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
- \let\IfUseNumber\secondoftwo
+ \let\IfUseNumber\@secondoftwo
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
\else
@@ -4875,7 +4998,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -4963,12 +5086,21 @@
\expandafter\@secondoftwo
\fi
}
-\DeclareRobustCommand*\textsubscript[1]{%
- \@textsubscript{\selectfont#1}%
+\scr@ifundefinedorrelax{textsubscript}{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+}{%
+ \scr@ifundefinedorrelax{textsubscript }{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+ }{}%
}
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
+\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
\newcommand*{\scr@package@not@recommended}[2]{%
\scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
\@firstofone
@@ -4995,9 +5127,6 @@
option\MessageBreak
`cleardoublepage' with one of it's\MessageBreak
several values}
-\scr@package@not@recommended{parskip}{%
- option\MessageBreak
- `parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
@@ -5007,15 +5136,26 @@
`\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{minitoc}{}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{titleps}{%
+ package `scrlayer-scrpage'}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
KOMA-Script features, i.e., option `headings' and\MessageBreak
the extended optional argument of the section\MessageBreak
commands}
-\scr@package@not@recommended{titleps}{%
- package `scrlayer-scrpage'}
-\scr@package@not@recommended{minitoc}{}
+\scr@package@not@recommended{tocbibind}{%
+ options like `listof=totoc'\MessageBreak
+ or `bibliography=totoc', or commands like\MessageBreak
+ `\string\setuptoc{toc}{totoc}' instead of this package,\MessageBreak
+ because it breaks several KOMA-Script features of\MessageBreak
+ the list of figures, list of tables, bibliography,\MessageBreak
+ index and the running head%
+}
\BeforePackage{minitoc}{%
\let\scr@mt@saved@sect\@sect
}
@@ -5272,7 +5412,60 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
+%%% (run: body)
+\providecommand*{\@mkleft}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markleft
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \ClassWarning{\KOMAClassName}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkleft.\MessageBreak
+ Nevertheless, \string\markleft\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markleft
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkright}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markright
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \ClassWarning{\KOMAClassName}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkright.\MessageBreak
+ Nevertheless, \string\markright\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markright
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkdouble}[1]{%
+ \@mkboth{#1}{#1}%
+}
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -5754,6 +5947,22 @@
\hb@xt@\hsize{%
\cap@left
\vbox{\hsize\cap@width\linewidth\hsize
+ \scr@ifundefinedorrelax{@captype}{%
+ \ClassWarning{\KOMAClassName}{%
+ `\string\caption' outside float.\MessageBreak
+ Seems you are using `\string\caption' outside a
+ float.\MessageBreak
+ Maybe you are using a package that uses
+ `\string\@makecaption'\MessageBreak
+ without setting `\string\@captype' before.\MessageBreak
+ Because I cannot detect the caption type, I'm using\MessageBreak
+ the empty one.%
+ }%
+ \let\@captype\@empty
+ }{}%
+ \scr@ifundefinedorrelax{ragged\@captype caption}{\raggedcaption}{%
+ \@nameuse{ragged\@captype caption}%
+ }%
\ifdofullc@p
\@hangfrom{%
\strut
@@ -5765,7 +5974,7 @@
}%
}%
}%
- {\usekomafont{caption}{#3\unskip\strut\par}}%
+ {\usekomafont{caption}{#3\scr@endstrut\par}}%
\else
\ifdim\cap@indent<\z@
\strut
@@ -5775,7 +5984,7 @@
}%
}%
\noindent{\usekomafont{caption}{%
- \hspace*{-\cap@indent}#3\unskip\strut\par
+ \hspace*{-\cap@indent}#3\scr@endstrut\par
}}%
\else
\if@capbreak
@@ -5786,7 +5995,7 @@
}%
}%
\noindent\@hangfrom{\hspace*{\cap@indent}}%
- {\usekomafont{caption}{#3\unskip\strut\par}}%
+ {\usekomafont{caption}{#3\scr@endstrut\par}}%
\else
\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
{%
@@ -5794,7 +6003,7 @@
\scr@smashdp{%
#1{\usekomafont{captionlabel}{#2\captionformat}}%
}%
- {\usekomafont{caption}{#3\unskip\strut}\par}%
+ {\usekomafont{caption}{#3\scr@endstrut}\par}%
}%
\fi
\fi
@@ -5805,6 +6014,127 @@
}%
}\kern-\dp\strutbox
}
+\newcommand*\setcaptionalignment{%
+ \kernel@ifnextchar [%]
+ {\@setcaptionalignment}
+ {%
+ \scr@ifundefinedorrelax{@captype}{\@setcaptionalignment}{%
+ \edef\reserved@a{\noexpand\@setcaptionalignment[{\@captype}]}\reserved@a
+ }%
+ }%
+}%
+\newcommand*\@setcaptionalignment[2][]{%
+ \IfArgIsEmpty{#1}{}{%
+ \expandafter\ifnum
+ \scr@ifundefinedorrelax{#1}{0}{\scr@ifundefinedorrelax{end#1}{0}{1}}=0
+ \ClassWarning{\KOMAClassName}{%
+ float type `#1' defined not yet,\MessageBreak
+ but setting ragged mode for captions of\MessageBreak
+ float type `#1'%
+ }%
+ \fi
+ }%
+ \def\reserved@a{#2}%
+ \ifstr{\reserved@a}{j}{%
+ \expandafter\let\csname ragged#1caption\endcsname\@empty
+ }{%
+ \ifstr{\reserved@a}{l}{%
+ \scr@ifundefinedorrelax{LaTeXraggedright}{%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedright
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedright
+ }%
+ }{%
+ \ifstr{\reserved@a}{r}{%
+ \scr@ifundefinedorrelax{LaTeXraggedleft}{%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedleft
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedleft
+ }%
+ }{%
+ \ifstr{\reserved@a}{c}{%
+ \scr@ifundefinedorrelax{LaTeXcentering}{%
+ \expandafter\let\csname ragged#1caption\endcsname\centering
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXcentering
+ }%
+ }{%
+ \ifstr{\reserved@a}{J}{%
+ \scr@ifundefinedorrelax{justifying}{%
+ \scr@caption@raggede@warning{J}{\justifying}%
+ \expandafter\let\csname ragged#1caption\endcsname\@empty
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\justifying
+ }%
+ }{%
+ \ifstr{\reserved@a}{L}{%
+ \scr@ifundefinedorrelax{RaggedRight}{%
+ \scr@caption@raggede@warning{L}{\RaggedRight}%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedright
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\RaggedRight
+ }%
+ }{%
+ \ifstr{\reserved@a}{R}{%
+ \scr@ifundefinedorrelax{RaggedLeft}{%
+ \scr@caption@raggede@warning{R}{\RaggedLeft}%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedleft
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\RaggedLeft
+ }%
+ }{%
+ \ifstr{\reserved@a}{C}{%
+ \scr@ifundefinedorrelax{Centering}{%
+ \scr@caption@raggede@warning{C}{\Centering}%
+ \expandafter\let\csname ragged#1caption\endcsname\centering
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\Centering
+ }%
+ }{%
+ \ifstr{\reserved@a}{}{%
+ \expandafter\let\csname ragged#1caption\endcsname\relax
+ }{%
+ \ClassError{\KOMAClassName}{unknown alignment char `#2'}{%
+ \string\setcaptionalignment\space supports
+ only:\MessageBreak
+ \space\space c - centered captions,\MessageBreak
+ \space\space j - justified captions,\MessageBreak
+ \space\space l - left align captions,\MessageBreak
+ \space\space r - right aligned captions,\MessageBreak
+ \space\space C - centered captions with
+ `ragged2e',\MessageBreak
+ \space\space J - justified captions with
+ `ragged2e',\MessageBreak
+ \space\space L - left align captions with
+ `ragged2e',\MessageBreak
+ \space\space R - right aligned captions with
+ `ragged2e',\MessageBreak
+ or an empty argument to remove special
+ alignment.\MessageBreak
+ If you'd continue, I'd not change the alignment.%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}
+\newcommand*{\scr@caption@raggede@warning}[2]{%
+ \begingroup
+ \lowercase{\def\reserved@a{#1}}%
+ \ClassWarning{\KOMAClassName}{%
+ `\string#2' undefined!\MessageBreak
+ To avoid replacing caption alignment `#1' by `\reserved@a'\MessageBreak
+ you should load package `ragged2e' before using\MessageBreak
+ `\string\setcaptionalignment'%
+ }%
+ \endgroup
+}
+\newcommand*\raggedcaption{}
\newcommand*{\scr@caption@before@longtable@warning}[1]{%
\ClassWarning{\KOMAClassName}{%
you've loaded package `#1' before package\MessageBreak
@@ -5833,6 +6163,7 @@
}%
\LT@mcol\LT@cols c{%
\hbox to\z@{\hss\parbox[t]\linewidth{%
+ \def\@captype{table}%
\@@makecaption{#1}{#2}{#3}%
\endgraf
\if@captionabove
@@ -5905,42 +6236,40 @@
}
\newcommand*\figurename{Figure}
\newcommand*\tablename{Table}
-\newcounter{figure}[chapter]
+\DeclareNewTOC[%
+ type=figure,
+ float,
+ counterwithin=chapter,
+ floatpos=tbp,
+ floattype=1,
+ tocentryindent=1.5em,
+ tocentrynumwidth=2.3em,
+ atbegin=\def\caption{%
+ \if@figurecaptionabove\expandafter\captionabove
+ \else\expandafter\captionbelow\fi
+ }
+]{lof}
\renewcommand*\thefigure{%
\expandafter\ifnum\scr@v@is@gt{2.97d}\relax
\if@mainmatter\thechapter.\fi
\else
- \thechapter.%
+ \thechapter.%
\fi
\@arabic\c@figure
}
-\newcommand*{\figureformat}{%
- \figurename~\thefigure%
- \autodot%
-}
-\newcommand*{\fps@figure}{tbp}
-\newcommand*{\ftype@figure}{1}
-\newcommand*{\ext@figure}{lof}
-\newcommand*{\fnum@figure}{\figureformat}
-\newenvironment{figure}{%
- \def\caption{%
- \if@figurecaptionabove\expandafter\captionabove
- \else\expandafter\captionbelow\fi
- }%
- \@float{figure}%
-}{%
- \end@float
-}
-\newenvironment{figure*}{%
- \def\caption{%
- \if@figurecaptionabove\expandafter\captionabove
+\DeclareNewTOC[%
+ type=table,
+ float,
+ counterwithin=chapter,
+ floatpos=tbp,
+ floattype=2,
+ tocentryindent=1.5em,
+ tocentrynumwidth=2.3em,
+ atbegin=\def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
\else\expandafter\captionbelow\fi
- }%
- \@dblfloat{figure}%
-}{%
- \end@dblfloat
-}
-\newcounter{table}[chapter]
+ }
+]{lot}
\renewcommand*\thetable{%
\expandafter\ifnum\scr@v@is@gt{2.97d}\relax
\if@mainmatter\thechapter.\fi
@@ -5949,32 +6278,6 @@
\fi
\@arabic\c@table
}
-\newcommand*{\tableformat}{%
- \tablename~\thetable%
- \autodot%
-}
-\newcommand*{\fps@table}{tbp}
-\newcommand*{\ftype@table}{2}
-\newcommand*{\ext@table}{lot}
-\newcommand*{\fnum@table}{\tableformat}
-\newenvironment{table}{%
- \def\caption{%
- \if@tablecaptionabove\expandafter\captionabove
- \else\expandafter\captionbelow\fi
- }%
- \@float{table}%
-}{%
- \end@float
-}
-\newenvironment{table*}{%
- \def\caption{%
- \if@tablecaptionabove\expandafter\captionabove
- \else\expandafter\captionbelow\fi
- }%
- \@dblfloat{table}%
-}{%
- \end@dblfloat
-}
%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
@@ -6134,7 +6437,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -6182,13 +6485,11 @@
\def\do@endgroup{\endgroup}%
\def\do##1{%
\scr@ifundefinedorrelax{scr@tso@##1@numwidth}{}{%
- \typeout{Setting numwidth of `##1' to \last@l@number}%
\l@addto@macro\do@endgroup{%
\@namedef{scr@tso@##1@numwidth}{\last@l@number}%
}%
}%
\scr@ifundefinedorrelax{scr@tso@##1@indent}{}{%
- \typeout{Setting indent of `##1' to \string\z@}%
\l@addto@macro\do@endgroup{%
\@namedef{scr@tso@##1@indent}{\z@}%
}%
@@ -6277,17 +6578,13 @@
}%
\global\let\scr@float@addtolists@warning\relax
}
-\newcommand*\listfigurename{List of Figures}
-\newcommand*\listoflofname{\listfigurename}
-\newcommand*\listoflofentryname{\figurename}
-\newcommand*\listtablename{List of Tables}
-\newcommand*\listoflotname{\listtablename}
-\newcommand*\listoflotentryname{\tablename}
-\newcommand*\listoffigures{\listoftoc{\ext@figure}}
-\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 2640 2017-05-08 09:36:55Z kohm $
+\renewcommand*\listfigurename{List of Figures}
+\renewcommand*\listoflofname{\listfigurename}
+\renewcommand*\listoflofentryname{\figurename}
+\renewcommand*\listtablename{List of Tables}
+\renewcommand*\listoflotname{\listtablename}
+\renewcommand*\listoflotentryname{\tablename}
+%%% From File: $Id: scrkernel-bibliography.dtx 2769 2017-12-03 10:56:06Z kohm $
%%% (run: body)
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
@@ -6373,7 +6670,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2782 2017-12-04 07:47:52Z kohm $
%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
@@ -6384,17 +6681,9 @@
\@chaptertolistsfalse
\idx@@heading{\indexname}]%
\ifidx@leveldown
- \scr@ifundefinedorrelax{@mkright}{%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\indexname}}\fi
- }{%
- \@mkright{\MakeMarkcase{\indexname}}%
- }%
+ \@mkright{\MakeMarkcase{\indexname}}%
\else
- \scr@ifundefinedorrelax{@mkdouble}{%
- \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
- }{%
- \@mkdouble{\MakeMarkcase{\indexname}}%
- }%
+ \@mkdouble{\MakeMarkcase{\indexname}}%
\fi
}
\newenvironment{theindex}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 122a98fb523..089b55ce832 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 12cc37982a7..dce014701cd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -78,7 +78,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -100,7 +100,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -109,7 +109,7 @@
%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: prepare)
\ProvidesPackage{scrextend}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr@ext@activate}[1]{%
@@ -133,13 +133,13 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: prepare)
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
@@ -208,7 +208,8 @@
\@namedef{scr@v@3.22}{16}
\@namedef{scr@v@3.23}{16}
\@namedef{scr@v@3.24}{16}
-\@namedef{scr@v@last}{16}
+\@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@last}{17}
%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
\KOMA@key{extendedfeature}{%
@@ -233,7 +234,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -288,7 +289,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -297,11 +298,17 @@
\KOMA@kav@replacebool{.%
scrextend.\scr@pkgextension
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
\KOMA@kav@replacebool{.%
scrextend.\scr@pkgextension
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
@@ -312,11 +319,36 @@
\KOMA@DeclareStandardOption
[scrextend]
{final}{draft=false}
+\KOMA@key{overfullrule}[true]{%
+ \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{\z@}%
+ \fi
+ \fi
+}
+\KOMA@kav@xadd{.scrextend.\scr@pkgextension}{overfullrule}{%
+ \ifdim\overfullrule>\z@ true\else false\fi
+}
\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
@@ -353,7 +385,7 @@
scrextend.\scr@pkgextension
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: option)
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
@@ -397,7 +429,7 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
@@ -481,7 +513,7 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
@@ -556,14 +588,14 @@
\relax}
%%% 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 $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: execoption)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -920,13 +952,17 @@
because I do not change it%
}%
}
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: body)
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
##1%
}}%
+\newcommand*{\@frontispiece}{}%
+\newcommand{\frontispiece}[1]{\gdef\@frontispiece{%
+ ##1%
+}}%
\newcommand*{\@titlehead}{}%
\newcommand{\titlehead}[1]{\gdef\@titlehead{%
##1%
@@ -1017,8 +1053,20 @@
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
- \ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty
+ \else
+ \if@twoside\mbox{}\next@tpage\fi
+ \noindent\@frontispiece\next@tdpage
+ \fi
+ \else
+ \noindent\@extratitle
+ \ifx\@frontispiece\@empty
+ \else
+ \next@tpage
+ \noindent\@frontispiece
+ \fi
+ \next@tdpage
\fi
\parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil
\ifx\@titlehead\@empty \else
@@ -1101,20 +1149,46 @@
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \ifx\@extratitle\@empty\else
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
\@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
\next@tdpage
\fi
\@maketitle
\else
- \ifx\@extratitle\@empty\else
- \twocolumn[\@makeextratitle]\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
+ \twocolumn[\@makeextratitle]%
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \twocolumn[\@makefrontispiece]%
+ \next@tdpage
\fi
\twocolumn[\@maketitle]%
\fi
\else
- \ifx\@extratitle\@empty\else
- \@makeextratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else \mbox{}\fi
+ \else
+ \@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
+ \next@tdpage
\fi
\@maketitle
\fi
@@ -1133,6 +1207,7 @@
\global\let\@title\@empty
\global\let\@subtitle\@empty
\global\let\@extratitle\@empty
+ \global\let\@frontispiece\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
\global\let\@publishers\@empty
@@ -1157,6 +1232,11 @@
\noindent\@extratitle\par
\fi
}
+\newcommand*{\@makefrontispiece}{%
+ \ifx\@frontispiece\@empty \else
+ \noindent\@frontispiece\par
+ \fi
+}
\newcommand*{\@maketitle}{%
\global\@topnum=\z@
\parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil
@@ -1232,11 +1312,11 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: body)
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: body)
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
@@ -1315,15 +1395,24 @@
\expandafter\@secondoftwo
\fi
}
-\DeclareRobustCommand*\textsubscript[1]{%
- \@textsubscript{\selectfont#1}%
+\scr@ifundefinedorrelax{textsubscript}{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+}{%
+ \scr@ifundefinedorrelax{textsubscript }{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+ }{}%
}
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
+\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
%%% 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 $
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index 3cb03ddd39d..e269b963013 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -42,7 +42,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,21 +64,21 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: identify)
\ProvidesPackage{scrfontsizes}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package (font size file generator)]
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index f21b8c47bc1..2d086eb6085 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,22 +65,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
%%% using: package,option
\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
\KOMAExecuteOptions{hyperref=true}%
@@ -99,7 +99,7 @@
\KOMA@ifkey{lscape}{@scrhack@lscape}%
\KOMAExecuteOptions{lscape=true}%
\KOMAProcessOptions\relax
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
%%% using: package,body
\newcommand{\scr@ifexpected}[2]{%
\begingroup
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index ed9a3d30960..2218f038bcf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -39,10 +39,10 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrjura.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrjura.dtx 2847 2017-12-19 09:38:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(for jurists)
]
@@ -382,32 +382,38 @@
\@onlypreamble\DeclareNewJuraEnvironment
\DefineFamily{KOMAarg}
\DefineFamilyMember{KOMAarg}
-\DefineFamilyKey{KOMAarg}{Clause}{%
- \expandafter\gdef\csname \scrjura@env@type @Clause\endcsname{#1}%
-}
-\DefineFamilyKey{KOMAarg}{SubClause}{%
- \expandafter\gdef\csname \scrjura@env@type @SubClause\endcsname{#1}%
-}
-\DefineFamilyKey{KOMAarg}{Sentence}{%
- \expandafter\gdef\csname \scrjura@env@type @Sentence\endcsname{#1}%
-}
-\DefineFamilyKey{KOMAarg}{ClauseNumberFormat}{%
- \expandafter\gdef\csname \scrjura@env@type @Clauseformat \endcsname
- ##1{#1{##1}}
- \expandafter\xdef\csname \scrjura@env@type @Clauseformat\endcsname{%
- \noexpand\protect\expandafter\noexpand
- \csname \scrjura@env@type @Clauseformat \endcsname
- }%
-}
\newcommand{\@defjuraenvironment}{}
\long\def\@defjuraenvironment#1[#2]#3#4{%
+ \let\reserved@defjuraenvironment\relax
\newcounter{#1Clause}%
\newcounter{#1AbsoluteClause}%
\newcounter{#1SubClause}%
- \begingroup
- \edef\scrjura@env@type{#1}%
- \FamilyExecuteOptions[.scrjura.sty]{KOMAarg}{#2}%
- \endgroup
+ \FamilyCSKey[.scrjura.sty]{KOMAarg}{Clause}{#1@Clause}%
+ \FamilyCSKey[.scrjura.sty]{KOMAarg}{SubClause}{#1@SubClause}%
+ \FamilyCSKey[.scrjura.sty]{KOMAarg}{Sentence}{#1@Sentence}%
+ \DefineFamilyKey[.scrjura.sty]{KOMAarg}{ClauseNumberFormat}{%
+ \expandafter\def\csname #1@Clauseformat \endcsname####1{##1{####1}}%
+ \expandafter\edef\csname #1@Clauseformat\endcsname{%
+ \noexpand\protect\expandafter\noexpand\csname #1@Clauseformat \endcsname
+ }%
+ \FamilyKeyStateProcessed
+ }
+ \DefineFamilyKey[.scrjura.sty]{KOMAarg}{ClauseFont}{%
+ \IfExistskomafont{#1.Clause}{%
+ \IfIsAliaskomafont{#1.Clause}{%
+ \expandafter\let\csname scr@fnt@instead@#1.Clause\endcsname\relax
+ \newkomafont{#1.Clause}{##1}%
+ }{\setkomafont{#1.Clause}{##1}}%
+ }{%
+ \newkomafont{#1.Clause}{##1}%
+ }%
+ }
+ \FamilyExecuteOptions[.scrjura.sty]{KOMAarg}{#2}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{ClauseFont}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{ClauseNumberFormat}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{Sentence}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{SubClause}%
+ \RelaxFamilyKey[.scrjura.sty]{KOMAarg}{Clause}%
\@ifundefined{#1@Clauseformat}{%
\expandafter\DeclareRobustCommand\expandafter*%
\csname #1@Clauseformat\endcsname[1]{\Clauseformat{##1}}%
@@ -447,11 +453,11 @@
\csname \scrjura@env@type @everypar\endcsname
\contract@everypar
}{}%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \aliaskomafont{Clause}{contract.Clause}%
+ \IfExistskomafont{#1.Clause}{%
+ \IfIsAliaskomafont{#1.Clause}{%
+ \aliaskomafont{Clause}{\csname scr@fnt@instead@#1.Clause\endcsname}%
}{%
- \aliaskomafont{Clause}{\csname scr@fnt@instead@#1\endcsname}%
+ \aliaskomafont{Clause}{#1.Clause}%
}%
}{%
\aliaskomafont{Clause}{contract.Clause}%
@@ -497,7 +503,7 @@
\newif\ifcontract@dummy
\define@key{contract}{dummy}[true]{\csname contract@dummy#1\endcsname}
\newkomafont{contract.Clause}{\sffamily\bfseries\large}
-\newcommand*{\contract@paragraph@font}{\usekomafont{contract.Clause}%
+\newcommand*{\contract@paragraph@font}{\usekomafont{Clause}%
\@hangfrom}
\newcounter{@AbsClause}
\newcommand*{\theH@AbsClause}{P-\arabic{@AbsClause}}
@@ -728,6 +734,7 @@
\renewcommand*\p@par{{\scrjura@usetype{\scrjura@env@type}\theSubClause\scrjura@separator{\nobreakspace}}}
\@addtoreset{par}{Clause}
\@addtoreset{par}{SubClause}
+\newcommand*{\withoutparnumber}{}
\newcommand*{\contract@everypar}{%
\ifparnumber
\ifx\scrjura@special@par\relax
@@ -767,12 +774,14 @@
\else
\def\reserved@a{\relax}%
\ifx\@tempa\reserved@a
+ \withoutparnumber
\else
{\usekomafont{parnumber}{\parformat\parformatseparation}}%
\fi
\fi
\endgroup
\else
+ \begingroup\withoutparnumber\endgroup
\setcounter{sentence}{-1}\refstepcounter{sentence}%
\fi
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 7eafbe65746..0c1794f7de8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,19 +67,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(%
KOMA-Script-dependent
@@ -243,16 +243,16 @@
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: option)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\RequirePackage{scrlfile}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: body)
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
@@ -420,15 +420,22 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\newcommand*{\IfExistskomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
+ \scr@ifundefinedorrelax{scr@fnt@#1}{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
}{%
\@firstoftwo
}%
}
+\newcommand*{\IfIsAliaskomafont}[1]{%
+ \scr@ifundefinedorrelax{scr@fnt@#1}{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
+ }{%
+ \@secondoftwo
+ }%
+}
\newcommand*{\setkomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -604,6 +611,13 @@
\l@addto@macro\scr@komafontonearglist{\do#1}%
}
\newcommand*{\newkomafont}[3][\relax]{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@#2}{}{%
+ \PackageWarning{scrkbase}{%
+ Making stand-alone element `#2' from\MessageBreak
+ alias to `\@nameuse{scr@fnt@instead@#2}'
+ }%
+ \expandafter\let\csname scr@fnt@instead@#2\endcsname\relax
+ }%
\expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
\expandafter\expandafter\expandafter\newcommand
\expandafter\expandafter\expandafter*%
@@ -615,6 +629,16 @@
\fi
}
\newcommand*{\aliaskomafont}[2]{%
+ \scr@ifundefinedorrelax{scr@fnt@#1}{}{%
+ \PackageWarning{scrkbase}{%
+ Redefining stand alone element `#1' as\MessageBreak
+ alias to `#2'%
+ }
+ \expandafter\let\csname scr@fnt@#1\endcsname\relax
+ }%
+ \scr@ifundefinedorrelax{scr@fnt@wrn@#1}{}{%
+ \expandafter\let\csname scr@fnt@wrn@#1\encsname\relax
+ }
\expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
#2%
}%
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 b703bc78cb3..e957bebc4b8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -46,14 +46,14 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 2017/08/11 v0.1.2670 KOMA-Script
+ 2018/02/02 v0.1.2928 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -65,7 +65,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $
%%% (run: init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
@@ -98,7 +98,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
@@ -241,12 +241,12 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z 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 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
@@ -318,7 +318,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $
%%% (run: body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
@@ -574,7 +574,7 @@
\scrlayerAddToInterface\slnc@initwrite{}%
\scrlayerAddToInterface\slnc@openwrite{%
\newcommand*{\slnc@openwrite}{%
- \immediate\closeout\slnc@file
+ \immediate\closein\slnc@file
\PackageInfo{scrlayer-notecolumn}{%
Opening `\jobname.slnc'\MessageBreak
for writing}%
@@ -583,19 +583,27 @@
}
\AfterReadingMainAux{%
\immediate\closeout\tf@slnc
- \scr@ifundefinedorrelax{pdfmdfivesum}{%
- \PackageWarningNoLine{scrlayer-notecolumn}{%
- \string\pdfmdfivesum\space unavailable.\MessageBreak
- The package needs \string\pdfmdfivesum\space to test\MessageBreak
- whether or not one more LaTeX run will\MessageBreak
- be needed to make the note columns\MessageBreak
- right. If this command is unavailable\MessageBreak
- you have to do the decision without\MessageBreak
- this help of the package.%
- }%
- }{%
- \begingroup
+ \begingroup
+ \scr@ifundefinedorrelax{pdfmdfivesum}{%
+ \ifdefined\directlua
+ \edef\reserved@a{\directlua{slncmdfivesum("\jobname.slnc")}}%
+ \else
+ \let\reserved@a\relax
+ \fi
+ }{%
\edef\reserved@a{\pdfmdfivesum file {\jobname.slnc}}%
+ }%
+ \ifx\reserved@a\relax
+ \PackageWarningNoLine{scrlayer-notecolumn}{%
+ \string\pdfmdfivesum\space unavailable.\MessageBreak
+ The package needs \string\pdfmdfivesum\space or LuaTeX\MessageBreak
+ to test whether or not one more LaTeX run\MessageBreak
+ will be needed to make the note columns\MessageBreak
+ right. If this command is unavailable\MessageBreak
+ you have to do the decision without\MessageBreak
+ this help of the package%
+ }%
+ \else
\ifx \slnc@mdfivesum\reserved@a
\PackageInfo{scrlayer-notecolumn}{%
MD5 of current `\jobname.slnc':\MessageBreak
@@ -605,13 +613,13 @@
MD5 of slnc-file changed.\MessageBreak
Last: \slnc@mdfivesum\MessageBreak
New: \space \reserved@a\MessageBreak
- At least one more LaTeX rerun need to\MessageBreak
+ At least one more LaTeX rerun needed to\MessageBreak
make note columns right%
}%
\aftergroup\@tempswatrue
\fi
- \endgroup
- }%
+ \fi
+ \endgroup
}
\scrlayerAddToInterface\slnc@unexpanded{%
\let\slnc@unexpanded\detokenize
@@ -675,7 +683,7 @@
}%
\else
\ifnum ##2<\value{slncpage}\relax
- \PackageWarning{scrlayer-notecolumn}{note of type `#1' delayed.}%
+ \PackageWarning{scrlayer-notecolumn}{note of type `#1' delayed}%
\fi
\boxmaxdepth\maxdepth
\expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
@@ -860,7 +868,7 @@
\PackageWarning{scrlayer-notecolumn}{%
column `\reserved@b' undefined.\MessageBreak
You should declare the column before the usage.\MessageBreak
- Notes will be lost
+ Notes will be lost%
}%
}{%
\expandafter\g@addto@macro
@@ -901,15 +909,31 @@
\let\slnc@mdfivesum\@empty
}
\scrlayerAddToInterface\slnc@file{%
- \scr@ifundefinedorrelax{pdfmdfivesum}{}{%
+ \scr@ifundefinedorrelax{pdfmdfivesum}{%
+ \ifdefined\directlua
+ \directlua{%
+ function slncmdfivesum(filename)
+ local fh = io.open(filename,"rb")
+ if fh then
+ local sum=md5.sumhexa(fh:read("*a"))
+ tex.sprint(sum)
+ fh:close()
+ end
+ end
+ }%
+ \xdef\slnc@mdfivesum{\directlua{slncmdfivesum("\jobname.slnc")}}%
+ \fi
+ }{%
\xdef\slnc@mdfivesum{\pdfmdfivesum file {\jobname.slnc}}%
+ }%
+ \scr@ifundefinedorrelax{slnc@mdfivesum}{}{%
\PackageInfo{scrlayer-notecolumn}{%
MD5 of last `\jobname.slnc':\MessageBreak
\slnc@mdfivesum}%
}%
\newread\slnc@file
\immediate\openin\slnc@file \jobname.slnc
- \scrlayerOnAutoRemoveInterface{\immediate\closeout\slnc@file}%
+ \scrlayerOnAutoRemoveInterface{\immediate\closein\slnc@file}%
}
\scrlayerAddToInterface\c@slnc@clearnote@label{%
\newcounter{slnc@clearnote@label}%
@@ -1290,7 +1314,7 @@
\@esphack
}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $
%%% (run: final)
\DeclareNoteColumn{marginpar}
\let\reserved@a\clearpage
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 b8d1ac3b452..9eff8fe3b32 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -45,14 +45,14 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -64,7 +64,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: init)
\AtEndOfPackage{%
\sls@auto@pagestyleset%
@@ -81,7 +81,7 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: options)
\KOMA@key{markcase}{%
\scrlayer@AtEndOfPackage{%
@@ -226,7 +226,7 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: options)
\KOMA@key{headwidth}{%
\begingroup
@@ -708,11 +708,18 @@
markcase=ignoreuppercase%
}
\KOMA@ifkey{hmode}{sls@leavevmode}
-\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode}%
-\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}%
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}
\scrlayer@AddCsToInterface{sls@leavevmode@linetrue}
\scrlayer@AddCsToInterface{sls@leavevmode@linefalse}
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+\KOMA@ifkey{autoenlargeheadfoot}{sls@autoenlarge}
+\KOMAExecuteOptions{autoenlargeheadfoot=true}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot@default}
+\scrlayer@AddCsToInterface{sls@autoenlargetrue}
+\scrlayer@AddCsToInterface{sls@autoenlargefalse}
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
@@ -784,7 +791,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\scrlayerAddToInterface\setheadwidth{%
\newcommand*{\setheadwidth}[2][]{%
@@ -1167,8 +1174,12 @@
\string#1 to low.\MessageBreak
At least \the\dimexpr \ht\z@+\dp\z@\relax\space needed,\MessageBreak
but only \the#1 found.\MessageBreak
- I'll enlarge \string#1, for further\MessageBreak
- processing, but you should do this yourself,\MessageBreak
+ \ifsls@autoenlarge
+ I'll enlarge \string#1, for further\MessageBreak
+ processing, but you should do this yourself,\MessageBreak
+ \else
+ You should enlarge \string#1,\MessageBreak
+ \fi
e.g.,
\scr@ifundefinedorrelax{geometry}{%
\scr@ifundefinedorrelax{typearea}{%
@@ -1191,32 +1202,42 @@
in your preamble%
\fi
}%
- .\MessageBreak
- I'll also
- \ifx #1\headheight decrease \string\topmargin
- \else increase \string\footskip\fi
+ \ifsls@autoenlarge
+ .\MessageBreak
+ I'll also
+ \ifx #1\headheight decrease \string\topmargin
+ \else increase \string\footskip\fi
+ \fi
}%
- \@tempdima\dimexpr \ht\z@+\dp\z@\relax
- \ifx #1\headheight
- \global\advance\topmargin by \dimexpr #1-(\ht\z@+\dp\z@)\relax
- \dp\z@\dimexpr \dp\z@+\ht\z@+\dp\z@-\headheight\relax
- \else
- \global\advance\footskip by \dimexpr \ht\z@+\dp\z@-#1\relax
+ \ifsls@autoenlarge
+ \@tempdima\dimexpr \ht\z@+\dp\z@\relax
+ \ifx #1\headheight
+ \global\advance\topmargin by \dimexpr #1-(\ht\z@+\dp\z@)\relax
+ \dp\z@\dimexpr \dp\z@+\ht\z@+\dp\z@-\headheight\relax
+ \else
+ \global\advance\footskip by \dimexpr \ht\z@+\dp\z@-#1\relax
+ \fi
+ \global#1\@tempdima
\fi
- \global#1\@tempdima
\fi
\usebox\z@
\endgroup
}%
}
\@ifundefined{scr@fnt@pagehead}{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@pagehead}{}{%
+ \PackageInfo{scrlayer-scrpage}{%
+ Makeing stand-alone element `pagehead' from\MessageBreak
+ alias to `pageheadfoot'%
+ }%
+ \let\scr@fnt@instead@pagehead\relax
+ }%
\scrlayer@AddCsToInterface{scr@fnt@pagehead}%
\@ifundefined{@pageheadfont}{%
- \newkomafont{pagehead}{}%
+ \newcommand*{\@pageheadfont}{}%
\scrlayer@AddCsToInterface{@pageheadfont}%
- }{%
- \newcommand*{\scr@fnt@pagehead}{\@pageheadfont}%
- }%
+ }{}%
+ \newcommand*{\scr@fnt@pagehead}{\@pageheadfont}%
}{}
\@ifundefined{scr@fnt@pageheadfoot}{%
\newcommand*{\scr@fnt@pageheadfoot}{\headfont}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index a0edae04e4c..43d9fa36ead 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -43,14 +43,14 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: init)
\RequirePackage{scrkbase}[2013/03/05]
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -115,7 +115,7 @@
\setlength{\footheight}{\baselineskip}
\fi
}
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
@@ -281,7 +281,7 @@
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
@@ -2172,7 +2172,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
%%% (run: final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index fc50677cf69..232400cf92b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -62,7 +62,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -84,20 +84,20 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: init)
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
@@ -121,30 +121,7 @@
}
\providecommand*{\par@updaterelative}{}
}{}
-\newcommand*{\scr@renewforletter}{%
- \kernel@ifstar {\@renewforletter*}%
- {\@renewforletter{}}%
-}
-\newcommand*{\@renewforletter}[2]{%
- \g@addto@macro\do@renewforletter@list{\do#2}%
- \edef\reserved@a{%
- \noexpand\newcommand\noexpand#1\expandafter\noexpand
- \csname scrletter@extra@\string#2\endcsname
- }%
- \expandafter\reserved@a
-}
-\newcommand*{\do@renewforletter@list}{}
-\newcommand*{\do@renewforletter}{%
- \begingroup
- \def\do##1{%
- \aftergroup\let\aftergroup##1
- \expandafter\aftergroup\csname scrletter@extra@\string##1\endcsname
- }%
- \do@renewforletter@list
- \endgroup
- \let\do@renewforletter@list\@empty
-}
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
@@ -213,12 +190,13 @@
\@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 2661 2017-07-24 19:45:16Z kohm $
+\@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@last}{17}
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -252,15 +230,15 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z 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 $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z 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 $
+%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -782,14 +760,15 @@
}{symbolicnames}{false}%
%%% 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 $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -1660,7 +1639,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z kohm $
%%% (run: body)
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
@@ -1678,19 +1657,14 @@
Don't use this KOMA-Script internal macro}%
}%
}
-\scr@ifundefinedorrelax{dimexpr}{%
- \newcommand*{\useplength}[1]{%
- \number \csname ltx@len@#1\endcsname\relax}%
-}{%
- \newcommand*{\useplength}[1]{%
- \dimexpr \csname ltr@len@#1\endcsname\relax}%
-}
+\newcommand*{\useplength}[1]{%
+ \glueexpr \csname ltr@len@#1\endcsname\relax}%
\newcommand*{\setlengthtoplength}[3][]{%
\setlength{#2}{\useplength{#3}}%
\setlength{#2}{#1#2}}
\newcommand*{\@setplength}[3][]{%
\begingroup%
- \setlength{\@tempskipa}{#3}%
+ \setlength{\@tempskipa}{\glueexpr #3\relax}%
\setlength{\@tempskipa}{#1\@tempskipa}%
\edef\@tempa{\noexpand\endgroup%
\noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
@@ -1707,7 +1681,7 @@
}
\newcommand*{\@addtoplength}[3][]{%
\begingroup%
- \setlength{\@tempskipa}{#3}%
+ \setlength{\@tempskipa}{\glueexpr #3\relax}%
\setlength{\@tempskipa}{#1\@tempskipa}%
\addtolengthplength{\@tempskipa}{#2}%
\edef\@tempa{\noexpand\endgroup%
@@ -1748,7 +1722,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\newkomavar{firsthead}
\setkomavar{firsthead}{%
@@ -2368,8 +2342,8 @@
\raggedright
\fontsize{8pt}{9pt}\selectfont\usekomafont{PPdata}%
\usekomavar*{fromzipcode}\usekomavar{zipcodeseparator}%
- \usekomavar{fromzipcode}\unskip\strut\\
- \usekomavar{place}\unskip\strut
+ \usekomavar{fromzipcode}\scr@endstrut\\
+ \usekomavar{place}\scr@endstrut
\hfill
}%
}%
@@ -2892,10 +2866,10 @@
\ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
\hspace{\useplength{sigindent}}%
\parbox{\@tempdima}{\raggedsignature\strut\ignorespaces
- #1\ifhmode\unskip\strut\\[\useplength{sigbeforevskip}]
+ #1\ifhmode\scr@endstrut\\[\useplength{sigbeforevskip}]
\else\vskip \useplength{sigbeforevskip}\fi
\strut\ignorespaces
- \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par
+ \usekomavar{signature}\ifhmode\scr@endstrut\fi}}\par
\nobreak\vskip\baselineskip
}
\newcommand\ps{\par%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 6797b1835b2..d3f089e5288 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $
\ProvidesPackage{scrlfile}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(loading files)]
\ExecuteOptions{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 7ffb45cfa26..cd0673ef20c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -73,7 +73,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -110,13 +110,13 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -185,10 +185,11 @@
\@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 2661 2017-07-24 19:45:16Z kohm $
+\@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@last}{17}
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -238,7 +239,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -247,11 +248,17 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
@@ -259,11 +266,34 @@
\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
+\KOMA@key{overfullrule}[true]{%
+ \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{\z@}%
+ \fi
+ \fi
+}
+\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false}
\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -297,7 +327,7 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
\newcommand*\@ptsize{%
12%
@@ -385,9 +415,9 @@
}
%%% 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 $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -496,7 +526,7 @@
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -649,7 +679,7 @@
\fi
\else
\endgroup
- \FamilyKeyStateUnkownValue
+ \FamilyKeyStateUnknownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -767,7 +797,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: option)
@@ -842,7 +872,7 @@
\relax}
%%% 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 $
+%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -1394,13 +1424,13 @@
}{symbolicnames}{false}%
%%% 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 $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: body)
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
@@ -1413,7 +1443,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -1888,7 +1918,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: body)
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -1944,12 +1974,21 @@
\expandafter\@secondoftwo
\fi
}
-\DeclareRobustCommand*\textsubscript[1]{%
- \@textsubscript{\selectfont#1}%
+\scr@ifundefinedorrelax{textsubscript}{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+}{%
+ \scr@ifundefinedorrelax{textsubscript }{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+ }{}%
}
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
+\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
\newcommand*{\scr@package@not@recommended}[2]{%
\scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
\@firstofone
@@ -1976,9 +2015,6 @@
option\MessageBreak
`cleardoublepage' with one of it's\MessageBreak
several values}
-\scr@package@not@recommended{parskip}{%
- option\MessageBreak
- `parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
@@ -1988,16 +2024,27 @@
`\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{minitoc}{}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{titleps}{%
+ package `scrlayer-scrpage'}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
KOMA-Script features, i.e., option `headings' and\MessageBreak
the extended optional argument of the section\MessageBreak
commands}
-\scr@package@not@recommended{titleps}{%
- package `scrlayer-scrpage'}
-\scr@package@not@recommended{minitoc}{}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+\scr@package@not@recommended{tocbibind}{%
+ options like `listof=totoc'\MessageBreak
+ or `bibliography=totoc', or commands like\MessageBreak
+ `\string\setuptoc{toc}{totoc}' instead of this package,\MessageBreak
+ because it breaks several KOMA-Script features of\MessageBreak
+ the list of figures, list of tables, bibliography,\MessageBreak
+ index and the running head%
+}
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -2870,7 +2917,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z kohm $
%%% (run: body)
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
@@ -2888,19 +2935,14 @@
Don't use this KOMA-Script internal macro}%
}%
}
-\scr@ifundefinedorrelax{dimexpr}{%
- \newcommand*{\useplength}[1]{%
- \number \csname ltx@len@#1\endcsname\relax}%
-}{%
- \newcommand*{\useplength}[1]{%
- \dimexpr \csname ltr@len@#1\endcsname\relax}%
-}
+\newcommand*{\useplength}[1]{%
+ \glueexpr \csname ltr@len@#1\endcsname\relax}%
\newcommand*{\setlengthtoplength}[3][]{%
\setlength{#2}{\useplength{#3}}%
\setlength{#2}{#1#2}}
\newcommand*{\@setplength}[3][]{%
\begingroup%
- \setlength{\@tempskipa}{#3}%
+ \setlength{\@tempskipa}{\glueexpr #3\relax}%
\setlength{\@tempskipa}{#1\@tempskipa}%
\edef\@tempa{\noexpand\endgroup%
\noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*%
@@ -2917,7 +2959,7 @@
}
\newcommand*{\@addtoplength}[3][]{%
\begingroup%
- \setlength{\@tempskipa}{#3}%
+ \setlength{\@tempskipa}{\glueexpr #3\relax}%
\setlength{\@tempskipa}{#1\@tempskipa}%
\addtolengthplength{\@tempskipa}{#2}%
\edef\@tempa{\noexpand\endgroup%
@@ -2926,7 +2968,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2938,7 +2980,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -3162,7 +3204,7 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -3476,7 +3518,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
@@ -4128,8 +4170,8 @@
\raggedright
\fontsize{8pt}{9pt}\selectfont\usekomafont{PPdata}%
\usekomavar*{fromzipcode}\usekomavar{zipcodeseparator}%
- \usekomavar{fromzipcode}\unskip\strut\\
- \usekomavar{place}\unskip\strut
+ \usekomavar{fromzipcode}\scr@endstrut\\
+ \usekomavar{place}\scr@endstrut
\hfill
}%
}%
@@ -4682,10 +4724,10 @@
\ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
\hspace{\useplength{sigindent}}%
\parbox{\@tempdima}{\raggedsignature\strut\ignorespaces
- #1\ifhmode\unskip\strut\\[\useplength{sigbeforevskip}]
+ #1\ifhmode\scr@endstrut\\[\useplength{sigbeforevskip}]
\else\vskip \useplength{sigbeforevskip}\fi
\strut\ignorespaces
- \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par
+ \usekomavar{signature}\ifhmode\scr@endstrut\fi}}\par
\nobreak\vskip\baselineskip
}
\newcommand\ps{\par%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index a25ea958470..5bde76159fd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -42,7 +42,7 @@
%%% From File: $Id: scrpage.dtx 2640 2017-05-08 09:36:55Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(page head and foot)]
\PackageWarning{scrpage2}{usage of obsolete package!\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 26b6b68c5bc..62fda5c2771 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -43,6 +43,7 @@
%% scrkernel-sections.dtx (with options: `class,report,body')
%% scrkernel-miscellaneous.dtx (with options: `class,report,body')
%% scrkernel-pagestyles.dtx (with options: `class,report,body')
+%% scrlayer.dtx (with options: `class,report,body')
%% scrkernel-floats.dtx (with options: `class,report,body')
%% scrkernel-footnotes.dtx (with options: `class,report,body')
%% scrkernel-listsof.dtx (with options: `class,report,body')
@@ -83,7 +84,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -105,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -120,25 +121,23 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
\RequirePackage{tocbasic}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
-\addtotoclist[float]{lof}
-\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrightfalse
@@ -214,7 +213,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -283,10 +282,11 @@
\@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 2661 2017-07-24 19:45:16Z kohm $
+\@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@last}{17}
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
@@ -361,7 +361,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -370,11 +370,17 @@
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
\KOMA@kav@replacebool{.%
\KOMAClassFileName
}{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
@@ -382,6 +388,29 @@
\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
+\KOMA@key{overfullrule}[true]{%
+ \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{overfullrule}{@tempswa}%
+ \setlength{\overfullrule}{\z@}%
+ \fi
+ \fi
+}
+\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
@@ -390,7 +419,7 @@
}
%%% 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 $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: option)
\newcommand*\@ptsize{%
11%
@@ -476,7 +505,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -586,7 +615,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -739,7 +768,7 @@
\fi
\else
\endgroup
- \FamilyKeyStateUnkownValue
+ \FamilyKeyStateUnknownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -752,7 +781,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: option)
\newif\if@titlepage
\@titlepagetrue
@@ -787,9 +816,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1156,7 +1185,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1362,7 +1391,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
@@ -1445,13 +1474,14 @@
{flat}{3},{left}{3},%
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
- {entryprefix}{6},
- {indenttextentries}{7},{indentunnumbered}{7},{numberline}{7},%
- {leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
- {chapterentry}{9},{withchapterentry}{9},%
- {nochaptergap}{10},{ignorechapter}{10},%
- {chaptergapsmall}{11},{smallchaptergap}{11},%
- {chaptergapline}{12},{onelinechaptergap}{12}%
+ {standardlevel}{6},
+ {entryprefix}{7},
+ {indenttextentries}{8},{indentunnumbered}{8},{numberline}{8},%
+ {leftaligntextentries}{9},{leftalignunnumbered}{9},{nonumberline}{9}%
+ ,{chapterentry}{10},{withchapterentry}{10},%
+ {nochaptergap}{11},{ignorechapter}{11},%
+ {chaptergapsmall}{12},{smallchaptergap}{12},%
+ {chaptergapline}{13},{onelinechaptergap}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax % notoc
@@ -1525,6 +1555,7 @@
\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{standardlevel}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
@@ -1532,6 +1563,15 @@
\AtAddToTocList[float]{%
\setuptoc{\@currext}{leveldown}%
}%
+ \or% standardlevel
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leveldown}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{standardlevel}%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{leveldown}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{leveldown}%
+ }%
\or% entryprefix
\KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
@@ -1627,7 +1667,7 @@
\BeforeTOCHead{\@chaptertolistsfalse}
\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2769 2017-12-03 10:56:06Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
@@ -1690,21 +1730,16 @@
\renewcommand*{\newblock}{\hskip .11em\@plus.33em\@minus.07em}%
}
\scr@bibstyle@oldstyle
-\newcommand*\bib@heading{%
+\newcommand*{\bib@heading}{%
+ \bibliography@heading{\bibname}%
+}
+\newcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \section*{\bibname}%
- \scr@ifundefinedorrelax{@mkright}{%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi
- }{%
- \@mkright{\MakeMarkcase{\bibname}}%
- }%
+ \section*{#1}%
+ \@mkright{\MakeMarkcase{#1}}%
\else
- \chapter*{\bibname}%
- \scr@ifundefinedorrelax{@mkdouble}{%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
- }{%
- \@mkdouble{\MakeMarkcase{\bibname}}%
- }%
+ \chapter*{#1}%
+ \@mkdouble{\MakeMarkcase{#1}}%
\fi
}%
\newif\ifbib@leveldown
@@ -1727,13 +1762,13 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \section*{\bibname}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \section*{##1}%
+ \@mkright{\MakeMarkcase{##1}}%
\else
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \chapter*{##1}%
+ \@mkdouble{\MakeMarkcase{##1}}%
\fi
}%
\or% totoc
@@ -1745,16 +1780,16 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \addsec{\bibname}
+ \addsec{##1}%
\else
\if@chaptertolists
- \@chaptertolistsfalse\addchap{\bibname}\@chaptertoliststrue
+ \@chaptertolistsfalse\addchap{##1}\@chaptertoliststrue
\else
- \addchap{\bibname}
+ \addchap{##1}%
\fi
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \@mkdouble{\MakeMarkcase{##1}}%
\fi
}%
\or% numbered
@@ -1766,17 +1801,16 @@
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
\KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
- \renewcommand*\bib@heading{%
+ \renewcommand*{\bibliography@heading}[1]{%
\ifbib@leveldown
- \section{\bibname}%
+ \section{##1}%
\else
\if@chaptertolists
- \@chaptertolistsfalse\chapter{\bibname}\@chaptertoliststrue
+ \@chaptertolistsfalse\chapter{##1}\@chaptertoliststrue
\else
- \chapter{\bibname}
+ \chapter{##1}
\fi
- \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
- {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \@mkdouble{\MakeMarkcase{\chaptermarkformat ##1}}%
\fi
}
\or% leveldown
@@ -1802,7 +1836,7 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2782 2017-12-04 07:47:52Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
@@ -1816,7 +1850,8 @@
\KOMA@set@ncmdkey{index}{@tempa}{%
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1},%
- {numbered}{2},{totocnumbered}{2},%
+ {numbered}{2},{totocnumbered}{2},{numberedtotoc}{2},{tocnumbered}{2},%
+ {numberedtoc}{2},%
{leveldown}{3},%
{standardlevel}{4}%
}{#1}%
@@ -1888,20 +1923,20 @@
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% 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 $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2382,7 +2417,7 @@
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 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2427,7 +2462,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -2556,12 +2591,16 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2942 2018-02-19 07:23:07Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
}}%
+\newcommand*{\@frontispiece}{}%
+\newcommand{\frontispiece}[1]{\gdef\@frontispiece{%
+ #1%
+}}%
\newcommand*{\@titlehead}{}%
\newcommand{\titlehead}[1]{\gdef\@titlehead{%
#1%
@@ -2651,8 +2690,20 @@
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
- \ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty
+ \else
+ \if@twoside\mbox{}\next@tpage\fi
+ \noindent\@frontispiece\next@tdpage
+ \fi
+ \else
+ \noindent\@extratitle
+ \ifx\@frontispiece\@empty
+ \else
+ \next@tpage
+ \noindent\@frontispiece
+ \fi
+ \next@tdpage
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
@@ -2735,20 +2786,46 @@
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \ifx\@extratitle\@empty\else
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
\@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
\next@tdpage
\fi
\@maketitle
\else
- \ifx\@extratitle\@empty\else
- \twocolumn[\@makeextratitle]\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else\if@twoside\mbox{}\fi\fi
+ \else
+ \twocolumn[\@makeextratitle]%
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \twocolumn[\@makefrontispiece]%
+ \next@tdpage
\fi
\twocolumn[\@maketitle]%
\fi
\else
- \ifx\@extratitle\@empty\else
- \@makeextratitle\next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else \mbox{}\fi
+ \else
+ \@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
+ \next@tdpage
\fi
\@maketitle
\fi
@@ -2767,6 +2844,7 @@
\global\let\@title\@empty
\global\let\@subtitle\@empty
\global\let\@extratitle\@empty
+ \global\let\@frontispiece\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
\global\let\@publishers\@empty
@@ -2791,6 +2869,11 @@
\noindent\@extratitle\par
\fi
}
+\newcommand*{\@makefrontispiece}{%
+ \ifx\@frontispiece\@empty \else
+ \noindent\@frontispiece\par
+ \fi
+}
\newcommand*{\@maketitle}{%
\global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -2898,10 +2981,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2915,7 +2998,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -2935,17 +3018,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z 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 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2954 2018-03-10 21:15:16Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -3904,29 +3987,54 @@
}
\newcommand*{\DeclareNewSectionCommand}[2][]{%
\@ifundefined{#2}{%
- \DeclareSectionCommand[{#1}]{#2}%
+ \@tempswatrue
+ \let\reserved@b\@empty
+ \@for \reserved@a:=the#2,#2mark,#2format,#2markformat\do{%
+ \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{%
+ \@tempswafalse
+ \edef\reserved@b{\expandafter\string\csname \reserved@a\endcsname}%
+ }
+ }
+ \if@tempswa
+ \DeclareSectionCommand[{#1}]{#2}%
+ \else
+ \ClassError{\KOMAClassName}{%
+ command `\reserved@b` already defined%
+ }{%
+ You've tried to define the section command `\expandafter\string\csname
+ #2\endcsname` newly.\MessageBreak
+ Such a section command needs an additional new command
+ `\reserved@b`,\MessageBreak
+ but this already exists. So you cannot define
+ `\expandafter\string\csname #2\endcsname` newly.\MessageBreak
+ Maybe you should use one of \string\DeclareSectionCommand,
+ \string\RedeclareSectionCommand,\MessageBreak
+ or \string\ProvideSectionCommand.\MessageBreak
+ If you'll continue, the command will be ignored.%
+ }%
+ \fi
}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #1\endcsname` already defined%
+ command `\expandafter\string\csname #2\endcsname` already defined%
}{%
You've tried to define the section command `\expandafter\string\csname
- #1\endcsname` newly,\MessageBreak
- but a command, token, box or length with this name already
+ #2\endcsname` newly,\MessageBreak
+ but a command or something else with this name already
exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\RedeclareSectionCommand,\MessageBreak
or \string\ProvideSectionCommand.\MessageBreak
- If you'll continue, the command will be irgnored.%
+ If you'll continue, the command will be ignored.%
}%
}%
}
\newcommand*{\RedeclareSectionCommand}[2][]{%
\@ifundefined{#2}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #1\endcsname` not defined%
+ command `\expandafter\string\csname #2\endcsname` not defined%
}{%
You've tried to re-define the section command `\expandafter\string\csname
- #1\endcsname`,\MessageBreak
+ #2\endcsname`,\MessageBreak
but a command with this name does not exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\DeclareNewSectionCommand,\MessageBreak
@@ -4275,21 +4383,28 @@
}%
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+ \def\IfUseNumber{\ifnumbered{#1}}%
\raggedpart
- \interlinepenalty \@M
- \normalfont\sectfont\nobreak
- \ifnumbered{#1}{%
- \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
- \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
- \partheadmidvskip
- }{}%
- \usekomafont{part}{\nobreak #3}\strut
- \expandafter\ifx\csname #1mark\endcsname\@gobble
- \@mkboth{}{}%
- \else
- \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
- \fi
- \par
+ \normalfont\usekomafont{disposition}{\nobreak
+ \IfUseNumber{%
+ \partlineswithprefixformat{#1}{%
+ \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
+ \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
+ \partheadmidvskip
+ }{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#3\strut\@@par}%
+ }%
+ }{%
+ \partlineswithprefixformat{#1}{}{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#3\strut\@@par}%
+ }
+ }%
+ \expandafter\ifx\csname #1mark\endcsname\@gobble
+ \@mkboth{}{}%
+ \else
+ \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
+ \fi
+ }%
\endgroup
\@nameuse{@end#1}%
}
@@ -4300,13 +4415,21 @@
\endgroup
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+ \let\IfUseNumber\@secondoftwo
\raggedpart
- \interlinepenalty \@M
- \normalfont
- \sectfont\nobreak\usekomafont{#1}{\nobreak #2}\strut\@mkboth{}{}\par
+ \normalfont\usekomafont{disposition}{%
+ \nobreak
+ \partlineswithprefixformat{#1}{}{%
+ \usekomafont{#1}{\nobreak\interlinepenalty \@M#2\strut\@@par}%
+ }%
+ \@mkboth{}{}%
+ }%
\endgroup
\@nameuse{@end#1}%
}
+\newcommand{\partlineswithprefixformat}[3]{%
+ #2#3%
+}
\newcommand*{\scr@@endpart}[1]{%
\vbox to\z@{\use@preamble{#1@u}\vss}%
\@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax
@@ -4556,7 +4679,7 @@
\chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
- \let\IfUseNumber\secondoftwo
+ \let\IfUseNumber\@secondoftwo
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
\else
@@ -4877,7 +5000,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $
%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -4961,12 +5084,21 @@
\expandafter\@secondoftwo
\fi
}
-\DeclareRobustCommand*\textsubscript[1]{%
- \@textsubscript{\selectfont#1}%
+\scr@ifundefinedorrelax{textsubscript}{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+}{%
+ \scr@ifundefinedorrelax{textsubscript }{%
+ \DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}%
+ }%
+ }{}%
}
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
+\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
\newcommand*{\scr@package@not@recommended}[2]{%
\scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{%
\@firstofone
@@ -4993,9 +5125,6 @@
option\MessageBreak
`cleardoublepage' with one of it's\MessageBreak
several values}
-\scr@package@not@recommended{parskip}{%
- option\MessageBreak
- `parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
package `scrlayer' or `scrlayer-scrpage', because\MessageBreak
@@ -5005,15 +5134,26 @@
`\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{minitoc}{}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{titleps}{%
+ package `scrlayer-scrpage'}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
KOMA-Script features, i.e., option `headings' and\MessageBreak
the extended optional argument of the section\MessageBreak
commands}
-\scr@package@not@recommended{titleps}{%
- package `scrlayer-scrpage'}
-\scr@package@not@recommended{minitoc}{}
+\scr@package@not@recommended{tocbibind}{%
+ options like `listof=totoc'\MessageBreak
+ or `bibliography=totoc', or commands like\MessageBreak
+ `\string\setuptoc{toc}{totoc}' instead of this package,\MessageBreak
+ because it breaks several KOMA-Script features of\MessageBreak
+ the list of figures, list of tables, bibliography,\MessageBreak
+ index and the running head%
+}
\BeforePackage{minitoc}{%
\let\scr@mt@saved@sect\@sect
}
@@ -5268,7 +5408,60 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
+%%% (run: body)
+\providecommand*{\@mkleft}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markleft
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \ClassWarning{\KOMAClassName}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkleft.\MessageBreak
+ Nevertheless, \string\markleft\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markleft
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkright}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markright
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \ClassWarning{\KOMAClassName}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkright.\MessageBreak
+ Nevertheless, \string\markright\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markright
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkdouble}[1]{%
+ \@mkboth{#1}{#1}%
+}
+%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -5750,6 +5943,22 @@
\hb@xt@\hsize{%
\cap@left
\vbox{\hsize\cap@width\linewidth\hsize
+ \scr@ifundefinedorrelax{@captype}{%
+ \ClassWarning{\KOMAClassName}{%
+ `\string\caption' outside float.\MessageBreak
+ Seems you are using `\string\caption' outside a
+ float.\MessageBreak
+ Maybe you are using a package that uses
+ `\string\@makecaption'\MessageBreak
+ without setting `\string\@captype' before.\MessageBreak
+ Because I cannot detect the caption type, I'm using\MessageBreak
+ the empty one.%
+ }%
+ \let\@captype\@empty
+ }{}%
+ \scr@ifundefinedorrelax{ragged\@captype caption}{\raggedcaption}{%
+ \@nameuse{ragged\@captype caption}%
+ }%
\ifdofullc@p
\@hangfrom{%
\strut
@@ -5761,7 +5970,7 @@
}%
}%
}%
- {\usekomafont{caption}{#3\unskip\strut\par}}%
+ {\usekomafont{caption}{#3\scr@endstrut\par}}%
\else
\ifdim\cap@indent<\z@
\strut
@@ -5771,7 +5980,7 @@
}%
}%
\noindent{\usekomafont{caption}{%
- \hspace*{-\cap@indent}#3\unskip\strut\par
+ \hspace*{-\cap@indent}#3\scr@endstrut\par
}}%
\else
\if@capbreak
@@ -5782,7 +5991,7 @@
}%
}%
\noindent\@hangfrom{\hspace*{\cap@indent}}%
- {\usekomafont{caption}{#3\unskip\strut\par}}%
+ {\usekomafont{caption}{#3\scr@endstrut\par}}%
\else
\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
{%
@@ -5790,7 +5999,7 @@
\scr@smashdp{%
#1{\usekomafont{captionlabel}{#2\captionformat}}%
}%
- {\usekomafont{caption}{#3\unskip\strut}\par}%
+ {\usekomafont{caption}{#3\scr@endstrut}\par}%
}%
\fi
\fi
@@ -5801,6 +6010,127 @@
}%
}\kern-\dp\strutbox
}
+\newcommand*\setcaptionalignment{%
+ \kernel@ifnextchar [%]
+ {\@setcaptionalignment}
+ {%
+ \scr@ifundefinedorrelax{@captype}{\@setcaptionalignment}{%
+ \edef\reserved@a{\noexpand\@setcaptionalignment[{\@captype}]}\reserved@a
+ }%
+ }%
+}%
+\newcommand*\@setcaptionalignment[2][]{%
+ \IfArgIsEmpty{#1}{}{%
+ \expandafter\ifnum
+ \scr@ifundefinedorrelax{#1}{0}{\scr@ifundefinedorrelax{end#1}{0}{1}}=0
+ \ClassWarning{\KOMAClassName}{%
+ float type `#1' defined not yet,\MessageBreak
+ but setting ragged mode for captions of\MessageBreak
+ float type `#1'%
+ }%
+ \fi
+ }%
+ \def\reserved@a{#2}%
+ \ifstr{\reserved@a}{j}{%
+ \expandafter\let\csname ragged#1caption\endcsname\@empty
+ }{%
+ \ifstr{\reserved@a}{l}{%
+ \scr@ifundefinedorrelax{LaTeXraggedright}{%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedright
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedright
+ }%
+ }{%
+ \ifstr{\reserved@a}{r}{%
+ \scr@ifundefinedorrelax{LaTeXraggedleft}{%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedleft
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedleft
+ }%
+ }{%
+ \ifstr{\reserved@a}{c}{%
+ \scr@ifundefinedorrelax{LaTeXcentering}{%
+ \expandafter\let\csname ragged#1caption\endcsname\centering
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\LaTeXcentering
+ }%
+ }{%
+ \ifstr{\reserved@a}{J}{%
+ \scr@ifundefinedorrelax{justifying}{%
+ \scr@caption@raggede@warning{J}{\justifying}%
+ \expandafter\let\csname ragged#1caption\endcsname\@empty
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\justifying
+ }%
+ }{%
+ \ifstr{\reserved@a}{L}{%
+ \scr@ifundefinedorrelax{RaggedRight}{%
+ \scr@caption@raggede@warning{L}{\RaggedRight}%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedright
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\RaggedRight
+ }%
+ }{%
+ \ifstr{\reserved@a}{R}{%
+ \scr@ifundefinedorrelax{RaggedLeft}{%
+ \scr@caption@raggede@warning{R}{\RaggedLeft}%
+ \expandafter\let\csname ragged#1caption\endcsname\raggedleft
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\RaggedLeft
+ }%
+ }{%
+ \ifstr{\reserved@a}{C}{%
+ \scr@ifundefinedorrelax{Centering}{%
+ \scr@caption@raggede@warning{C}{\Centering}%
+ \expandafter\let\csname ragged#1caption\endcsname\centering
+ }{%
+ \expandafter\let\csname ragged#1caption\endcsname\Centering
+ }%
+ }{%
+ \ifstr{\reserved@a}{}{%
+ \expandafter\let\csname ragged#1caption\endcsname\relax
+ }{%
+ \ClassError{\KOMAClassName}{unknown alignment char `#2'}{%
+ \string\setcaptionalignment\space supports
+ only:\MessageBreak
+ \space\space c - centered captions,\MessageBreak
+ \space\space j - justified captions,\MessageBreak
+ \space\space l - left align captions,\MessageBreak
+ \space\space r - right aligned captions,\MessageBreak
+ \space\space C - centered captions with
+ `ragged2e',\MessageBreak
+ \space\space J - justified captions with
+ `ragged2e',\MessageBreak
+ \space\space L - left align captions with
+ `ragged2e',\MessageBreak
+ \space\space R - right aligned captions with
+ `ragged2e',\MessageBreak
+ or an empty argument to remove special
+ alignment.\MessageBreak
+ If you'd continue, I'd not change the alignment.%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}
+\newcommand*{\scr@caption@raggede@warning}[2]{%
+ \begingroup
+ \lowercase{\def\reserved@a{#1}}%
+ \ClassWarning{\KOMAClassName}{%
+ `\string#2' undefined!\MessageBreak
+ To avoid replacing caption alignment `#1' by `\reserved@a'\MessageBreak
+ you should load package `ragged2e' before using\MessageBreak
+ `\string\setcaptionalignment'%
+ }%
+ \endgroup
+}
+\newcommand*\raggedcaption{}
\newcommand*{\scr@caption@before@longtable@warning}[1]{%
\ClassWarning{\KOMAClassName}{%
you've loaded package `#1' before package\MessageBreak
@@ -5829,6 +6159,7 @@
}%
\LT@mcol\LT@cols c{%
\hbox to\z@{\hss\parbox[t]\linewidth{%
+ \def\@captype{table}%
\@@makecaption{#1}{#2}{#3}%
\endgraf
\if@captionabove
@@ -5901,68 +6232,40 @@
}
\newcommand*\figurename{Figure}
\newcommand*\tablename{Table}
-\newcounter{figure}[chapter]
-\renewcommand*\thefigure{%
- \thechapter.%
- \@arabic\c@figure
-}
-\newcommand*{\figureformat}{%
- \figurename~\thefigure%
- \autodot%
-}
-\newcommand*{\fps@figure}{tbp}
-\newcommand*{\ftype@figure}{1}
-\newcommand*{\ext@figure}{lof}
-\newcommand*{\fnum@figure}{\figureformat}
-\newenvironment{figure}{%
- \def\caption{%
+\DeclareNewTOC[%
+ type=figure,
+ float,
+ counterwithin=chapter,
+ floatpos=tbp,
+ floattype=1,
+ tocentryindent=1.5em,
+ tocentrynumwidth=2.3em,
+ atbegin=\def\caption{%
\if@figurecaptionabove\expandafter\captionabove
\else\expandafter\captionbelow\fi
- }%
- \@float{figure}%
-}{%
- \end@float
+ }
+]{lof}
+\renewcommand*\thefigure{%
+ \thechapter.%
+ \@arabic\c@figure
}
-\newenvironment{figure*}{%
- \def\caption{%
- \if@figurecaptionabove\expandafter\captionabove
+\DeclareNewTOC[%
+ type=table,
+ float,
+ counterwithin=chapter,
+ floatpos=tbp,
+ floattype=2,
+ tocentryindent=1.5em,
+ tocentrynumwidth=2.3em,
+ atbegin=\def\caption{%
+ \if@tablecaptionabove\expandafter\captionabove
\else\expandafter\captionbelow\fi
- }%
- \@dblfloat{figure}%
-}{%
- \end@dblfloat
-}
-\newcounter{table}[chapter]
+ }
+]{lot}
\renewcommand*\thetable{%
\thechapter.%
\@arabic\c@table
}
-\newcommand*{\tableformat}{%
- \tablename~\thetable%
- \autodot%
-}
-\newcommand*{\fps@table}{tbp}
-\newcommand*{\ftype@table}{2}
-\newcommand*{\ext@table}{lot}
-\newcommand*{\fnum@table}{\tableformat}
-\newenvironment{table}{%
- \def\caption{%
- \if@tablecaptionabove\expandafter\captionabove
- \else\expandafter\captionbelow\fi
- }%
- \@float{table}%
-}{%
- \end@float
-}
-\newenvironment{table*}{%
- \def\caption{%
- \if@tablecaptionabove\expandafter\captionabove
- \else\expandafter\captionbelow\fi
- }%
- \@dblfloat{table}%
-}{%
- \end@dblfloat
-}
%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
@@ -6122,7 +6425,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -6170,13 +6473,11 @@
\def\do@endgroup{\endgroup}%
\def\do##1{%
\scr@ifundefinedorrelax{scr@tso@##1@numwidth}{}{%
- \typeout{Setting numwidth of `##1' to \last@l@number}%
\l@addto@macro\do@endgroup{%
\@namedef{scr@tso@##1@numwidth}{\last@l@number}%
}%
}%
\scr@ifundefinedorrelax{scr@tso@##1@indent}{}{%
- \typeout{Setting indent of `##1' to \string\z@}%
\l@addto@macro\do@endgroup{%
\@namedef{scr@tso@##1@indent}{\z@}%
}%
@@ -6265,17 +6566,13 @@
}%
\global\let\scr@float@addtolists@warning\relax
}
-\newcommand*\listfigurename{List of Figures}
-\newcommand*\listoflofname{\listfigurename}
-\newcommand*\listoflofentryname{\figurename}
-\newcommand*\listtablename{List of Tables}
-\newcommand*\listoflotname{\listtablename}
-\newcommand*\listoflotentryname{\tablename}
-\newcommand*\listoffigures{\listoftoc{\ext@figure}}
-\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 2640 2017-05-08 09:36:55Z kohm $
+\renewcommand*\listfigurename{List of Figures}
+\renewcommand*\listoflofname{\listfigurename}
+\renewcommand*\listoflofentryname{\figurename}
+\renewcommand*\listtablename{List of Tables}
+\renewcommand*\listoflotname{\listtablename}
+\renewcommand*\listoflotentryname{\tablename}
+%%% From File: $Id: scrkernel-bibliography.dtx 2769 2017-12-03 10:56:06Z kohm $
%%% (run: body)
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
@@ -6361,7 +6658,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2782 2017-12-04 07:47:52Z kohm $
%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
@@ -6372,17 +6669,9 @@
\@chaptertolistsfalse
\idx@@heading{\indexname}]%
\ifidx@leveldown
- \scr@ifundefinedorrelax{@mkright}{%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\indexname}}\fi
- }{%
- \@mkright{\MakeMarkcase{\indexname}}%
- }%
+ \@mkright{\MakeMarkcase{\indexname}}%
\else
- \scr@ifundefinedorrelax{@mkdouble}{%
- \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
- }{%
- \@mkdouble{\MakeMarkcase{\indexname}}%
- }%
+ \@mkdouble{\MakeMarkcase{\indexname}}%
\fi
}
\newenvironment{theindex}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 3cf92f47737..3e7d40dfb20 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: 10pt)
\ProvidesFile{%
scrsize10pt.clo%
@@ -150,7 +150,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z 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 a1c3dce27c8..9309633a8a9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $
%%% (run: 11pt)
%%% (run: 12pt)
\ProvidesFile{%
@@ -151,7 +151,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z 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 593faa7179f..27498dbf63e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z 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 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2680 2017-09-28 05:45:12Z 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 3ffb75332ed..90a6d7ce415 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
index e8662621bc2..cf1d8a9ef51 100644
--- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z kohm $
\ProvidesFile{setspace.hak}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(hacking package
setspace)%
]
-%%% From File: $Id: scrhack.dtx 2660 2017-07-24 19:31:57Z kohm $
+%%% From File: $Id: scrhack.dtx 2960 2018-03-16 08:39:32Z 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 ef485afa64f..9fe7c231f75 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -52,24 +52,24 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(handling toc-files)%
]
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: prepare)
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: option)
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
%%% (run: body)
\RequirePackage{scrbase}
\newcommand*{\tb@listoftocs}{}
@@ -400,6 +400,32 @@
\tocbasic@starttoc{#2}%
\endgroup
}
+\@ifpackageloaded{tocbibind}{}{%
+ \AtBeginDocument{%
+ \@ifpackageloaded{tocbibind}{%
+ \PackageInfo{tocbasic}{usage of `tocbibind' detected}%
+ \newcommand*{\tb@tocbibindpatch}[3]{%
+ \long\def\reserved@a{\tocfile{#2}{#1} }%
+ \ifx #3\reserved@a
+ \PackageWarningNoLine{tocbasic}{%
+ `tocbibind' redefinition of `\string#3'\MessageBreak
+ detected.\MessageBreak
+ Note: Loading `tocbibind' without option `not#1'\MessageBreak
+ can break several features of `tocbasic'%
+ \scr@ifundefinedorrelax{KOMAClassName}{%
+ .\MessageBreak
+ Loading `tocbibind' before `tocbasic' would avoid\MessageBreak
+ this warning message%
+ }{}%
+ }%
+ \fi
+ }%
+ \tb@tocbibindpatch{toc}{\contentsname}{\tableofcontents}%
+ \tb@tocbibindpatch{lof}{\listfigurename}{\listoffigures}%
+ \tb@tocbibindpatch{lot}{\listtablename}{\listoftables}%
+ }{}%
+ }%
+}
\newcommand*{\listofname}{List of}
\newcommand*{\listofeachtoc}{%
\kernel@ifnextchar [%]
@@ -649,11 +675,15 @@
}%
}%
}%
+ \DefineFamilyKey[.toc]{KOMAarg}{extension}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@ext{##1}}%
+ }%
\DefineFamilyKey[.toc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
\FamilyExecuteOptions[.toc]{KOMAarg}{#1}%
\RelaxFamilyKey[.toc]{KOMAarg}{@else@}%
\DefineFamilyKey[.toc]{KOMAarg}{type}{\FamilyKeyStateProcessed}%
\DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}%
+ \DefineFamilyKey[.toc]{KOMAarg}{extension}{\FamilyKeyStateProcessed}%
\ifstr{\tb@nt@tocentrystyle}{}{}{%
\begingroup
\let\scr@dte@current\tb@nt@type
@@ -708,9 +738,6 @@
\DefineFamilyKey[.toc]{KOMAarg}{counterwithin}{%
\edef\tb@nt@counterwithin{##1}\FamilyKeyStateProcessed
}%
- \DefineFamilyKey[.toc]{KOMAarg}{extension}{%
- \tb@ifvalueisnotempty{##1}{\edef\tb@nt@ext{##1}}%
- }%
\FamilyBoolKey[.toc]{KOMAarg}{float}{tb@nt@float}%
\DefineFamilyKey[.toc]{KOMAarg}{floatpos}{%
\tb@ifvalueisnotempty{##1}{\edef\tb@nt@floatpos{##1}}%
@@ -789,10 +816,16 @@
\DefineFamilyKey[.toc]{KOMAarg}{types}{%
\tb@ifvalueisnotempty{##1}{\edef\tb@nt@types{##1}}%
}%
+ \DefineFamilyKey[.toc]{KOMAarg}{setup}{%
+ \setuptoc\tb@nt@ext{##1}%
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{unset}{%
+ \unsettoc\tb@nt@ext{##1}%
+ }%
\FamilyExecuteOptions[.toc]{KOMAarg}{#1}%
\RelaxFamilyKey[.toc]{KOMAarg}{types}%
\RelaxFamilyKey[.toc]{KOMAarg}{owner}%
- \RelaxFamilyKey[.toc]{KOMAarg}{nonfload}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{nonfloat}%
\RelaxFamilyKey[.toc]{KOMAarg}{name}%
\RelaxFamilyKey[.toc]{KOMAarg}{listname}%
\RelaxFamilyKey[.toc]{KOMAarg}{level}%
@@ -838,7 +871,8 @@
\expandafter{\csname list\tb@nt@type name\endcsname}%
\begingroup\edef\@tempa{\endgroup
\noexpand\newcommand*\csname listof\tb@nt@types\endcsname{%
- \noexpand\listoftoc{\tb@nt@ext}%
+ \noexpand\listoftoc{%
+ \expandafter\noexpand\csname ext@\tb@nt@type\endcsname}%
}%
}\@tempa
\ifstr{\tb@nt@tocentrystyle}{}{%
@@ -977,7 +1011,7 @@
}%
}
\newcommand*{\tb@nt@autofloattype}{16}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: body)
\newcommand*{\scr@numberline}[1]{%
\numberline@box{%
@@ -1362,10 +1396,10 @@
\expandafter\let\csname scr@dte@#2@init\expandafter\endcsname
\csname scr@dte@#1@init\endcsname
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: style,gobble)
\DeclareTOCEntryStyle{gobble}{}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: style,dottedtocline)
\DeclareTOCEntryStyle{dottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1494,7 +1528,7 @@
\@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}%
{\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: style,undottedtocline)
\DeclareTOCEntryStyle{undottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1650,7 +1684,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: style, largetocline)
\DeclareTOCEntryStyle{largetocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1760,7 +1794,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: style,tocline)
\DeclareTOCEntryStyle{tocline}[{%
\DefineTOCEntryLengthOption{beforeskip}%
@@ -2031,8 +2065,8 @@
\scr@ifundefinedorrelax{l@chapter}{%
\ifstr{#1}{section}{%
\@namedef{scr@tso@#1@linefill}{\hfill}%
- }{}
- }{}
+ }{}%
+ }{}%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}%
@@ -2043,9 +2077,20 @@
\expandafter\providecommand%
\csname scr@tso@#1@pagenumberformat\endcsname[1]{\large\bfseries ##1}%
}{%
- \expandafter\providecommand%
- \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
- \normalfont\normalcolor ##1}%
+ \ifstr{#1}{chapter}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}%
+ }{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}%
+ }{}%
+ }{}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+ \normalfont\normalcolor ##1}%
+ }%
}%
\expandafter\providecommand%
\csname scr@tso@#1@pagenumberbox\endcsname[1]{%
@@ -2192,10 +2237,10 @@
\mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
mu$}\hfill
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
-%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $
%%% (run: exit)
\AtBeginDocument{%
\@ifundefined{MakeMarkcase}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index f4640a772bf..3a751f344e2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -48,7 +48,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -70,23 +70,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2017/09/07 v3.24 KOMA-Script
+ 2018/03/30 v3.25 KOMA-Script
package
(type area)]
-%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
@@ -156,12 +156,13 @@
\@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 2661 2017-07-24 19:45:16Z kohm $
+\@namedef{scr@v@3.25}{17}
+\@namedef{scr@v@last}{17}
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z 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 $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -216,7 +217,7 @@
\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 $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: options)
\providecommand*{\PaperNameToSize}[2][warning]{%
\ifstr{#2}{letter}{%
@@ -966,11 +967,24 @@
\KOMAExecuteOptions{twoside=false}
\fi
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: body)
\newcommand*{\ta@divfor}[1]{%
+ \ta@div=\z@
+ \expandafter\ifnum\scr@ta@v@is@ge{3.25}\relax
+ \ifnum \z@=\ifdim \paperwidth<207mm \z@\else\ifdim \paperwidth>213mm \z@
+ \else\ifdim \paperheight<294mm \z@\else
+ \ifdim \paperheight>300mm \z@\else \@ne\fi\fi\fi\fi
+ \PackageInfoNoLine{typearea}{%
+ With paper sizes other than (almost) `A4' predefined\MessageBreak
+ DIV values do not exist. Using DIV calculation for good\MessageBreak
+ line width (unless using `version=3.24` or prior)%
+ }%
+ \ta@div=\tw@
+ \fi
+ \fi
\if@mincl
\PackageInfo{typearea}{%
With option `mpinclude' there are no predefined\MessageBreak
@@ -978,7 +992,8 @@
width%
}%
\ta@div=\tw@
- \else
+ \fi
+ \ifnum \ta@div=\z@
\xdef\@tempa{\ta@divlist{}}%
\@tempdima=#1pt
\addtolength{\@tempdima}{.5\p@}%
@@ -1001,7 +1016,12 @@
\PackageWarningNoLine{typearea}{%
DIV for \the\@tempdima\space and used papersize\MessageBreak
not defined!\MessageBreak
- Using DIV=\ta@divlistelse
+ Using DIV=\ifnum\number\ta@divlistelse>\m@ne
+ \ifcase \ta@divlistelse default%
+ \or calc%
+ \or calc%
+ \or classic%
+ \else\ta@divlistelse\fi\else\ta@divlistelse\fi
}%
\ta@div=\ta@divlistelse\relax
\else
@@ -1681,7 +1701,7 @@
\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 $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $
%%% (run: final)
\typearea[current]{current}
%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index 8ab3a8208fa..6a7d2e444c4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: head)
\ProvidesFile{%
visualize%
@@ -80,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\RequirePackage{eso-pic}
\newcommand*{\showfields}[1]{%
@@ -576,7 +576,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $
%%% (run: body)
\endinput
%%