1 files changed, 37 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
index fd90da4263d..341c33f9d38 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -46,10 +46,10 @@
 %% find a complete unmodified copy of LaTeX2e at
 %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
 %% 
-%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (identify)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (identify)
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{scrlayer-notecolumn}[%
-  2016/06/28 v0.1.2483 KOMA-Script 
+  2017/02/08 v0.1.2583 KOMA-Script 
   package
   (end user interface for scrlayer)]
 %%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init)
@@ -63,7 +63,7 @@
 }
 \let\scrlayer@AtEndOfPackage\AtEndOfPackage
 \scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (init)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (init)
 \@tempswatrue
 \scr@ifundefinedorrelax{pdfsavepos}{%
   \scr@ifundefinedorrelax{savepos}{%
@@ -236,7 +236,7 @@
   \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
                        {scrlayer@autoremoveinterfaces}%
 }
-%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (options)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (options)
 \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue
 \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns}
 \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default}
@@ -311,7 +311,7 @@
 \expandafter\let
   \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
   \relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (body)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (body)
 \scrlayerAddToInterface\DeclareNoteColumn{%
   \newcommand*{\DeclareNoteColumn}[2][]{%
     \@ifundefined{slnc@#2@box}{%
@@ -605,15 +605,24 @@
     \endgroup
   }%
 }
+\scrlayerAddToInterface\slnc@unexpanded{%
+  \let\slnc@unexpanded\detokenize
+}
 \scrlayerAddToInterface\makenote{%
-  \newcommand{\makenote}[2][marginpar]{%
+  \newcommand*{\makenote}{%
+    \kernel@ifstar{\let\slnc@unexpanded\detokenize\slnc@makenote}%
+                  {\let\slnc@unexpanded\@firstofone\slnc@makenote}%
+  }%
+}
+\scrlayerAddToInterface\slnc@makenote{%
+  \newcommand{\slnc@makenote}[2][marginpar]{%
     \@bsphack
     \scr@savepos
     \addtocontents{slnc}{%
       \string\slnc@note{#1}%
                        {\noexpand\number\value{slncpage}}%
                        {\noexpand\number\scr@lastypos}%
-                       {#2}%
+                       {\slnc@unexpanded{#2}}%
     }%
     \@esphack
   }%
@@ -718,6 +727,7 @@
                   \expandafter\unvbox\csname slnc@#1@box\endcsname
                   \ifdim\@tempdima>\z@ \kern\@tempdima\fi
                 \fi
+                \slnc@restoreinnote
                 \strut\ignorespaces ##4\par
               }%
             }%
@@ -778,6 +788,25 @@
     \endgroup
   }
 }
+\scrlayerAddToInterface\slnc@restoreinnote{%
+  \let\slnc@restoreinnote\@empty
+}
+\scrlayerAddToInterface\restoreinnote{%
+  \newcommand*\restoreinnote[1]{%
+    \AtBeginDocument{%
+      \expandafter\scrlayerAddCsToInterface[scrlayer-notecolumn.sty]{slnc\string#1}{%
+        \expandafter\let\csname slnc\string#1\endcsname#1%
+        \g@addto@macro\slnc@restoreinnote{%
+          \expandafter\let\expandafter#1\csname slnc\string#1\endcsname
+        }%
+      }%
+    }%
+  }%
+  \@onlypreamble\restoreinnote
+  \restoreinnote\label
+  \restoreinnote\index
+  \restoreinnote\glossary
+}
 \scrlayerAddToInterface\slnc@readnotes{%
   \newcommand*\slnc@readnotes[1]{%
     \ifeof\slnc@file\else
@@ -1241,7 +1270,7 @@
   \ifslnc@autoclearnotecolumns\clearnotecolumns\relax\fi
 }%
 \expandafter\g@addto@macro\expandafter\clearpage\expandafter{\reserved@a}
-%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
 \@ifundefined{KOMAScript}{%
   \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
       M\kern.05em A\kern.1em-\kern.1em Script}}}{}