summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-12-15 00:23:34 +0000
committerKarl Berry <karl@freefriends.org>2007-12-15 00:23:34 +0000
commit116405a01899ba783a14653896d02888e298fbb1 (patch)
treea18817a449117e864d52b1cf21f5be0eac3ed7cb /Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
parent61cc3ba9dfd27cde051a486dad06940dfff0e699 (diff)
oberdiek: luacolor1.0 luatex1.0 ... (14dec07)
git-svn-id: svn://tug.org/texlive/trunk@5785 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx90
1 files changed, 79 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
index 90ad5d5dd49..59bd8fc1ba3 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
@@ -17,7 +17,7 @@
% This work consists of the main source file pdfcol.dtx
% and the derived files
% pdfcol.sty, pdfcol.pdf, pdfcol.ins, pdfcol.drv, pdfcol-test1.tex,
-% pdfcol-test2.tex, pdfcol-test3.tex.
+% pdfcol-test2.tex, pdfcol-test3.tex, pdfcol-test4.tex.
%
% Distribution:
% CTAN:macros/latex/contrib/oberdiek/pdfcol.dtx
@@ -55,6 +55,7 @@
% TDS:doc/latex/oberdiek/test/pdfcol-test1.tex
% TDS:doc/latex/oberdiek/test/pdfcol-test2.tex
% TDS:doc/latex/oberdiek/test/pdfcol-test3.tex
+% TDS:doc/latex/oberdiek/test/pdfcol-test4.tex
% TDS:source/latex/oberdiek/pdfcol.dtx
%
%<*ignore>
@@ -70,7 +71,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdfcol 2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)}
+\Msg{* Package: pdfcol 2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -98,7 +99,7 @@ This Current Maintainer of this work is Heiko Oberdiek.
This work consists of the main source file pdfcol.dtx
and the derived files
pdfcol.sty, pdfcol.pdf, pdfcol.ins, pdfcol.drv, pdfcol-test1.tex,
- pdfcol-test2.tex, pdfcol-test3.tex.
+ pdfcol-test2.tex, pdfcol-test3.tex, pdfcol-test4.tex.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -112,6 +113,7 @@ and the derived files
\file{pdfcol-test1.tex}{\from{pdfcol.dtx}{test1}}%
\file{pdfcol-test2.tex}{\from{pdfcol.dtx}{test2}}%
\file{pdfcol-test3.tex}{\from{pdfcol.dtx}{test3}}%
+ \file{pdfcol-test4.tex}{\from{pdfcol.dtx}{test4}}%
}
\obeyspaces
@@ -141,7 +143,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdfcol.drv}%
- [2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)]%
+ [2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2007/11/11]
\begin{document}
@@ -150,7 +152,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{589}
+% \CheckSum{640}
%
% \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
@@ -171,7 +173,7 @@ and the derived files
% \GetFileInfo{pdfcol.drv}
%
% \title{The \xpackage{pdfcol} package}
-% \date{2007/09/09 v1.0}
+% \date{2007/12/12 v1.2}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -260,6 +262,11 @@ and the derived files
% of package \xpackage{color} (or \xpackage{xcolor}) now uses the
% new color stack with name \meta{name}.
%
+% \begin{declcs}{pdfcolSetCurrentColor}
+% \end{declcs}
+% Macro \cs{pdfcolSetCurrentColor} replaces the topmost
+% entry of the stack by the current color (\cs{current@color}).
+%
% \begin{declcs}{pdfcolSetCurrent} \M{name}
% \end{declcs}
% Macro \cs{pdfcolSetCurrent} sets the color that is read in
@@ -339,7 +346,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdfcol.sty\endcsname
\ProvidesPackage{pdfcol}%
- [2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)]
+ [2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)]
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -401,12 +408,24 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Check package \xpackage{luacolor}}
+%
+% \begin{macrocode}
+\newif\ifPDFCOL@luacolor
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname ver@luacolor.sty\endcsname\relax
+ \PDFCOL@luacolorfalse
+\else
+ \PDFCOL@luacolortrue
+\fi
+% \end{macrocode}
+%
% \subsubsection{Check PDF mode}
%
% \begin{macrocode}
\PDFCOL@RequirePackage{infwarerr}[2007/09/09]
\PDFCOL@RequirePackage{ifpdf}[2007/09/09]
-\ifpdf
+\ifcase\ifpdf\ifPDFCOL@luacolor 1\fi\else 1\fi0 %
\def\PDFCOL@Message{%
\@PackageWarningNoLine{pdfcol}%
}%
@@ -416,7 +435,12 @@ and the derived files
\@PackageInfoNoLine{pdfcol}%
}%
\PDFCOL@Message{%
- Interface disabled because of missing PDF mode of pdfTeX%
+ Interface disabled because of %
+ \ifPDFCOL@luacolor
+ package `luacolor'%
+ \else
+ missing PDF mode of pdfTeX%
+ \fi
}%
\fi
% \end{macrocode}
@@ -567,6 +591,14 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\pdfcolSetCurrentColor}
+% \begin{macrocode}
+ \def\pdfcolSetCurrentColor{%
+ \pdfcolorstack\@pdfcolorstack set{\current@color}%
+ }%
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\pdfcolSetCurrent}
% \begin{macrocode}
\def\pdfcolSetCurrent#1{%
@@ -650,6 +682,14 @@ and the derived files
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\pdfcolSetCurrentColor}
+% \begin{macrocode}
+ \def\pdfcolSetCurrentColor{%
+ \PDFCOL@Disabled
+ }%
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\pdfcolSetCurrent}
% \begin{macrocode}
\def\pdfcolSetCurrent#1{%
@@ -729,6 +769,9 @@ and the derived files
\advance\count@ 1 %
\repeat
}
+\expandafter\ifx\csname LoadCommand\endcsname\relax
+ \def\LoadCommand{\input pdfcol.sty\relax}%
+\fi
\def\Test{%
\RangeCatcodeInvalid{0}{47}%
\RangeCatcodeInvalid{58}{64}%
@@ -744,7 +787,7 @@ and the derived files
\catcode`\%=14 %
\catcode`\ =10 %
\catcode13=5 %
- \input pdfcol.sty\relax
+ \LoadCommand
\RestoreCatcodes
}
\Test
@@ -762,7 +805,7 @@ and the derived files
\NeedsTeXFormat{LaTeX2e}
\nofiles
\documentclass{article}
-\usepackage{pdfcol}[2007/09/09]
+\usepackage{pdfcol}[2007/12/12]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -801,6 +844,22 @@ and the derived files
%</test2|test3>
% \end{macrocode}
%
+% \subsection{Detection of package \xpackage{luacolor}}
+%
+% \begin{macrocode}
+%<*test4>
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{article}
+\usepackage{luacolor}
+\usepackage{pdfcol}
+\makeatletter
+\ifpdfcolAvailable
+ \@latex@error{Detection of package luacolor failed}%
+\fi
+\csname @@end\endcsname
+%</test4>
+% \end{macrocode}
+%
% \section{Installation}
%
% \subsection{Download}
@@ -865,6 +924,7 @@ and the derived files
% test/pdfcol-test1.tex & doc/latex/oberdiek/test/pdfcol-test1.tex\\
% test/pdfcol-test2.tex & doc/latex/oberdiek/test/pdfcol-test2.tex\\
% test/pdfcol-test3.tex & doc/latex/oberdiek/test/pdfcol-test3.tex\\
+% test/pdfcol-test4.tex & doc/latex/oberdiek/test/pdfcol-test4.tex\\
% pdfcol.dtx & source/latex/oberdiek/pdfcol.dtx\\
% \end{tabular}^^A
% }^^A
@@ -990,6 +1050,14 @@ and the derived files
% \item
% First version.
% \end{Version}
+% \begin{Version}{2007/12/09 v1.1}
+% \item
+% \cs{pdfcolSetCurrentColor} added.
+% \end{Version}
+% \begin{Version}{2007/12/12 v1.2}
+% \item
+% Detection for package \xpackage{luacolor} added.
+% \end{Version}
% \end{History}
%
% \PrintIndex