diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/pagecolor/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.pdf | bin | 85390 -> 85390 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.tex | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/pagecolor/pagecolor.pdf | bin | 304734 -> 306361 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/pagecolor/pagecolor.drv | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx | 90 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/pagecolor/pagecolor.ins | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty | 40 |
8 files changed, 88 insertions, 62 deletions
diff --git a/Master/texmf-dist/doc/latex/pagecolor/README b/Master/texmf-dist/doc/latex/pagecolor/README index 5d9bb71b6b6..7254fc63cd9 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/01, v1.0d +README for pagecolor package, 2012/02/23, v1.0e TABLE OF CONTENTS diff --git a/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.pdf b/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.pdf Binary files differindex 0fbe9179eb4..2932eda285c 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 0ed479b3d22..b9864ee665e 100644 --- a/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.tex +++ b/Master/texmf-dist/doc/latex/pagecolor/pagecolor-example.tex @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pagecolor -%% Version: 2012/02/01 v1.0d +%% Version: 2012/02/23 v1.0e %% %% Copyright (C) 2011 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> @@ -54,11 +54,11 @@ H.-Martin Muench},% pdfview=Fit,pdfstartview=Fit,% pdfpagelayout=SinglePage% -]{hyperref}[2011/12/04]% v6.82m +]{hyperref}[2012/02/06]% v6.82o \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/01]% v1.0d +\usepackage[pagecolor={LightGoldenrod1}]{pagecolor}[2012/02/23]% v1.0e \usepackage{afterpage}[1995/10/27]% v1.08 % The afterpage package is generally not needed, @@ -76,7 +76,7 @@ \section*{Example for pagecolor} This example demonstrates the use of package\newline -\textsf{pagecolor}, v1.0d as of 2012/02/01 (HMM).\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 diff --git a/Master/texmf-dist/doc/latex/pagecolor/pagecolor.pdf b/Master/texmf-dist/doc/latex/pagecolor/pagecolor.pdf Binary files differindex e320c292ba4..f729de8dde7 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 14eed9f93fb..6cfb2909d3e 100644 --- a/Master/texmf-dist/source/latex/pagecolor/pagecolor.drv +++ b/Master/texmf-dist/source/latex/pagecolor/pagecolor.drv @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pagecolor -%% Version: 2012/02/01 v1.0d +%% Version: 2012/02/23 v1.0e %% %% Copyright (C) 2011 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesFile{pagecolor.drv}% - [2012/02/01 v1.0d Provides thepagecolor (HMM)] + [2012/02/23 v1.0e Provides thepagecolor (HMM)] \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2011/02/04]% v0.21 %% pagecolor may work with earlier versions of LaTeX2e and those diff --git a/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx b/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx index e7c30e72342..d96237e9847 100644 --- a/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx +++ b/Master/texmf-dist/source/latex/pagecolor/pagecolor.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: pagecolor.dtx -% Version: 2012/02/01 v1.0d +% Version: 2012/02/23 v1.0e % % Copyright (C) 2011 - 2012 by % H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> @@ -84,7 +84,7 @@ \input docstrip.tex \Msg{*****************************************************************} \Msg{* Installation } -\Msg{* Package: pagecolor 2012/02/01 v1.0d Provides thepagecolor (HMM)} +\Msg{* Package: pagecolor 2012/02/23 v1.0e Provides thepagecolor (HMM)} \Msg{*****************************************************************} \keepsilent @@ -96,7 +96,7 @@ This is a generated file. Project: pagecolor -Version: 2012/02/01 v1.0d +Version: 2012/02/23 v1.0e Copyright (C) 2011 - 2012 by H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> @@ -181,7 +181,7 @@ the README, and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesFile{pagecolor.drv}% - [2012/02/01 v1.0d Provides thepagecolor (HMM)] + [2012/02/23 v1.0e Provides thepagecolor (HMM)] \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2011/02/04]% v0.21 %% pagecolor may work with earlier versions of LaTeX2e and those @@ -217,7 +217,7 @@ the README, and the derived files % % \fi % -% \CheckSum{134} +% \CheckSum{137} % % \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 @@ -268,7 +268,7 @@ the README, and the derived files % \DoNotIndex{\DeclareStringOption} % % \title{The \xpackage{pagecolor} package} -% \date{2012/02/01 v1.0d} +% \date{2012/02/23 v1.0e} % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}} % % \maketitle @@ -344,7 +344,7 @@ the README, and the derived files % package\\ % |\newpagecolor{<|\textit{some colour} |>}| and |\restorepagecolor| % are provided:\\ -% |\newpagecolor{<|\textit{some colour} |>}| will execute +% |\newpagecolor{<|\textit{some colour} |>}| will execute % |\pagecolor{<|\textit{some colour} |>}| and remember the page colour used before. % |\restorecolor| (without argument) restores the page colour to the one used before % use of the |\newpagecolor{...}| command. When you want to change the colour for @@ -423,11 +423,11 @@ the README, and the derived files H.-Martin Muench},% pdfview=Fit,pdfstartview=Fit,% pdfpagelayout=SinglePage% -]{hyperref}[2011/12/04]% v6.82m +]{hyperref}[2012/02/06]% v6.82o \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/01]% v1.0d +\usepackage[pagecolor={LightGoldenrod1}]{pagecolor}[2012/02/23]% v1.0e \usepackage{afterpage}[1995/10/27]% v1.08 % The afterpage package is generally not needed, @@ -445,7 +445,7 @@ the README, and the derived files \section*{Example for pagecolor} This example demonstrates the use of package\newline -\textsf{pagecolor}, v1.0d as of 2012/02/01 (HMM).\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 @@ -538,7 +538,7 @@ in mid-sentence! % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[2011/06/27] -\ProvidesPackage{pagecolor}[2012/02/01 v1.0d +\ProvidesPackage{pagecolor}[2012/02/23 v1.0e Provides thepagecolor (HMM)] % \end{macrocode} % @@ -559,22 +559,30 @@ in mid-sentence! % % \begin{macrocode} %% \RequirePackage{ either color or xcolor }: -\@ifpackageloaded{color}{% - \RequirePackage{color}[2005/11/14]% v1.0j - }{% \else - \@ifpackageloaded{xcolor}{% OK +\@ifpackageloaded{xcolor}{% xcolor loaded + \@ifpackagelater{xcolor}{2007/01/21}{% + % 2007/01/21, v2.11, or even more recent: OK + }{% 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 not loaded + \@ifpackageloaded{color}{% + \RequirePackage{color}[2005/11/14]% v1.0j }{% \else - \PackageWarning{pagecolor}{% - The pagecolor package must be loaded after either\MessageBreak% - package color or after package xcolor (at your\MessageBreak% - option). Neither package was loaded before package\MessageBreak% - pagecolor. Loading of package xcolor will now be\MessageBreak% - tried automatically.\MessageBreak% - When the pagecolor package is used with option\MessageBreak% - pagecolor using a colour requiring e. g. x11names\MessageBreak% - option for xcolor package, this will not work!\MessageBreak% + \PackageWarning{pagecolor}{% + The pagecolor package must be loaded after either\MessageBreak% + package color or after package xcolor (at your\MessageBreak% + option). Neither package was loaded before package\MessageBreak% + pagecolor. Loading of package xcolor will now be\MessageBreak% + tried automatically.\MessageBreak% + When the pagecolor package is used with option\MessageBreak% + pagecolor using a colour requiring e. g. x11names\MessageBreak% + option for xcolor package, this will not work!\MessageBreak% } - }% \fi + }% \fi \RequirePackage{xcolor}[2007/01/21]% v2.11 }% \fi % \end{macrocode} @@ -607,12 +615,11 @@ in mid-sentence! % \end{macrocode} % +% \begin{macro}{\pagecolor} % before we redefine it to include a definition of |\thepagecolor| % and \linebreak % |\thepagecolornone|: % -% \pagebreak -% % \begin{macrocode} \renewcommand{\pagecolor}[1]{\@bsphack% \edef\pagecolourtmpa{#1}% @@ -642,6 +649,7 @@ 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 @@ -723,9 +731,10 @@ in mid-sentence! % is changed, |\thepagecolor| and |\thepagecolornone| are changed % accordingly. % -% \bigskip +% \newpage % -% There have been requests (via e-mail and at +% \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 % (or two) page(s) only, similar to |\newgeometry| and |\restoregeometry| of the % \xpackage{geometry} package (\url{http://ctan.org/pkg/geometry}). Therefore @@ -739,20 +748,21 @@ in mid-sentence! } % \end{macrocode} +% \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} \newcommand{\restorepagecolor}{\pagecolor{\pagecolourtmpc}} % \end{macrocode} +% \end{macro} % % |\restorecolor| (without argument) restores the page colour to the one used before % use of the |\newpagecolor{...}| command. % -% \pagebreak -% % \begin{macrocode} \gdef\pagecolourtmpc{\thepagecolor} @@ -769,7 +779,7 @@ in mid-sentence! %</package> % \end{macrocode} % -% \bigskip +% \newpage % % \section{Installation} % @@ -803,7 +813,7 @@ in mid-sentence! % and either % \begin{description} % \item[-] package \xpackage{color}, 2005/11/14, v1.0j, -% \url{http://ctan.org/pkg/color} (from the +% \url{http://ctan.org/pkg/color} (from the\\ % \xpackage{graphics} package bundle) % \end{description} % or @@ -819,7 +829,7 @@ in mid-sentence! % \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/01, v1.0d, +% \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, @@ -874,7 +884,7 @@ in mid-sentence! % \item[\CTAN{macros/latex/contrib/pagecolor/README}]\hspace*{0.1cm} \\ % The README file. % \end{description} -% There is also an undolabl.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. @@ -1058,6 +1068,14 @@ in mid-sentence! % \item New commands: |\newpagecolor{...}|, |\restorepagecolor|. % \item Update of documentation, README, and \xfile{dtx} internals. % \end{Version} +% \begin{Version}{2012/02/23 v1.0e} +% \item Fixed an error in the documentation. +% \item Check for loading of \xpackage{color} or \xpackage{xcolor} package +% and their versions has been changed, because \xpackage{xcolor} sets\\ +% |\@namedef{ver@color.sty}{1999/02/16}|\\ +% which gave a warning about old \xpackage{color} package even if a new +% version was used. +% \end{Version} % \end{History} % % \bigskip diff --git a/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins b/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins index e7e59424ba8..240cab04b05 100644 --- a/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins +++ b/Master/texmf-dist/source/latex/pagecolor/pagecolor.ins @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pagecolor -%% Version: 2012/02/01 v1.0d +%% Version: 2012/02/23 v1.0e %% %% Copyright (C) 2011 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> @@ -42,7 +42,7 @@ \input docstrip.tex \Msg{*****************************************************************} \Msg{* Installation } -\Msg{* Package: pagecolor 2012/02/01 v1.0d Provides thepagecolor (HMM)} +\Msg{* Package: pagecolor 2012/02/23 v1.0e Provides thepagecolor (HMM)} \Msg{*****************************************************************} \keepsilent @@ -54,7 +54,7 @@ This is a generated file. Project: pagecolor -Version: 2012/02/01 v1.0d +Version: 2012/02/23 v1.0e Copyright (C) 2011 - 2012 by H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> diff --git a/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty b/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty index 1e8b659687a..81b5fe7ee6b 100644 --- a/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty +++ b/Master/texmf-dist/tex/latex/pagecolor/pagecolor.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pagecolor -%% Version: 2012/02/01 v1.0d +%% Version: 2012/02/23 v1.0e %% %% Copyright (C) 2011 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> @@ -40,28 +40,36 @@ %% pagecolor-example.tex, pagecolor-example.pdf. %% \NeedsTeXFormat{LaTeX2e}[2011/06/27] -\ProvidesPackage{pagecolor}[2012/02/01 v1.0d +\ProvidesPackage{pagecolor}[2012/02/23 v1.0e Provides thepagecolor (HMM)] %% Provides the \thepagecolor, \thepagecolornone, \newpagecolor{...}, %% and \restorepagecolor commands. \RequirePackage{kvoptions}[2010/12/23]% v3.10 %% \RequirePackage{ either color or xcolor }: -\@ifpackageloaded{color}{% - \RequirePackage{color}[2005/11/14]% v1.0j - }{% \else - \@ifpackageloaded{xcolor}{% OK +\@ifpackageloaded{xcolor}{% xcolor loaded + \@ifpackagelater{xcolor}{2007/01/21}{% + % 2007/01/21, v2.11, or even more recent: OK + }{% 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 not loaded + \@ifpackageloaded{color}{% + \RequirePackage{color}[2005/11/14]% v1.0j }{% \else - \PackageWarning{pagecolor}{% - The pagecolor package must be loaded after either\MessageBreak% - package color or after package xcolor (at your\MessageBreak% - option). Neither package was loaded before package\MessageBreak% - pagecolor. Loading of package xcolor will now be\MessageBreak% - tried automatically.\MessageBreak% - When the pagecolor package is used with option\MessageBreak% - pagecolor using a colour requiring e. g. x11names\MessageBreak% - option for xcolor package, this will not work!\MessageBreak% + \PackageWarning{pagecolor}{% + The pagecolor package must be loaded after either\MessageBreak% + package color or after package xcolor (at your\MessageBreak% + option). Neither package was loaded before package\MessageBreak% + pagecolor. Loading of package xcolor will now be\MessageBreak% + tried automatically.\MessageBreak% + When the pagecolor package is used with option\MessageBreak% + pagecolor using a colour requiring e. g. x11names\MessageBreak% + option for xcolor package, this will not work!\MessageBreak% } - }% \fi + }% \fi \RequirePackage{xcolor}[2007/01/21]% v2.11 }% \fi %% pagecolor may work with earlier versions of LaTeX and the |