From 9a6785706ed1238169de63236cf1ade3038a8315 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 3 Jan 2019 21:58:12 +0000
Subject: koma-script (3jan19)

git-svn-id: svn://tug.org/texlive/trunk@49587 c570f23f-e606-0410-a88d-b1316a301751
---
 .../latex/koma-script/scrlayer-notecolumn.dtx      | 82 +++++++++++++---------
 1 file changed, 49 insertions(+), 33 deletions(-)

(limited to 'Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx')

diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
index 46ea2cc8e9f..324a5e83303 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{1740}
+% \CheckSum{1747}
 % \iffalse^^A meta-comment
 % ======================================================================
 % scrlayer-notecolumn.dtx
-% Copyright (c) Markus Kohm, 2013-2017
+% Copyright (c) Markus Kohm, 2013-2018
 %
 % This file is part of the LaTeX2e KOMA-Script bundle.
 %
@@ -20,7 +20,7 @@
 % This work consists of all files listed in manifest.txt.
 % ----------------------------------------------------------------------
 % scrlayer-notecolumn.dtx
-% Copyright (c) Markus Kohm, 2013-2017
+% Copyright (c) Markus Kohm, 2013-2018
 %
 % Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung.
 %
@@ -57,7 +57,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \iffalse^^A meta-comment
-%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
 %<identify>%%%            (run: identify)
 %<init>%%%            (run: init)
 %<options>%%%            (run: options)
@@ -67,9 +67,9 @@
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 \begingroup
   \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
-  \filedate$Date: 2018-02-02 18:10:27 +0100 (Fri, 02 Feb 2018) $
+  \filedate$Date: 2018-08-29 09:35:17 +0200 (Wed, 29 Aug 2018) $
   \def\filerevision$#1: #2 ${\gdef\filerevision{v0.1.#2}}
-  \filerevision$Revision: 2928 $
+  \filerevision$Revision: 3011 $
   \edef\reserved@a{%
     \noexpand\endgroup
     \noexpand\ProvidesFile{scrlayer-notecolumn.dtx}%
@@ -728,28 +728,34 @@
 % we set |\if@tempswa| to |\iftrue| to provocate a rerun message.
 % \changes{v0.1.2872}{2018/01/17}{usage of Lua function
 %   \texttt{slncmdfivesum}}^^A
+% \changes{v0.1.2972}{2018/04/01}{usage of not yet documented Xe\TeX{}
+%   primitive \cs{mdfivesum}}^^A
 %    \begin{macrocode}
 \AfterReadingMainAux{%
   \immediate\closeout\tf@slnc
   \begingroup
     \scr@ifundefinedorrelax{pdfmdfivesum}{%
-      \ifdefined\directlua
-        \edef\reserved@a{\directlua{slncmdfivesum("\jobname.slnc")}}%
-      \else
-        \let\reserved@a\relax  
-      \fi
+      \scr@ifundefinedorrelax{mdfivesum}{%
+        \ifdefined\directlua
+          \edef\reserved@a{\directlua{slncmdfivesum("\jobname.slnc")}}%
+        \else
+          \let\reserved@a\relax
+        \fi
+      }{%
+        \edef\reserved@a{\mdfivesum file {\jobname.slnc}}%
+      }%
     }{%
       \edef\reserved@a{\pdfmdfivesum file {\jobname.slnc}}%
     }%
     \ifx\reserved@a\relax
       \PackageWarningNoLine{scrlayer-notecolumn}{%
         \string\pdfmdfivesum\space unavailable.\MessageBreak
-        The package needs \string\pdfmdfivesum\space or LuaTeX\MessageBreak
-        to test whether or not one more LaTeX run\MessageBreak
-        will be needed to make the note columns\MessageBreak
-        right. If this command is unavailable\MessageBreak
-        you have to do the decision without\MessageBreak
-        this help of the package%
+        The package needs \string\pdfmdfivesum,\MessageBreak
+        \string\mdfivesum, or LuaTeX to test whether\MessageBreak
+        or not one more LaTeX run is needed to place the\MessageBreak
+        note columns correctly. If these are unavailable\MessageBreak
+        you have to do the decision without the help\MessageBreak
+        of the package%
       }%
     \else
       \ifx \slnc@mdfivesum\reserved@a
@@ -1182,6 +1188,8 @@
 % \begin{macro}{\slnc@mdfivesum}
 % \changes{v0.1.2872}{2018/01/17}{definition and usage of Lua function
 %   \texttt{slncmdfivesum}}^^A
+% \changes{v0.1.2972}{2018/04/01}{usage of not yet documented Xe\TeX{}
+%   primitive \cs{mdfivesum}}^^A
 % The MD5 sum of the file before opening it for reading.
 %    \begin{macrocode}
 %<*body>
@@ -1190,19 +1198,23 @@
 }
 \scrlayerAddToInterface\slnc@file{%
   \scr@ifundefinedorrelax{pdfmdfivesum}{%
-    \ifdefined\directlua
-      \directlua{%
-        function slncmdfivesum(filename)
-          local fh = io.open(filename,"rb")
-          if fh then
-            local sum=md5.sumhexa(fh:read("*a"))
-            tex.sprint(sum)
-            fh:close()
+    \scr@ifundefinedorrelax{mdfivesum}{%
+      \ifdefined\directlua
+        \directlua{%
+          function slncmdfivesum(filename)
+            local fh = io.open(filename,"rb")
+            if fh then
+              local sum=md5.sumhexa(fh:read("*a"))
+              tex.sprint(sum)
+              fh:close()
+            end
           end
-        end
-      }%
-      \xdef\slnc@mdfivesum{\directlua{slncmdfivesum("\jobname.slnc")}}%
-    \fi
+        }%
+        \xdef\slnc@mdfivesum{\directlua{slncmdfivesum("\jobname.slnc")}}%
+      \fi
+    }{%
+      \xdef\slnc@mdfivesum{\mdfivesum file {\jobname.slnc}}%
+    }%
   }{%
     \xdef\slnc@mdfivesum{\pdfmdfivesum file {\jobname.slnc}}%
   }%
@@ -1402,6 +1414,8 @@
 % \end{macro}^^A \clearnotecolumn
 % 
 % \begin{macro}{\clearnotecolumns}
+% \changes{v3.26}{2018/08/29}{\cs{scr@trim@spaces} added}^^A
+% \changes{v3.26}{2018/08/29}{removed spurious \cs{expandafter}}^^A
 %   \begin{description}
 %   \item[\OParameter{string list}:] comma separated list of note column names
 %     (must be fully expandable and each element must expand to a string only,
@@ -1421,8 +1435,8 @@
       \ifx\relax#1\relax\else
         \let\slnc@processnotecolumns\@empty
         \edef\reserved@a{#1}%
-        \expandafter\@for\expandafter\reserved@a\expandafter:\expandafter=%
-        \reserved@a\do {%
+        \@for\reserved@a:=\reserved@a\do {%
+          \scr@trim@spaces\reserved@a
           \ifx\reserved@a\@empty\else
             \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns
             \expandafter{\expandafter\@elt\expandafter{\reserved@a}}%
@@ -1564,6 +1578,8 @@
 % synchronisation of the text with the note.
 %
 % \begin{macro}{\syncwithnotecolumn}
+% \changes{v3.26}{2018/08/29}{\cs{scr@trim@spaces} added}^^A
+% \changes{v3.26}{2018/08/29}{removed spurious \cs{expandafter}}^^A
 %   \begin{description}
 %   \item[\OParameter{string}:] the name of the note column to sync with (this
 %     must be fully expandable and expand to the name of a note column). By
@@ -1592,8 +1608,8 @@
       \ifx\relax#1\relax\else
         \let\slnc@processnotecolumns\@empty
         \edef\reserved@a{#1}%
-        \expandafter\@for\expandafter\reserved@a\expandafter:\expandafter=%
-        \reserved@a\do {%
+        \@for\reserved@a:=\reserved@a\do {%
+          \scr@trim@spaces\reserved@a
           \ifx\reserved@a\@empty\else
             \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns
             \expandafter{\expandafter\@elt\expandafter{\reserved@a}}%
-- 
cgit v1.2.3

