koma-script (31jan20)

git-svn-id: svn://tug.org/texlive/trunk@53617 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2020-01-31 22:13:38 +0000
committer: Karl Berry <karl@freefriends.org> 2020-01-31 22:13:38 +0000
commit: ffcfa7a52180e1be3e81d0e0c4ce442e4bc1de02 (patch)
tree: c0e2f8bc5978b27383c47d4fdb1b767fe77826c9 /Master/texmf-dist/source
parent: 4f5d53354429fb0f4c2228807598014959ecd6f3 (diff)
6 files changed, 46 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf
index 9eea16c3dbb..e2b0bd297b8 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.pdf
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf
index 2b23401e8d0..a955cd736d2 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguien.pdf
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx
index af70ac7217d..f9c193af4f4 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{4334}
+% \CheckSum{4335}
 % \iffalse meta-comment
 % ======================================================================
 % scrkernel-basics.dtx
@@ -55,7 +55,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \iffalse
-%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $
 %<prepare>%%%            (run: prepare)
 %<option>%%%            (run: option)
 %<body>%%%            (run: body)
@@ -65,7 +65,7 @@
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 \begingroup
   \def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
-  \filedate$Date: 2019-11-26 17:16:24 +0100 (Tue, 26 Nov 2019) $
+  \filedate$Date: 2020-01-17 15:56:41 +0100 (Fri, 17 Jan 2020) $
   \def\filerevision$#1: #2 ${\def\filerevision{r#2}}
   \filerevision$Revision: 1638 $
   \xdef\fileinfo{\filedate\space\filerevision\space}
@@ -1394,13 +1394,14 @@
 % \changes{v2.95}{2002/08/21}{neu}%^^A
 % \changes{v2.95c}{2006/08/12}{über interne Anweisung definiert}%^^A
 % \changes{v2.97c}{2007/06/20}{umbenannt von \cs{ifundefined}}%^^A
-% \changes{3.28}{2019/11/18}{umbenannt in \cs{Ifundefinedorrelax}}%^^A
+% \changes{v3.28}{2019/11/18}{umbenannt in \cs{Ifundefinedorrelax}}%^^A
+% \changes{v3.29}{2020/01/17}{fix of missing backslash}%^^A
 % \begin{macro}{\Ifundefinedorrelax}%^^A
 % Dieses Makro arbeitet wie \cs{@ifundefined}, definiert dabei aber
 % ein undefiniertes Makro nicht als \cs{relax}.
 %    \begin{macrocode}
 %<*base>
-\newcommand*{\Ifundefinedorrelax}{scr@ifundefinedorrelax}%
+\newcommand*{\Ifundefinedorrelax}{\scr@ifundefinedorrelax}%
 %</base>
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
index 5c2a3ddb393..3037d123abe 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{221}
+% \CheckSum{222}
 % \iffalse meta-comment
 % ======================================================================
 % scrkernel-compatibility.dtx
@@ -55,7 +55,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \iffalse
-%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $
 %<identify>%%%            (run: identify)
 %<init>%%%            (run: init)
 %<option>%%%            (run: option)
@@ -65,7 +65,7 @@
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 \begingroup
   \def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
-  \filedate$Date: 2019-11-20 11:26:14 +0100 (Wed, 20 Nov 2019) $
+  \filedate$Date: 2020-01-06 17:31:11 +0100 (Mon, 06 Jan 2020) $
   \def\filerevision$#1: #2 ${\def\filerevision{r#2}}
   \filerevision$Revision: 1638 $
   \edef\reserved@a{%
@@ -426,6 +426,8 @@
 %   \changes{v3.27a}{2019/10/13}{Neues Macro}
 % \begin{macro}{\scr@v@3.28}
 %   \changes{v3.28}{2019/11/20}{Neues Macro}
+% \begin{macro}{\scr@v@3.29}
+%   \changes{v3.29}{2020/01/06}{Neues Macro}
 % \begin{macro}{\scr@v@last}
 % \changes{v2.9u}{2005/03/05}{Neues Macro}%^^A
 % Nun die unterschiedlichen möglichen Werte (|\scr@v@last| ist jeweils die
@@ -503,6 +505,7 @@
 \@namedef{scr@v@3.27}{17}
 \@namedef{scr@v@3.27a}{17}
 \@namedef{scr@v@3.28}{17}
+\@namedef{scr@v@3.29}{17}
 \@namedef{scr@v@last}{17}
 %    \end{macrocode}
 % \end{macro}
@@ -564,6 +567,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 % \end{macro} 
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
index 6d3777dbae5..f7ba6495275 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
@@ -55,7 +55,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \iffalse
-%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $
 % \fi
 %
 % \iffalse
@@ -123,7 +123,7 @@
   \fi
 %</ignorethis>
   \fi
-  \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}%
 \endgroup
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx
index cc64485ec6e..8746d73643c 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{839}
+% \CheckSum{849}
 % \iffalse^^A meta-comment
 % ======================================================================
 % scrlfile.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
 %
 % This file is part of the work `scrlfile' which is part of the LaTeX2e
 % KOMA-Script bundle.
@@ -21,7 +21,7 @@
 % This work consists of all files listed in manifest.txt.
 % ----------------------------------------------------------------------
 % scrlfile.dtx
-% Copyright (c) Markus Kohm, 2002-2019
+% Copyright (c) Markus Kohm, 2002-2020
 %
 % Diese Datei ist Teil des Werks `scrlfile', das wiederum Teil des
 % LaTeX2e KOMA-Script Pakets ist.
@@ -59,12 +59,12 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \iffalse
-%%% From File: $Id: scrlfile.dtx 3399 2019-11-21 09:01:49Z kohm $
+%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $
 %<*dtx>
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 \begingroup
   \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
-  \filedate$Date: 2019-11-21 10:01:49 +0100 (Thu, 21 Nov 2019) $
+  \filedate$Date: 2020-01-06 17:40:47 +0100 (Mon, 06 Jan 2020) $
   \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
   \filerevision$Revision: 2631 $
   \edef\reserved@a{%
@@ -444,9 +444,11 @@
 \newcommand*{\scr@load@hook}[2]{%
 %    \end{macrocode}
 % \begin{macro}{\scrlfile@cmp@hook}
-% \changes{v3.27a}{2019/10/23}{local macros renamed}
+% \changes{v3.27a}{2019/10/23}{local macros renamed}%^^A
 % \begin{macro}{\scrlfile@hookname}
-% \changes{v3.27a}{2019/10/23}{local macros renamed}
+% \changes{v3.27a}{2019/10/23}{local macros renamed}%^^A
+% \changes{v3.29}{2020/06/01}{do the class and package load hooks only in the
+%   document preamble}%^^A --> https://komascript.de/node/2274
 % Workaround for strange handling of the \cs{AtEndOfPackage} hook in
 % \cs{@onefilewithoptions} (becomes \cs{@empty}, if the package already has
 % been loaded and is not loaded again). This workaround is not nice but
@@ -454,19 +456,24 @@
 % later. To decide whether to define or remove the marker, two local macros
 % are used \cs{scrlfile@hookname} and \cs{scrlfile@cmp@hook}. The first has
 % the name of the current hook from the first argument. The other is a compare
-% string. The first one is also valid while processing the hook. The names are
-% very unique, so we do not reserve them using \cs{newcommand} outside. The
-% name of the marker is less unique. Nevertheless it is not reserved.
+% string. The first one is also valid while processing the hook, but only in
+% the document preamble. The names are very unique, so we do not reserve them
+% using \cs{newcommand} outside. The name of the marker is less
+% unique. Nevertheless it is not reserved.
 % Note: For recursive loading of files this does not work. But this also does
 % not matter, because it is needed only for packages and classes, which are
-% never loaded recursive.
+% never loaded recursive. For the same reason from \KOMAScript{} 3.29 this is
+% only used inside the document preamble. After the document preamble it can
+% be dangerous, e.g., inside a |tabular| or |array|.
 %    \begin{macrocode}
-  \edef\scrlfile@hookname{#1}%
-  \def\scrlfile@cmp@hook{before}%
-  \ifx\scrlfile@hookname\scrlfile@cmp@hook
-    \expandafter\def\csname #2-l@ading\endcsname{#2}%
+  \ifx\@begindocumenthook\@undefined\else
+    \edef\scrlfile@hookname{#1}%
+    \def\scrlfile@cmp@hook{before}%
+    \ifx\scrlfile@hookname\scrlfile@cmp@hook
+      \expandafter\def\csname #2-l@ading\endcsname{#2}%
+    \fi
+    \let\scrlfile@cmp@hook\@undefined
   \fi
-  \let\scrlfile@cmp@hook\@undefined
   \@ifundefined{#2-@#1}{}{%
     \@nameuse{#2-@#1}%
     \expandafter\let\csname #2-@#1\endcsname\relax
@@ -474,13 +481,15 @@
 %    \end{macrocode}
 % The hook could destroy \cs{scrlfile@hookname} so define it again:
 %    \begin{macrocode}
-  \edef\scrlfile@hookname{#1}%
-  \def\scrlfile@cmp@hook{after}%
-  \ifx\scrlfile@hookname\scrlfile@cmp@hook
-    \expandafter\let\csname #2-l@ading\endcsname\@undefined
+  \ifx\@begindocumenthook\@undefined\else
+    \edef\scrlfile@hookname{#1}%
+    \def\scrlfile@cmp@hook{after}%
+    \ifx\scrlfile@hookname\scrlfile@cmp@hook
+      \expandafter\let\csname #2-l@ading\endcsname\@undefined
+    \fi
+    \let\scrlfile@cmp@hook\@undefined
+    \let\scrlfile@hookname\@undefined
   \fi
-  \let\scrlfile@cmp@hook\@undefined
-  \let\scrlfile@hookname\@undefined
 }
 %    \end{macrocode}
 %  \end{macro}
author	Karl Berry <karl@freefriends.org>	2020-01-31 22:13:38 +0000
committer	Karl Berry <karl@freefriends.org>	2020-01-31 22:13:38 +0000
commit	ffcfa7a52180e1be3e81d0e0c4ce442e4bc1de02 (patch)
tree	c0e2f8bc5978b27383c47d4fdb1b767fe77826c9 /Master/texmf-dist/source
parent	4f5d53354429fb0f4c2228807598014959ecd6f3 (diff)