pagecolor (21jun15)

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

10 files changed, 596 insertions, 392 deletions

diff --git a/Master/texmf-dist/doc/latex/pagecolor/README b/Master/texmf-dist/doc/latex/pagecolor/README
index 7254fc63cd9..fbf61c8540f 100644
--- a/Master/texmf-dist/doc/latex/pagecolor/README
+++ b/Master/texmf-dist/doc/latex/pagecolor/README
@@ -1,4 +1,4 @@
-README for pagecolor package, 2012/02/23, v1.0e
+README for pagecolor package, 2015/06/22, v1.0g
 
 
 TABLE OF CONTENTS
@@ -23,40 +23,36 @@ the most recent call of \pagecolor{...}.
 The command \thepagecolornone gives the same colour as
 \thepagecolor, except when the page background colour is "none".
 In that case \thepagecolor is white and \thepagecolornone is none.
+When \nopagecolor is unknown (e.g. Xe(La)TeX) or broken (crop package)
+this package provides a replacement.
 Similar to \newgeometry and \restoregeometry of the geometry
 package \newpagecolor{...} and \restorepagecolor are provided.
-This material is subject to the LaTeX Project Public License
-(LPPL). See http://www.ctan.org/tex-archive/help/Catalogue/
-licenses.lppl.html for the details of that license.
+
+This material is published under the LPPL 1.3c: This work may be
+distributed and/or modified under the conditions of the LaTeX Project
+Public License, either version 1.3c of this license or (at your option) any
+later version. This version of this license is in
+http://www.latex-project.org/lppl/lppl-1-3c.txt
+and the latest version of this license is in
+http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX version
+2005/12/01 or later.
 
 
 2 DOWNLOAD
 ==========
 
 `pagecolor' is available on CTAN:
-  CTAN:macros/latex/contrib/pagecolor/
-
-Running
-tex pagecolor.dtx
-generates the files
-pagecolor.ins, pagecolor.drv, pagecolor.sty,
-and pagecolor-example.tex.
-
-Also a ZIP file is provided that contains these files,
-the manual (pagecolor.pdf), the compiled example
-(pagecolor-example.pdf), and this README, already
-sorted in a TDS tree:
-  CTAN:install/macros/latex/contrib/pagecolor.tds.zip
+https://www.ctan.org/pkg/pagecolor
 
-`CTAN:' means one of the `Comprehensive TeX Archive Network'
-nodes or one of its mirrors. This is explained in
-  http://www.tex.ac.uk/cgi-bin/texfaq2html?label=archives
-
-The CTAN stuff will be mirrored automatically from the
-ftp server, so
-  ftp://ftp.tug.org/pub/tex/pagecolor/
-corresponds to
-  CTAN:macros/latex/contrib/pagecolor/
+Also a ZIP file is provided that contains the files:
+the manual (pagecolor.pdf), the example (pagecolor-example.tex),
+the compiled example (pagecolor-example.pdf),
+driver (pagecolor.drv), pagecolor.dtx,
+installation file (pagecolor.ins), 
+the style file (pagecolor.sty),
+and this README, already sorted in a TDS tree:
+http://mirrors.ctan.org/install/macros/latex/contrib/pagecolor.tds.zip
 
 
 3 INSTALLATION
@@ -67,7 +63,8 @@ Installation with ZIP file in TDS format
 The ZIP file `pagecolor.tds.zip' contains the files
 sorted in a TDS tree. Thus you can directly unpack the
 ZIP file inside a TDS tree.
-(See CTAN:tds.zip for an explanation of TDS.)
+See https://www.ctan.org/TDS-guidelines for an explanation
+of TDS.
 Example:
   cd /...somewhere.../texmf
   unzip /...downloadpath.../pagecolor.tds.zip
@@ -82,11 +79,11 @@ a) Download the pagecolor files from CTAN.
    If necessary, unpack them.
 b) Generate the package and driver files:
      tex pagecolor.dtx
-c) Install the file `*.sty' in your TDS tree:
-     cp *.sty TDS:tex/latex/pagecolor/
+c) Install the file `pagecolor.sty' in your TDS tree:
+     cp pagecolor.sty TDS:tex/latex/pagecolor/
    Replace `TDS:' by the prefix of your TDS tree
    (texmf directory).
-d) Create the documentation (if necessary), e.g.
+d) Create the documentation, if necessary, e.g.
      pdflatex pagecolor.dtx
      makeindex -s gind.ist pagecolor.idx
      pdflatex pagecolor.dtx
@@ -94,7 +91,7 @@ d) Create the documentation (if necessary), e.g.
      pdflatex pagecolor.dtx
 e) Update the databases if necessary, e.g. for teTeX:
      mktexlsr .../texmf
-f) Create the pagecolor-example.pdf (if necessary), e.g.
+f) Create the pagecolor-example.pdf, if necessary, e.g.
      pdflatex pagecolor-example.tex
      pdflatex pagecolor-example.tex
      pdflatex pagecolor-example.tex
@@ -108,11 +105,8 @@ g) Copy the documentation files to
 =====================
 
 pagecolor loads other packages:
-
-* kvoptions, CTAN:macros/latex/contrib/oberdiek/kvoptions.dtx
-* xcolor, CTAN:macros/latex/contrib/xcolor/xcolor.dtx
-  if the color package has not been loaded before pagecolor.
-
+kvoptions, xcolor (if the color package has not been loaded
+before pagecolor), ifpdf, and ifluatex,
 which again load other packages
 (see the result of the \listfiles command in the log-file
  of the example).
@@ -126,13 +120,14 @@ pagecolor should be loaded quite early, i. e. before
 (but can be loaded later using the pagecolor={...} option
 with accordingly chosen value), but must be loaded after
 \nopagecolor is defined (if that is defined in the document
-at all).
+at all). If the xcolor or the color package shall be used,
+they also should be loaded before pagecolor.
 
 
 6 AUTHOR/MAINTAINER
 =====================
 
-* H.-Martin Münch
+H.-Martin Münch
 
 
 7 BUG REPORTS
diff --git a/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.pdf b/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.pdf
index 2932eda285c..3f27205606a 100644
--- a/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.pdf
+++ b/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.pdf
diff --git a/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.tex b/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.tex
index b9864ee665e..b47a922f53f 100644
--- a/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.tex
+++ b/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.tex
@@ -9,9 +9,9 @@
 %% This is a generated file.
 %% 
 %% Project: pagecolor
-%% Version: 2012/02/23 v1.0e
+%% Version: 2015/06/22 v1.0g
 %% 
-%% Copyright (C) 2011 - 2012 by
+%% Copyright (C) 2011 - 2015 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %% 
 %% The usual disclaimer applies:
@@ -39,7 +39,12 @@
 %%    pagecolor.ins, pagecolor.drv,
 %%    pagecolor-example.tex, pagecolor-example.pdf.
 %% 
-\documentclass[british]{article}[2007/10/19]% v1.4h
+%% In memoriam
+%%  Claudia Simone Barth + 1996/01/30
+%%  Tommy Muench + 2014/01/02
+%%  Hans-Klaus Muench + 2014/08/24
+%% 
+\documentclass[british]{article}[2014/09/29]% v1.4h
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \usepackage[%
  extension=pdf,%
@@ -54,21 +59,26 @@
   H.-Martin Muench},%
  pdfview=Fit,pdfstartview=Fit,%
  pdfpagelayout=SinglePage%
-]{hyperref}[2012/02/06]% v6.82o
+]{hyperref}[2012/11/06]% v6.83m
 \usepackage[x11names]{xcolor}[2007/01/21]% v2.11
  % The xcolor package would not be needed for just using
  % the base colours. The color package would be sufficient for that.
-\usepackage[pagecolor={LightGoldenrod1}]{pagecolor}[2012/02/23]% v1.0e
+\usepackage[pagecolor={LightGoldenrod1},%
+  nopagecolor={none}]{pagecolor}[2015/06/22]% v1.0g
 
-\usepackage{afterpage}[1995/10/27]% v1.08
+\usepackage{afterpage}[2014/10/28]% v1.08
  % The afterpage package is generally not needed,
  % but the |\newpagecolor{somecolour}\afterpage{\restorepagecolor}|
  % construct shall be demonstrated.
 
-\usepackage{lipsum}[2011/04/14]% v1.2
+\usepackage{lipsum}[2014/07/27]% v1.3
  % The lipsum package is generally not needed,
  % but some blind text is needed for the example.
 
+\usepackage{hologo}[2012/04/26]% v1.10
+ % The hologo package is only needed to write
+ % \hologo{pdfTeX}, \hologo{LuaTeX}, and \hologo{XeTeX}.
+
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \listfiles
 \begin{document}
@@ -76,17 +86,19 @@
 \section*{Example for pagecolor}
 
 This example demonstrates the use of package\newline
-\textsf{pagecolor}, v1.0e as of 2012/02/23 (HMM).\newline
-The used option was \verb|pagecolor={LightGoldenrod1}|.\newline
-\verb|pagecolor={none}| would be the default.\newline
+\textsf{pagecolor}, v1.0g as of 2015/06/22 (HMM).\newline
+The used options were\newline
+\verb|pagecolor={LightGoldenrod1}| (\verb|pagecolor={none}|
+would be the default), and
+\verb|pagecolor={none}| (which is the default).\newline
 
-For more details please see the documentation!\newline
+\noindent For more details please see the documentation!\newline
 
 \noindent {\color{teal} Save per page about $200\unit{ml}$ water,
 $2\unit{g}$ CO$_{2}$ and $2\unit{g}$ wood:\newline
 Therefore please print only if this is really necessary.}\newline
 
-The current page (background) colour is\newline
+\noindent The current page (background) colour is\newline
 \verb|\thepagecolor|\ =\ \thepagecolor \newline
 (and \verb|\thepagecolornone|\ =\ \thepagecolornone ,
 which would only be different from \verb|\thepagecolor|,
@@ -119,8 +131,10 @@ the page colour to the value it had before the red page.}
 \pagecolor{none}
 
 This page uses \verb|\pagecolor{none}|. If the \verb|\nopagecolor|
-command is known (pdf\TeX and Lua\TeX; not yet for dvips, dvipdfm(x)
-or Xe\TeX), the page colour is now \verb|none|, otherwise \verb|white|:
+command is known (\hologo{pdfTeX} and \hologo{LuaTeX}; not yet for
+dvips, dvipdfm(x) or \hologo{XeTeX}), the page colour is now
+\verb|none| (because option \verb|nopagecolor={none}|), otherwise
+\verb|white| (or the colour given with option \verb|nopagecolor={...}|):
 \verb|\thepagecolor|\ =\ \thepagecolor\ and
 \verb|\thepagecolornone|\ =\ \thepagecolornone .
 
diff --git a/Master/texmf-dist/doc/latex/pagecolor/pagecolor.pdf b/Master/texmf-dist/doc/latex/pagecolor/pagecolor.pdf
index f729de8dde7..65706ee4914 100644
--- a/Master/texmf-dist/doc/latex/pagecolor/pagecolor.pdf
+++ b/Master/texmf-dist/doc/latex/pagecolor/pagecolor.pdf
diff --git a/Master/texmf-dist/source/latex/pagecolor/pagecolor.drv b/Master/texmf-dist/source/latex/pagecolor/pagecolor.drv
index 6cfb2909d3e..b9bb423b326 100644
--- a/Master/texmf-dist/source/latex/pagecolor/pagecolor.drv
+++ b/Master/texmf-dist/source/latex/pagecolor/pagecolor.drv
@@ -9,9 +9,9 @@
 %% This is a generated file.
 %% 
 %% Project: pagecolor
-%% Version: 2012/02/23 v1.0e
+%% Version: 2015/06/22 v1.0g
 %% 
-%% Copyright (C) 2011 - 2012 by
+%% Copyright (C) 2011 - 2015 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %% 
 %% The usual disclaimer applies:
@@ -39,11 +39,16 @@
 %%    pagecolor.ins, pagecolor.drv,
 %%    pagecolor-example.tex, pagecolor-example.pdf.
 %% 
-\NeedsTeXFormat{LaTeX2e}[2011/06/27]
+%% In memoriam
+%%  Claudia Simone Barth + 1996/01/30
+%%  Tommy Muench + 2014/01/02
+%%  Hans-Klaus Muench + 2014/08/24
+%% 
+\NeedsTeXFormat{LaTeX2e}[2014/05/01]
 \ProvidesFile{pagecolor.drv}%
-  [2012/02/23 v1.0e Provides thepagecolor (HMM)]
-\documentclass{ltxdoc}[2007/11/11]% v2.0u
-\usepackage{holtxdoc}[2011/02/04]%  v0.21
+  [2015/06/22 v1.0g Provides thepagecolor (HMM)]
+\documentclass{ltxdoc}[2014/09/29]% v2.0u
+\usepackage{holtxdoc}[2012/03/21]%  v0.24
 %% pagecolor may work with earlier versions of LaTeX2e and those
 %% class and package, but this was not tested.
 %% Please consider updating your LaTeX, class, and package
diff --git a/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx b/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx
index d96237e9847..541fdc549f1 100644
--- a/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx
+++ b/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx
@@ -1,9 +1,9 @@
 % \iffalse meta-comment
 %
 % File: pagecolor.dtx
-% Version: 2012/02/23 v1.0e
+% Version: 2015/06/22 v1.0g
 %
-% Copyright (C) 2011 - 2012 by
+% Copyright (C) 2011 - 2015 by
 %    H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %
 % This work may be distributed and/or modified under the
@@ -26,48 +26,12 @@
 %    pagecolor.ins, pagecolor.drv,
 %    pagecolor-example.tex, pagecolor-example.pdf.
 %
-% Distribution:
-%    CTAN:macros/latex/contrib/pagecolor/pagecolor.dtx
-%    CTAN:macros/latex/contrib/pagecolor/pagecolor.pdf
-%    CTAN:install/macros/latex/contrib/pagecolor.tds.zip
-%
-% Cf. http://ctan.org/pkg/pagecolor and
-% http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/pagecolor.html
-%
-% Unpacking:
-%    (a) If pagecolor.ins is present:
-%           tex pagecolor.ins
-%    (b) Without pagecolor.ins:
-%           tex pagecolor.dtx
-%    (c) If you insist on using LaTeX
-%           latex \let\install=y\input{pagecolor.dtx}
-%        (quote the arguments according to the demands of your shell)
-%
-% Documentation:
-%    (a) If pagecolor.drv is present:
-%           (pdf)latex pagecolor.drv
-%           makeindex -s gind.ist pagecolor.idx
-%           (pdf)latex pagecolor.drv
-%           makeindex -s gind.ist pagecolor.idx
-%           (pdf)latex pagecolor.drv
-%    (b) Without pagecolor.drv:
-%           (pdf)latex pagecolor.dtx
-%           makeindex -s gind.ist pagecolor.idx
-%           (pdf)latex pagecolor.dtx
-%           makeindex -s gind.ist pagecolor.idx
-%           (pdf)latex pagecolor.dtx
-%
-%    The class ltxdoc loads the configuration file ltxdoc.cfg
-%    if available. Here you can specify further options, e.g.
-%    use DIN A4 as paper format:
-%       \PassOptionsToClass{a4paper}{article}
-%
-% Installation:
-%    TDS:tex/latex/pagecolor/pagecolor.sty
-%    TDS:doc/latex/pagecolor/pagecolor.pdf
-%    TDS:doc/latex/pagecolor/pagecolor-example.tex
-%    TDS:doc/latex/pagecolor/pagecolor-example.pdf
-%    TDS:source/latex/pagecolor/pagecolor.dtx
+% 'pagecolor' is available on CTAN:
+% https://www.ctan.org/pkg/pagecolor
+%
+% Also a TDS.ZIP file is provided that contains all the files
+% already sorted in a TDS tree:
+% http://mirrors.ctan.org/install/macros/latex/contrib/pagecolor.tds.zip
 %
 %<*ignore>
 \begingroup
@@ -82,10 +46,10 @@
 %</ignore>
 %<*install>
 \input docstrip.tex
-\Msg{*****************************************************************}
-\Msg{* Installation                                                   }
-\Msg{* Package: pagecolor 2012/02/23 v1.0e Provides thepagecolor (HMM)}
-\Msg{*****************************************************************}
+\Msg{******************************************************************}
+\Msg{* Installation                                                   *}
+\Msg{* Package: pagecolor 2015/06/22 v1.0g Provides thepagecolor (HMM)*}
+\Msg{******************************************************************}
 
 \keepsilent
 \askforoverwritefalse
@@ -96,9 +60,9 @@
 This is a generated file.
 
 Project: pagecolor
-Version: 2012/02/23 v1.0e
+Version: 2015/06/22 v1.0g
 
-Copyright (C) 2011 - 2012 by
+Copyright (C) 2011 - 2015 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 
 The usual disclaimer applies:
@@ -126,6 +90,11 @@ the README, and the derived files
    pagecolor.ins, pagecolor.drv,
    pagecolor-example.tex, pagecolor-example.pdf.
 
+In memoriam
+ Claudia Simone Barth + 1996/01/30
+ Tommy Muench + 2014/01/02
+ Hans-Klaus Muench + 2014/08/24
+
 \endpreamble
 \let\MetaPrefix\DoubleperCent
 
@@ -145,7 +114,7 @@ the README, and the derived files
 \Msg{* To finish the installation you have to move the following}
 \Msg{* file into a directory searched by TeX:}
 \Msg{*}
-\Msg{*     pagecolor.sty}
+\Msg{*  pagecolor.sty}
 \Msg{*}
 \Msg{* To produce the documentation run the file `pagecolor.drv'}
 \Msg{* through (pdf)LaTeX, e.g.}
@@ -171,7 +140,7 @@ the README, and the derived files
 % \section{The documentation driver file}
 %
 % The next bit of code contains the documentation driver file for
-% \TeX{}, i.\,e., the file that will produce the documentation you
+% \TeX , i.\,e., the file that will produce the documentation you
 % are currently reading. It will be extracted from this file by the
 % \texttt{docstrip} programme. That is, run \LaTeX{} on \texttt{docstrip}
 % and specify the \texttt{driver} option when \texttt{docstrip}
@@ -179,11 +148,11 @@ the README, and the derived files
 %
 %    \begin{macrocode}
 %<*driver>
-\NeedsTeXFormat{LaTeX2e}[2011/06/27]
+\NeedsTeXFormat{LaTeX2e}[2014/05/01]
 \ProvidesFile{pagecolor.drv}%
-  [2012/02/23 v1.0e Provides thepagecolor (HMM)]
-\documentclass{ltxdoc}[2007/11/11]% v2.0u
-\usepackage{holtxdoc}[2011/02/04]%  v0.21
+  [2015/06/22 v1.0g Provides thepagecolor (HMM)]
+\documentclass{ltxdoc}[2014/09/29]% v2.0u
+\usepackage{holtxdoc}[2012/03/21]%  v0.24
 %% pagecolor may work with earlier versions of LaTeX2e and those
 %% class and package, but this was not tested.
 %% Please consider updating your LaTeX, class, and package
@@ -217,7 +186,7 @@ the README, and the derived files
 %
 % \fi
 %
-% \CheckSum{137}
+% \CheckSum{268}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -252,23 +221,22 @@ the README, and the derived files
 %     }%^^A
 %   \expandafter\endgroup\x
 %
-% \DoNotIndex{\,,\\}
+% \DoNotIndex{\",\-,\,,\\,\noindent}
 % \DoNotIndex{\documentclass,\usepackage,\ProvidesPackage,\begin,\end}
 % \DoNotIndex{\MessageBreak}
 % \DoNotIndex{\NeedsTeXFormat,\DoNotIndex,\verb}
-% \DoNotIndex{\def,\edef,\gdef,\global}
+% \DoNotIndex{\def,\edef,\gdef,\xdef,\global}
 % \DoNotIndex{\ifx,\listfiles,\mathord,\mathrm}
 % \DoNotIndex{\kvoptions,\SetupKeyvalOptions,\ProcessKeyvalOptions}
-% \DoNotIndex{\bigskip,\space,\thinspace,\ldots}
+% \DoNotIndex{\smallskip,\bigskip,\space,\thinspace,\ldots}
 % \DoNotIndex{\indent,\noindent,\newline,\linebreak,\pagebreak,\newpage}
-% \DoNotIndex{\textbf,\textit,\textsf,\texttt,\textsc,\textquotedblleft,\textquotedblright}
+% \DoNotIndex{\textbf,\textit,\textsf,\texttt,\textsc}
+% \DoNotIndex{\textquotedblleft,\textquotedblright}
 % \DoNotIndex{\plainTeX,\TeX,\LaTeX,\pdfLaTeX}
-% \DoNotIndex{\section,\color,\pagenumbering,\smallskip}
-% \DoNotIndex{\@ifundefined,\@ifpackageloaded}
-% \DoNotIndex{\DeclareStringOption}
+% \DoNotIndex{\section,\color,\pagenumbering}
 %
 % \title{The \xpackage{pagecolor} package}
-% \date{2012/02/23 v1.0e}
+% \date{2015/06/22 v1.0g}
 % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
 %
 % \maketitle
@@ -276,11 +244,13 @@ the README, and the derived files
 % \begin{abstract}
 %  This \LaTeX{} package provides the command |\thepagecolor|,
 % which gives the current page (background) colour,
-% i.\,e.~the argument used with the most recent call of |\pagecolor{...}|.
+% \hbox{i.\,e. the} argument used with the most recent call of |\pagecolor{...}|.
 % The command |\thepagecolornone| gives the same colour as |\thepagecolor|,
 % except when the page background colour is
 % \textquotedblleft|none|\textquotedblright. In that case |\thepagecolor| is
 % |white| and |\thepagecolornone| is |none|.\\
+% When |\nopagecolor| is unknown (e.\,g. \XeLaTeX ) or broken
+% (\xpackage{crop} package) this package provides a replacement.
 % Similar to |\newgeometry| and |\restoregeometry| of the \xpackage{geometry}
 % package\\
 % |\newpagecolor{<|\textit{some colour} |>}| and |\restorepagecolor|
@@ -301,42 +271,42 @@ the README, and the derived files
 % $2\unit{g}$ CO$_{2}$ and $2\unit{g}$ wood:\\
 % Therefore please print only if this is really necessary.}
 %
-% \pagebreak
+% \newpage
 %
 % \tableofcontents
 %
 % \bigskip
 %
-% \section{Introduction\label{sec:Introduction}}
-%
+% \section{Introduction\label{s:Introduction}}
 % \indent This \LaTeX{} package provides the command |\thepagecolor|,
 % which gives the current page (background) colour,
-% i.\,e.~the argument used with the most recent call of |\pagecolor{...}|.
+% \hbox{i.\,e. the} argument used with the most recent call of |\pagecolor{...}|.
 % The package should be loaded before any package sets a page (background)
-% colour, but after \xpackage{color} or \xpackage{xcolor} package.
-% Its option |pagecolor={...}| is used to set the |\pagecolor{...}|.\\
+% colour, but after \xpackage{xcolor} or \xpackage{color} package.
+% Its option |pagecolor={...}| is used to set the initial |\pagecolor{...}|.\\
 % The command |\thepagecolornone| gives the same colour as |\thepagecolor|,
 % except when the page background colour is
 % \textquotedblleft|none|\textquotedblright (e.\,g. result of using the
 % |\nopagecolor| command). In that case |\thepagecolor| is |white| and\linebreak
-% |\thepagecolornone| is |none|.\\
+% |\thepagecolornone| is |none|.
+% When |\nopagecolor| is unknown (e.g. \XeLaTeX ) or broken
+% (\xpackage{crop} package) this package provides a replacement
+% depending on option |nopagecolor|. 
 % Similar to |\newgeometry| and |\restoregeometry| of the \xpackage{geometry}
-% package\\
+% package 
 % |\newpagecolor{<|\textit{some colour}|>}| and |\restorepagecolor|
 % are provided.
 %
-% \pagebreak
+% \newpage
 %
 % \section{Usage}
 %
 % \indent Just load the package placing
 % \begin{quote}
-%   |\usepackage[<|\textit{option}|>]{pagecolor}|
+%   |\usepackage[<|\textit{options}|>]{pagecolor}|
 % \end{quote}
 % \noindent in the preamble of your \LaTeXe{} source file.
-% This should be done before another package uses |\pagecolor|,
-% but after |\nopagecolor| is defined (if that is defined in the document
-% at all).\\
+% This should be done before another package uses |\pagecolor|.
 % Afterwards |\pagecolor{...}| can be used to change the page (background)
 % colour as usual. Then |\thepagecolor| gives the current page (background)
 % colour (in the same format as given with |\pagecolor{...}|).\\
@@ -353,54 +323,61 @@ the README, and the derived files
 % does the trick (and requires a |\usepackage{afterpage}| in the document's
 % preamble), or for short\\
 % |\newcommand{\onepagecolor}[1]{%|\\
-% |\newpagecolor{#1}\afterpage{\restorepagecolor}}|\\
+% |  \newpagecolor{#1}\afterpage{\restorepagecolor}}|\\
 % in the preamble and\\
 % |\onepagecolor{<|\textit{some colour}|>}| in the document.
 %
-% \subsection{Option}
-% \DescribeMacro{option}
-% \indent The \xpackage{pagecolor} package takes the following option:
+% \subsection{Options}
+% \DescribeMacro{options}
+% \indent The \xpackage{pagecolor} package takes the following options:
 %
 % \subsubsection{pagecolor\label{sss:pagecolor}}
 % \DescribeMacro{pagecolor}
 % \indent The option |pagecolor={...}| takes as value a colour. This
-% could be as simple as |white| or |black|, but when e.\,g.~the
+% could be as simple as |black| or |white|, but when \hbox{e.\,g. the}
 % \xpackage{xcolor} package is used (loaded before \xpackage{pagecolor}!),
 % also colours like |red!50!green!20!blue| are possible.
-% The default is |pagecolor={none}|.
+% The default is |pagecolor={none}|. A |\pagecolor{...}| command with
+% the given colour is used to initialise the pagecolour.
+% 
+%
+% \subsubsection{nopagecolor\label{sss:nopagecolor}}
+% \DescribeMacro{nopagecolor}
+% \indent The option |nopagecolor={...}| takes as value a colour. This
+% could be as simple as |white| or |black|, but when \hbox{e.\,g. the}
+% \xpackage{xcolor} package is used (loaded before \xpackage{pagecolor}!),
+% also colours like |red!50!green!20!blue| are possible.
+% The default is |pagecolor={none}|. When |\nopagecolor| is unknown
+% (e.\,g. \XeLaTeX ) or broken (\xpackage{crop} package) |\nopagecolor|
+% is replaced by a |\pagecolor| command using the colour defined with the
+% |nopagecolor| option. If |\nopagecolor| is not available and
+% |nopagecolor| is |none|, instead of |none|\hspace{1em}|white| is used.
 %
-% \section{Alternatives\label{sec:Alternatives}}
+% \newpage
+%
+% \section{Alternatives\label{s:Alternatives}}
 %
 % As I neither know what exactly you want to accomplish
 % when using this package (e.\,g.~hiding text), nor what resources you have
-% (e.\,g.~\pdfTeX{} version), here is a list of some possible alternatives:\\
+% (e.\,g.~\pdfTeX{} version), here is a list of possible alternatives:\\
 %
 % \begin{description}
-%  \item[-]
-%  \DescribeMacro{transparent}
-%  \xpackage{transparent} package: With it some object can be made
-%  (fully or partially) transparent.
-% \end{description}
-%
-% \begin{description}
-%  \item[-]
-%  \DescribeMacro{hrefhide}\xpackage{hrefhide} package: It allows to
-%  \textquotedblleft hide\textquotedblright\ some (hyperlinked) text when
-%  printing the document while keeping the layout.
+%  \item[-] \xpackage{transparent} package: With it some object can be made
+%  (fully or partially) transparent,
+%  \url{https://www.ctan.org/pkg/transparent}.
+%
+%  \item[-] \xpackage{hrefhide} package: It allows to
+%  \textquotedblleft hide\textquotedblright{} some (hyperlinked) text when
+%  printing the document while keeping the layout,
+%  \url{https://www.ctan.org/pkg/hrefhide}.
 % \end{description}
 %
 % \bigskip
 %
-% \noindent (You programmed or found another alternative,
-%  which is available at \CTAN{}?\\
-%  OK, send an e-mail to me with the name, location at \CTAN{},
-%  and a short notice, and I will probably include it in
-%  the list above.)\\
-%
-% \smallskip
-%
-% \noindent About how to get those packages, please see
-% subsection~\ref{ss:Downloads}.
+% \noindent You programmed or found another alternative,
+% which is available at \url{https://www.CTAN.org/}?
+% OK, send an e-mail to me with the name, location at CTAN,
+% and a short notice, and I will probably include it in the list above.
 %
 % \newpage
 %
@@ -408,7 +385,7 @@ the README, and the derived files
 %
 %    \begin{macrocode}
 %<*example>
-\documentclass[british]{article}[2007/10/19]% v1.4h
+\documentclass[british]{article}[2014/09/29]% v1.4h
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \usepackage[%
  extension=pdf,%
@@ -423,21 +400,26 @@ the README, and the derived files
   H.-Martin Muench},%
  pdfview=Fit,pdfstartview=Fit,%
  pdfpagelayout=SinglePage%
-]{hyperref}[2012/02/06]% v6.82o
+]{hyperref}[2012/11/06]% v6.83m
 \usepackage[x11names]{xcolor}[2007/01/21]% v2.11
  % The xcolor package would not be needed for just using
  % the base colours. The color package would be sufficient for that.
-\usepackage[pagecolor={LightGoldenrod1}]{pagecolor}[2012/02/23]% v1.0e
+\usepackage[pagecolor={LightGoldenrod1},%
+  nopagecolor={none}]{pagecolor}[2015/06/22]% v1.0g
 
-\usepackage{afterpage}[1995/10/27]% v1.08
+\usepackage{afterpage}[2014/10/28]% v1.08
  % The afterpage package is generally not needed,
  % but the |\newpagecolor{somecolour}\afterpage{\restorepagecolor}|
  % construct shall be demonstrated.
 
-\usepackage{lipsum}[2011/04/14]% v1.2
+\usepackage{lipsum}[2014/07/27]% v1.3
  % The lipsum package is generally not needed,
  % but some blind text is needed for the example.
 
+\usepackage{hologo}[2012/04/26]% v1.10
+ % The hologo package is only needed to write
+ % \hologo{pdfTeX}, \hologo{LuaTeX}, and \hologo{XeTeX}.
+
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \listfiles
 \begin{document}
@@ -445,17 +427,22 @@ the README, and the derived files
 \section*{Example for pagecolor}
 
 This example demonstrates the use of package\newline
-\textsf{pagecolor}, v1.0e as of 2012/02/23 (HMM).\newline
-The used option was \verb|pagecolor={LightGoldenrod1}|.\newline
-\verb|pagecolor={none}| would be the default.\newline
+\textsf{pagecolor}, v1.0g as of 2015/06/22 (HMM).\newline
+The used options were\newline
+\verb|pagecolor={LightGoldenrod1}| (\verb|pagecolor={none}|
+would be the default), and 
+\verb|pagecolor={none}| (which is the default).\newline
 
-For more details please see the documentation!\newline
+\noindent For more details please see the documentation!\newline
 
 \noindent {\color{teal} Save per page about $200\unit{ml}$ water,
 $2\unit{g}$ CO$_{2}$ and $2\unit{g}$ wood:\newline
 Therefore please print only if this is really necessary.}\newline
 
-The current page (background) colour is\newline
+%    \end{macrocode}
+% \pagebreak
+%    \begin{macrocode}
+\noindent The current page (background) colour is\newline
 \verb|\thepagecolor|\ =\ \thepagecolor \newline
 (and \verb|\thepagecolornone|\ =\ \thepagecolornone ,
 which would only be different from \verb|\thepagecolor|,
@@ -488,8 +475,10 @@ the page colour to the value it had before the red page.}
 \pagecolor{none}
 
 This page uses \verb|\pagecolor{none}|. If the \verb|\nopagecolor|
-command is known (pdf\TeX and Lua\TeX; not yet for dvips, dvipdfm(x)
-or Xe\TeX), the page colour is now \verb|none|, otherwise \verb|white|:
+command is known (\hologo{pdfTeX} and \hologo{LuaTeX}; not yet for
+dvips, dvipdfm(x) or \hologo{XeTeX}), the page colour is now
+\verb|none| (because option \verb|nopagecolor={none}|), otherwise
+\verb|white| (or the colour given with option \verb|nopagecolor={...}|):
 \verb|\thepagecolor|\ =\ \thepagecolor\ and
 \verb|\thepagecolornone|\ =\ \thepagecolornone .
 
@@ -537,8 +526,8 @@ in mid-sentence!
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{pagecolor}[2012/02/23 v1.0e
+\NeedsTeXFormat{LaTeX2e}[2014/05/01]
+\ProvidesPackage{pagecolor}[2015/06/20 v1.0g
             Provides thepagecolor (HMM)]
 %    \end{macrocode}
 %
@@ -546,13 +535,14 @@ in mid-sentence!
 %
 %    \begin{macrocode}
 %% Provides the \thepagecolor, \thepagecolornone, \newpagecolor{...},
-%% and \restorepagecolor commands.
+%% and \restorepagecolor commands and the a replacement for the
+%% \nopagecolor command, if it is not available.
 %    \end{macrocode}
 %
 % We need the \xpackage{kvoptions} package by \textsc{Heiko Oberdiek}:
 %
 %    \begin{macrocode}
-\RequirePackage{kvoptions}[2010/12/23]% v3.10
+\RequirePackage{kvoptions}[2011/06/30]% v3.11
 %    \end{macrocode}
 %
 % and either the \xpackage{color} or the \xpackage{xcolor} package:
@@ -565,12 +555,12 @@ in mid-sentence!
     }{% else: older package version
       \PackageWarning{pagecolor}{%
         It is requested version `2007/01/21' of package\MessageBreak%
-        xcolor, but only an older version is available.\MessageBreak%
+        xcolor, but only an older version is available\MessageBreak%
        }%
      }%
  }{% xcolor not loaded
    \@ifpackageloaded{color}{%
-      \RequirePackage{color}[2005/11/14]% v1.0j
+      \RequirePackage{color}[2014/10/28]% v1.1a
     }{% \else
       \PackageWarning{pagecolor}{%
         The pagecolor package must be loaded after either\MessageBreak%
@@ -587,6 +577,14 @@ in mid-sentence!
   }% \fi
 %    \end{macrocode}
 %
+% as well as the \xpackage{ifpdf} and the \xpackage{ifluatex} package,
+% because only \pdfTeX{} and \LuaTeX{} provide the |\nopagecolor| command:
+%
+%    \begin{macrocode}
+\RequirePackage{ifpdf}[2011/01/30]%    v2.3
+\RequirePackage{ifluatex}[2010/03/01]% v1.3
+%    \end{macrocode}
+%
 % A last information for the user:
 %
 %    \begin{macrocode}
@@ -603,11 +601,69 @@ in mid-sentence!
 %
 %    \begin{macrocode}
 \SetupKeyvalOptions{family=pagecolor,prefix=pagecolor@}
-\DeclareStringOption[none]{pagecolor}% \pagecolor@pagecolor
+\DeclareStringOption[none]{pagecolor}%   \pagecolor@pagecolor
+\DeclareStringOption[none]{nopagecolor}% \pagecolor@nopagecolor
 \ProcessKeyvalOptions*
 
 %    \end{macrocode}
+%    \begin{macro}{\nopagecolor}\label{nopagecolor}
+%    \begin{macrocode}
+%% \nopagecolor is only available for pdf(La)TeX and Lua(La)TeX
+%% but not for dvips, dvipdfm(x), Xe(La)TeX,...
+%    \end{macrocode}
 %
+% therefore |pagecolor| and/or |nopagecolor| can only be |none|,
+% if either \pdfTeX{} or \LuaTeX{} is used; otherwise |white| is fine
+% or another colour (other colours) requested by the user with the two options.
+%
+%    \begin{macrocode}
+\def\pagecolourtmpa{0}
+\ifluatex\def\pagecolourtmpa{1}\fi
+\ifpdf\def\pagecolourtmpa{1}\fi
+\def\pagecolourtmpb{1}
+\ifx\pagecolourtmpa\pagecolourtmpb\relax%
+\else%
+  \PackageInfo{pagecolor}{\string\nopagecolor\space is undefined}%
+  \def\pagecolourtmpb{none}%
+  \edef\pagecolourtmpa{\pagecolor@nopagecolor}%
+  \ifx\pagecolourtmpa\pagecolourtmpb%
+    \PackageWarning{pagecolor}{%
+      Option nopagecolor=none requested but \string\nopagecolor\space%
+      unknown:\MessageBreak%
+      By option nopagecolor the "colour" to be used with%
+      \string\nopagecolor\MessageBreak%
+      is set. The current value is "none" (maybe by default),\MessageBreak%
+      but command \string\nopagecolor\space is undefined.\MessageBreak%
+      Therefore the colour cannot be "none".\MessageBreak%
+      Please change the option accordingly!\MessageBreak%
+      As first aid nopagecolor is now set to white\MessageBreak%
+     }%
+    \setkeys{pagecolor}{nopagecolor=white}%
+  \fi%
+  \edef\pagecolourtmpa{\pagecolor@pagecolor}%
+  \ifx\pagecolourtmpa\pagecolourtmpb%
+    \PackageWarning{pagecolor}{%
+      Option pagecolor=none (maybe by default) used,\MessageBreak%
+      but \string\nopagecolor\space is unknown.\MessageBreak%
+      Please use anotheroption value;\MessageBreak%
+      \pagecolor@nopagecolor\space\MessageBreak%
+      will be used now\MessageBreak%
+     }%
+    \setkeys{pagecolor}{pagecolor={\pagecolor@nopagecolor}}%
+  \fi%
+  \@ifundefined{nopagecolor}{%
+     \newcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+   }{\renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+    }%
+\fi%
+
+
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\pagecolor}
+% 
+% \pagebreak
 % We save the original |\pagecolor| command,
 %
 %    \begin{macrocode}
@@ -615,7 +671,6 @@ in mid-sentence!
 
 %    \end{macrocode}
 %
-%    \begin{macro}{\pagecolor}
 % before we redefine it to include a definition of |\thepagecolor|
 % and \linebreak
 % |\thepagecolornone|:
@@ -624,19 +679,21 @@ in mid-sentence!
 \renewcommand{\pagecolor}[1]{\@bsphack%
   \edef\pagecolourtmpa{#1}%
   \def\pagecolourtmpb{none}%
-  \ifx\pagecolourtmpa\pagecolourtmpb
+  \ifx\pagecolourtmpa\pagecolourtmpb\relax%
     \@ifundefined{nopagecolor}{%
-      \PackageError{pagecolor}{%
-        pagecolor=none requested but \string\nopagecolor\space unknown%
-       }{%
-        \string\pagecolor{none} was used, but the command %
+      \PackageWarning{pagecolor}{%
+        pagecolor=none requested but \string\nopagecolor\space%
+        unknown:\MessageBreak%
+        \string\pagecolor{none} was used, but the command\MessageBreak%
         \string\nopagecolor\space is undefined.\MessageBreak%
-        Please use another colour. pagecolor=white will be used now.%
-        \MessageBreak%
-        }%
-      \gdef\thepagecolor{white}%
-      \gdef\thepagecolornone{white}% although it should be "none"
-      \origpagecolour{white}%
+        Please use another colour.\MessageBreak%
+        pagecolor=\pagecolor@nopagecolor \MessageBreak%
+        will be used now\MessageBreak%
+       }%
+      \xdef\thepagecolor{\pagecolor@nopagecolor}%
+      \xdef\thepagecolornone{\pagecolor@nopagecolor}%
+                            % although it should be "none"
+      \origpagecolour{\pagecolor@nopagecolor}%
      }{%
       \nopagecolor%
      }%
@@ -651,69 +708,78 @@ in mid-sentence!
 %    \end{macrocode}
 %    \end{macro}
 %
-% |\nopagecolor| is only defined for \pdfTeX and \LuaTeX, but not yet for dvips,
-% dvipdfm(x) or \XeTeX. Maybe
-% \begin{verbatim}
-% \@ifundefined{nopagecolor}{\newcommand{\nopagecolor}{\pagecolor{white}}}{}
-% \end{verbatim}
-% could be an alternative.\\
-% When |\pagecolor{none}| is used and |\nopagecolor| is defined, then \\
-% |\pagecolor{none}| is made into a synonym for |\nopagecolor|.\\
-% If |\nopagecolor| has not been defined, nothing needs to be done.
-% Otherwise we redefine |\nopagecolor|, thus that |\thepagecolor| is
-% set to |white| and |\thepagecolornone| to |none| whenever
-% |\nopagecolor| is used.
+% |\nopagecolor| is only defined for \pdfTeX{} and \LuaTeX , but not for dvips,
+% dvipdfm(x) or \XeTeX . (We defined a replacement, see page~\pageref{nopagecolor}.)
+% But additionally |\nopagecolor| does not work if the \xpackage{crop} package is used.
+% A workaround needs to be defined:
 %
 %    \begin{macrocode}
-\@ifundefined{nopagecolor}{%
-  \PackageWarning{pagecolor}{%
-    \string\nopagecolor\space is undefined.\MessageBreak%
-    (As long as it is neither used anywhere\MessageBreak%
-    \space nor defined later, that will be no problem.)\MessageBreak%
-   }
-  \AtEndDocument{%
-  \@ifundefined{nopagecolor}{% no problem
-    }{%
-    \PackageError{pagecolor}{%
-      \string\nopagecolor\space defined after loading package%
-      \MessageBreak%
-      pagecolor%
-      }{\string\nopagecolor\space was defined after loading the %
-       pagecolor package.\MessageBreak%
-       Either define \string\nopagecolor\space earlier or load the %
-       pagecolor package later.\MessageBreak%
-      }
-    }%
-  }%
-  }{% \else
-    \let\orignopagecolour\nopagecolor
-    \renewcommand{\nopagecolor}{%
-      \xdef\thepagecolor{white}
-      \xdef\thepagecolornone{none}
-      \orignopagecolour
-      }
-  }
 
+\AtBeginDocument{%
+  \let\orignopagecolour\nopagecolor\relax%
+  \@ifpackageloaded{crop}{% crop loaded
+    \@ifpackagelater{crop}{2003/05/21}{%
+       % later than 2003/05/20 v1.9 might be OK
+       \PackageWarning{pagecolor}{%
+         \string\nopagecolor\space did not work with package\MessageBreak%
+         crop 2003/05/20 v1.9. A newer version is used, \MessageBreak%
+         which the pagecolor package does not know how to handle.\MessageBreak%
+         Please contact the maintainer of the pagecolor package!\MessageBreak%
+         }%
+       % Let us just hope everything got fixed:
+       \renewcommand{\nopagecolor}{%
+         \xdef\thepagecolor{white}%
+         \xdef\thepagecolornone{none}%
 %    \end{macrocode}
-%
-% If the page colour as given with option |pagecolor={...}| is |none|,
-% but |\nopagecolor| is not known, |\pagecolor@pagecolor| is set to
-% |white| and a warning is given.
-%
+% \pagebreak
 %    \begin{macrocode}
-\def\pagecolourtmpb{none}
-\ifx\pagecolor@pagecolor\pagecolourtmpb
-  \@ifundefined{nopagecolor}{%
-    \PackageWarning{pagecolor}{%
-      Option pagecolor=none (maybe by default) used,\MessageBreak%
-      but \string\nopagecolor\space is unknown. Please use another%
-      \MessageBreak%
-      option value; white will be used now.\MessageBreak%
-     }
-    \setkeys{pagecolor}{pagecolor=white}%
-  }{% ok
-  }%
-\fi
+         \orignopagecolour%
+         % That will not have any effect except when things got fixed!
+         }%
+      }{% else: older package version
+        \PackageWarning{pagecolor}{%
+          \string\nopagecolor\space does not work with\MessageBreak%
+          the used crop package. Using\MessageBreak%
+          \pagecolor@nopagecolor\MessageBreak%
+          as nopagecolor now\MessageBreak% 
+          }%
+        \def\pagecolourtmpb{none}%
+        \edef\pagecolourtmpa{\pagecolor@nopagecolor}%
+        \ifx\pagecolourtmpa\pagecolourtmpb%
+          \PackageWarning{pagecolor}{%
+            Option nopagecolor=none requested \MessageBreak%
+            but this does not work with the crop package.\MessageBreak%
+            By option nopagecolor the "colour" to be used with %
+            \string\nopagecolor\MessageBreak%
+            is set. The current value is "none" (maybe by default),%
+            \MessageBreak%
+            but the crop package broke \string\nopagecolor .\MessageBreak%
+            Therefore the colour cannot be "none".\MessageBreak%
+            Please change the option accordingly!\MessageBreak%
+            As first aid nopagecolor is now set to white\MessageBreak%
+           }%
+          \setkeys{pagecolor}{nopagecolor=white}%
+        \fi%
+        \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+       }%
+   }{% crop not loaded
+     \def\pagecolourtmpa{0}
+     \ifluatex\def\pagecolourtmpa{1}\fi
+     \ifpdf\def\pagecolourtmpa{1}\fi
+     \def\pagecolourtmpb{1}
+     \ifx\pagecolourtmpa\pagecolourtmpb\relax%
+       \def\pagecolourtmpa{none}%
+     \else%
+       \def\pagecolourtmpa{\pagecolor@nopagecolor}%
+     \fi%
+     \renewcommand{\nopagecolor}{%
+       \xdef\thepagecolor{white}%
+       \xdef\thepagecolornone{\pagecolourtmpa}%
+       \orignopagecolour%
+       }%
+    }%
+  }
+
 
 %    \end{macrocode}
 %
@@ -724,21 +790,23 @@ in mid-sentence!
 
 %    \end{macrocode}
 %
-% Now the page (background) colour and |\thepagecolor| and \\
-% |\thepagecolornone| are |\pagecolor@pagecolor| (or page (background) colour
-% and |\thepagecolornone| are |none|=|\pagecolor@pagecolor| and
-% |\thepagecolor| is |white|), and when the page (background) colour
-% is changed, |\thepagecolor| and |\thepagecolornone| are changed
-% accordingly.
-%
-% \newpage
+% Now the page (background) colour as well as |\thepagecolor| are\\
+% |\pagecolor@pagecolor|. |\thepagecolornone| is |none|, if that colour is known,
+% otherwise it is |\pagecolor@nopagecolor|, and if that was |none| (but that unknown),
+% it is |white|. If |\pagecolor@pagecolor| was |none|,
+% the page (background) colour is |none|, when known, otherwise
+% |\pagecolor@nopagecolor|, and if that was |none| (but that unknown),
+% it is |white|, and |\thepagecolor| is |\pagecolor@nopagecolor|,
+% and if that was also |none| but |none| unknown, then it is |white|.
+% When the page (background) colour is changed, |\thepagecolor| and
+% |\thepagecolornone| are changed accordingly.
 %
 %    \begin{macro}{\newpagecolor}
 % There have been requests (via e-mail and at \\
-% \url{http://tex.stackexchange.com/q/25137}) to change the colour of just one
+% \url{https://tex.stackexchange.com/q/25137/6865}) to change the colour of just one
 % (or two) page(s) only, similar to |\newgeometry| and |\restoregeometry| of the
-% \xpackage{geometry} package (\url{http://ctan.org/pkg/geometry}). Therefore
-% |\newpagecolor| and |\restorepagecolor| are introduced (as suggested by
+% \xpackage{geometry} package (\url{https://www.ctan.org/pkg/geometry}).\\
+% Therefore |\newpagecolor| and |\restorepagecolor| are introduced (as suggested by
 % \textsc{haoyun\_tex}):
 %
 %    \begin{macrocode}
@@ -751,7 +819,7 @@ in mid-sentence!
 %    \end{macro}
 %
 % |\newpagecolor{<|\textit{some colour}|>}| will execute |\pagecolor{somecolour}|
-% and remember the page colour used before.\\
+% and remember the page colour used before.
 %
 %    \begin{macro}{\restorepagecolor}
 %    \begin{macrocode}
@@ -785,109 +853,134 @@ in mid-sentence!
 %
 % \subsection{Downloads\label{ss:Downloads}}
 %
-% Everything is available on \CTAN{}, \url{http://www.ctan.org/tex-archive/},
+% Everything is available at \url{https://www.ctan.org},
 % but may need additional packages themselves.\\
 %
 % \DescribeMacro{pagecolor.dtx}
 % For unpacking the |pagecolor.dtx| file and constructing the documentation
 % it is required:
 % \begin{description}
-% \item[-] \TeX{} Format \LaTeXe{}, \url{http://www.CTAN.org/}
+% \item[-] \TeX Format \LaTeXe{}: \url{https://www.CTAN.org}
 %
-% \item[-] document class \xpackage{ltxdoc}, 2007/11/11, v2.0u,
-%           \url{http://ctan.org/pkg/ltxdoc}
+% \item[-] document class \xclass{ltxdoc}, 2014/09/29, v2.0u,
+%   \url{https://www.ctan.org/pkg/ltxdoc}
 %
-% \item[-] package \xpackage{holtxdoc}, 2011/02/04, v0.21,
-%           \url{http://ctan.org/pkg/holtxdoc}
+% \item[-] package \xpackage{holtxdoc}, 2012/03/21, v0.24,
+%   \url{https://www.ctan.org/pkg/holtxdoc}
 % \end{description}
 %
 % \DescribeMacro{pagecolor.sty}
 % The |pagecolor.sty| for \LaTeXe{} (i.\,e. each document using
 % the \xpackage{pagecolor} package) requires:
 % \begin{description}
-% \item[-] \TeX{} Format \LaTeXe{}, \url{http://www.CTAN.org/}
+% \item[-] \TeX{} Format \LaTeXe{}, \url{https://www.CTAN.org}
+%
+% \item[-] package \xpackage{kvoptions}, 2011/06/30, v3.11,
+%   \url{https://www.ctan.org/pkg/kvoptions}
 %
-% \item[-] package \xpackage{kvoptions}, 2010/12/23, v3.10,
-%           \url{http://ctan.org/pkg/kvoptions}
+% \item[-] package \xpackage{ifpdf}, 2011/01/30, v2.3,
+%   \url{https://www.ctan.org/pkg/ifpdf}
+%
+% \item[-] package \xpackage{ifluatex}, 2010/03/01, v1.3,
+%   \url{https://www.ctan.org/pkg/ifluatex}
 % \end{description}
 % and either
 % \begin{description}
-% \item[-] package \xpackage{color}, 2005/11/14, v1.0j,
-%           \url{http://ctan.org/pkg/color} (from the\\
-%           \xpackage{graphics} package bundle)
+% \item[-] package \xpackage{xcolor}, 2007/01/21, v2.11,
+%           \url{https://www.ctan.org/pkg/xcolor}
 % \end{description}
 % or
 % \begin{description}
-% \item[-] package \xpackage{xcolor}, 2007/01/21, v2.11,
-%           \url{http://ctan.org/pkg/xcolor}
+% \item[-] package \xpackage{color}, 2014/10/28, v1.1a,
+%           \url{https://www.ctan.org/pkg/color} (from the\\
+%           \xpackage{graphics} package bundle).
 % \end{description}
 %
 % \DescribeMacro{pagecolor-example.tex}
-% The |pagecolor-example.tex| requires the same files as all
-% documents using the \xpackage{pagecolor} package and additionally:
+% The |pagecolor-example.tex| requires the same file as all
+% documents using the \xpackage{pagecolor} package, i.\,e.
 % \begin{description}
-% \item[-] class \xpackage{article}, 2007/10/19, v1.4h, from \xpackage{classes.dtx}:\\
-%           \CTAN{macros/latex/base/classes.dtx}
-%
-% \item[-] package \xpackage{pagecolor}, 2012/02/23, v1.0e,
-%           \url{http://ctan.org/pkg/pagecolor}\\
-%           (Well, it is the example file for this package, and because you are
-%            reading the documentation for the \xpackage{pagecolor} package,
-%            it can be assumed that you already have some version of it --
-%            is it the current one?)
+% \item[-] package \xpackage{pagecolor},  2015/06/22, v1.0g,
+%   \url{https://www.ctan.org/pkg/pagecolor}\\
+%   (Well, it is the example file for this package, and because you are reading the
+%    documentation for the \xpackage{pagecolor} package, it~can be assumed that you already
+%    have some version of it -- is it the current one?)
+% \end{description}
+% and additionally:
+% \begin{description}
+% \item[-] class \xpackage{article}, 2014/09/29, v1.4h, from \xpackage{classes}:\\
+%           \url{https://www.ctan.org/pkg/classes}
 %
 % \item[-] package \xpackage{xcolor}, 2007/01/21, v2.11,
-%           \url{http://ctan.org/pkg/xcolor}\\
+%           \url{https://www.ctan.org/pkg/xcolor}\\
 %           This package would not be needed for the use of just base colours only,
 %           the \xpackage{color} package would be sufficient for that.
+%
+% \item[-] package \xpackage{afterpage}, 2014/10/28, v1.08,
+%           \url{https://www.ctan.org/pkg/afterpage}\\
+%           This package is only needed for demonstrating the\\
+%           |\newpagecolor{somecolour}\afterpage{\restorepagecolor}| construct.
+%
+% \item[-] package \xpackage{lipsum}, 2014/07/27, v1.3,
+%           \url{https://www.ctan.org/pkg/lipsum}\\
+%           This package is only needed for some blind text.
+%
+% \item[-] package \xpackage{hologo}, 2012/04/26, v1.10,
+%           \url{https://www.ctan.org/pkg/hologo}\\
+%           This package is only needed to write \hologo{pdfTeX}, \hologo{LuaTeX},
+%           and \hologo{XeTeX}.
 % \end{description}
 %
+% \DescribeMacro{Alternatives}
 % \DescribeMacro{transparent}
 % \DescribeMacro{hrefhide}
-% As possible alternatives in section \ref{sec:Alternatives} there are listed
+% As possible alternatives in section~\ref{s:Alternatives}, Alternatives,
+% there are listed (newer versions might be available):
 % \begin{description}
 % \item[-] package \xpackage{transparent}, 2007/01/08, v1.0, \\
-%           \url{http://ctan.org/pkg/transparent}
+%           \url{https://www.ctan.org/pkg/transparent}
 %
-% \item[-] package \xpackage{hrefhide}, 2011/04/29, v1.0f, \\
-%           \url{http://ctan.org/pkg/hrefhide}
+% \item[-] package \xpackage{hrefhide}, 2011/04/29, v1.0g, \\
+%           \url{https://www.ctan.org/pkg/hrefhide}
 % \end{description}
 %
 % \DescribeMacro{Oberdiek}
+% \DescribeMacro{hologo}
 % \DescribeMacro{holtxdoc}
 % \DescribeMacro{kvoptions}
-% All packages of \textsc{Heiko Oberdiek}'s bundle `oberdiek'
-% (especially \xpackage{holtxdoc} and \xpackage{kvoptions})
+% All packages of \textsc{Heiko Oberdiek's} bundle `oberdiek'
+% (especially \xpackage{hologo}, \xpackage{holtxdoc}, and \xpackage{kvoptions})
 % are also available in a TDS compliant ZIP archive:\\
-% \CTAN{install/macros/latex/contrib/oberdiek.tds.zip}.\\
+% \url{http://mirrors.ctan.org/install/macros/latex/contrib/oberdiek.tds.zip}.\\
 % It is probably best to download and use this, because the packages in there
 % are quite probably both recent and compatible among themselves.\\
 %
 % \DescribeMacro{hyperref}
 % \noindent \xpackage{hyperref} is not included in that bundle and needs to be
 % downloaded separately,\\
-% \url{http://mirror.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\
+% \url{http://mirrors.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\
 %
 % \DescribeMacro{M\"{u}nch}
 % A hyperlinked list of my (other) packages can be found at
-% \url{http://www.Uni-Bonn.de/~uzs5pv/LaTeX.html}.\\
+% \url{https://www.ctan.org/author/muench-hm}.\\
 %
 % \subsection{Package, unpacking TDS}
-% \paragraph{Package.} This package is available on \CTAN{}
+% \paragraph{Package.} This package is available on \url{https://www.CTAN.org}.
 % \begin{description}
-% \item[\CTAN{macros/latex/contrib/pagecolor/pagecolor.dtx}]\hspace*{0.1cm} \\
+% \item[\url{http://mirrors.ctan.org/macros/latex/contrib/pagecolor/pagecolor.dtx}]\hspace*{0.1cm} 
 %       The source file.
-% \item[\CTAN{macros/latex/contrib/pagecolor/pagecolor.pdf}]\hspace*{0.1cm} \\
+% \item[\url{http://mirrors.ctan.org/macros/latex/contrib/pagecolor/pagecolor.pdf}]\hspace*{0.1cm} 
 %       The documentation.
-% \item[\CTAN{macros/latex/contrib/pagecolor/pagecolor-example.pdf}]\hspace*{0.1cm} \\
+% \item[\url{http://mirrors.ctan.org/macros/latex/contrib/pagecolor/pagecolor-example.pdf}]\hspace*{0.1cm} 
 %       The compiled example file, as it should look like.
-% \item[\CTAN{macros/latex/contrib/pagecolor/README}]\hspace*{0.1cm} \\
-%       The README file.
+% \item[\url{http://mirrors.ctan.org/macros/latex/contrib/pagecolor/README}]\hspace*{0.1cm}\\
+%       \hspace*{1em}The README file.
 % \end{description}
-% There is also a pagecolor.tds.zip available:
+%
+% There is also a |pagecolor.tds.zip| available:
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/pagecolor.tds.zip}]\hspace*{0.1cm} \\
-%       Everything in \xfile{TDS} compliant, compiled format.
+% \item[\url{http://mirror.ctan.org/install/macros/latex/contrib/pagecolor.tds.zip}]\hspace*{0.1cm} 
+%       Everything in TDS compliant, compiled format.
 % \end{description}
 % which additionally contains\\
 % \begin{tabular}{ll}
@@ -982,14 +1075,14 @@ in mid-sentence!
 %   \usebox0
 % \fi
 % \end{quote}
-% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip{}'s
-% \xfile{TDS} installing feature, then some files can already be in the right
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip{}.
 %
 % \subsection{Refresh file name databases}
 %
-% If your \TeX{}~distribution (\teTeX{}, \mikTeX{},\dots{}) relies on file name
-% databases, you must refresh these. For example, \teTeX{} users run
+% If your \TeX~distribution (\TeX{} Live, \mikTeX, \teTeX, \dots) relies on 
+% file name databases, you must refresh these. For example, \teTeX{} users run
 % \verb|texhash| or \verb|mktexlsr|.
 %
 % \subsection{Some details for the interested}
@@ -1001,7 +1094,7 @@ in mid-sentence!
 % \item[\LaTeX:] Generate the documentation.
 % \end{description}
 % If you insist on using \LaTeX{} for \docstrip{} (really,
-% \docstrip{} does not need \LaTeX{}), then inform the autodetect routine
+% \docstrip{} does not need \LaTeX ), then inform the autodetect routine
 % about your intention:
 % \begin{quote}
 %   \verb|latex \let\install=y\input{pagecolor.dtx}|
@@ -1019,7 +1112,7 @@ in mid-sentence!
 % \end{quote}
 %
 % \noindent An example follows how to generate the
-% documentation with \pdfLaTeX{}:
+% documentation with \pdfLaTeX :
 %
 % \begin{quote}
 %\begin{verbatim}
@@ -1034,7 +1127,7 @@ in mid-sentence!
 % \subsection{Compiling the example}
 %
 % The example file, \textsf{pagecolor-example.tex}, can be compiled via\\
-% |(pdf)latex pagecolor-example.tex|.\\
+% |(pdf)latex pagecolor-example.tex|.
 %
 % \section{Acknowledgements}
 %
@@ -1044,21 +1137,25 @@ in mid-sentence!
 % \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex} newsgroups
 % for their help in all things \TeX{}, especially all contributors to the
 % discussion at
-% \url{http://groups.google.com/group/comp.text.tex/browse_thread/thread/533576ebe44d60f6/e1654d70a19de63c?lnk=gst&q=Determination+of+the+current+page+colour#e1654d70a19de63c}
+% \url{https://groups.google.com/forum/#!topic/comp.text.tex/UzV26-RNYPY}%
 % \ (\textsc{H.~Oberdiek} \& \textsc{Gouailles}).\\
 % I thank \textsc{haoyun\_tex} for suggesting the |\newpagecolor|/|\restorepagecolor|
-% pair of commands and everyone at \url{http://tex.stackexchange.com/q/25137}
+% pair of commands and everyone at \url{https://tex.stackexchange.com/q/25137/6865}
 % for their contributions there.
 %
 % \bigskip
 %
 % \phantomsection
 % \begin{History}\label{History}
+%
+%   Some old versions have been archived at
+%   \url{http://ctanhg.scharrer-online.de/pkg/pagecolor.html}.
+%
 %   \begin{Version}{2011/07/16 v1.0a}
 %     \item First version discussed at \Newsgroup{comp.text.tex}.
 %   \end{Version}
 %   \begin{Version}{2011/08/06 v1.0b}
-%     \item Changed version uploaded to \CTAN{}.
+%     \item Changed version uploaded to the CTAN.
 %   \end{Version}
 %   \begin{Version}{2011/08/08 v1.0c}
 %     \item Fixed a |\setkeys|.
@@ -1076,6 +1173,15 @@ in mid-sentence!
 %             which gave a warning about old \xpackage{color} package even if a new
 %             version was used.
 %   \end{Version}
+%   \begin{Version}{2015/06/21 v1.0f}
+%     \item Fixed the urls in the documentation.
+%     \item Handle |\nopagecolor| when it is not defined or broken by \xpackage{crop},
+%             new option |nopagecolor| introduced.
+%     \item Update of documentation, README, and \xfile{dtx} internals.
+%   \end{Version}
+%   \begin{Version}{2015/06/22 v1.0g}
+%     \item Replaced all error messages by warnings.
+%   \end{Version}
 % \end{History}
 %
 % \bigskip
@@ -1083,7 +1189,7 @@ in mid-sentence!
 % When you find a mistake or have a suggestion for an improvement of this package,
 % please send an e-mail to the maintainer, thanks! (Please see BUG REPORTS in the README.)
 %
-% \newpage
+% \bigskip
 %
 % \PrintIndex
 %
diff --git a/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins b/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins
index 240cab04b05..9d35876d0a4 100644
--- a/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins
+++ b/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins
@@ -9,9 +9,9 @@
 %% This is a generated file.
 %% 
 %% Project: pagecolor
-%% Version: 2012/02/23 v1.0e
+%% Version: 2015/06/22 v1.0g
 %% 
-%% Copyright (C) 2011 - 2012 by
+%% Copyright (C) 2011 - 2015 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %% 
 %% The usual disclaimer applies:
@@ -39,11 +39,16 @@
 %%    pagecolor.ins, pagecolor.drv,
 %%    pagecolor-example.tex, pagecolor-example.pdf.
 %% 
+%% In memoriam
+%%  Claudia Simone Barth + 1996/01/30
+%%  Tommy Muench + 2014/01/02
+%%  Hans-Klaus Muench + 2014/08/24
+%% 
 \input docstrip.tex
-\Msg{*****************************************************************}
-\Msg{* Installation                                                   }
-\Msg{* Package: pagecolor 2012/02/23 v1.0e Provides thepagecolor (HMM)}
-\Msg{*****************************************************************}
+\Msg{******************************************************************}
+\Msg{* Installation                                                   *}
+\Msg{* Package: pagecolor 2015/06/22 v1.0g Provides thepagecolor (HMM)*}
+\Msg{******************************************************************}
 
 \keepsilent
 \askforoverwritefalse
@@ -54,9 +59,9 @@
 This is a generated file.
 
 Project: pagecolor
-Version: 2012/02/23 v1.0e
+Version: 2015/06/22 v1.0g
 
-Copyright (C) 2011 - 2012 by
+Copyright (C) 2011 - 2015 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 
 The usual disclaimer applies:
@@ -84,6 +89,11 @@ the README, and the derived files
    pagecolor.ins, pagecolor.drv,
    pagecolor-example.tex, pagecolor-example.pdf.
 
+In memoriam
+ Claudia Simone Barth + 1996/01/30
+ Tommy Muench + 2014/01/02
+ Hans-Klaus Muench + 2014/08/24
+
 \endpreamble
 \let\MetaPrefix\DoubleperCent
 
@@ -103,7 +113,7 @@ the README, and the derived files
 \Msg{* To finish the installation you have to move the following}
 \Msg{* file into a directory searched by TeX:}
 \Msg{*}
-\Msg{*     pagecolor.sty}
+\Msg{*  pagecolor.sty}
 \Msg{*}
 \Msg{* To produce the documentation run the file `pagecolor.drv'}
 \Msg{* through (pdf)LaTeX, e.g.}
diff --git a/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty b/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty
index 81b5fe7ee6b..9d0ef98d18d 100644
--- a/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty
+++ b/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty
@@ -9,9 +9,9 @@
 %% This is a generated file.
 %% 
 %% Project: pagecolor
-%% Version: 2012/02/23 v1.0e
+%% Version: 2015/06/22 v1.0g
 %% 
-%% Copyright (C) 2011 - 2012 by
+%% Copyright (C) 2011 - 2015 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %% 
 %% The usual disclaimer applies:
@@ -39,12 +39,18 @@
 %%    pagecolor.ins, pagecolor.drv,
 %%    pagecolor-example.tex, pagecolor-example.pdf.
 %% 
-\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{pagecolor}[2012/02/23 v1.0e
+%% In memoriam
+%%  Claudia Simone Barth + 1996/01/30
+%%  Tommy Muench + 2014/01/02
+%%  Hans-Klaus Muench + 2014/08/24
+%% 
+\NeedsTeXFormat{LaTeX2e}[2014/05/01]
+\ProvidesPackage{pagecolor}[2015/06/20 v1.0g
             Provides thepagecolor (HMM)]
 %% Provides the \thepagecolor, \thepagecolornone, \newpagecolor{...},
-%% and \restorepagecolor commands.
-\RequirePackage{kvoptions}[2010/12/23]% v3.10
+%% and \restorepagecolor commands and the a replacement for the
+%% \nopagecolor command, if it is not available.
+\RequirePackage{kvoptions}[2011/06/30]% v3.11
 %% \RequirePackage{ either color or xcolor }:
 \@ifpackageloaded{xcolor}{% xcolor loaded
    \@ifpackagelater{xcolor}{2007/01/21}{%
@@ -52,12 +58,12 @@
     }{% else: older package version
       \PackageWarning{pagecolor}{%
         It is requested version `2007/01/21' of package\MessageBreak%
-        xcolor, but only an older version is available.\MessageBreak%
+        xcolor, but only an older version is available\MessageBreak%
        }%
      }%
  }{% xcolor not loaded
    \@ifpackageloaded{color}{%
-      \RequirePackage{color}[2005/11/14]% v1.0j
+      \RequirePackage{color}[2014/10/28]% v1.1a
     }{% \else
       \PackageWarning{pagecolor}{%
         The pagecolor package must be loaded after either\MessageBreak%
@@ -72,33 +78,80 @@
      }% \fi
    \RequirePackage{xcolor}[2007/01/21]% v2.11
   }% \fi
+\RequirePackage{ifpdf}[2011/01/30]%    v2.3
+\RequirePackage{ifluatex}[2010/03/01]% v1.3
 %% pagecolor may work with earlier versions of LaTeX and the
 %% packages, but this was not tested. Please consider updating
 %% your LaTeX and packages to the most recent version
 %% (if they are not already the most recent version).
 
 \SetupKeyvalOptions{family=pagecolor,prefix=pagecolor@}
-\DeclareStringOption[none]{pagecolor}% \pagecolor@pagecolor
+\DeclareStringOption[none]{pagecolor}%   \pagecolor@pagecolor
+\DeclareStringOption[none]{nopagecolor}% \pagecolor@nopagecolor
 \ProcessKeyvalOptions*
 
+%% \nopagecolor is only available for pdf(La)TeX and Lua(La)TeX
+%% but not for dvips, dvipdfm(x), Xe(La)TeX,...
+\def\pagecolourtmpa{0}
+\ifluatex\def\pagecolourtmpa{1}\fi
+\ifpdf\def\pagecolourtmpa{1}\fi
+\def\pagecolourtmpb{1}
+\ifx\pagecolourtmpa\pagecolourtmpb\relax%
+\else%
+  \PackageInfo{pagecolor}{\string\nopagecolor\space is undefined}%
+  \def\pagecolourtmpb{none}%
+  \edef\pagecolourtmpa{\pagecolor@nopagecolor}%
+  \ifx\pagecolourtmpa\pagecolourtmpb%
+    \PackageWarning{pagecolor}{%
+      Option nopagecolor=none requested but \string\nopagecolor\space%
+      unknown:\MessageBreak%
+      By option nopagecolor the "colour" to be used with%
+      \string\nopagecolor\MessageBreak%
+      is set. The current value is "none" (maybe by default),\MessageBreak%
+      but command \string\nopagecolor\space is undefined.\MessageBreak%
+      Therefore the colour cannot be "none".\MessageBreak%
+      Please change the option accordingly!\MessageBreak%
+      As first aid nopagecolor is now set to white\MessageBreak%
+     }%
+    \setkeys{pagecolor}{nopagecolor=white}%
+  \fi%
+  \edef\pagecolourtmpa{\pagecolor@pagecolor}%
+  \ifx\pagecolourtmpa\pagecolourtmpb%
+    \PackageWarning{pagecolor}{%
+      Option pagecolor=none (maybe by default) used,\MessageBreak%
+      but \string\nopagecolor\space is unknown.\MessageBreak%
+      Please use anotheroption value;\MessageBreak%
+      \pagecolor@nopagecolor\space\MessageBreak%
+      will be used now\MessageBreak%
+     }%
+    \setkeys{pagecolor}{pagecolor={\pagecolor@nopagecolor}}%
+  \fi%
+  \@ifundefined{nopagecolor}{%
+     \newcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+   }{\renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+    }%
+\fi%
+
 \let\origpagecolour\pagecolor
 
 \renewcommand{\pagecolor}[1]{\@bsphack%
   \edef\pagecolourtmpa{#1}%
   \def\pagecolourtmpb{none}%
-  \ifx\pagecolourtmpa\pagecolourtmpb
+  \ifx\pagecolourtmpa\pagecolourtmpb\relax%
     \@ifundefined{nopagecolor}{%
-      \PackageError{pagecolor}{%
-        pagecolor=none requested but \string\nopagecolor\space unknown%
-       }{%
-        \string\pagecolor{none} was used, but the command %
+      \PackageWarning{pagecolor}{%
+        pagecolor=none requested but \string\nopagecolor\space%
+        unknown:\MessageBreak%
+        \string\pagecolor{none} was used, but the command\MessageBreak%
         \string\nopagecolor\space is undefined.\MessageBreak%
-        Please use another colour. pagecolor=white will be used now.%
-        \MessageBreak%
-        }%
-      \gdef\thepagecolor{white}%
-      \gdef\thepagecolornone{white}% although it should be "none"
-      \origpagecolour{white}%
+        Please use another colour.\MessageBreak%
+        pagecolor=\pagecolor@nopagecolor \MessageBreak%
+        will be used now\MessageBreak%
+       }%
+      \xdef\thepagecolor{\pagecolor@nopagecolor}%
+      \xdef\thepagecolornone{\pagecolor@nopagecolor}%
+                            % although it should be "none"
+      \origpagecolour{\pagecolor@nopagecolor}%
      }{%
       \nopagecolor%
      }%
@@ -110,49 +163,69 @@
   \@esphack%
 }
 
-\@ifundefined{nopagecolor}{%
-  \PackageWarning{pagecolor}{%
-    \string\nopagecolor\space is undefined.\MessageBreak%
-    (As long as it is neither used anywhere\MessageBreak%
-    \space nor defined later, that will be no problem.)\MessageBreak%
-   }
-  \AtEndDocument{%
-  \@ifundefined{nopagecolor}{% no problem
-    }{%
-    \PackageError{pagecolor}{%
-      \string\nopagecolor\space defined after loading package%
-      \MessageBreak%
-      pagecolor%
-      }{\string\nopagecolor\space was defined after loading the %
-       pagecolor package.\MessageBreak%
-       Either define \string\nopagecolor\space earlier or load the %
-       pagecolor package later.\MessageBreak%
-      }
+
+\AtBeginDocument{%
+  \let\orignopagecolour\nopagecolor\relax%
+  \@ifpackageloaded{crop}{% crop loaded
+    \@ifpackagelater{crop}{2003/05/21}{%
+       % later than 2003/05/20 v1.9 might be OK
+       \PackageWarning{pagecolor}{%
+         \string\nopagecolor\space did not work with package\MessageBreak%
+         crop 2003/05/20 v1.9. A newer version is used, \MessageBreak%
+         which the pagecolor package does not know how to handle.\MessageBreak%
+         Please contact the maintainer of the pagecolor package!\MessageBreak%
+         }%
+       % Let us just hope everything got fixed:
+       \renewcommand{\nopagecolor}{%
+         \xdef\thepagecolor{white}%
+         \xdef\thepagecolornone{none}%
+         \orignopagecolour%
+         % That will not have any effect except when things got fixed!
+         }%
+      }{% else: older package version
+        \PackageWarning{pagecolor}{%
+          \string\nopagecolor\space does not work with\MessageBreak%
+          the used crop package. Using\MessageBreak%
+          \pagecolor@nopagecolor\MessageBreak%
+          as nopagecolor now\MessageBreak%
+          }%
+        \def\pagecolourtmpb{none}%
+        \edef\pagecolourtmpa{\pagecolor@nopagecolor}%
+        \ifx\pagecolourtmpa\pagecolourtmpb%
+          \PackageWarning{pagecolor}{%
+            Option nopagecolor=none requested \MessageBreak%
+            but this does not work with the crop package.\MessageBreak%
+            By option nopagecolor the "colour" to be used with %
+            \string\nopagecolor\MessageBreak%
+            is set. The current value is "none" (maybe by default),%
+            \MessageBreak%
+            but the crop package broke \string\nopagecolor .\MessageBreak%
+            Therefore the colour cannot be "none".\MessageBreak%
+            Please change the option accordingly!\MessageBreak%
+            As first aid nopagecolor is now set to white\MessageBreak%
+           }%
+          \setkeys{pagecolor}{nopagecolor=white}%
+        \fi%
+        \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+       }%
+   }{% crop not loaded
+     \def\pagecolourtmpa{0}
+     \ifluatex\def\pagecolourtmpa{1}\fi
+     \ifpdf\def\pagecolourtmpa{1}\fi
+     \def\pagecolourtmpb{1}
+     \ifx\pagecolourtmpa\pagecolourtmpb\relax%
+       \def\pagecolourtmpa{none}%
+     \else%
+       \def\pagecolourtmpa{\pagecolor@nopagecolor}%
+     \fi%
+     \renewcommand{\nopagecolor}{%
+       \xdef\thepagecolor{white}%
+       \xdef\thepagecolornone{\pagecolourtmpa}%
+       \orignopagecolour%
+       }%
     }%
-  }%
-  }{% \else
-    \let\orignopagecolour\nopagecolor
-    \renewcommand{\nopagecolor}{%
-      \xdef\thepagecolor{white}
-      \xdef\thepagecolornone{none}
-      \orignopagecolour
-      }
   }
 
-\def\pagecolourtmpb{none}
-\ifx\pagecolor@pagecolor\pagecolourtmpb
-  \@ifundefined{nopagecolor}{%
-    \PackageWarning{pagecolor}{%
-      Option pagecolor=none (maybe by default) used,\MessageBreak%
-      but \string\nopagecolor\space is unknown. Please use another%
-      \MessageBreak%
-      option value; white will be used now.\MessageBreak%
-     }
-    \setkeys{pagecolor}{pagecolor=white}%
-  }{% ok
-  }%
-\fi
-
 \pagecolor{\pagecolor@pagecolor}
 
 \newcommand{\newpagecolor}[1]{%
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index ba72dcbd9f2..f9add8e22f4 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -152,7 +152,7 @@ my @TLP_working = qw(
     context-visualcounter
     contour contracard convbkmk
     cooking cookingsymbols cool coollist coolstr coolthms cooltooltips
-    coordsys copyrightbox coseoul
+    coordsys copyedit copyrightbox coseoul
     countriesofeurope counttexruns courier-scaled courseoutline coursepaper
     coverpage covington
     cprotect
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index a96c19a22cf..1027d132f8d 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -169,6 +169,7 @@ depend coolstr
 depend coolthms
 depend cooltooltips
 depend coordsys
+#depend copyedit
 depend copyrightbox
 depend coseoul
 depend counttexruns