summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-08-12 16:09:08 +0000
committerKarl Berry <karl@freefriends.org>2006-08-12 16:09:08 +0000
commitd850ed90db1a9f0924025751583132c068c524ee (patch)
treee4e64e69a6f99d9daf10f9b26e2c0b375d81a21a /Master/texmf-dist/tex
parentc6141418a8cc97b3ebbf324c22c27c20dfd95063 (diff)
pstricks 2006/08/10 update
git-svn-id: svn://tug.org/texlive/trunk@1935 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/Changes22
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex72
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/Changes16
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-node.sty3
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-text.sty3
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstcol.sty23
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty218
7 files changed, 187 insertions, 170 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/Changes b/Master/texmf-dist/tex/generic/pstricks/Changes
index f34f21b2105..7cea60d5129 100644
--- a/Master/texmf-dist/tex/generic/pstricks/Changes
+++ b/Master/texmf-dist/tex/generic/pstricks/Changes
@@ -1,12 +1,9 @@
-pstricks.sty --------
-0.24 2005-08-30 drop support for \scalebox check, it is now renamed
- in pstricks.tex (hv)
-0.23 2005-06-02 Option DIA to prevent a clash with \scalebox (hv)
-0.22 2005-02-25 changes were done in the wrong version
-0.21 2005-02-21 fix problem with \newrgbcolor (RN,hv)
-
-
pstricks.tex --------
+1.14c 2006-04-29 - add option linecap for dashed lines
+1.14b 2006-04-20 - fix a bug in \psset@linetype
+1.14a 2006-02-06 - revert the changes for pslongbox (introduced bug)
+1.14 2005-12-17 - make the color part compatible to color/xcolor
+1.13 2005-12-15 - fix bug of \psdot*
1.12 2005-10-25 - spurious blank for \multirput
- shift only for an absolute length
- add the missing arrows ]-[)-(
@@ -27,12 +24,3 @@ pstricks.tex --------
1.07 2005-05-06 make \nccircle working for counter-clockwise
orientation (hv)
1.06 2005-02-24 fix spurious blank in doublestroke (hv)
-
-
----- pstricks.pro
-1.00 2005-09-19 (hv) move the code for arcs of an ellipse from
- the main pstricks.tex into this pro
-97, patch 7 2005-09-11 (hv) added new fillstyles
-97, patch 6 2005-05-17 (hv) added some helper stuff
- RadtoDeg, DegtoRad, Pi, TwoPi, ATAN
-97, patch 5 2005-03-08 (hv) bugfix for DashLine
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index dc3ea08413c..f9fa9535fcf 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -20,8 +20,8 @@
% See the PSTricks User's Guide for description.
% This uses the header file `pstricks.pro'.
%
-\def\fileversion{1.12}
-\def\filedate{2005/10/25}
+\def\fileversion{1.14c}
+\def\filedate{2006/04/29}
%
\csname PSTricksLoaded\endcsname
\let\PSTricksLoaded\endinput
@@ -309,7 +309,8 @@
\endgroup
\def\@newcolor#1#2{%
\expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}%
-\expandafter\edef\csname color@#1\endcsname{#2}%
+%\expandafter\edef\csname color@#1\endcsname{#2}%
+\expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17
\ignorespaces}
\def\pst@color#1{%
\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}
@@ -328,7 +329,9 @@
setmatrix
moveto
}
-\def\pst@usecolor#1{\csname color@#1\endcsname\space}
+%\def\pst@usecolor#1{\csname color@#1\endcsname\space}% hv 1.14 2005--12-17
+\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space}
+%
\def\newgray#1#2{%
\pst@checknum{#2}\pst@tempg
\@newcolor{#1}{\pst@tempg setgray}%
@@ -379,7 +382,8 @@
%------------ hv 1.10 end -------------------
\def\@none{none}
\def\pst@getcolor#1#2{%
- \@ifundefined{color@#1}%
+% \@ifundefined{color@#1}% hv 1.14 2005-12-17
+ \@ifundefined{\string\color@#1}%
{\@pstrickserr{Color `#1' not defined}\@eha}%
{\edef#2{#1}}%
}
@@ -668,9 +672,12 @@
\psset@dashadjust{true}
\def\tx@DashLine{DashLine }
\def\psls@dashed{%
+%%--------------------------------- hv 2006-04-29 beg ---------------------
+ \psk@linecap\space setlinecap
+%%--------------------------------- hv 2006-04-29 end ---------------------
\ifpsdashadjust
% \psk@dash \pst@linetype\space \tx@DashLine
- \psk@dash \@ifundefined\pst@linetype{2}{\pst@linetype}\space \tx@DashLine
+ \psk@dash \@ifundefined{pst@linetype}{2}{\pst@linetype}\space \tx@DashLine
\else
[ \psk@dash ] 0 setdash stroke
\fi}
@@ -690,6 +697,17 @@
{\edef\pslinestyle{#1}}%
}
\psset@linestyle{solid}
+%%--------------------------------- hv 2006-04-29 beg ---------------------
+\def\psset@linecap#1{%
+ \def\psk@linecap{0}%
+ \ifnum#1>-1
+ \ifnum#1<3
+ \pst@getint{#1}\psk@linecap%
+ \fi\fi%
+}
+\psset{linecap=0}
+%%--------------------------------- hv 2006-04-29 end ---------------------
+
\def\psfs@none{}
\def\psset@fillcolor#1{\pst@getcolor{#1}\psfillcolor}
\psset@fillcolor{white}
@@ -835,7 +853,7 @@
mtrx setmatrix stroke 0 CLW moveto } def
\psk@rbracketlength\space \psk@tbarsize\space \tx@RoundBracketOut
}
-% end of new definitions of the missing arrows ---- hv 1.1.2
+% end of new definitions of the missing arrows ---- hv 1.12
\@namedef{psas@>}{%
false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow
}
@@ -1221,7 +1239,10 @@ grestore}}
%
\def\psset@linetype#1{%
\pst@getint{#1}\pslinetype
- \ifnum\pst@dimg<-3
+%----------------- hv begin 2006-04-20 ------------- patch 1.14b
+ \ifnum\pst@cntg<-3
+% \ifnum\pst@dimg<-3
+%----------------- hv end 2004-05-07 ------------- patch 1.14b
\@pstrickserr{linetype must be greater than -3}\@ehpa
%----------------- hv begin 2004-05-07 ------------- patch 15
% \def\pslinetype{0}%
@@ -1289,7 +1310,8 @@ grestore}}
\def\setcolor#1{%
% ----------------hv begin 2004-05-07-------------------- patch 15
% \@ifundefined{color@#1}{}{\addto@pscode{\use@color{#1}}}}%
- \@ifundefined{color@#1}{}{\addto@pscode{\pst@usecolor{#1}}}}%
+% \@ifundefined{color@#1}{}{\addto@pscode{\pst@usecolor{#1}}}}%
+ \@ifundefined{\string\color@#1}{}{\addto@pscode{\pst@usecolor{#1}}}}% hv 1.14 2005-12-17
% ----------------hv end 2004-05-07--------------------
\def\arrows#1{{\psset@arrows{#1}\pst@addarrowdef}}%
\let\file\pst@rawfile
@@ -1492,6 +1514,9 @@ grestore}}
\def\psdot@i{\@ifnextchar({\psdot@ii}{\psdot@ii(\z@,\z@)}}
\def\psdot@ii(#1){%
\begin@SpecialObj
+% hv modification 1.13 2005-11-28
+ \solid@star
+% hv modification end
\pst@@getcoor{#1}%
\addto@pscode{%
\psk@dotsize
@@ -1871,11 +1896,8 @@ DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED
\egroup%
}
\def\pslongbox#1#2{%
-%--------------- hv begin 2004-05-07 ---------- patch 15
- \@namedef{#1}{\pst@longbox#2\ignorespaces}%
-% \@namedef{#1}{\pst@longbox#2}%
-%--------------- hv end 2004-05-07 ---------- patch 15
- \@namedef{end#1}{\pst@endlongbox}%
+\@namedef{#1}{\pst@longbox#2}%
+\@namedef{end#1}{\pst@endlongbox}%
}
\newdimen\psframesep
\def\psset@framesep#1{\pssetlength\psframesep{#1}}
@@ -2692,16 +2714,16 @@ closepath}%
\kern-\pst@dimh\vbox to\z@{\vss\box#1\kern-\pst@dimg}\hss}}
\def\psset@ref#1{\pst@expandafter\psset@@ref{#1}\@empty,,\@nil}
\def\psset@@ref#1#2,#3,#4\@nil{%
-\def\psk@xref{.5}%
-\def\psk@yref{.5}%
-\let\pst@makesmall\pst@@@makesmall
-\ifx\@empty#3\@empty
-\@nameuse{getref@#1}%
-\@nameuse{getref@#2}%
-\else
-\pst@checknum{#1#2}\psk@xref
-\pst@checknum{#3}\psk@yref
-\fi}
+ \def\psk@xref{.5}%
+ \def\psk@yref{.5}%
+ \let\pst@makesmall\pst@@@makesmall
+ \ifx\@empty#3\@empty
+ \@nameuse{getref@#1}%
+ \@nameuse{getref@#2}%
+ \else
+ \pst@checknum{#1#2}\psk@xref
+ \pst@checknum{#3}\psk@yref
+ \fi}
\def\getref@c{\let\pst@makesmall\pst@@makesmall}
\def\getref@t{\def\psk@yref{1}}
\def\getref@b{\def\psk@yref{0}}
@@ -2997,7 +3019,7 @@ closepath}%
\egroup
\ifdim\wd\pst@hbox=\z@\else
%\@pstrickserr{Extraneous space in the pspicture environment}%
- %{Type \space <return> \space to procede.}%
+ %{Type \space <return> \space to proceed.}%
\fi
\ht\pst@hbox=\pst@dimd
\dp\pst@hbox=-\pst@dimb
diff --git a/Master/texmf-dist/tex/latex/pstricks/Changes b/Master/texmf-dist/tex/latex/pstricks/Changes
index 2439fef4cf3..485f08d8633 100644
--- a/Master/texmf-dist/tex/latex/pstricks/Changes
+++ b/Master/texmf-dist/tex/latex/pstricks/Changes
@@ -1,6 +1,16 @@
pstricks.sty --------
-0.24 2005-08-25 commented the \scalebox macros
-0.23 2005-06-02 Option DIA to prevebt a clash with \scalebox (hv)
-0.22 2005-06-02 Option DIA to prevebt a clash with \scalebox (hv)
+0.32 2006-08-10 message for loading the pro file
+0.31 2005-12-19 one more step to a better color support (hv)
+0.30 2005-11-15 drop test for pstcol
+ fix bug with xcolor (hv)
+0.24 2005-08-30 drop support for \sclabox check, it is now renamed
+ in pstricks.tex (hv)
+0.23 2005-06-02 Option DIA to prevent a clash with \scalebox (hv)
+0.22 2005-02-25 changes were done in the wrong version
0.21 2005-02-21 fix problem with \newrgbcolor (RN,hv)
+pst-node.sty --------
+ 2006-01-01 message for loading the pro file
+
+pst-text.sty --------
+ 2006-01-01 message for loading the pro file
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-node.sty b/Master/texmf-dist/tex/latex/pstricks/pst-node.sty
index 06de912d4c2..5b273bf28a2 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-node.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-node.sty
@@ -1,6 +1,7 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-node}[2004/07/15 package wrapper for pst-node.tex]
+\ProvidesPackage{pst-node}[2006/01/01 package wrapper for pst-node.tex]
\input{pst-node.tex}
\ProvidesFile{pst-node.tex}
[\filedate\space \fileversion\space `pst-node' (tvz)]
+\IfFileExists{pst-node.pro}{\@addtofilelist{pst-node.pro}}{}%
\endinput
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-text.sty b/Master/texmf-dist/tex/latex/pstricks/pst-text.sty
index 80e4381879d..ff0fb9bcfeb 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-text.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-text.sty
@@ -1,6 +1,7 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-text}[2004/07/15 package wrapper for pst-text.tex]
+\ProvidesPackage{pst-text}[2006/01/01 package wrapper for pst-text.tex]
\input{pst-text.tex}
\ProvidesFile{pst-text.tex}
[\filedate\space \fileversion\space `pst-text' (tvz)]
+\IfFileExists{pst-text.pro}{\@addtofilelist{pst-text.pro}}{}%
\endinput
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
new file mode 100644
index 00000000000..3597ebd03ed
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
@@ -0,0 +1,23 @@
+%%
+%% pstcol.sty Copyright (C) 1994--1996 1999 David Carlisle
+%% 2004--2005 Herbert Voss <voss@perce.de>
+%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{pstcol}
+ [2005/11/16 v1.2 LaTeX wrapper for `PSTricks' (RN,HV)]
+
+\DeclareOption*{\PassOptionsToPackage\CurrentOption{color}}
+\ProcessOptions\relax
+
+\PackageWarningNoLine{pstcol}{%
+ ************************************ \MessageBreak
+ The package `pstcol' is obsolet! \MessageBreak
+ You should use `pstricks' directly: \MessageBreak
+ \@spaces\string\usepackage{pstricks}\MessageBreak
+ ************************************}
+
+\RequirePackage[noxcolor]{pstricks}
+
+\endinput
+%%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 69391b99323..d5f6287bfd0 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -1,11 +1,11 @@
%%
-%% This is file `pstricks.sty' based on the code of `pstcol.sty'.
+%% This is file `pstricks.sty'.
%%
%% IMPORTANT NOTICE:
%%
%% pstricks.sty Copyright (C) 1997 Timothy Van Zandt
%% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle
-%% pstricks.sty Copyright (C) 2004-2005 Herbert Voss <voss@perce.de>
+%% pstricks.sty Copyright (C) 2004-2006 Herbert Voss <voss@perce.de>
%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -16,8 +16,8 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pstricks}
- [2005/10/07 v0.25 LaTeX wrapper for `PSTricks' (RN,HV)]
-
+ [2006/08/10 v0.32 LaTeX wrapper for `PSTricks' (RN,HV)]
+%
\DeclareOption{plain}{%
\input{pstricks.tex}
\ProvidesFile{pstricks.tex}
@@ -28,15 +28,13 @@
\ProcessOptions\relax
-\@ifpackageloaded{pstcol}{}{\let\saved@gray\color@gray}
-
\@ifundefined{PSTricksLoaded}
{%
\let\saved@scalebox\scalebox
\input{pstricks.tex}
\ProvidesFile{pstricks.tex}
[\filedate\space v\fileversion\space `PSTricks' (tvz)]
- \@ifundefined{psscalebox}%
+ \IfFileExists{pstricks.pro}{\@addtofilelist{pstricks.pro}}{}%
{%
\let\psscalebox=\scalebox
\let\psscaleboxto=\scaleboxto
@@ -44,133 +42,107 @@
\let\scalebox\saved@scalebox
}{}
-\def\pst@LaTeX@Setup{%
+\IfFileExists{xcolor.sty}{%
+ \def\pst@ColorPackage{xcolor}
\PassOptionsToPackage{override}{xcolor}
+}{\def\pst@ColorPackage{color}}%
+
+\newif\ifpst@DIA\pst@DIAfalse
+\DeclareOption{DIA}{\pst@DIAtrue}
+\DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
+\DeclareOption*{%
+ \PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
+\ProcessOptions\relax
+
+\RequirePackage{\pst@ColorPackage}
+
+\@ifpackageloaded{xcolor}{%
+ \@ifpackagelater{xcolor}{2004/05/02}%
+ {%
+ \let\pst@getcolor\XC@getcolor
+ \let\pst@usecolor\XC@usecolor
+ }
+ {%
+ \PackageError{pstricks}{%
+ *************************************************\MessageBreak
+ * Your Version of `xcolor.sty' is too old!\MessageBreak
+ * You need the version from 2004/05/02 or newer\MessageBreak
+ * or use: \string\usepackage[noxcolor]{pstricks}\MessageBreak
+ *************************************************}{}%
+ }%
+}{%
+ \def\pst@getcolor#1#2{%
+ \@ifundefined{\string\color@#1}%
+ {\@pstrickserr{Color `#1' not defined}\@eha}%
+ {\edef#2{#1}}}%
+ \def\pst@usecolor#1{\expandafter\expandafter\expandafter\c@lor@to@ps%
+ \csname\string\color@#1\endcsname\@@\space}%
+ \definecolor{darkgray}{gray}{.25}
+ \definecolor{gray}{gray}{.5}
+ \definecolor{lightgray}{gray}{.75}
+}%
%
- \IfFileExists{xcolor.sty}%
- {\def\pst@ColorPackage{xcolor}}{\def\pst@ColorPackage{color}}%
+\definecolor{gradbegin}{rgb}{0,1,1}
+\definecolor{gradend}{rgb}{0,.1,.95}
%
- \newif\ifpst@DIA\pst@DIAfalse
- \DeclareOption{DIA}{\pst@DIAtrue}
- \DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
- \DeclareOption*{\PassOptionsToPackage\CurrentOption
- {\pst@ColorPackage}}
- \ProcessOptions\relax
-
- \RequirePackage{\pst@ColorPackage}
+\@ifundefined{xglobal}%
+ {\def\xglobal#1#2#3#4% UK 2005-11-17
+ {#1{#2}{#3}{#4}%
+ \expandafter\global\expandafter\let\csname\string\color@#2%
+ \expandafter\endcsname\csname\string\color@#2\endcsname}}{}%
%
- \@ifpackageloaded{xcolor}{%
- \@ifpackagelater{xcolor}{2004/05/02}%
- {%
- \let\pst@getcolor\XC@getcolor
- \let\pst@usecolor\XC@usecolor
- }
- {%
- \PackageError{pstricks}{%
- *************************************************\MessageBreak
- * Your Version of `xcolor.sty' is too old!\MessageBreak
- * You need the version from 2004/05/02 or newer\MessageBreak
- * or use: \string\usepackage[noxcolor]{pstricks}\MessageBreak
- *************************************************}{}%
- }%
- }{%
- \def\pst@getcolor##1##2{%
- \@ifundefined{\string\color@##1}%
- {\@pstrickserr{Color `##1' not defined}\@eha}%
- {\edef##2{##1}}}%
- \def\pst@usecolor##1{\expandafter\expandafter\expandafter\c@lor@to@ps%
- \csname\string\color@##1\endcsname\@@\space}%
- \definecolor{darkgray}{gray}{.25}
- \definecolor{gray}{gray}{.5}
- \definecolor{lightgray}{gray}{.75}
- }%
+\def\newgray#1{%
+ \expandafter\gdef\csname #1\endcsname{\color{#1}}% HV 2004-03-31
+ \xglobal\definecolor{#1}{gray}}%
%
- \definecolor{gradbegin}{rgb}{0,1,1}
- \definecolor{gradend}{rgb}{0,.1,.95}
+\def\newrgbcolor#1#2{%
+ \expandafter\gdef\csname #1\endcsname{\color{#1}}% HV 2004-03-31
+ \edef\@tempa{\noexpand\newrgbcolorx{#1}#2\noexpand\@@}\@tempa}%
+\def\newrgbcolorx#1#2 #3 #4\@@{%
+ \xglobal\definecolor{#1}{rgb}{#2,#3,#4}}
%
- \@ifpackageloaded{pstcol}{%
- \psset@bordercolor{white}
- \psset@doublecolor{white}
- \psset@linecolor{black}
- \psset@fillcolor{white}
- \psset@hatchcolor{black}
- \psset@gridcolor{black}
- \psset@gridlabelcolor{black}
- \psset@shadowcolor{darkgray}
- \psset@subgridcolor{gray}
- }{}%
+\def\newcmykcolor#1#2{%
+ \expandafter\gdef\csname #1\endcsname{\color{#1}}% HV 2004-03-31
+ \edef\@tempa{\noexpand\newcmykcolorx{#1}#2\noexpand\@@}\@tempa}
+\def\newcmykcolorx#1#2 #3 #4 #5\@@{%
+ \xglobal\definecolor{#1}{cmyk}{#2,#3,#4,#5}}
%
- \def\newgray##1##2{%
- \expandafter\gdef\csname ##1\endcsname{\color{##1}}% HV 2004-03-31
- \edef\@tempa{\noexpand\definecolor{##1}{gray}{##2}}\@tempa%
- \expandafter\xdef\csname color@##1\endcsname{##2 setgray}% HA 2005-02-24
- }%
- \def\newrgbcolor##1##2{%
- \expandafter\gdef\csname ##1\endcsname{\color{##1}}% HV 2004-03-31
- \edef\@tempa{\noexpand\newrgbcolorx{##1}##2\noexpand\@@}\@tempa
- \expandafter\xdef\csname color@##1\endcsname{##2 setrgbcolor}% HA 2005-02-24
- }
- \def\newrgbcolorx##1##2 ##3 ##4\@@{%
- \definecolor{##1}{rgb}{##2,##3,##4}}
- \def\newcmykcolor##1##2{%
- \expandafter\gdef\csname ##1\endcsname{\color{##1}}% HV 2004-03-31
- \edef\@tempa{\noexpand\newcmykcolorx{##1}##2\noexpand\@@}\@tempa
- \expandafter\xdef\csname color@##1\endcsname{##2 setcmykcolor}% HA 2005-02-24
- }%
- \def\newcmykcolorx##1##2 ##3 ##4 ##5\@@{%
- \definecolor{##1}{cmyk}{##2,##3,##4,##5}}
- \def\newhsbcolor##1##2{%
- \expandafter\gdef\csname ##1\endcsname{\color{##1}}% HV 2004-03-31
- \edef\@tempa{\noexpand\newhsbcolorx{##1}##2\noexpand\@@}\@tempa
- \expandafter\xdef\csname color@##1\endcsname{##2 sethsbcolor}% HA 2005-02-24
- }%
- \def\newhsbcolorx##1##2 ##3 ##4\@@{%
- \definecolor{##1}{hsb}{##2,##3,##4}}%
+\def\newhsbcolor#1#2{%
+ \expandafter\gdef\csname #1\endcsname{\color{#1}}% HV 2004-03-31
+ \edef\@tempa{\noexpand\newhsbcolorx{#1}#2\noexpand\@@}\@tempa}
+\def\newhsbcolorx#1#2 #3 #4\@@{%
+ \xglobal\definecolor{#1}{hsb}{#2,#3,#4}}
%
- \renewcommand\black{\color{black}}
- \renewcommand\darkgray{\color{darkgray}}
- \renewcommand\gray{\color{gray}}
- \renewcommand\lightgray{\color{lightgray}}
- \renewcommand\white{\color{white}}
- \renewcommand\blue{\color{blue}}
- \renewcommand\red{\color{red}}
- \renewcommand\green{\color{green}}
- \renewcommand\yellow{\color{yellow}}
- \renewcommand\magenta{\color{magenta}}
- \renewcommand\cyan{\color{cyan}}
+\definecolor{black}{gray}{0}
+\definecolor{darkgray}{gray}{.25}
+\definecolor{gray}{gray}{.5}
+\definecolor{lightgray}{gray}{.75}
+\definecolor{white}{gray}{1}
+\definecolor{red}{rgb}{1,0,0}
+\definecolor{green}{rgb}{0,1,0}
+\definecolor{blue}{rgb}{0,0,1}
+%\definecolor{yellow}{rgb}{1,1,0}
+%\definecolor{cyan}{rgb}{0,1,1}
+%\definecolor{magenta}{rgb}{1,0,1}
+\definecolor{yellow}{cmyk}{0,0,1,0}
+\definecolor{cyan}{cmyk}{1,0,0,0}
+\definecolor{magenta}{cmyk}{0,1,0,0}
+%
+\renewcommand*\black{\color{black}}
+\renewcommand*\darkgray{\color{darkgray}}
+\renewcommand*\gray{\color{gray}}
+\renewcommand*\lightgray{\color{lightgray}}
+\renewcommand*\white{\color{white}}
+\renewcommand*\blue{\color{blue}}
+\renewcommand*\red{\color{red}}
+\renewcommand*\green{\color{green}}
+\renewcommand*\yellow{\color{yellow}}
+\renewcommand*\magenta{\color{magenta}}
+\renewcommand*\cyan{\color{cyan}}
%
- \let\pst@LaTeX@Setup=\relax%
-}
-
-\@ifpackageloaded{pstcol}% Is our package called from `pstcol'?
-{%
-% We use our own definitions even if `pstcol' is in the first
-% place (adding to pstcol's \AtEndOfPackage hook). RN 2004-05-02
- \expandafter\g@addto@macro\csname pstcol.sty-h@@k\endcsname{%
- \pst@LaTeX@Setup}%
-}%
-{%
- \let\color@gray\saved@gray%
-% Dummy version entry for `pstcol' to prevent forther loading. RN 2004-04-22
- \@namedef{ver@pstcol.sty}{1938/01/10}% The birthday of Don Knuth
- \PassOptionsToPackage{usenames}{color}
- \pst@LaTeX@Setup%
-}
-
\AtBeginDocument{%
- \@ifpackageloaded{pstcol}%
- {%
- \@ifpackagelater{pstcol}{1938/01/11}{% Really loaded? RN 2004-04-22
- \PackageWarningNoLine{pstricks}{%
- *************************************************\MessageBreak
- * The installed version of `pstricks.sty' doesn't\MessageBreak
- * need `pstcol' any more. You should write only:\MessageBreak
- * \@spaces\string\usepackage{pstricks}\MessageBreak
- *************************************************}
- }{\expandafter\let\csname ver@pstcol.sty\endcsname\relax}%
- }{}%
-% \ifpst@DIA\else\@ifundefined{saved@scalebox}{}{\let\scalebox=\saved@scalebox}\fi%
\let\pst@endcolor=\relax%
+% \let\pst@color=\relax%
% LaTeX used `\color@endgroup' instead. RN 2004-05-06
}
%