xespotcolor (2mar21)

git-svn-id: svn://tug.org/texlive/trunk@58064 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 31 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xespotcolor/README b/Master/texmf-dist/doc/xelatex/xespotcolor/README
index 3b34d1e4776..979d74385fa 100644
--- a/Master/texmf-dist/doc/xelatex/xespotcolor/README
+++ b/Master/texmf-dist/doc/xelatex/xespotcolor/README
@@ -5,9 +5,12 @@ by Jens Elstner is a first attempt to introduce the use of
 spot colors with pdfLaTeX. The xespotcolor package is a 
 reimplementation of this package so to be usable with 
 XeLaTeX or LaTeX+dvipdfmx. As such, it has the same user 
-interface and  the same capabilities. Version 2.0a adds
+interface and  the same capabilities. Version 2.0a added
 support for the xcolor package and so one can use
-spotcolors in TikZ pictures.
+spotcolors in TikZ pictures. In this version one can 
+safely use spotcolors with the tcolorbox package and
+I have updated the package so to use the correct shipout
+hook provided by the LaTeX kernel.
  
 Apostolos Syropoulos
-2016/03/22
+2021/03/01
diff --git a/Master/texmf-dist/doc/xelatex/xespotcolor/jatestspot.pdf b/Master/texmf-dist/doc/xelatex/xespotcolor/jatestspot.pdf
index c681db61f28..a7e22f6fc52 100644
--- a/Master/texmf-dist/doc/xelatex/xespotcolor/jatestspot.pdf
+++ b/Master/texmf-dist/doc/xelatex/xespotcolor/jatestspot.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xespotcolor/spotcolor-test.pdf b/Master/texmf-dist/doc/xelatex/xespotcolor/spotcolor-test.pdf
index 8e4de76e79f..ef2b8390c2c 100644
--- a/Master/texmf-dist/doc/xelatex/xespotcolor/spotcolor-test.pdf
+++ b/Master/texmf-dist/doc/xelatex/xespotcolor/spotcolor-test.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xespotcolor/xespotcolor.pdf b/Master/texmf-dist/doc/xelatex/xespotcolor/xespotcolor.pdf
index 6df553415ed..9925c3b1689 100644
--- a/Master/texmf-dist/doc/xelatex/xespotcolor/xespotcolor.pdf
+++ b/Master/texmf-dist/doc/xelatex/xespotcolor/xespotcolor.pdf
diff --git a/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.dtx b/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.dtx
index 88cf2450edf..570c1cc5362 100644
--- a/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.dtx
+++ b/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.dtx
@@ -16,7 +16,7 @@
 %%
 %\iffalse
 %
-% (c) Copyright 2014-2016 Apostolos Syropoulos 
+% (c) Copyright 2014-2021 Apostolos Syropoulos 
 % This program can be redistributed and/or modified under the 
 % terms of the LaTeX Project Public License Distributed from 
 % http://www.latex-project.org/lppl.txt; either
@@ -29,12 +29,12 @@
 %    Apostolos Syropoulos  (asyropoulos@yahoo.com)
 %
 %\fi
-% \CheckSum{184}
+% \CheckSum{187}
 % \iffalse This is a Metacomment
 %
 %<xespotcolor, >\ProvidesFile{xesporcolor.sty}
 %
-%<xespotcolor, > [2016/03/22 v2.0a Package `xespotcolor.sty']
+%<xespotcolor, > [2021/03/01 v2.1 Package `xespotcolor.sty']
 %
 %    \begin{macrocode}
 %<*driver>
@@ -58,7 +58,7 @@
 %        (Apostolos Syropoulos)\\
 %        Xanthi, Greece\\
 %        \texttt{asyropoulos@yahoo.com}}
-% \date{2016/03/22}
+% \date{2016/03/22\\updated 2021/03/01}
 %\maketitle
 % \begin{abstract}
 % A spot color is one that is printed with its own ink. Typically, printers use spot colors
@@ -145,7 +145,7 @@
 %<*xespotcolor>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{xespotcolor}
-          [2016/03/22 v.2.0a, Package for adding Spot Color support to LaTeX/XeLaTeX.]
+          [2021/03/01 v.2.1, Package for adding Spot Color support to LaTeX/XeLaTeX.]
 %    \end{macrocode}
 % The package needs three packages in order to operate properly: the \textsf{graphics} package, the
 % \textsf{everypage} package, and either the package \textsf{color} or the package \textsf{xcolor}.
@@ -153,10 +153,9 @@
 % rely on package \textsf{xcolor}. Akira Kakuto has discovered that this package can be used with
 % either \LaTeX\ or \XeLaTeX\ and the \texttt{dvipdfmx}/\texttt{xdvipdfmx} driver, respectively.
 % However, in order to properly load the various packages it is necessary to know which typesetting
-% engine is being used. A simple solution is to use the \textsf{ifxetex} package:
+% engine is being used. A simple solution is to use the \textsf{iftex} package:
 %    \begin{macrocode}
-\RequirePackage{ifxetex}
-\RequirePackage{everypage}
+\RequirePackage{iftex}
 %    \end{macrocode}
 % Before proceeding it is also necessary to know if the package \textsf{xcolor} has been loaded
 % (package \textsf{color} is loaded by default). The following command check if \textsf{xcolor}
@@ -195,10 +194,11 @@
    \@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}
 \fi\fi
 %    \end{macrocode}
-% The following command should be executed only when using \textsf{TikZ}. Thus, always load this
-% package after loading package \textsf{TikZ}.
+% The following command should be executed only when using \textsf{TikZ} and/or \textsf{tcolorbox}. Thus, always 
+% load this package after loading \textsf{TikZ} and/or \textsf{tcolorbox}. 
 %    \begin{macrocode}
 \@ifpackageloaded{tikz}{\global\pgf@sys@pdf@colorspaces@existsfalse}{}
+\@ifpackageloaded{tcolorbox}{\global\pgf@sys@pdf@colorspaces@existsfalse}{}
 %    \end{macrocode}
 % The |\NewSpotColorSpace| command should be used to define a new color space for spot colors. The new color 
 % space can be any imaginable word! This color space is the place where a new spot color will live. The  
@@ -272,11 +272,13 @@
 %
 % Command |\SetPageColorResource| is used by command |\SetPageColorSpace| to set the color space.
 % The |\special| command below sets the page resources only for the current page. Since the color
-% space should be visible to every subsequent page, I have opted to use command the |\AddEverypageHook| 
-% command provided by the \textsf{everypage} package. 
+% space should be visible to every subsequent page, initially I had opted to use command the |\AddEverypageHook| 
+% command provided by the \textsf{everypage} package. However, since the latest version of \LaTeX\ defines
+% hooks, I had to use the new \texttt{shipout/background} hook. 
 %    \begin{macrocode}
 \def\SetPageColorResource#1{%
-   \AddEverypageHook{\special{pdf:put @resources <</ColorSpace <<#1>>>>}}%
+   \AddToHook{shipout/background}{\put(1in,-1in){%
+                \special{pdf:put @resources <</ColorSpace <<#1>>>>}}}%
 }%
 \def\SetPageColorSpace#1{%
    \expandafter\SetPageColorResource\expandafter{\the\csname #1\endcsname}%
diff --git a/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.ins b/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.ins
index 87a72bfb1f1..f0379837ac4 100644
--- a/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.ins
+++ b/Master/texmf-dist/source/xelatex/xespotcolor/xespotcolor.ins
@@ -1,9 +1,9 @@
-%% Copyright 2014-2016 Apostolos Syropoulos 
+%% Copyright 2014-2021 Apostolos Syropoulos 
 %%
 %% This file is part of the `xespotcolor' package.
 %% You are not allowed to modify its contents.
 %%
-\def\filedate{2016/03/22}
+\def\filedate{2021/03/01}
 \def\batchfile{xespotcolor.ins}
 \input docstrip.tex
 
@@ -24,7 +24,7 @@
 
 \preamble
 
- (c) Copyright 2014-2016 Apostolos Syropoulos 
+ (c) Copyright 2014-2021 Apostolos Syropoulos 
  This program can be redistributed and/or modified under the 
  terms of the LaTeX Project Public License Distributed from 
  http://www.latex-project.org/lppl.txt; either
diff --git a/Master/texmf-dist/tex/xelatex/xespotcolor/xespotcolor.sty b/Master/texmf-dist/tex/xelatex/xespotcolor/xespotcolor.sty
index 8c9dbd472d9..78e179cf951 100644
--- a/Master/texmf-dist/tex/xelatex/xespotcolor/xespotcolor.sty
+++ b/Master/texmf-dist/tex/xelatex/xespotcolor/xespotcolor.sty
@@ -6,7 +6,7 @@
 %%
 %% xespotcolor.dtx  (with options: `xespotcolor')
 %% 
-%%  (c) Copyright 2014-2016 Apostolos Syropoulos
+%%  (c) Copyright 2014-2021 Apostolos Syropoulos
 %%  This program can be redistributed and/or modified under the
 %%  terms of the LaTeX Project Public License Distributed from
 %%  http://www.latex-project.org/lppl.txt; either
@@ -36,12 +36,11 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 \ProvidesFile{xesporcolor.sty}
- [2016/03/22 v2.0a Package `xespotcolor.sty']
+ [2021/03/01 v2.1 Package `xespotcolor.sty']
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{xespotcolor}
-          [2016/03/22 v.2.0a, Package for adding Spot Color support to LaTeX/XeLaTeX.]
-\RequirePackage{ifxetex}
-\RequirePackage{everypage}
+          [2021/03/01 v.2.1, Package for adding Spot Color support to LaTeX/XeLaTeX.]
+\RequirePackage{iftex}
 \@ifpackageloaded{xcolor}{\let\use@xcolor\relax}{}
 \DeclareOption{hks}{\let\use@hks\relax}
 \DeclareOption{pantone}{\let\use@pantone\relax}
@@ -64,6 +63,7 @@
    \@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}
 \fi\fi
 \@ifpackageloaded{tikz}{\global\pgf@sys@pdf@colorspaces@existsfalse}{}
+\@ifpackageloaded{tcolorbox}{\global\pgf@sys@pdf@colorspaces@existsfalse}{}
 \def\NewSpotColorSpace#1{%
   \expandafter\newtoks\csname #1\endcsname%
   \csname #1\endcsname{}%
@@ -86,7 +86,8 @@
    \advance\colorprofilecnt by1%
 }
 \def\SetPageColorResource#1{%
-   \AddEverypageHook{\special{pdf:put @resources <</ColorSpace <<#1>>>>}}%
+   \AddToHook{shipout/background}{\put(1in,-1in){%
+                \special{pdf:put @resources <</ColorSpace <<#1>>>>}}}%
 }%
 \def\SetPageColorSpace#1{%
    \expandafter\SetPageColorResource\expandafter{\the\csname #1\endcsname}%