diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty | 80 |
1 files changed, 44 insertions, 36 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 e957bebc4b8..2908644528d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -46,14 +46,14 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2018/02/02 v0.1.2928 KOMA-Script + 2018/08/29 v0.1.3011 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $ +%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -65,7 +65,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% 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 $ %%% (run: init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% @@ -98,7 +98,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $ +%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -241,12 +241,12 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $ %%% (run: options) \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns} \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default} -%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $ +%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -318,7 +318,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $ %%% (run: body) \scrlayerAddToInterface\DeclareNoteColumn{% \newcommand*{\DeclareNoteColumn}[2][]{% @@ -585,23 +585,27 @@ \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 @@ -910,19 +914,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}}% }% @@ -1048,8 +1056,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}}% @@ -1170,8 +1178,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}}% @@ -1314,7 +1322,7 @@ \@esphack }% } -%%% 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 $ %%% (run: final) \DeclareNoteColumn{marginpar} \let\reserved@a\clearpage |