summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-20 22:41:14 +0000
committerKarl Berry <karl@freefriends.org>2016-06-20 22:41:14 +0000
commitdd8cd465b253cee19fa61fc89383c0c61a0791e4 (patch)
tree879b137590b9ae1dc87a49a741cbb9a1390dad25 /Master/texmf-dist/tex/latex
parent84f03266593d0aeb4f714b3f4b76f2d1ea4f4bd6 (diff)
koma-script (20jun16)
git-svn-id: svn://tug.org/texlive/trunk@41508 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/lscape.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls213
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty40
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls213
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty31
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty26
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls41
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls213
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/setspace.hak6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty119
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty23
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco6
42 files changed, 636 insertions, 445 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 072776ed881..e0e1a665683 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index a21b7a3f269..b46ca186b39 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index f31fa9b08c0..6bb6c1797ea 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
@@ -204,7 +204,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
\def\setpresigskip{\@setplength{sigbeforevskip}}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index a527581c3b8..b916ff8c266 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 8baa12b30c8..8ee197f32ed 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index e3f6a068dc6..b562bb5b42f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index 05a723e0199..d90c3e5b1f4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index e036541e75a..f81174a7af1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index 99f446dea98..3090d2cc3b0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index d4fd96b6761..00d51945a79 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 9f441361f91..6e5d82daa64 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index e075ce4142c..a4b7f3bcb97 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index 77b9e1d17fb..22f7c729838 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index 2bdb424542f..3456d2d1c5b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index 41d3b4de5a7..f7a3dfcdcc1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{float.hak}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(hacking package
float)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index 0e8ddab17c2..69f0dcb1b01 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(hacking package
floatrow)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index 38ea2882203..54adb9cfebc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(hacking package
hyperref)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index c6370ccb626..4ce2ee8f885 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{listings.hak}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(hacking package
listings)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
index 5eae94e91bf..9098ae150ff 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://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{lscape.hak}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(hacking package
lscape)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index ebc4cd252c9..6f85fa9d918 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -81,7 +81,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -103,7 +103,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -118,21 +118,21 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
\RequirePackage{tocbasic}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
]
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: prepare)
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -184,7 +184,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -309,6 +309,7 @@
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
+\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -322,7 +323,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -434,7 +435,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -743,9 +744,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: option)
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -975,7 +976,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1650,16 +1651,16 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2139,7 +2140,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 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2652,10 +2653,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2669,7 +2670,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -2689,17 +2690,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,subsection)
\CloneTOCEntryStyle{tocline}{subsection}
\TOCEntryStyleStartInitCode{subsection}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{3}
\newcommand*{\ifnumbered}[1]{%
@@ -2946,7 +2947,7 @@
\@tempskipa \glueexpr #5\relax\relax
\ifdim \@tempskipa>\z@
\begingroup
- #6{\interlinepenalty \@M
+ #6{\nobreak\interlinepenalty \@M
\sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
\endgroup
\expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
@@ -2966,7 +2967,7 @@
\fi
\else
\def\@svsechd{%
- #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
+ #6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
\expandafter\csname #1mark\expandafter\endcsname
\expandafter{\scr@ds@head}%
\ifx\scr@ds@tocentry\@empty\else
@@ -3039,13 +3040,14 @@
\@tempskipa #3\relax
\ifdim \@tempskipa>\z@
\begingroup
- #4{\interlinepenalty \@M
+ #4{\nobreak\interlinepenalty \@M
\expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
{\glueexpr #1\relax}\@empty{#5}\@@par}%
\endgroup
\else
\edef\@svsechd{%
\unexpanded{#4}{%
+ \noexpand\nobreak
\noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
\unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
}%
@@ -3277,6 +3279,7 @@
\l@addto@macro\do@endgroup{%
\l@addto@macro\scr@dsc@extra@relax@opts{%
\RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocentry##1}%
}%
}%
\kernel@ifnextchar[%]
@@ -3289,6 +3292,10 @@
\l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
}%
}%
\def\@dodefault##1[##2]{%
@@ -3297,6 +3304,10 @@
\l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}[##2]{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
}%
}%
\scr@dte@doopts
@@ -3691,10 +3702,10 @@
\interlinepenalty \@M
\normalfont\sectfont\nobreak
\ifnumbered{#1}{%
- \usekomafont{#1prefix}{\@nameuse{#1format}}%
+ \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
\partheadmidvskip
}{}%
- \usekomafont{part}{#3}\strut
+ \usekomafont{part}{\nobreak #3}\strut
\expandafter\ifx\csname #1mark\endcsname\@gobble
\@mkboth{}{}%
\else
@@ -3718,7 +3729,7 @@
\raggedpart
\interlinepenalty \@M
\normalfont
- \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par
+ \sectfont\nobreak\usekomafont{#1}{\nobreak #2}\strut\@mkboth{}{}\par
\endgroup
\nobreak
\@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax
@@ -3821,7 +3832,7 @@
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak
- \usekomafont{minisec}#1\par\nobreak}\nobreak%
+ \usekomafont{minisec}{\nobreak #1\par\nobreak}}\nobreak%
\@afterheading
}
\newcommand*{\addsectiontocentry}[2]{%
@@ -3943,7 +3954,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4222,7 +4233,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -4644,71 +4655,97 @@
}
\newcommand{\@@makecaption}[3]{%
\cap@margin
- \ifonelinecaptions
- \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}%
- \let\scr@tmp@footnotetext=\@footnotetext
- \let\@footnotetext=\@gobble
- \sbox\@tempboxa{%
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
- #3\unskip\strut}}%
+ \begingroup
+ \ifonelinecaptions
+ \let\stepcounter\@gobble
+ \let\refstepcounter\@gobble
+ \let\label\@gobble
+ \let\@footnotetext=\@gobble
+ \let\hypertarget\@gobbletwo
+ \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}%
+ \ifdim\@tempdima>\linewidth
+ \aftergroup\scr@makemultilinecaption
+ \else
+ \aftergroup\scr@makesinglelinecaption
+ \fi
+ \else
+ \aftergroup\scr@makemultilinecaption
+ \fi
+ \endgroup
+ {#1}{#2}{#3}%
+}
+\newcommand{\scr@makesinglelinecaption}[3]{%
+ {%
+ \usefontofkomafont{caption}{%
+ \hb@xt@\hsize{%
+ \cap@left
+ \scr@@makesinglelinecaption{#1}{#2}{#3}%
+ \cap@right
+ }\par\kern\dp\strutbox%
}%
- \let\@footnotetext=\scr@tmp@footnotetext
- \let\scr@tmp@footnotetext=\undefined
- \setcounter{footnote}{\@tempcntb}%
- \setcounter{mpfootnote}{\@tempcnta}%
- \else
- \sbox\@tempboxa{\hspace*{2\cap@width}}%
- \fi
- \begingroup%
- \setlength{\@tempdima}{\cap@width}%
- \ifdim \wd\@tempboxa >\@tempdima
+ }\kern-\dp\strutbox
+}
+\newcommand{\scr@@makesinglelinecaption}[3]{%
+ \usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
+ \ignorespaces #3\unskip}%
+}
+\newcommand{\scr@makemultilinecaption}[3]{%
+ {%
+ \usefontofkomafont{caption}{%
\hb@xt@\hsize{%
- \setbox\@tempboxa\vbox{\hsize=\cap@width
+ \cap@left
+ \vbox{\hsize\cap@width\linewidth\hsize
\ifdofullc@p
- {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
- {#3\unskip\strut\par}}}%
- \else%
+ \@hangfrom{%
+ \strut
+ \scr@smashdp{%
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat}%
+ }%
+ }%
+ }%
+ }%
+ {\usekomafont{caption}{#3\unskip\strut\par}}%
+ \else
\ifdim\cap@indent<\z@
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
- \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
- \else%
+ \strut
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat\par}%
+ }%
+ }%
+ \noindent{\usekomafont{caption}{%
+ \hspace*{-\cap@indent}#3\unskip\strut\par
+ }}%
+ \else
\if@capbreak
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
- \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
+ \strut
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat\par}%
+ }%
+ }%
+ \noindent\@hangfrom{\hspace*{\cap@indent}}%
+ {\usekomafont{caption}{#3\unskip\strut\par}}%
\else
- {\usekomafont{caption}{%
- \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
- {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
- {{\usekomafont{captionlabel}{%
- #2\captionformat}}}}#3\unskip\strut\par}}}%
+ \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {%
+ \hspace{-\cap@indent}%
+ \scr@smashdp{%
+ #1{\usekomafont{captionlabel}{#2\captionformat}}%
+ }%
+ {\usekomafont{caption}{#3\unskip\strut}\par}%
+ }%
\fi
\fi
\fi
}%
- \setlength{\@tempdima}{\ht\@tempboxa}%
- \addtolength{\@tempdima}{\dp\@tempboxa}%
- \addtolength{\@tempdima}{-\ht\strutbox}%
- \ht\@tempboxa\ht\strutbox
- \dp\@tempboxa\@tempdima
- \strut\cap@left
- \box\@tempboxa
- \cap@right\strut
- }%
- \else
- \global \@minipagefalse
- \sbox\@tempboxa{%
- {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
- #3}}%
- }%
- {\usesizeofkomafont{caption}{%
- \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
- \fi
- \endgroup
+ \cap@right
+ }\par\kern\dp\strutbox
+ }%
+ }\kern-\dp\strutbox
}
\newcommand*{\scr@caption@before@longtable@warning}[1]{%
\ClassWarning{\KOMAClassName}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index b8a5b21e7cf..7f6ce060e4f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,18 +66,18 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package (%
KOMA-Script-independent
basics and keyval usage)]
@@ -393,9 +393,9 @@
%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $
\RequirePackage{scrlfile}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -1061,7 +1061,15 @@
\ifstr{#1}{mm}{\@tempswatrue}{%
\ifstr{#1}{dd}{\@tempswatrue}{%
\ifstr{#1}{cc}{\@tempswatrue}{%
- \ifstr{#1}{sp}{\@tempswatrue}{}%
+ \ifstr{#1}{sp}{\@tempswatrue}{%
+ \ifstr{#1}{ex}{\@tempswatrue}{%
+ \ifstr{#1}{em}{\@tempswatrue}{%
+ \scr@ifpdfoutput{%
+ \ifstr{#1}{px}{\@tempswatrue}{}%
+ }{}%
+ }%
+ }%
+ }%
}%
}%
}%
@@ -1075,14 +1083,26 @@
\let@as@internal@defined{ifpdftex}
\BeforePackage{pdfcprot}{\let\ifpdftex\relax}
\AfterPackage{pdfcprot}{\let@as@internal@defined{ifpdftex}}
+\newcommand{\scr@ifluatex}{\ifnotundefined{luatexversion}}
+\newcommand*{\scr@ifpdforluatex}{%
+ \scr@ifpdftex{\@firstoftwo}{\scr@ifluatex{\@firstoftwo}{\@secondoftwo}}%
+}
\newcommand{\scr@ifVTeX}{\ifnotundefined{VTeXversion}}
\let@as@internal@defined{ifVTeX}
\newcommand{\scr@ifpdfoutput}{%
\scr@ifundefinedorrelax{pdfoutput}{%
- \scr@ifundefinedorrelax{OpMode}{%
- \expandafter\@secondoftwo%
+ \scr@ifundefinedorrelax{outputmode}{%
+ \scr@ifundefinedorrelax{OpMode}{%
+ \expandafter\@secondoftwo%
+ }{%
+ \ifnum\OpMode=1
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
}{%
- \ifnum\OpMode=1
+ \ifnum\outputmode>0
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index de602fd9f98..f5f665690fd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -81,7 +81,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -103,7 +103,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -118,23 +118,23 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
\RequirePackage{tocbasic}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrighttrue
@@ -210,7 +210,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -334,6 +334,7 @@
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
+\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -347,7 +348,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -459,7 +460,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -765,9 +766,9 @@
}{titlepage}{\if@titlepage true\else false\fi}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1133,7 +1134,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1859,17 +1860,17 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2356,7 +2357,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 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2836,10 +2837,10 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2853,7 +2854,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -2873,17 +2874,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -3130,7 +3131,7 @@
\@tempskipa \glueexpr #5\relax\relax
\ifdim \@tempskipa>\z@
\begingroup
- #6{\interlinepenalty \@M
+ #6{\nobreak\interlinepenalty \@M
\sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
\endgroup
\expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
@@ -3150,7 +3151,7 @@
\fi
\else
\def\@svsechd{%
- #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
+ #6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
\expandafter\csname #1mark\expandafter\endcsname
\expandafter{\scr@ds@head}%
\ifx\scr@ds@tocentry\@empty\else
@@ -3223,13 +3224,14 @@
\@tempskipa #3\relax
\ifdim \@tempskipa>\z@
\begingroup
- #4{\interlinepenalty \@M
+ #4{\nobreak\interlinepenalty \@M
\expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
{\glueexpr #1\relax}\@empty{#5}\@@par}%
\endgroup
\else
\edef\@svsechd{%
\unexpanded{#4}{%
+ \noexpand\nobreak
\noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
\unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
}%
@@ -3525,6 +3527,7 @@
\l@addto@macro\do@endgroup{%
\l@addto@macro\scr@dsc@extra@relax@opts{%
\RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocentry##1}%
}%
}%
\kernel@ifnextchar[%]
@@ -3537,6 +3540,10 @@
\l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
}%
}%
\def\@dodefault##1[##2]{%
@@ -3545,6 +3552,10 @@
\l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}[##2]{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
}%
}%
\scr@dte@doopts
@@ -4072,11 +4083,11 @@
\interlinepenalty \@M
\normalfont\sectfont\nobreak
\ifnumbered{#1}{%
- \usekomafont{#1prefix}{\@nameuse{#1format}}%
+ \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
\setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
\partheadmidvskip
}{}%
- \usekomafont{part}{#3}\strut
+ \usekomafont{part}{\nobreak #3}\strut
\expandafter\ifx\csname #1mark\endcsname\@gobble
\@mkboth{}{}%
\else
@@ -4096,7 +4107,7 @@
\raggedpart
\interlinepenalty \@M
\normalfont
- \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par
+ \sectfont\nobreak\usekomafont{#1}{\nobreak #2}\strut\@mkboth{}{}\par
\endgroup
\@nameuse{@end#1}%
}
@@ -4547,7 +4558,7 @@
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak
- \usekomafont{minisec}#1\par\nobreak}\nobreak%
+ \usekomafont{minisec}{\nobreak #1\par\nobreak}}\nobreak%
\@afterheading
}
\newcommand*{\addsectiontocentry}[2]{%
@@ -4683,7 +4694,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4973,7 +4984,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -5395,71 +5406,97 @@
}
\newcommand{\@@makecaption}[3]{%
\cap@margin
- \ifonelinecaptions
- \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}%
- \let\scr@tmp@footnotetext=\@footnotetext
- \let\@footnotetext=\@gobble
- \sbox\@tempboxa{%
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
- #3\unskip\strut}}%
+ \begingroup
+ \ifonelinecaptions
+ \let\stepcounter\@gobble
+ \let\refstepcounter\@gobble
+ \let\label\@gobble
+ \let\@footnotetext=\@gobble
+ \let\hypertarget\@gobbletwo
+ \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}%
+ \ifdim\@tempdima>\linewidth
+ \aftergroup\scr@makemultilinecaption
+ \else
+ \aftergroup\scr@makesinglelinecaption
+ \fi
+ \else
+ \aftergroup\scr@makemultilinecaption
+ \fi
+ \endgroup
+ {#1}{#2}{#3}%
+}
+\newcommand{\scr@makesinglelinecaption}[3]{%
+ {%
+ \usefontofkomafont{caption}{%
+ \hb@xt@\hsize{%
+ \cap@left
+ \scr@@makesinglelinecaption{#1}{#2}{#3}%
+ \cap@right
+ }\par\kern\dp\strutbox%
}%
- \let\@footnotetext=\scr@tmp@footnotetext
- \let\scr@tmp@footnotetext=\undefined
- \setcounter{footnote}{\@tempcntb}%
- \setcounter{mpfootnote}{\@tempcnta}%
- \else
- \sbox\@tempboxa{\hspace*{2\cap@width}}%
- \fi
- \begingroup%
- \setlength{\@tempdima}{\cap@width}%
- \ifdim \wd\@tempboxa >\@tempdima
+ }\kern-\dp\strutbox
+}
+\newcommand{\scr@@makesinglelinecaption}[3]{%
+ \usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
+ \ignorespaces #3\unskip}%
+}
+\newcommand{\scr@makemultilinecaption}[3]{%
+ {%
+ \usefontofkomafont{caption}{%
\hb@xt@\hsize{%
- \setbox\@tempboxa\vbox{\hsize=\cap@width
+ \cap@left
+ \vbox{\hsize\cap@width\linewidth\hsize
\ifdofullc@p
- {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
- {#3\unskip\strut\par}}}%
- \else%
+ \@hangfrom{%
+ \strut
+ \scr@smashdp{%
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat}%
+ }%
+ }%
+ }%
+ }%
+ {\usekomafont{caption}{#3\unskip\strut\par}}%
+ \else
\ifdim\cap@indent<\z@
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
- \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
- \else%
+ \strut
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat\par}%
+ }%
+ }%
+ \noindent{\usekomafont{caption}{%
+ \hspace*{-\cap@indent}#3\unskip\strut\par
+ }}%
+ \else
\if@capbreak
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
- \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
+ \strut
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat\par}%
+ }%
+ }%
+ \noindent\@hangfrom{\hspace*{\cap@indent}}%
+ {\usekomafont{caption}{#3\unskip\strut\par}}%
\else
- {\usekomafont{caption}{%
- \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
- {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
- {{\usekomafont{captionlabel}{%
- #2\captionformat}}}}#3\unskip\strut\par}}}%
+ \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {%
+ \hspace{-\cap@indent}%
+ \scr@smashdp{%
+ #1{\usekomafont{captionlabel}{#2\captionformat}}%
+ }%
+ {\usekomafont{caption}{#3\unskip\strut}\par}%
+ }%
\fi
\fi
\fi
}%
- \setlength{\@tempdima}{\ht\@tempboxa}%
- \addtolength{\@tempdima}{\dp\@tempboxa}%
- \addtolength{\@tempdima}{-\ht\strutbox}%
- \ht\@tempboxa\ht\strutbox
- \dp\@tempboxa\@tempdima
- \strut\cap@left
- \box\@tempboxa
- \cap@right\strut
- }%
- \else
- \global \@minipagefalse
- \sbox\@tempboxa{%
- {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
- #3}}%
- }%
- {\usesizeofkomafont{caption}{%
- \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
- \fi
- \endgroup
+ \cap@right
+ }\par\kern\dp\strutbox
+ }%
+ }\kern-\dp\strutbox
}
\newcommand*{\scr@caption@before@longtable@warning}[1]{%
\ClassWarning{\KOMAClassName}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index f3822546f01..3f495bddb41 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 839ff6faebd..9edeffc09b7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -76,7 +76,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -98,7 +98,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -106,7 +106,7 @@
}
%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $
\ProvidesPackage{scrextend}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr@ext@activate}[1]{%
@@ -130,9 +130,9 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: prepare)
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $
@@ -158,7 +158,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -263,6 +263,7 @@
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
+\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -276,7 +277,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -382,7 +383,7 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
\KOMA@key{cleardoublepage}{%
@@ -465,7 +466,7 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -537,11 +538,11 @@
\ifhmode\spacefactor\@x@sf\fi
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: execoption)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -1209,11 +1210,11 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: body)
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
\@restonecolfalse
@@ -1296,7 +1297,7 @@
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\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 8770c0a73a2..baed4ff8abe 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -42,7 +42,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -72,7 +72,7 @@
}
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesPackage{scrfontsizes}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package (font size file generator)]
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index bf2e9acbf9c..4ea3f39a643 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,10 +74,10 @@
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
%%% using: package,option
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 69be06b9cda..9a56b1d0e22 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,18 +66,18 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package (%
KOMA-Script-dependent
basics and keyval usage)]
@@ -244,9 +244,9 @@
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
%%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $
\RequirePackage{scrlfile}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
}
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 6e01eac85db..67a98cc3262 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -48,7 +48,7 @@
%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(end user interface for scrlayer)]
%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index f90d95a9e2e..6584f9057a9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -46,7 +46,7 @@
%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(defining layers and page styles)]
%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index fa174e18ea0..8a7e1b1e5e5 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -60,7 +60,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -82,19 +82,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
Cannot detect any KOMA-Script class.\MessageBreak
@@ -129,7 +129,7 @@
\endgroup
\let\do@renewforletter@list\@empty
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -166,7 +166,7 @@
%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
@@ -686,10 +686,10 @@
scrletter.\scr@pkgextension
}{symbolicnames}{false}%
%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMAProcessOptions\relax
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -1605,7 +1605,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
\newkomavar{firsthead}
\setkomavar{firsthead}{%
\parbox[b]{\useplength{firstheadwidth}}%
@@ -1771,7 +1771,7 @@
\newkomafont{fromname}{}
\newkomafont{fromaddress}{}
\newkomafont{fromrule}{}
-\newkomafont{backaddress}{\sffamily}
+\newkomafont{backaddress}{\@gr@gsffamily}
\newkomafont{specialmail}{}
\newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries}
\newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont}
@@ -1780,10 +1780,10 @@
\newkomafont{addressee}{}
\newkomafont{toname}{}
\newkomafont{toaddress}{}
-\newkomafont{refname}{\sffamily\scriptsize}
+\newkomafont{refname}{\@gr@gsffamily\scriptsize}
\newkomafont{refvalue}{}
\newkomafont{placeanddate}{}
-\newkomafont{lettertitle}{\normalcolor\sffamily\bfseries}
+\newkomafont{lettertitle}{\normalcolor\@gr@gsffamily\bfseries}
\scr@ifundefinedorrelax{scr@fnt@title}{%
\aliaskomafont{title}{lettertitle}%
}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 61584d16d14..b85916f62d8 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 2429 2016-04-12 12:10:19Z kohm $
\ProvidesPackage{scrlfile}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package (loading files)]
\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
^^J\@spaces\@spaces\@spaces\@spaces\space\space
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 9a9be159fa3..d2f8649e0d7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -71,7 +71,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -108,12 +108,12 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -213,6 +213,7 @@
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
+\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -226,7 +227,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -246,6 +247,10 @@
\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
+\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles}
+\newcommand*{\@gr@gsffamily}{%
+ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi
+}
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -365,7 +370,7 @@
}
%%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $
%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -743,7 +748,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -815,7 +820,7 @@
\ifhmode\spacefactor\@x@sf\fi
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
@@ -1365,12 +1370,12 @@
\KOMAClassFileName
}{symbolicnames}{false}%
%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1856,7 +1861,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
@@ -2830,7 +2835,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -3064,7 +3069,7 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -3347,7 +3352,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -3529,7 +3534,7 @@
\newkomafont{fromname}{}
\newkomafont{fromaddress}{}
\newkomafont{fromrule}{}
-\newkomafont{backaddress}{\sffamily}
+\newkomafont{backaddress}{\@gr@gsffamily}
\newkomafont{specialmail}{}
\newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries}
\newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont}
@@ -3538,14 +3543,14 @@
\newkomafont{addressee}{}
\newkomafont{toname}{}
\newkomafont{toaddress}{}
-\newkomafont{refname}{\sffamily\scriptsize}
+\newkomafont{refname}{\@gr@gsffamily\scriptsize}
\ifnum\scr@compatibility=\@nameuse{scr@v@2.97}\relax
\newkomafont{refvalue}{\sffamily\scriptsize}
\else
\newkomafont{refvalue}{}
\fi
\newkomafont{placeanddate}{}
-\newkomafont{lettertitle}{\normalcolor\sffamily\bfseries}
+\newkomafont{lettertitle}{\normalcolor\@gr@gsffamily\bfseries}
\aliaskomafont{title}{lettertitle}%
\newkomafont{lettersubject}{\normalfont\bfseries}
\aliaskomafont{subject}{lettersubject}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index a9da5dc4a3f..919946d9f73 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 2428 2016-04-12 10:31:07Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package (page head and foot)]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index c62a96922eb..1c1d0b789c4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -81,7 +81,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -103,7 +103,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -118,23 +118,23 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
\RequirePackage{tocbasic}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrightfalse
@@ -210,7 +210,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -335,6 +335,7 @@
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
+\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -348,7 +349,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -460,7 +461,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -769,9 +770,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1137,7 +1138,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1863,17 +1864,17 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2353,7 +2354,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 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2867,10 +2868,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2884,7 +2885,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -2904,17 +2905,17 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
@@ -3161,7 +3162,7 @@
\@tempskipa \glueexpr #5\relax\relax
\ifdim \@tempskipa>\z@
\begingroup
- #6{\interlinepenalty \@M
+ #6{\nobreak\interlinepenalty \@M
\sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
\endgroup
\expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
@@ -3181,7 +3182,7 @@
\fi
\else
\def\@svsechd{%
- #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
+ #6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
\expandafter\csname #1mark\expandafter\endcsname
\expandafter{\scr@ds@head}%
\ifx\scr@ds@tocentry\@empty\else
@@ -3254,13 +3255,14 @@
\@tempskipa #3\relax
\ifdim \@tempskipa>\z@
\begingroup
- #4{\interlinepenalty \@M
+ #4{\nobreak\interlinepenalty \@M
\expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
{\glueexpr #1\relax}\@empty{#5}\@@par}%
\endgroup
\else
\edef\@svsechd{%
\unexpanded{#4}{%
+ \noexpand\nobreak
\noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
\unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
}%
@@ -3556,6 +3558,7 @@
\l@addto@macro\do@endgroup{%
\l@addto@macro\scr@dsc@extra@relax@opts{%
\RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{tocentry##1}%
}%
}%
\kernel@ifnextchar[%]
@@ -3568,6 +3571,10 @@
\l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
}%
}%
\def\@dodefault##1[##2]{%
@@ -3576,6 +3583,10 @@
\l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}[##2]{%
+ \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+ \FamilyKeyStateProcessed
+ }%
}%
}%
\scr@dte@doopts
@@ -4091,11 +4102,11 @@
\interlinepenalty \@M
\normalfont\sectfont\nobreak
\ifnumbered{#1}{%
- \usekomafont{#1prefix}{\@nameuse{#1format}}%
+ \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
\setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
\partheadmidvskip
}{}%
- \usekomafont{part}{#3}\strut
+ \usekomafont{part}{\nobreak #3}\strut
\expandafter\ifx\csname #1mark\endcsname\@gobble
\@mkboth{}{}%
\else
@@ -4115,7 +4126,7 @@
\raggedpart
\interlinepenalty \@M
\normalfont
- \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par
+ \sectfont\nobreak\usekomafont{#1}{\nobreak #2}\strut\@mkboth{}{}\par
\endgroup
\@nameuse{@end#1}%
}
@@ -4555,7 +4566,7 @@
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak
- \usekomafont{minisec}#1\par\nobreak}\nobreak%
+ \usekomafont{minisec}{\nobreak #1\par\nobreak}}\nobreak%
\@afterheading
}
\newcommand*{\addsectiontocentry}[2]{%
@@ -4685,7 +4696,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -4969,7 +4980,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -5391,71 +5402,97 @@
}
\newcommand{\@@makecaption}[3]{%
\cap@margin
- \ifonelinecaptions
- \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}%
- \let\scr@tmp@footnotetext=\@footnotetext
- \let\@footnotetext=\@gobble
- \sbox\@tempboxa{%
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
- #3\unskip\strut}}%
+ \begingroup
+ \ifonelinecaptions
+ \let\stepcounter\@gobble
+ \let\refstepcounter\@gobble
+ \let\label\@gobble
+ \let\@footnotetext=\@gobble
+ \let\hypertarget\@gobbletwo
+ \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}%
+ \ifdim\@tempdima>\linewidth
+ \aftergroup\scr@makemultilinecaption
+ \else
+ \aftergroup\scr@makesinglelinecaption
+ \fi
+ \else
+ \aftergroup\scr@makemultilinecaption
+ \fi
+ \endgroup
+ {#1}{#2}{#3}%
+}
+\newcommand{\scr@makesinglelinecaption}[3]{%
+ {%
+ \usefontofkomafont{caption}{%
+ \hb@xt@\hsize{%
+ \cap@left
+ \scr@@makesinglelinecaption{#1}{#2}{#3}%
+ \cap@right
+ }\par\kern\dp\strutbox%
}%
- \let\@footnotetext=\scr@tmp@footnotetext
- \let\scr@tmp@footnotetext=\undefined
- \setcounter{footnote}{\@tempcntb}%
- \setcounter{mpfootnote}{\@tempcnta}%
- \else
- \sbox\@tempboxa{\hspace*{2\cap@width}}%
- \fi
- \begingroup%
- \setlength{\@tempdima}{\cap@width}%
- \ifdim \wd\@tempboxa >\@tempdima
+ }\kern-\dp\strutbox
+}
+\newcommand{\scr@@makesinglelinecaption}[3]{%
+ \usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
+ \ignorespaces #3\unskip}%
+}
+\newcommand{\scr@makemultilinecaption}[3]{%
+ {%
+ \usefontofkomafont{caption}{%
\hb@xt@\hsize{%
- \setbox\@tempboxa\vbox{\hsize=\cap@width
+ \cap@left
+ \vbox{\hsize\cap@width\linewidth\hsize
\ifdofullc@p
- {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
- {#3\unskip\strut\par}}}%
- \else%
+ \@hangfrom{%
+ \strut
+ \scr@smashdp{%
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat}%
+ }%
+ }%
+ }%
+ }%
+ {\usekomafont{caption}{#3\unskip\strut\par}}%
+ \else
\ifdim\cap@indent<\z@
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
- \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
- \else%
+ \strut
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat\par}%
+ }%
+ }%
+ \noindent{\usekomafont{caption}{%
+ \hspace*{-\cap@indent}#3\unskip\strut\par
+ }}%
+ \else
\if@capbreak
- {\usekomafont{caption}{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
- \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
+ \strut
+ #1{%
+ \usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat\par}%
+ }%
+ }%
+ \noindent\@hangfrom{\hspace*{\cap@indent}}%
+ {\usekomafont{caption}{#3\unskip\strut\par}}%
\else
- {\usekomafont{caption}{%
- \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
- {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
- {{\usekomafont{captionlabel}{%
- #2\captionformat}}}}#3\unskip\strut\par}}}%
+ \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {%
+ \hspace{-\cap@indent}%
+ \scr@smashdp{%
+ #1{\usekomafont{captionlabel}{#2\captionformat}}%
+ }%
+ {\usekomafont{caption}{#3\unskip\strut}\par}%
+ }%
\fi
\fi
\fi
}%
- \setlength{\@tempdima}{\ht\@tempboxa}%
- \addtolength{\@tempdima}{\dp\@tempboxa}%
- \addtolength{\@tempdima}{-\ht\strutbox}%
- \ht\@tempboxa\ht\strutbox
- \dp\@tempboxa\@tempdima
- \strut\cap@left
- \box\@tempboxa
- \cap@right\strut
- }%
- \else
- \global \@minipagefalse
- \sbox\@tempboxa{%
- {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
- #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
- #3}}%
- }%
- {\usesizeofkomafont{caption}{%
- \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
- \fi
- \endgroup
+ \cap@right
+ }\par\kern\dp\strutbox
+ }%
+ }\kern-\dp\strutbox
}
\newcommand*{\scr@caption@before@longtable@warning}[1]{%
\ClassWarning{\KOMAClassName}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 9efc4a7a90d..f4a27fcf1ce 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index d8c20dfb464..5de94b80233 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index fb261ad1876..362a971a66e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index 161236d1e6b..942a6d76b07 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $
\newif\if@Hxii
diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
index 37db6ea6571..6ca55ed666e 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://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,11 +62,11 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $
\ProvidesFile{setspace.hak}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(hacking package
setspace)%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 390d986e9af..0012ad1269a 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://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(handling toc-files)%
]
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: option)
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: body)
\RequirePackage{scrbase}
\newcommand*{\tb@listoftocs}{}
@@ -636,6 +636,7 @@
\l@addto@macro\do@endgroup{%
\l@addto@macro\tb@nt@extra@relax@opts{%
\RelaxFamilyKey[.toc]{KOMAarg}{toc##1}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{tocentry##1}%
}%
}%
\kernel@ifnextchar[%]
@@ -645,6 +646,13 @@
\def\@donodefault##1{%
\l@addto@macro\do@endgroup{%
\DefineFamilyKey[.toc]{KOMAarg}{toc##1}{%
+ \PackageWarning{tocbasic}{you should use `tocentry##1'
+ instead\MessageBreak
+ of `toc##1'}%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1}{%
\l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
\FamilyKeyStateProcessed
}%
@@ -653,6 +661,13 @@
\def\@dodefault##1[##2]{%
\l@addto@macro\do@endgroup{%
\DefineFamilyKey[.toc]{KOMAarg}{toc##1}[##2]{%
+ \PackageWarning{tocbasic}{you should use `tocentry##1'
+ instead\MessageBreak
+ of `toc##1'}%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1}[##2]{%
\l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
\FamilyKeyStateProcessed
}%
@@ -696,7 +711,7 @@
\PackageWarning{tocbasic}{%
deprecated option `hang'.\MessageBreak
You should replace option `hang' by option\MessageBreak
- `tocnumwidth'%
+ `tocentrynumwidth'%
}%
\l@addto@macro\tb@nt@tocstyle@options{,numwidth={##1}}%
}%
@@ -716,7 +731,7 @@
\PackageWarning{tocbasic}{%
deprecated option `indent'.\MessageBreak
You should replace option `indent' by option\MessageBreak
- `tocindent'%
+ `tocentryindent'%
}%
\l@addto@macro\tb@nt@tocstyle@options{,indent={##1}}%
}%
@@ -729,7 +744,7 @@
\PackageWarning{tocbasic}{%
deprecated option `level'.\MessageBreak
You should replace option `level' by option\MessageBreak
- `toclevel'
+ `tocentrylevel'
}%
\l@addto@macro\tb@nt@tocstyle@options{,level={##1}}%
\FamilyKeyStateProcessed
@@ -934,7 +949,7 @@
}%
}
\newcommand*{\tb@nt@autofloattype}{16}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: body)
\newcommand*{\scr@numberline}[1]{%
\numberline@box{%
@@ -1276,6 +1291,19 @@
\if@tempswa
\@nameuse{scr@dte@def@l@#2}{#3}%
\expandafter\edef\csname scr@dte@#3@style\endcsname{#2}%
+ \expandafter\let\csname toclevel@#3\expandafter\endcsname
+ \csname #3tocdepth\endcsname
+ \if@atdocument\else
+ \scr@ifundefinedorrelax{AfterPackage}{%
+ \AtBeginDocument
+ }{%
+ \AfterPackage*{hyperref}%
+ }%
+ {%
+ \expandafter\let\csname toclevel@#3\expandafter\endcsname
+ \csname #3tocdepth\endcsname
+ }%
+ \fi
\fi
}%
}
@@ -1306,10 +1334,10 @@
\expandafter\let\csname scr@dte@#2@init\expandafter\endcsname
\csname scr@dte@#1@init\endcsname
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,gobble)
\DeclareTOCEntryStyle{gobble}{}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,dottedtocline)
\DeclareTOCEntryStyle{dottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1438,7 +1466,7 @@
\@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}%
{\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,undottedtocline)
\DeclareTOCEntryStyle{undottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1594,7 +1622,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style, largetocline)
\DeclareTOCEntryStyle{largetocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1704,35 +1732,47 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,tocline)
\DeclareTOCEntryStyle{tocline}[{%
- \DefineTOCEntryIfOption{raggedpagenumber}%
- {scr@tso@}{@raggedpage}{page number ragged flag}%
+ \DefineTOCEntryLengthOption{beforeskip}%
+ {scr@tso@}{@beforeskip}{vertical skip before the entry}%
\DefineTOCEntryIfOption{breakafternumber}%
{scr@tso@}{@breakafternumber}{line break after number flag}%
\DefineTOCEntryIfOption{dynnumwidth}%
{scr@tso@}{@dynnumwidth}{dynamic number width flag}%
- \DefineTOCEntryCommandOption{onstarthigherlevel}%
- {scr@tso@}{@LastTOCLevelWasLower}{start higher level entry hook}%
- \DefineTOCEntryCommandOption{onstartsamelevel}%
- {scr@tso@}{@LastTOCLevelWasSame}{start same level entry hook}%
- \DefineTOCEntryCommandOption{onstartlowerlevel}%
- {scr@tso@}{@LastTOCLevelWasHigher}{start lower level entry hook}%
\DefineTOCEntryCommandOption{entryformat}%
{scr@tso@}{@entryformat}[1]{entry format}%
\DefineTOCEntryCommandOption{entrynumberformat}%
{scr@tso@}{@numberformat}[1]{entry number format}%
- \DefineTOCEntryCommandOption{pagenumberformat}%
- {scr@tso@}{@pagenumberformat}[1]{page number format}%
- \DefineTOCEntryCommandOption{pagenumberbox}%
- {scr@tso@}{@pagenumberbox}[1]{page number box}%
\DefineTOCEntryCommandOption{linefill}[\TOCLineLeaderFill]%
{scr@tso@}{@linefill}{filling between text and page number}%
- \DefineTOCEntryLengthOption{beforeskip}%
- {scr@tso@}{@beforeskip}{vertical skip before the entry}%
\DefineTOCEntryLengthOption{numsep}%
{scr@tso@}{@numsep}{entry number separation}%
+ \DefineTOCEntryCommandOption{onstarthigherlevel}%
+ {scr@tso@}{@LastTOCLevelWasLower}{start higher level entry hook}%
+ \DefineTOCEntryCommandOption{onstartlowerlevel}%
+ {scr@tso@}{@LastTOCLevelWasHigher}{start lower level entry hook}%
+ \DefineTOCEntryCommandOption{onstartsamelevel}%
+ {scr@tso@}{@LastTOCLevelWasSame}{start same level entry hook}%
+ \DefineTOCEntryCommandOption{pagenumberbox}%
+ {scr@tso@}{@pagenumberbox}[1]{page number box}%
+ \DefineTOCEntryCommandOption{pagenumberformat}%
+ {scr@tso@}{@pagenumberformat}[1]{page number format}%
+ \DefineTOCEntryOption{raggedentrytext}[true]{%
+ \FamilySetBool{KOMAarg}{raggedentrytext}{@tempswa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \expandafter\let\csname ragged\scr@dte@current entry\endcsname
+ \raggedright
+ \else
+ \expandafter\let\csname ragged\scr@dte@current entry\endcsname
+ \relax
+ \fi
+ \fi
+ }%
+ \DefineTOCEntryIfOption{raggedpagenumber}%
+ {scr@tso@}{@raggedpage}{page number ragged flag}%
\DefineTOCEntryLengthOption{indent}%
{scr@tso@}{@indent}{entry indent}%
\DefineTOCEntryLengthOption{numwidth}%
@@ -1741,7 +1781,7 @@
\ifstrstart{#1}{sub}{%
\scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{%
\expandafter\edef\csname #1tocdepth\endcsname{%
- \numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax
+ \the\numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax
}%
}%
}{}%
@@ -2026,6 +2066,19 @@
\parindent \@nameuse{scr@tso@#1@indent}\relax
\@afterindenttrue
\interlinepenalty\@M
+ \expandafter\ifx\csname ragged#1entry\endcsname\raggedright
+ \addtolength\rightskip\@flushglue
+ \else
+ \def\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \else
+ \renewcommand\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \fi
+ \fi
+ \fi
\leavevmode
\@tempdima \@nameuse{scr@tso@#1@numwidth}\relax
\@nameuse{Ifscr@tso@#1@dynnumwidth}{%
@@ -2110,10 +2163,10 @@
\mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
mu$}\hfill
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z 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 17033952446..1fc15a0feb4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,16 +67,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package (type area)]
\typeout{%
Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J%
@@ -85,9 +85,9 @@
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -476,10 +476,10 @@
}
\newcommand{\set@pdftexpagesize}{%
\scr@ifundefinedorrelax{pdfpagewidth}{%
- \scr@ifundefinedorrelax{pagewidth}{}{pagewidth=\paperwidth}%
+ \scr@ifundefinedorrelax{pagewidth}{}{\pagewidth=\paperwidth}%
}{\pdfpagewidth=\paperwidth}%
\scr@ifundefinedorrelax{pdfpageheight}{%
- \scr@ifundefinedorrelax{pageheight}{}{pageheight=\paperheight}%
+ \scr@ifundefinedorrelax{pageheight}{}{\pageheight=\paperheight}%
}{\pdfpageheight=\paperheight}%
}
\newcommand{\set@dvipspagesize}{%
@@ -689,7 +689,7 @@
\KOMA@ifkey{usegeometry}{@ta@usegeometry}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -795,6 +795,7 @@
\@namedef{scr@v@3.19}{15}
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
+\@namedef{scr@v@3.21}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@ta@v@is@lt}[1]{%
\scr@ta@compatibility<\@nameuse{scr@v@#1}
@@ -808,7 +809,7 @@
\newcommand*{\scr@ta@v@is@ge}[1]{%
\numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -1526,7 +1527,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index 2c7c8496e00..0a80f88406b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $
\ProvidesFile{%
@@ -574,7 +574,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $
\endinput
%%
%% End of file `visualize.lco'.