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 | 82 |
1 files changed, 53 insertions, 29 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 b703bc78cb3..e957bebc4b8 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 2670 2017-08-11 09:31:30Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2017/08/11 v0.1.2670 KOMA-Script + 2018/02/02 v0.1.2928 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $ +%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -65,7 +65,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $ %%% (run: init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% @@ -98,7 +98,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $ +%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z 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 2670 2017-08-11 09:31:30Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z 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 2645 2017-05-22 19:04:42Z kohm $ +%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z 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 2670 2017-08-11 09:31:30Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $ %%% (run: body) \scrlayerAddToInterface\DeclareNoteColumn{% \newcommand*{\DeclareNoteColumn}[2][]{% @@ -574,7 +574,7 @@ \scrlayerAddToInterface\slnc@initwrite{}% \scrlayerAddToInterface\slnc@openwrite{% \newcommand*{\slnc@openwrite}{% - \immediate\closeout\slnc@file + \immediate\closein\slnc@file \PackageInfo{scrlayer-notecolumn}{% Opening `\jobname.slnc'\MessageBreak for writing}% @@ -583,19 +583,27 @@ } \AfterReadingMainAux{% \immediate\closeout\tf@slnc - \scr@ifundefinedorrelax{pdfmdfivesum}{% - \PackageWarningNoLine{scrlayer-notecolumn}{% - \string\pdfmdfivesum\space unavailable.\MessageBreak - The package needs \string\pdfmdfivesum\space to test\MessageBreak - whether or not one more LaTeX run will\MessageBreak - 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.% - }% - }{% - \begingroup + \begingroup + \scr@ifundefinedorrelax{pdfmdfivesum}{% + \ifdefined\directlua + \edef\reserved@a{\directlua{slncmdfivesum("\jobname.slnc")}}% + \else + \let\reserved@a\relax + \fi + }{% \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% + }% + \else \ifx \slnc@mdfivesum\reserved@a \PackageInfo{scrlayer-notecolumn}{% MD5 of current `\jobname.slnc':\MessageBreak @@ -605,13 +613,13 @@ MD5 of slnc-file changed.\MessageBreak Last: \slnc@mdfivesum\MessageBreak New: \space \reserved@a\MessageBreak - At least one more LaTeX rerun need to\MessageBreak + At least one more LaTeX rerun needed to\MessageBreak make note columns right% }% \aftergroup\@tempswatrue \fi - \endgroup - }% + \fi + \endgroup } \scrlayerAddToInterface\slnc@unexpanded{% \let\slnc@unexpanded\detokenize @@ -675,7 +683,7 @@ }% \else \ifnum ##2<\value{slncpage}\relax - \PackageWarning{scrlayer-notecolumn}{note of type `#1' delayed.}% + \PackageWarning{scrlayer-notecolumn}{note of type `#1' delayed}% \fi \boxmaxdepth\maxdepth \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% @@ -860,7 +868,7 @@ \PackageWarning{scrlayer-notecolumn}{% column `\reserved@b' undefined.\MessageBreak You should declare the column before the usage.\MessageBreak - Notes will be lost + Notes will be lost% }% }{% \expandafter\g@addto@macro @@ -901,15 +909,31 @@ \let\slnc@mdfivesum\@empty } \scrlayerAddToInterface\slnc@file{% - \scr@ifundefinedorrelax{pdfmdfivesum}{}{% + \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() + end + end + }% + \xdef\slnc@mdfivesum{\directlua{slncmdfivesum("\jobname.slnc")}}% + \fi + }{% \xdef\slnc@mdfivesum{\pdfmdfivesum file {\jobname.slnc}}% + }% + \scr@ifundefinedorrelax{slnc@mdfivesum}{}{% \PackageInfo{scrlayer-notecolumn}{% MD5 of last `\jobname.slnc':\MessageBreak \slnc@mdfivesum}% }% \newread\slnc@file \immediate\openin\slnc@file \jobname.slnc - \scrlayerOnAutoRemoveInterface{\immediate\closeout\slnc@file}% + \scrlayerOnAutoRemoveInterface{\immediate\closein\slnc@file}% } \scrlayerAddToInterface\c@slnc@clearnote@label{% \newcounter{slnc@clearnote@label}% @@ -1290,7 +1314,7 @@ \@esphack }% } -%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 2928 2018-02-02 17:10:27Z kohm $ %%% (run: final) \DeclareNoteColumn{marginpar} \let\reserved@a\clearpage |