summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
diff options
context:
space:
mode:
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.sty130
1 files changed, 111 insertions, 19 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 2908644528d..8e0cfd129c7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -14,7 +14,7 @@
%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2013-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2013-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,18 +42,18 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 2018/08/29 v0.1.3011 KOMA-Script
+ 2019/06/27 v0.3.3161 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -65,7 +65,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
@@ -98,7 +98,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z 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 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z 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 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z 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 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
@@ -344,6 +344,23 @@
\expandafter\let\csname slnc@#2@width\endcsname\relax
}%
}{}%
+ \@ifundefined{slnc@#2@colorstack}{%
+ \scr@ifundefinedorrelax{pdfcolorstackinit}{%
+ \scr@ifundefinedorrelax{pdffeedback}{}{%
+ \expandafter\chardef\csname slnc@#2@colorstack\endcsname=
+ \pdffeedback colorstackinit direct {\slnc@initial@black}%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@colorstack\endcsname\relax
+ }%
+ }%
+ }{%
+ \expandafter\chardef\csname slnc@#2@colorstack\endcsname=
+ \pdfcolorstackinit direct {\slnc@initial@black}%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@colorstack\endcsname\relax
+ }%
+ }%
+ }{}%
\@ifundefined{scr@fnt@notecolumn.#2}{%
\@ifundefined{@notecolumn.#2font}{%
\scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
@@ -390,6 +407,17 @@
\@cons\slnc@processnotecolumns{{#2}}%
}%
}
+\scrlayerAddToInterface\slnc@initial@black{%
+ \newcommand*{\slnc@initial@black}{0 g 0 G}%
+ \AfterPackage*{color}{%
+ \let\slnc@initial@black\current@color
+ \AtBeginDocument{\let\slnc@initial@black\default@color}%
+ }%
+ \AfterPackage*{xcolor}{%
+ \let\slnc@initial@black\current@color
+ \AtBeginDocument{\let\slnc@initial@black\default@color}%
+ }%
+}
\scrlayerAddToInterface\slnc@processnotecolumns{%
\newcommand*{\slnc@processnotecolumns}{}%
}
@@ -693,8 +721,8 @@
\expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
\expandafter\hsize\csname slnc@#1@width\endcsname
\normalfont\normalsize
+ \slnc@switchcolorstack{#1}%
{%
- \let\color\@gobble
\usekomafont{notecolumn.#1}{%
\slnc@notesyncfonttest{#1}%
\expandafter\ifvoid\csname slnc@#1@box\endcsname
@@ -794,12 +822,14 @@
\expandafter\ifvoid\csname slnc@#1@box\endcsname
\else
\expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
- \expandafter\unvbox\csname slnc@#1@box\endcsname
+ \slnc@switchcolorstack{#1}%
+ \expandafter\unvbox\csname slnc@#1@box\endcsname
}%
\fi
\else
\PackageInfo{scrlayer-notecolumn}{Flush note box `#1'}%
\usekomafont{notecolumn.#1}{%
+ \slnc@switchcolorstack{#1}%
\expandafter\box\csname slnc@#1@box\endcsname%
}%
\fi
@@ -810,6 +840,50 @@
\endgroup
}
}
+\scrlayerAddToInterface{\slnc@switchcolorstack}{%
+ \newcommand*{\slnc@switchcolorstack}[1]{%
+ \scr@ifundefinedorrelax{slnc@#1@colorstack}{%
+ \def\set@color{%
+ \PackageWarningNoLine{scrlayer-notecolumn}{%
+ unsupported change of colour!\MessageBreak
+ It seems you are using a TeX engine,\MessageBreak
+ that does not support switching the\MessageBreak
+ colour stack like pdfTeX or luaTeX do.\MessageBreak
+ Because of this, usage of \string\color,\MessageBreak
+ \string\textcolor\space etc. inside a note
+ column\MessageBreak
+ is not supported%
+ }%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{@pdfcolorstack}{%
+ }{%
+ \expandafter\let\expandafter\@pdfcolorstack
+ \csname slnc@#1@colorstack\endcsname
+ }%
+ \scr@ifundefinedorrelax{pdfcolorstack}{%
+ \scr@ifundefinedorrelax{pdfextension}{%
+ \PackageError{scrlayer-notecolumm}{%
+ colour stack defined but not usable%
+ }{%
+ \expandafter\string
+ \csname slnc@#1@colorstack\endcsname\space defined
+ \MessageBreak
+ but neither \string\pdfcolorstack\space nor
+ \string\pdfextension.\MessageBreak
+ This should never happen!%
+ }%
+ }{%
+ \pdfextension colorstack
+ \csname slnc@#1@colorstack\endcsname current\relax
+ }%
+ }{%
+ \pdfcolorstack
+ \csname slnc@#1@colorstack\endcsname current\relax
+ }%
+ }%
+ }%
+}
\scrlayerAddToInterface\slnc@restoreinnote{%
\let\slnc@restoreinnote\@empty
}
@@ -829,6 +903,21 @@
\restoreinnote\index
\restoreinnote\glossary
}
+\scrlayerAddToInterface\slnc@catcodes{%
+ \newcommand*{\slnc@catcodes}{}%
+}
+\AtBeginDocument{%
+ \begingroup
+ \def\do#1{%
+ \protected@xdef\slnc@catcodes{\slnc@catcodes
+ \catcode`\protect#1=\the\catcode`#1\relax
+ }%
+ }%
+ \dospecials
+ \let\protect\noexpand
+ \xdef\slnc@catcodes{\slnc@catcodes\catcode`\protect\@=11\relax}%
+ \endgroup
+}
\scrlayerAddToInterface\slnc@readnotes{%
\newcommand*\slnc@readnotes[1]{%
\ifeof\slnc@file\else
@@ -838,13 +927,16 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
- \edef\reserved@a{%
- \noexpand\makeatletter
+ \begingroup
+ \slnc@catcodes
\endlinechar\m@ne
- \read\noexpand\slnc@file to\noexpand\reserved@a
- \endlinechar\the\endlinechar\relax
- \catcode`\noexpand\@=\the\catcode`\@\relax
- }%
+ \read\slnc@file to\reserved@a
+ \edef\reserved@a{%
+ \endgroup
+ \noexpand\def\noexpand\reserved@a{%
+ \unexpanded\expandafter{\reserved@a}%
+ }%
+ }%
\reserved@a
\expandafter\slnc@iofv\expandafter\reserved@b\reserved@a
\@empty\@empty\@empty\@empty\@empty
@@ -1322,7 +1414,7 @@
\@esphack
}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: final)
\DeclareNoteColumn{marginpar}
\let\reserved@a\clearpage