diff options
author | Norbert Preining <preining@logic.at> | 2006-10-04 08:43:01 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2006-10-04 08:43:01 +0000 |
commit | ba9472aebfed07843bc4faa00c7b96bc86194691 (patch) | |
tree | 4a952a012e2f1663beaac6384dec265fb50dd361 /Master/texmf-dist/tex/generic | |
parent | a88bdfe70c672cfced299babf0a54881a916bcca (diff) |
Fix ctan2tds for pgf installation
comment powerdot-doc-vn in tpm-ctan-check, it always breaks
Update of the following packages:
labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj
pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref
muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo
git-svn-id: svn://tug.org/texlive/trunk@2240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
16 files changed, 626 insertions, 356 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex index 8e6e97b8017..d97d742934e 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex @@ -1,4 +1,4 @@ -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaselayers.code.tex,v 1.1 2005/08/13 18:59:56 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaselayers.code.tex,v 1.2 2005/10/24 15:14:48 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -17,10 +17,10 @@ % \pgfdeclarelayer{background} \def\pgfdeclarelayer#1{% - \expandafter\newbox\csname pgf@layerbox@#1\endcsname% - \expandafter\newbox\csname pgf@layerboxsaved@#1\endcsname% + \expandafter\pgf@newbox\csname pgf@layerbox@#1\endcsname% + \expandafter\pgf@newbox\csname pgf@layerboxsaved@#1\endcsname% } - +\let\pgf@newbox=\newbox % avoid plain TeX outer problem % Sets the layers that compose the picture % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex index 7403f2a7b8e..00169368ae1 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex @@ -1,4 +1,4 @@ -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbasesnakes.code.tex,v 1.5 2005/10/10 08:38:29 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbasesnakes.code.tex,v 1.6 2005/10/25 08:18:14 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -14,7 +14,7 @@ % % #1 = snake name % #1 = initial state -% #3= states of the snake +% #3 = states of the snake % % % This command declares a new snake for later use. The second @@ -273,7 +273,7 @@ \expandafter\expandafter\expandafter\pgf@marshal \expandafter\expandafter\expandafter{\csname pgf@snake@@\pgf@snake@name @\pgf@snake@current@state @options\endcsname}% \ifx\pgf@snake@next\relax% - \pgf@snake@next=\pgf@snake@do@code% + \let\pgf@snake@next=\pgf@snake@do@code% \fi% \pgf@snake@next% } @@ -291,7 +291,7 @@ \advance\pgfsnakecompleteddistance by\pgf@xa% % Next iteration: \let\pgf@snake@current@state=\pgf@snake@next@state% - \pgf@snake@run + \pgf@snake@run% } \define@key{pgfsnake}{width}{% diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex index 3496b92cf6d..0a3df3dec31 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex @@ -1,4 +1,4 @@ -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcore.code.tex,v 1.2 2005/07/06 15:58:57 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcore.code.tex,v 1.3 2005/10/25 08:18:14 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -9,7 +9,7 @@ \input pgfcoremath.code.tex \input pgfcorepoints.code.tex -\input pgfcorepathconstruction.code.tex +\input pgfcorepathconstruct.code.tex \input pgfcorepathusage.code.tex \input pgfcorescopes.code.tex \input pgfcoregraphicstate.code.tex diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruction.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex index b96bf719320..97df7f0cf34 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruction.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex @@ -1,4 +1,4 @@ -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruction.code.tex,v 1.2 2005/09/30 07:14:03 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex,v 1.1 2005/10/25 08:18:14 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex index 2f68e256038..f0b862575b7 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex @@ -1,4 +1,4 @@ -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.9 2005/10/14 13:13:23 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.12 2005/11/15 17:46:37 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -195,9 +195,10 @@ \def\pgf@picture{% \setbox\pgfpic\hbox to0pt\bgroup% \begingroup% - \color{.}% \pgfsys@beginpicture% \pgfsys@beginscope% + \begingroup% + \color{.}% \pgfsetlinewidth{0.4pt}% \pgftransformreset% \pgfsyssoftpath@setcurrentpath\@empty% @@ -216,10 +217,13 @@ % Shift baseline outside: \global\let\pgf@shift@baseline=\pgf@baseline% \endgroup% + \hss% \egroup% \pgf@insertlayers% \endgroup% - \pgfsys@discardpath\pgfsys@endscope% + \pgfsys@discardpath% + \endgroup% + \pgfsys@endscope% \pgfsys@endpicture% \endgroup% \hss @@ -289,6 +293,7 @@ \pgfsyssoftpath@getcurrentpath\pgf@interrupt@path% \pgfsyssoftpath@setcurrentpath\@empty% \edef\pgfscope@linewidth{\the\pgflinewidth}% + \let\pgf@interrupt@lastmoveto=\pgfsyssoftpath@lastmoveto% \begingroup% } \def\endpgfinterruptpath @@ -299,6 +304,7 @@ \pgf@setpathsizes\pgf@interrupt@pathsizes% \global\pgf@path@lastx=\pgf@interrupt@savex% \global\pgf@path@lasty=\pgf@interrupt@savey% + \global\let\pgfsyssoftpath@lastmoveto=\pgf@interrupt@lastmoveto% \endgroup% } diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex index 0002a30507b..8541b57607a 100644 --- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex @@ -1,4 +1,4 @@ -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/frontendlayer/tikz.code.tex,v 1.32 2005/10/18 08:03:44 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/frontendlayer/tikz.code.tex,v 1.35 2005/11/09 15:49:25 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -362,7 +362,7 @@ \def\tikz@test{#3}% \ifx\tikz@test\@empty% \else% - \pgf@x=#3\relax% + \setlength{\pgf@x}{#3}% \pgf@x=#2\pgf@x\relax% \edef\tikz@marshal{\noexpand\tikz@addtransform{% \expandafter\noexpand\csname pgftransform#1shift\endcsname{\the\pgf@x}}}% @@ -383,6 +383,7 @@ % Text options \define@key{tikz}{text}{\def\tikz@textcolor{#1}} \define@key{tikz}{font}{\def\tikz@textfont{#1}} +\define@key{tikz}{text opacity}{\def\tikz@textopacity{#1}} \define@key{tikz}{text width}{\def\tikz@text@width{#1}} \define@key{tikz}{text ragged}[]% {\def\tikz@text@action{\raggedright\rightskip\z@ plus2em \spaceskip.3333em \xspaceskip.5em\relax}} @@ -408,6 +409,7 @@ \let\tikz@text@width=\@empty \let\tikz@textcolor=\@empty \let\tikz@textfont=\@empty +\let\tikz@textopacity=\@empty \def\tikz@text@action{\raggedright\rightskip\z@ plus2em \spaceskip.3333em \xspaceskip.5em\relax} @@ -1495,6 +1497,16 @@ \fi% } +% snake or lineto? +\def\tikz@path@close#1{% + \iftikz@snaked% + \pgfpathsnakesto{\tikz@presnake,{\tikz@snake}{\tikz@mainsnakelength},\tikz@postsnake}{#1}% + \pgfpathclose% + \else% + \pgfpathclose% + \fi% +} + % Syntax for lineto horizontal/vertical: % -| <point> @@ -1570,7 +1582,7 @@ {\tikz@@close c}}% \def\tikz@@close cycle{% \tikz@flush@moveto% - \pgfpathclose% + \tikz@path@close{\expandafter\pgfpoint\pgfsyssoftpath@lastmoveto}% \def\pgfstrokehook{}% \let\tikz@timer=\@undefined% \tikz@scan@next@command% @@ -1710,8 +1722,7 @@ \tikz@path@lineto{\pgfpoint{\pgf@xa}{\tikz@lasty}}% \tikz@path@lineto{\pgfpoint{\tikz@lastx}{\tikz@lasty}}% \tikz@path@lineto{\pgfpoint{\tikz@lastx}{\pgf@ya}}% - \tikz@path@lineto{\pgfpoint{\pgf@xa}{\pgf@ya}}% - \pgfpathclose% + \tikz@path@close{\pgfpoint{\pgf@xa}{\pgf@ya}}% \pgfpathmoveto{\pgfpoint{\tikz@lastx}{\tikz@lasty}}% \def\pgfstrokehook{}% \tikz@scan@next@command% @@ -2048,6 +2059,11 @@ \setbox\pgfnodeparttextbox=\hbox% \bgroup% \tikz@every@style{every text node part}% + \ifx\tikz@textopacity\@empty% + \else% + \pgfsetfillopacity{\tikz@textopacity}% + \pgfsetstrokeopacity{\tikz@textopacity}% + \fi% \pgfinterruptpicture% \ifx\tikz@text@width\@empty% \else% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def index 0f6981d04da..81b062a6a6e 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def @@ -1,4 +1,4 @@ -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-postscript.def,v 1.6 2005/10/18 18:03:38 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-postscript.def,v 1.7 2005/10/25 08:18:14 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -148,6 +148,174 @@ \pgfsysprotocol@literal{#1 .pgfsetstrokeopacityalpha} } +% Objects +\newcount\pgf@objectcount +\def\pgfsys@defobject#1#2#3#4{% + \global\advance\pgf@objectcount by 1% + \expandafter\xdef\csname#1\endcsname{\the\pgf@objectcount}% + \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% + {% + \pgfsysprotocol@setcurrentprotocol\@empty% + \pgfsysprotocol@bufferedtrue% + #4% + \pgfsysprotocol@getcurrentprotocol\pgfsys@@temp% + \pgf@sys@postscript@object{/pgf\csname#1\endcsname{gsave exec \pgfsys@@temp\space grestore} bind def}% + }% + \pgfsysprotocol@setcurrentprotocol\pgfsys@temp% +} +\def\pgfsys@useobject#1#2{% + \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% + {% + \pgfsysprotocol@setcurrentprotocol\@empty% + \pgfsysprotocol@bufferedfalse% + #2% + \pgfsysprotocol@invokecurrentprotocol% + \pgfsys@invoke{pgf\csname#1\endcsname}% + }% + \pgfsysprotocol@setcurrentprotocol\pgfsys@temp} + +% Shadings + +\def\pgfsys@horishading#1#2#3{% + {% + \pgf@parsefunc{#3}% + \setlength\pgf@x{#2}% + \pgf@xa=\pgf@x% + \pgf@sys@bp@correct{\pgf@x}% + \pgf@y=\pgf@max% + \pgf@sys@bp@correct{\pgf@y}% + \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf@max{% + \noexpand\vrule width0pt height\the\pgf@xa% + \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@y}{\the\pgf@x}% + \noexpand\pgfsys@clipnext% + \noexpand\pgfsys@discardpath% + \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfH \pgf@psfuncs\space pop}% + \hss% + \noexpand\pgfsys@endpurepicture}}% + }% +} +\def\pgfsys@vertshading#1#2#3{% + {% + \pgf@parsefunc{#3}% + \setlength\pgf@x{#2}% + \pgf@xa=\pgf@x% + \pgf@sys@bp@correct{\pgf@x}% + \pgf@y=\pgf@max% + \pgf@sys@bp@correct{\pgf@y}% + \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to\the\pgf@xa{% + \noexpand\vrule width0pt height\the\pgf@max% + \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@x}{\the\pgf@y}% + \noexpand\pgfsys@clipnext% + \noexpand\pgfsys@discardpath% + \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfV \pgf@psfuncs\space pop}% + \hss% + \noexpand\pgfsys@endpurepicture}}% + }% +} +\def\pgfsys@radialshading#1#2#3{% + {% + \pgf@parsefunc{#3}% + \pgf@process{#2}% + \pgf@xa=2\pgf@max% + \pgf@sys@bp@correct{\pgf@max}% + \advance\pgf@x by \pgf@max% + \advance\pgf@y by \pgf@max% + \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf@xa{% + \noexpand\vrule width0pt height\the\pgf@xa% + \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@invoke{% + \pgf@domb\space \pgf@sys@tonumber{\pgf@y} \pgf@sys@tonumber{\pgf@x} \pgf@sys@tonumber{\pgf@max} pgfR1 + \pgf@psfuncs\space \pgf@firstcolor\space \pgf@doma\space pgfR2}% + \hss% + \noexpand\pgfsys@endpurepicture}}% + }% +} + +\AtBeginDocument{ + % Parameters to horizontal pre axishade: \pgf@domb x + \pgf@sys@postscript@header{/pgfH{% + /pgfheight exch def 0.75 setlinewidth [] 0 setdash + /pgfshade {pgfA} def /pgfdir { dup 0 moveto + dup 5 index lineto } bind def} bind def}% + + % Parameters to vertical pre axishade: \pgf@domb x + \pgf@sys@postscript@header{/pgfV{% + /pgfheight exch def 0.75 setlinewidth [] 0 setdash + /pgfshade {pgfA} def /pgfdir { dup 0 exch moveto dup 5 index + exch lineto } bind def} bind def}% + + % Parameters to axishade: end x, start x, r-, g-, b- of first color, r-, g-, b- of second color + % Stack afterwards: end x + \pgf@sys@postscript@header{/pgfA{ + /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 add def + 2 index 6 index sub pgfdiff div % put red-step on stack + 2 index 6 index sub pgfdiff div % put green-step on stack + 2 index 6 index sub pgfdiff div % put green-step on stack + pgfheight 9 index 9 index 9 index 14 index + pgfdiff { + 3 index 3 index 3 index setrgbcolor % Set color + pgfdir + stroke + 4 -1 roll 7 index add % red += incred + 4 -1 roll 6 index add % green += incgreen + 4 -1 roll 5 index add % blue += incblue + 4 -1 roll .5 sub % x += 0.5 + } repeat + mark 15 1 roll cleartomark exch pop % leave only start x on stack + }bind def } + + % Parameters to radialshade pre: \pgf@domb y x max + \pgf@sys@postscript@header{/pgfR1{ + newpath dup dup dup 0 360 arc clip newpath + dup /pgfendx exch def + /pgfendy exch def + 0.875 setlinewidth + [] 0 setdash + /pgfshade {pgfR} def + /pgfstartx exch def + /pgfstarty exch def + /pgfdiffx pgfendx pgfstartx sub def + /pgfdiffy pgfendy pgfstarty sub def + dup /pgfdomb exch def + }bind def } + + % Parameters to radialshade post: \pgf@firstcolor \pgf@doma + \pgf@sys@postscript@header{/pgfR2{ + newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc + setrgbcolor fill pop}bind def }% + + % Parameters to radialshade: end x, start x, r-, g-, b- of first color, r-, g-, b- of second color + % Stack afterwards: end x + \pgf@sys@postscript@header{/pgfR{ + /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 add def + /pgfcircx pgfstartx 9 index pgfdiffx pgfdomb div mul add def + /pgfcircy pgfstarty 9 index pgfdiffy pgfdomb div mul add def + /pgfcircxe pgfstartx 8 index pgfdiffx pgfdomb div mul add def + /pgfcircye pgfstarty 8 index pgfdiffy pgfdomb div mul add def + /pgfxstep pgfcircxe pgfcircx sub pgfdiff div def + /pgfystep pgfcircye pgfcircy sub pgfdiff div def + 2 index 6 index sub pgfdiff div % put red-step on stack + 2 index 6 index sub pgfdiff div % put green-step on stack + 2 index 6 index sub pgfdiff div % put green-step on stack + 8 index 8 index 8 index 13 index + pgfdiff { + 3 index 3 index 3 index setrgbcolor % Set color + pgfcircx pgfcircy 2 index 0 360 arc closepath + stroke + 4 -1 roll 6 index add % red += incred + 4 -1 roll 5 index add % green += incgreen + 4 -1 roll 4 index add % blue += incblue + 4 -1 roll .25 sub % x += 0.25 + /pgfcircx pgfcircx pgfxstep add def + /pgfcircy pgfcircy pgfystep add def + } repeat + mark 14 1 roll cleartomark exch pop % leave only start x on stack + }bind def} +} + + \endinput %%% Local Variables: diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def index 19a98a6bf60..0046ff5a2c1 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def @@ -1,4 +1,4 @@ -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-svg.def,v 1.12 2005/10/06 13:16:09 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-svg.def,v 1.13 2005/11/15 17:46:37 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -106,7 +106,7 @@ \pgfsysprotocol@literal{</g>\Hnewline }% \advance\pgf@sys@svg@scopecount by-1\relax% \ifnum\pgf@sys@svg@scopecount>0\relax% - \repeat% + \repeat% \endgroup% \global\pgf@sys@svg@scopecount=\pgf@sys@svg@thescopecount\relax% } diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def index e6ef83b5ade..75e0a857445 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def @@ -1,4 +1,4 @@ -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvips.def,v 1.9 2005/10/18 18:03:38 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvips.def,v 1.10 2005/10/25 08:18:14 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -10,6 +10,12 @@ % Driver commands for dvips +\def\pgfsys@invoke#1{\special{ps:: #1}} +\def\pgfsys@outerinvoke#1{\special{ps: #1}} +\def\pgf@sys@postscript@header#1{\special{! #1}} +\def\pgf@sys@postscript@object#1{\special{! #1}} + + % % Load common postscript commands: % @@ -19,8 +25,6 @@ % % dvips-specific stuff: % -\def\pgfsys@invoke#1{\special{ps:: #1}} -\def\pgfsys@outerinvoke#1{\special{ps: #1}} \def\pgfsys@beginpicture{\special{ps: }\special{ps::[begin]}\pgfsys@invoke{pgfo}} \def\pgfsys@endpicture{\pgfsys@invoke{pgfc}\special{ps::[end]}} @@ -44,87 +48,7 @@ \special{ps::[end]}% } \def\pgfsys@color@unstacked#1{\special{ps: \XC@usecolor{#1}}} -\newcount\pgf@objectcount -\def\pgfsys@defobject#1#2#3#4{% - \global\advance\pgf@objectcount by 1 - \expandafter\xdef\csname#1\endcsname{\the\pgf@objectcount} - \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% - {% - \pgfsysprotocol@setcurrentprotocol\@empty% - \pgfsysprotocol@bufferedtrue% - #4% - \pgfsysprotocol@getcurrentprotocol\pgfsys@@temp% - \special{! /pgf\csname#1\endcsname{gsave exec \pgfsys@@temp\space grestore} bind def}% - }% - \pgfsysprotocol@setcurrentprotocol\pgfsys@temp% -} -\def\pgfsys@useobject#1#2{% - \pgfsysprotocol@getcurrentprotocol\pgfsys@temp% - {% - \pgfsysprotocol@setcurrentprotocol\@empty% - \pgfsysprotocol@bufferedfalse% - #2% - \pgfsysprotocol@invokecurrentprotocol% - \pgfsys@invoke{pgf\csname#1\endcsname}% - }% - \pgfsysprotocol@setcurrentprotocol\pgfsys@temp} \def\pgfsys@imagesuffixlist{epsi:eps:ps} -\def\pgfsys@horishading#1#2#3{% - {% - \pgf@parsefunc{#3}% - \setlength\pgf@x{#2}% - \pgf@xa=\pgf@x% - \pgf@sys@bp@correct{\pgf@x}% - \pgf@y=\pgf@max% - \pgf@sys@bp@correct{\pgf@y}% - \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf@max{% - \noexpand\vrule width0pt height\the\pgf@xa% - \noexpand\pgfsys@beginpurepicture% - \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@y}{\the\pgf@x}% - \noexpand\pgfsys@clipnext% - \noexpand\pgfsys@discardpath% - \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfH \pgf@psfuncs\space pop}% - \hss% - \noexpand\pgfsys@endpurepicture}}% - }% -} -\def\pgfsys@vertshading#1#2#3{% - {% - \pgf@parsefunc{#3}% - \setlength\pgf@x{#2}% - \pgf@xa=\pgf@x% - \pgf@sys@bp@correct{\pgf@x}% - \pgf@y=\pgf@max% - \pgf@sys@bp@correct{\pgf@y}% - \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to\the\pgf@xa{% - \noexpand\vrule width0pt height\the\pgf@max% - \noexpand\pgfsys@beginpurepicture% - \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@x}{\the\pgf@y}% - \noexpand\pgfsys@clipnext% - \noexpand\pgfsys@discardpath% - \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfV \pgf@psfuncs\space pop}% - \hss% - \noexpand\pgfsys@endpurepicture}}% - }% -} -\def\pgfsys@radialshading#1#2#3{% - {% - \pgf@parsefunc{#3}% - \pgf@process{#2}% - \pgf@xa=2\pgf@max% - \pgf@sys@bp@correct{\pgf@max}% - \advance\pgf@x by \pgf@max% - \advance\pgf@y by \pgf@max% - \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf@xa{% - \noexpand\vrule width0pt height\the\pgf@xa% - \noexpand\pgfsys@beginpurepicture% - \noexpand\pgfsys@invoke{% - \pgf@domb\space \pgf@sys@tonumber{\pgf@y} \pgf@sys@tonumber{\pgf@x} \pgf@sys@tonumber{\pgf@max} pgfR1 - \pgf@psfuncs\space \pgf@firstcolor\space \pgf@doma\space pgfR2}% - \hss% - \noexpand\pgfsys@endpurepicture}}% - }% -} \AtBeginDocument{ % Always present specials. @@ -155,86 +79,6 @@ /pgfsoa 1 def end } - - % Parameters to horizontal pre axishade: \pgf@domb x - \special{! /pgfH{% - /pgfheight exch def 0.75 setlinewidth [] 0 setdash - /pgfshade {pgfA} def /pgfdir { dup 0 moveto - dup 5 index lineto } bind def} B}% - - % Parameters to vertical pre axishade: \pgf@domb x - \special{! /pgfV{% - /pgfheight exch def 0.75 setlinewidth [] 0 setdash - /pgfshade {pgfA} def /pgfdir { dup 0 exch moveto dup 5 index - exch lineto } bind def} B}% - - % Parameters to axishade: end x, start x, r-, g-, b- of first color, r-, g-, b- of second color - % Stack afterwards: end x - \special{! /pgfA{ - /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 add def - 2 index 6 index sub pgfdiff div % put red-step on stack - 2 index 6 index sub pgfdiff div % put green-step on stack - 2 index 6 index sub pgfdiff div % put green-step on stack - pgfheight 9 index 9 index 9 index 14 index - pgfdiff { - 3 index 3 index 3 index setrgbcolor % Set color - pgfdir - stroke - 4 -1 roll 7 index add % red += incred - 4 -1 roll 6 index add % green += incgreen - 4 -1 roll 5 index add % blue += incblue - 4 -1 roll .5 sub % x += 0.5 - } repeat - mark 15 1 roll cleartomark exch pop % leave only start x on stack - }B } - - % Parameters to radialshade pre: \pgf@domb y x max - \special{! /pgfR1{ - newpath dup dup dup 0 360 arc clip newpath - dup /pgfendx exch def - /pgfendy exch def - 0.875 setlinewidth - [] 0 setdash - /pgfshade {pgfR} def - /pgfstartx exch def - /pgfstarty exch def - /pgfdiffx pgfendx pgfstartx sub def - /pgfdiffy pgfendy pgfstarty sub def - dup /pgfdomb exch def - }B } - - % Parameters to radialshade post: \pgf@firstcolor \pgf@doma - \special{! /pgfR2{ - newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc - setrgbcolor fill pop}B }% - - % Parameters to radialshade: end x, start x, r-, g-, b- of first color, r-, g-, b- of second color - % Stack afterwards: end x - \special{! /pgfR{ - /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 add def - /pgfcircx pgfstartx 9 index pgfdiffx pgfdomb div mul add def - /pgfcircy pgfstarty 9 index pgfdiffy pgfdomb div mul add def - /pgfcircxe pgfstartx 8 index pgfdiffx pgfdomb div mul add def - /pgfcircye pgfstarty 8 index pgfdiffy pgfdomb div mul add def - /pgfxstep pgfcircxe pgfcircx sub pgfdiff div def - /pgfystep pgfcircye pgfcircy sub pgfdiff div def - 2 index 6 index sub pgfdiff div % put red-step on stack - 2 index 6 index sub pgfdiff div % put green-step on stack - 2 index 6 index sub pgfdiff div % put green-step on stack - 8 index 8 index 8 index 13 index - pgfdiff { - 3 index 3 index 3 index setrgbcolor % Set color - pgfcircx pgfcircy 2 index 0 360 arc closepath - stroke - 4 -1 roll 6 index add % red += incred - 4 -1 roll 5 index add % green += incgreen - 4 -1 roll 4 index add % blue += incblue - 4 -1 roll .25 sub % x += 0.25 - /pgfcircx pgfcircx pgfxstep add def - /pgfcircy pgfcircy pgfystep add def - } repeat - mark 14 1 roll cleartomark exch pop % leave only start x on stack - }B} } \endinput diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def index f7864d34070..016f909d24f 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def @@ -1,4 +1,4 @@ -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.8 2005/08/13 18:59:56 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.9 2005/11/15 17:46:37 tantau Exp $ % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. % @@ -57,16 +57,36 @@ \ifdim\pgf@y<1pt% \pgf@y=1pt% \fi% + \pgf@xc=\pgf@x% + \pgf@yc=\pgf@y% + \pgfsysprotocol@flushcurrentprotocol% \HCode{<object data="\jobname-\the\pgf@sys@svg@picnum.svg" - width="\the\pgf@x" height="\the\pgf@y" - type="image/svg+xml"><p>SVG-Viewer needed.</p></object>}% + width="}% + % Calculate pixel coordinates (this does not really make sense, but + % we have to do it anyway). Assume 96dpi. + \pgf@x=1.3333333\pgf@x% + \pgf@y=1.3333333\pgf@y% + % Add one pixel for security: + \advance\pgf@x by1pt% + \advance\pgf@y by1pt% + \pgf@sys@pt\pgf@x% + \pgfsysprotocol@flushcurrentprotocol% + \pgfsys@invoke{" height="}% + \pgf@sys@pt\pgf@y% + \pgfsysprotocol@flushcurrentprotocol% + \pgfsys@invoke{" type="image/svg+xml"><p>SVG-Viewer needed.</p></object>}% \special{t4ht>\jobname-\the\pgf@sys@svg@picnum.svg}% - \pgfsys@invoke{<svg width="\the\pgf@x" height="\the\pgf@y" viewBox="}% - \pgf@sys@pt{\pgf@xa}\pgf@sys@pt{\pgf@ya}\pgf@sys@pt{\pgf@x}\pgf@sys@pt{\pgf@y}% + \pgfsys@invoke{<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" width="\the\pgf@xc" + height="\the\pgf@yc" viewBox="}% + \pgf@sys@pt{\pgf@xa}\pgf@sys@pt{\pgf@ya}\pgf@sys@pt{\pgf@xc}\pgf@sys@pt{\pgf@yc}% \pgfsysprotocol@flushcurrentprotocol% \pgf@ya=-\pgf@ya% - \pgfsys@invoke{">\Hnewline <g transform="translate(0,\the\pgf@yb) scale(1,-1) - translate(0,\the\pgf@ya)">\Hnewline }% + \pgfsys@invoke{">\Hnewline <g transform="translate(0,} + \pgf@sys@pt\pgf@yb\pgfsysprotocol@flushcurrentprotocol% + \pgfsys@invoke{) scale(1,-1) translate(0,}% + \pgf@sys@pt\pgf@ya\pgfsysprotocol@flushcurrentprotocol% + \pgfsys@invoke{)">\Hnewline }% \setlength\pgf@x{\pgf@shift@baseline}% \advance\pgf@x by-\pgf@picminy\relax% \advance\pgf@picmaxy by-\pgf@picminy\relax% maxy is now the height @@ -92,7 +112,7 @@ \fi% tweak for TikZ \HCode{<text style="stroke:none" - transform="scale(1,-1) translate(\the\pgf@x,0pt)" + transform="scale(1,-1) translate(\pgf@sys@tonumber{\pgf@x},0)" text-anchor="middle" }% \ifx\f@size\@empty% diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def new file mode 100644 index 00000000000..34448c295a0 --- /dev/null +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def @@ -0,0 +1,85 @@ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-textures.def,v 1.2 2005/11/09 08:52:19 tantau Exp $ + +% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. +% +% This program can be redistributed and/or modified under the terms +% of the GNU Public License, version 2. + + + + +% Driver commands for textures driver + + +\def\pgfsys@invoke#1{\special{rawpostscript #1}} +\def\pgf@sys@postscript@header#1{\special{prepostscript #1}} +\def\pgf@sys@postscript@object#1{\special{rawpostscript #1}} + + +% +% Load common postscript commands: +% +\input pgfsys-common-postscript.def + + +% +% textures-specific stuff: +% + +\def\pgfsys@beginpicture{% + \special{rawpostscript save}% + \special{rawpostscript save pgfgetcoords}% + \special{postscript}% here come the coordiantes + \special{rawpostscript restore}% + \special{rawpostscript pgfbeginpicture}} +\def\pgfsys@endpicture{\special{rawpostscript restore}} +\def\pgfsys@hbox#1{% + \pgfsys@invoke{save pgfbeginhbox}% + \wd#1=0pt% + \ht#1=0pt% + \dp#1=0pt% + \box#1% + \pgfsys@invoke{restore}% +} +\def\pgfsys@begininvisible{% + \special{rawpostscript gsave nulldevice}% +} +\def\pgfsys@endinvisible{% + \special{rawpostscript grestore}% +} +\def\pgfsys@color@unstacked#1{\special{rawpostscript \XC@usecolor{#1}}} + +\def\pgfsys@imagesuffixlist{epsi:eps:ps} + +\AtBeginDocument{ + % Always present specials. + \special{prepostscript + /pgfsc{}bind def% stroke color is empty by default + /pgffc{}bind def% fill color is empty by default + /pgfe{moveto dup 0 rlineto exch 0 exch rlineto neg 0 rlineto closepath}bind def% rectangle + /pgfstr{stroke}bind def% + /pgffill{fill}bind def% + /pgfeofill{eofill}bind def% + /pgfw{setlinewidth}bind def% setlinewidth + /pgfgetcoords{/sps{globaldict begin /pgfgy exch def /pgfgx exch def + end pop pop}def/eps{}def userdict begin}bind def + /pgfbeginpicture{/pgfx pgfgx def /pgfy pgfgy def pgfx pgfy translate 1 1 72.27 72 div mul2 neg scale}bind def + /pgfbeginhbox{1 1 72 72.27 div mul2 neg scale + pgfx neg pgfy neg translate + pgffoa .setopacityalpha}bind def% save + /.setopacityalpha where {pop} {/.setopacityalpha{pop}def} ifelse % install .setopacityalpha + /.pgfsetfillopacityalpha{/pgffoa exch def + /pgffill{gsave pgffoa .setopacityalpha fill 1 .setopacityalpha newpath fill grestore}bind def + /pgfeofill{gsave pgffoa .setopacityalpha eofill1 .setopacityalpha newpath eofill grestore}bind def}bind def + /.pgfsetstrokeopacityalpha{/pgfsoa exch def + /pgfstr{gsave pgfsoa .setopacityalpha stroke grestore}bind def}bind def + /pgffoa 1 def + /pgfsoa 1 def + } +} + +\endinput + +%%% Local Variables: +%%% mode: latex +%%% End: diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def new file mode 100644 index 00000000000..197a3e14e0a --- /dev/null +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def @@ -0,0 +1,97 @@ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-vtex.def,v 1.4 2005/10/25 08:39:23 tantau Exp $ + +% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>. +% +% This program can be redistributed and/or modified under the terms +% of the GNU Public License, version 2. + + + + +% Driver commands for vtex + +% Invoking things: +\def\pgfsys@invoke#1{\special{pS: grestore #1 gsave}} % to protect against things happeing in between +\def\pgfsys@outerinvoke#1{\special{pS: #1}} +\def\pgf@sys@postscript@header#1{\special{pS: #1}} +\def\pgf@sys@postscript@object#1{\special{pS: #1}} + + +% +% Load common postscript commands: +% +\input pgfsys-common-postscript.def + + +% +% vtex-specific stuff: +% + + +% Starting and ending a picture: +\def\pgfsys@beginpicture{\special{pS: + save + /pgfx currentpoint /pgfy exch def def + currentpoint translate + gsave}% + \let\set@color=\pgf@sys@vtex@set@color% + \let\reset@color=\pgf@sys@vtex@reset@color% +} +\def\pgf@sys@vtex@setcolor#1{% + \colorlet{pgf@tempcolor}{#1}% + \@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}% + \expandafter\expandafter\expandafter\pgf@sys@vtex@@setcolor\csname\string\color@pgf@tempcolor\endcsname% +} +\def\pgf@sys@vtex@@setcolor#1#2#3#4#5{% + \pgfsysps@color@resetnow% + \expandafter\ifx\csname pgfsys@color@#4\endcsname\relax% + \PackageError{pgfbase}{Unsupported color model `#4'. Sorry}{}% + \else% + \edef\pgf@colmarshal{\expandafter\noexpand\csname pgfsys@color@#4\endcsname}% + \pgf@uncomma#5,,% + \pgf@colmarshal% + \fi} +\def\pgf@sys@vtex@set@color{\pgf@sys@vtex@setcolor{.}\aftergroup\reset@color} +\def\pgf@sys@vtex@reset@color{\pgf@sys@vtex@setcolor{.}} +\def\pgfsys@endpicture{\special{pS: + newpath + grestore + newpath + restore}} + +% Graphics: +\def\pgfsys@imagesuffixlist{epsi:eps:ps:pdf} + +% Starting and ending a box: +\def\pgfsys@hbox#1{% + \pgfsys@invoke{save pgfx neg pgfy neg translate}% + \wd#1=0pt% + \ht#1=0pt% + \dp#1=0pt% + \box#1 + \pgfsys@invoke{restore}% +} + +\def\pgfsys@color@unstacked#1{\special{pS: \XC@usecolor{#1}}} + +\def\pgfsys@fill@opacity#1{\pgf@sys@fail{opacity}} +\def\pgfsys@stroke@opacity#1{\pgf@sys@fail{opacity}} + +\AtBeginDocument{ + % Always present specials. + \special{pS: + /pgfsc{} bind def% stroke color is empty by default + /pgffc{} bind def% fill color is empty by default + /pgfstr{stroke} bind def% + /pgffill{fill} bind def% + /pgfeofill{eofill} bind def% + /pgfe{moveto dup 0 rlineto exch 0 exch rlineto neg 0 rlineto closepath} bind def% rectangle + /pgfw{setlinewidth} bind def % setlinewidth + } +} + +\endinput + +%%% Local Variables: +%%% mode: latex +%%% End: diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex index 46ee571bf7d..139ac162264 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgf-latex-emulation.tex @@ -53,10 +53,8 @@ \xdef#1{\the\toks@}% \endgroup} \long\def\mbox#1{\leavevmode\hbox{#1}} -\begingroup \def\:{\global\let\@sptoken= } \: \def\:{\@xifnch} \expandafter\def\: {\futurelet\@let@token\@ifnch} -\endgroup \def\@nnil{\@nil} \def\@fornoop#1\@@#2#3{} \long\def\@for#1:=#2\do#3{% @@ -106,7 +104,8 @@ \def\newcounter#1{\expandafter\alloc@\expandafter0\expandafter\count\expandafter\countdef\expandafter\insc@unt\csname c@#1\endcsname}% \def\setcounter#1#2{\global\csname c@#1\endcsname#2\relax}% \def\addtocounter#1#2{\global\advance\csname c@#1\endcsname #2\relax} -\def\setlength#1#2{#1#2\relax} +\newskip\pgf@length@skip +\def\setlength#1#2{\pgf@length@skip#2\relax#1\pgf@length@skip} \def\addtolength#1#2{\advance#1 #2\relax} @@ -146,17 +145,15 @@ \definecolor{brown}{rgb}{0.75,0.5,0.25} \def\color#1{% + \colorlet{.}{#1}% \pgfsysprotocol@getcurrentprotocol\pgf@emu@temp% {% \pgfsysprotocol@setcurrentprotocol\@empty% \pgfsysprotocol@bufferedtrue% - \pgfsetcolor{#1}% + \pgfsetcolor{.}% \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% }% \pgfsysprotocol@setcurrentprotocol\pgf@emu@temp% - \edef\pgf@marshal{\noexpand\let\expandafter\noexpand\csname\string\color@.\endcsname=% - \expandafter\noexpand\csname\string\color@#1\endcsname}% - \pgf@marshal% \aftergroup\reset@color% } \def\reset@color{% @@ -173,11 +170,12 @@ \def\colorlet#1#2{% - \in@!{#2}% + \edef\pgf@marshal{#2}% + \expandafter\in@\expandafter!\expandafter{\pgf@marshal}% \ifin@% % compute mixture {% - \pgf@emu@mix#2!white!\@nil% + \expandafter\pgf@emu@mix\pgf@marshal!white!\@nil% \xdef\pgf@marshal{\noexpand\def\expandafter\noexpand\csname\string\color@#1\endcsname{% \noexpand\xcolor@{}{}{rgb}{\pgf@sys@tonumber\pgf@xa,\pgf@sys@tonumber\pgf@xb,\pgf@sys@tonumber\pgf@xc}}}% }% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex index 3686eec117b..b744514f544 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfrcs.code.tex @@ -9,7 +9,7 @@ % prints out a message to the log. -\def\pgfversion{1.00} +\def\pgfversion{1.01} \ifx\pgfrcsloaded\undefined @@ -77,7 +77,7 @@ \def\ProvidesFile#1[#2]{\wlog{Loading file #1 version #2.}} \fi -\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgfrcs.code.tex,v 1.7 2005/10/23 16:16:21 tantau Exp $ +\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/utilities/pgfrcs.code.tex,v 1.8 2005/11/14 17:37:52 tantau Exp $ \catcode`\@=\pgfrcsatcode diff --git a/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex b/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex index 2eac1675ee9..18185953838 100644 --- a/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex +++ b/Master/texmf-dist/tex/generic/pst-osci/pst-osci.tex @@ -1,24 +1,41 @@ +%% +%% This is file `pst-osci.tex', +%% +%% IMPORTANT NOTICE: +%% +%% Package `pst-osci.tex' +%% %% Authors : Manuel LUQUE <Mluque5130@aol.com> -%% Christophe JORSSEN <Christophe.Jorssen@wanadoo.fr> +%% Christophe JORSSEN <Christophe.Jorssen@free.fr> +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. +%% +%% DESCRIPTION: +%% `pst-osci' is a PSTricks package to plot oscilloscope diagrams +%% +%% AllColor=false (true par défaut) Raoul HATTERER<Hatterer.Raoul@wanadoo.fr> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{2.7} -\def\filedate{99/11/02} - -\message{`PST-osci' v\fileversion, \filedate\space (Manuel LUQUE & Christophe -JORSSEN)} - +% \csname PSTOscilloLoaded\endcsname \let\PSTOscilloLoaded\endinput - +% % Require PSTricks, pstcol,pstplot and multido packages \ifx\PSTplotLoaded\endinput\else\input pst-plot.tex\fi \ifx\MultidoLoaded\endinput\else\input multido.tex\fi +\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi % hv -% DPC interface to the `keyval' package (until keyval based version of PSTricks) -\input pst-key.tex +\def\fileversion{2.82}% modifié +\def\filedate{2005/10/17} +\message{`PST-osci' v\fileversion, \filedate\space (ML/CJ)} +%%Last mod. by : Raoul HATTERER 2003/11/02 +%%Last mod. by : Herbert Voss 2005/11/07 +% \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax - +\pst@addfams{pst-osci} +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \font\ssf=cmss10 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -27,68 +44,79 @@ JORSSEN)} \newrgbcolor{VeryLightGray}{0.9 0.9 0.9} \newcmykcolor{PaleOrange}{0 0.2 0.4 0} \newcmykcolor{LightBlue}{0.1 0 0 0} +\newrgbcolor{ACredA}{1 0 0} +\newrgbcolor{ACgreenA}{0 1 0} +\newrgbcolor{ACmagentaA}{1 0 1} +\newrgbcolor{ACred}{0 0 0} +\newrgbcolor{ACgreen}{.25 .25 .25}% green or Darkgray +\newrgbcolor{ACmagenta}{0 0 0}% magenta or black +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\define@key{psset}{period1}{\edef\psk@Oscillo@PeriodA{#1}} -\define@key{psset}{period2}{\edef\psk@Oscillo@PeriodB{#1}} -\define@key{psset}{periodmodulation1}{\edef\psk@Oscillo@PeriodModulationA{#1}} -\define@key{psset}{freqmod1}{\edef\psk@Oscillo@FreqModA{#1}} -\define@key{psset}{periodmodulation2}{\edef\psk@Oscillo@PeriodModulationB{#1}} -\define@key{psset}{freqmod2}{\edef\psk@Oscillo@FreqModB{#1}} -\define@key{psset}{amplitude1}{\edef\psk@Oscillo@AmplitudeA{#1}} -\define@key{psset}{amplitude2}{\edef\psk@Oscillo@AmplitudeB{#1}} -\define@key{psset}{CC1}{\edef\psk@Oscillo@ContinuousComponentA{#1}} -\define@key{psset}{CC2}{\edef\psk@Oscillo@ContinuousComponentB{#1}} -\define@key{psset}{timediv}{\edef\psk@Oscillo@TimeDiv{#1}} -\define@key{psset}{phase1}{\edef\psk@Oscillo@PhaseA{#1}} -\define@key{psset}{phase2}{\edef\psk@Oscillo@PhaseB{#1}} -\define@key{psset}{sensivity1}{\edef\psk@ChannelA{#1}} -\define@key{psset}{sensivity2}{\edef\psk@ChannelB{#1}} -\define@key{psset}{damping1}{\edef\psk@Oscillo@dampingA{#1}} -\define@key{psset}{damping2}{\edef\psk@Oscillo@dampingB{#1}} -\define@key{psset}{Fourier}{\edef\psk@Oscillo@Fourier{#1}} -\define@key{psset}{offset1}{\edef\psk@Oscillo@OffsetA{#1}} -\define@key{psset}{offset2}{\edef\psk@Oscillo@OffsetB{#1}} -\define@key{psset}{offset3}{\edef\psk@Oscillo@OffsetC{#1}} -\define@key{psset}{plotstyle1}{\edef\psk@Oscillo@PlotStyleA{#1}} -\define@key{psset}{plotstyle2}{\edef\psk@Oscillo@PlotStyleB{#1}} -\define@key{psset}{plotstyle3}{\edef\psk@Oscillo@PlotStyleC{#1}} -\define@key{psset}{plotstyle4}{\edef\psk@Oscillo@PlotStyleD{#1}} -\define@key{psset}{operation}{% -\def\@tempa{#1}% -\let\psk@Oscillo@Operation\@tempa} - -\define@key{psset}{Wave1}{% -\def\@tempa{#1}% -\let\psk@Oscillo@WaveA\@tempa} - -\define@key{psset}{Wave2}{% -\def\@tempa{#1}% -\let\psk@Oscillo@WaveB\@tempa} - +\define@key[psset]{pst-osci}{period1}{\edef\psk@Oscillo@PeriodA{#1}} +\define@key[psset]{pst-osci}{period2}{\edef\psk@Oscillo@PeriodB{#1}} +\define@key[psset]{pst-osci}{periodmodulation1}{\edef\psk@Oscillo@PeriodModulationA{#1}} +\define@key[psset]{pst-osci}{freqmod1}{\edef\psk@Oscillo@FreqModA{#1}} +\define@key[psset]{pst-osci}{periodmodulation2}{\edef\psk@Oscillo@PeriodModulationB{#1}} +\define@key[psset]{pst-osci}{freqmod2}{\edef\psk@Oscillo@FreqModB{#1}} +\define@key[psset]{pst-osci}{amplitude1}{\edef\psk@Oscillo@AmplitudeA{#1}} +\define@key[psset]{pst-osci}{amplitude2}{\edef\psk@Oscillo@AmplitudeB{#1}} +\define@key[psset]{pst-osci}{CC1}{\edef\psk@Oscillo@ContinuousComponentA{#1}} +\define@key[psset]{pst-osci}{CC2}{\edef\psk@Oscillo@ContinuousComponentB{#1}} +\define@key[psset]{pst-osci}{timediv}{\edef\psk@Oscillo@TimeDiv{#1}} +\define@key[psset]{pst-osci}{phase1}{\edef\psk@Oscillo@PhaseA{#1}} +\define@key[psset]{pst-osci}{phase2}{\edef\psk@Oscillo@PhaseB{#1}} +\define@key[psset]{pst-osci}{sensivity1}{\edef\psk@ChannelA{#1}} +\define@key[psset]{pst-osci}{sensivity2}{\edef\psk@ChannelB{#1}} +\define@key[psset]{pst-osci}{damping1}{\edef\psk@Oscillo@dampingA{#1}} +\define@key[psset]{pst-osci}{damping2}{\edef\psk@Oscillo@dampingB{#1}} +\define@key[psset]{pst-osci}{Fourier}{\edef\psk@Oscillo@Fourier{#1}} +\define@key[psset]{pst-osci}{offset1}{\edef\psk@Oscillo@OffsetA{#1}} +\define@key[psset]{pst-osci}{offset2}{\edef\psk@Oscillo@OffsetB{#1}} +\define@key[psset]{pst-osci}{offset3}{\edef\psk@Oscillo@OffsetC{#1}} +\define@key[psset]{pst-osci}{plotstyle1}{\edef\psk@Oscillo@PlotStyleA{#1}} +\define@key[psset]{pst-osci}{plotstyle2}{\edef\psk@Oscillo@PlotStyleB{#1}} +\define@key[psset]{pst-osci}{plotstyle3}{\edef\psk@Oscillo@PlotStyleC{#1}} +\define@key[psset]{pst-osci}{plotstyle4}{\edef\psk@Oscillo@PlotStyleD{#1}} +\define@key[psset]{pst-osci}{operation}{% + \def\@tempa{#1}% + \let\psk@Oscillo@Operation\@tempa} +\define@key[psset]{pst-osci}{Wave1}{% + \def\@tempa{#1}% + \let\psk@Oscillo@WaveA\@tempa} +\define@key[psset]{pst-osci}{Wave2}{% + \def\@tempa{#1}% + \let\psk@Oscillo@WaveB\@tempa} \newif\ifPst@Oscillo@Lissajous -\define@key{psset}{Lissajous}[true]{% -\@nameuse{Pst@Oscillo@Lissajous#1}} - +\define@key[psset]{pst-osci}{Lissajous}[true]{\@nameuse{Pst@Oscillo@Lissajous#1}} +\newif\ifPst@Oscillo@AllColor +\define@key[psset]{pst-osci}{AllColor}[true]{\@nameuse{Pst@Oscillo@AllColor#1}} \newif\ifPst@Oscillo@Combine -\define@key{psset}{combine}[true]{% -\@nameuse{Pst@Oscillo@Combine#1}} - -\setkeys{psset}{period1=20,period2=20,amplitude1=2,amplitude2=0,% -phase1=0,phase2=0,timediv=5,Lissajous=false,sensivity1=1,% -sensivity2=1,damping1=0,damping2=0,combine=false,% -offset1=0,offset2=0,plotstyle1=GreenContA,Fourier=100,% -plotstyle2=BlueContB,plotstyle3=RedContLissajou,% -plotstyle4=MagentaContAddSub,operation=\relax,Wave1=\SinusA,Wave2=\SinusB,% -periodmodulation1=100,freqmod1=0,periodmodulation2=100,freqmod2=0,CC1=0,CC2=0,offset3=0} - -\newpsstyle{GreenContA}{linecolor=green,% -linewidth=0.05,plotpoints=360} -\newpsstyle{BlueContB}{linecolor=blue,% -linewidth=0.05,plotpoints=360} -\newpsstyle{RedContLissajou}{linecolor=red,% -linewidth=0.05,plotpoints=1000} -\newpsstyle{MagentaContAddSub}{linecolor=magenta,% -linewidth=0.05,plotpoints=1000} +\define@key[psset]{pst-osci}{combine}[true]{\@nameuse{Pst@Oscillo@Combine#1}} +% +\psset{period1=20,period2=20,amplitude1=2,amplitude2=0,% + phase1=0,phase2=0,timediv=5,Lissajous=false,AllColor=true,sensivity1=1,% + sensivity2=1,damping1=0,damping2=0,combine=false,% + offset1=0,offset2=0,plotstyle1=GreenContA,Fourier=100,% + plotstyle2=BlueContB,plotstyle3=RedContLissajou,% + plotstyle4=MagentaContAddSub,operation=\relax,Wave1=\SinusA,Wave2=\SinusB,% + periodmodulation1=100,freqmod1=0,periodmodulation2=100,% + freqmod2=0,CC1=0,CC2=0,offset3=0} +% +\newpsstyle{GreenContA}{linecolor=green,linewidth=0.05,plotpoints=360} +\newpsstyle{BlackContA}{linecolor=black,%AllColor + linewidth=0.05,plotpoints=360} +\newpsstyle{BlueContB}{linecolor=blue,linewidth=0.05,plotpoints=360} +\newgray{darkgray}{.25} +\newpsstyle{DarkgrayContB}{linecolor=darkgray,%AllColor + linewidth=0.06,plotpoints=360} +\newpsstyle{RedContLissajou}{linecolor=red,linewidth=0.05,plotpoints=1000} +\newpsstyle{BlackContLissajou}{linecolor=black,%AllColor + linewidth=0.06,plotpoints=1000} +\newpsstyle{MagentaContAddSub}{linecolor=magenta,linewidth=0.05,plotpoints=1000} +\newgray{gray}{.5} +\newpsstyle{DarkgrayDashAddSub}{linestyle=dashed,linecolor=darkgray,%AllColor + linewidth=0.06,plotpoints=1000} \def\TriangleA{% /Cste 0.4050284 def % 4/pi^2 @@ -184,84 +212,91 @@ mod2 57.3 mul t 10 mul Tm2 div BT mul sin mul add phaseB add sin A2 mul e t AR2 mul neg exp mul SB div CC2 add} -\def\Oscillo{\@ifnextchar[{\pst@Oscillo}{\pst@Oscillo[]}} - -\def\pst@Oscillo[#1]{{% -\setkeys{psset}{#1} - -\pspicture(0,-5)(10,5) \psframe*[linecolor=LightBlue](0,-4)(10,4) -\psgrid[gridlabels=0,subgriddiv=0](0,-4)(10,4) -\multido{\nxDiv=0+0.2}{50}{% -\psline(\nxDiv,-.1)(\nxDiv,0.1)} -\multido{\nyDiv=-4.0+0.2}{40}{% -\psline(4.9,\nyDiv)(5.1,\nyDiv)} - -%%%%%%%%%%%% Tuning %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\psframe[fillcolor=VeryLightGray,fillstyle=solid,dimen=middle](0,4)(10,5) -\rput(1.5,4.8){\ssf timeDiv :} \rput(1.5,4.3){\ssf\psk@Oscillo@TimeDiv{}ms/div} -\rput(4,4.8){\ssf Channel A :} \rput(4,4.3){\ssf\psk@ChannelA{} V/div} -\rput(7,4.8){\ssf Channel B :} \rput(7,4.3){\ssf\psk@ChannelB{} V/div} -\rput(9,4.8){\ssf XY} \rput(9,4.3){\ifPst@Oscillo@Lissajous\red ON\else\green OFF\fi} -\psframe[fillcolor=VeryLightGray,fillstyle=solid,dimen=middle](0,-5)(10,-4) -\ifPst@Oscillo@Combine -\rput(2,-4.3){\ssf\psk@Oscillo@Operation:} -\rput(2,-4.8){\ssf\magenta ON} -\fi -\rput(6.5,-4.3){\ssf OffsetB} -\rput(6.5,-4.8){\ssf \psk@Oscillo@OffsetB} -\rput(8.5,-4.3){\ssf OffsetC} -\rput(8.5,-4.8){\ssf \psk@Oscillo@OffsetC} -\rput(4.5,-4.3){\ssf OffsetA} -\rput(4.5,-4.8){\ssf \psk@Oscillo@OffsetA} -\ifPst@Oscillo@Lissajous - -\psclip{\psframe(0,-4)(10,4)} -\parametricplot[style=\psk@Oscillo@PlotStyleC]{0}{360}{% -/fourier \psk@Oscillo@Fourier\space def -/T1 \psk@Oscillo@PeriodA\space def -/T2 \psk@Oscillo@PeriodB\space def -/Tm1 \psk@Oscillo@PeriodModulationA\space def -/mod1 \psk@Oscillo@FreqModA\space def -/Tm2 \psk@Oscillo@PeriodModulationB\space def -/mod2 \psk@Oscillo@FreqModB\space def -/CC1 \psk@Oscillo@ContinuousComponentA\space def -/CC2 \psk@Oscillo@ContinuousComponentB\space def -/BT T1 def -/A1 \psk@Oscillo@AmplitudeA\space def -/A2 \psk@Oscillo@AmplitudeB\space def -/phaseA \psk@Oscillo@PhaseA\space def -/phaseB \psk@Oscillo@PhaseB\space def -%/K 36 T div def -/e 2.718 def -/AR1 \psk@Oscillo@dampingA\space def -/AR2 \psk@Oscillo@dampingB\space def -/SA \psk@ChannelA\space def -/SB \psk@ChannelB\space def -/offset1 \psk@Oscillo@OffsetA\space def -/offset2 \psk@Oscillo@OffsetB\space def -\psk@Oscillo@WaveA\space 5 add -\psk@Oscillo@WaveB\space} -\endpsclip -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\else -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\psclip{\psframe(0,-4)(10,4)}\psset{xunit=0.02777} -\parametricplot[style=\psk@Oscillo@PlotStyleA]{0}{360}{% -/fourier \psk@Oscillo@Fourier\space def -/T1 \psk@Oscillo@PeriodA\space def -/Tm1 \psk@Oscillo@PeriodModulationA\space def -/mod1 \psk@Oscillo@FreqModA\space def -/BT \psk@Oscillo@TimeDiv\space def -/A1 \psk@Oscillo@AmplitudeA\space def -/phaseA \psk@Oscillo@PhaseA\space def -/CC1 \psk@Oscillo@ContinuousComponentA\space def -/e 2.718 def -/AR1 \psk@Oscillo@dampingA\space def -/offset1 \psk@Oscillo@OffsetA\space def -/SA \psk@ChannelA\space def -t \psk@Oscillo@WaveA\space -offset1 add -} +\def\Oscillo{\@ifnextchar[\Oscillo@i{\Oscillo@i[]}} +\def\Oscillo@i[#1]{% + \begingroup + \def\pst@par{#1}\ifx\pst@par\@empty\else\psset{#1}\fi + \pst@killglue + \ifPst@Oscillo@AllColor + \psset{plotstyle1=GreenContA,plotstyle2=BlueContB,% + plotstyle3=RedContLissajou,plotstyle4=MagentaContAddSub} + \else + \psset{plotstyle1=BlackContA,plotstyle2=DarkgrayContB,% + plotstyle3=BlackContLissajou,plotstyle4=DarkgrayDashAddSub} + \fi + \ifx\pst@par\@empty\else\psset{#1}\fi + \pspicture(0,-5)(10,5) + \psframe*[linecolor=LightBlue](0,-4)(10,4) + \psgrid[gridlabels=0,subgriddiv=0](0,-4)(10,4) + \multido{\nxDiv=0+0.2}{50}{% + \psline(\nxDiv,-.1)(\nxDiv,0.1)} + \multido{\nyDiv=-4.0+0.2}{40}{% + \psline(4.9,\nyDiv)(5.1,\nyDiv)} + \psframe[fillcolor=VeryLightGray,fillstyle=solid,dimen=middle](0,4)(10,5) + \rput(1.5,4.8){\ssf timeDiv :} \rput(1.5,4.3){\ssf\psk@Oscillo@TimeDiv{}ms/div} + \rput(4,4.8){\ssf Channel A :} \rput(4,4.3){\ssf\psk@ChannelA{} V/div} + \rput(7,4.8){\ssf Channel B :} \rput(7,4.3){\ssf\psk@ChannelB{} V/div} + \rput(9,4.8){\ssf XY} + \rput(9,4.3){\ifPst@Oscillo@Lissajous + \ifPst@Oscillo@AllColor\ACredA\else\ACred\fi ON + \else\ifPst@Oscillo@AllColor\ACgreenA\else\ACgreen\fi OFF\fi}%AllColor + \psframe[fillcolor=VeryLightGray,fillstyle=solid,dimen=middle](0,-5)(10,-4) + \ifPst@Oscillo@Combine + \rput(2,-4.3){\ssf\psk@Oscillo@Operation:} + \rput(2,-4.8){\ssf\ifPst@Oscillo@AllColor\ACmagentaA\else\ACmagenta\fi ON}%AllColor + \fi + \rput(6.5,-4.3){\ssf OffsetB} + \rput(6.5,-4.8){\ssf \psk@Oscillo@OffsetB} + \rput(8.5,-4.3){\ssf OffsetC} + \rput(8.5,-4.8){\ssf \psk@Oscillo@OffsetC} + \rput(4.5,-4.3){\ssf OffsetA} + \rput(4.5,-4.8){\ssf \psk@Oscillo@OffsetA} + \ifPst@Oscillo@Lissajous + \psclip{\psframe(0,-4)(10,4)} + \parametricplot[style=\psk@Oscillo@PlotStyleC]{0}{360}{% + /fourier \psk@Oscillo@Fourier\space def + /T1 \psk@Oscillo@PeriodA\space def + /T2 \psk@Oscillo@PeriodB\space def + /Tm1 \psk@Oscillo@PeriodModulationA\space def + /mod1 \psk@Oscillo@FreqModA\space def + /Tm2 \psk@Oscillo@PeriodModulationB\space def + /mod2 \psk@Oscillo@FreqModB\space def + /CC1 \psk@Oscillo@ContinuousComponentA\space def + /CC2 \psk@Oscillo@ContinuousComponentB\space def + /BT T1 def + /A1 \psk@Oscillo@AmplitudeA\space def + /A2 \psk@Oscillo@AmplitudeB\space def + /phaseA \psk@Oscillo@PhaseA\space def + /phaseB \psk@Oscillo@PhaseB\space def + %/K 36 T div def + /e 2.718 def + /AR1 \psk@Oscillo@dampingA\space def + /AR2 \psk@Oscillo@dampingB\space def + /SA \psk@ChannelA\space def + /SB \psk@ChannelB\space def + /offset1 \psk@Oscillo@OffsetA\space def + /offset2 \psk@Oscillo@OffsetB\space def + \psk@Oscillo@WaveA\space 5 add + \psk@Oscillo@WaveB\space} + \endpsclip + \else + \psclip{\psframe(0,-4)(10,4)}\psset{xunit=0.02777} + \parametricplot[style=\psk@Oscillo@PlotStyleA]{0}{360}{% + /fourier \psk@Oscillo@Fourier\space def + /T1 \psk@Oscillo@PeriodA\space def + /Tm1 \psk@Oscillo@PeriodModulationA\space def + /mod1 \psk@Oscillo@FreqModA\space def + /BT \psk@Oscillo@TimeDiv\space def + /A1 \psk@Oscillo@AmplitudeA\space def + /phaseA \psk@Oscillo@PhaseA\space def + /CC1 \psk@Oscillo@ContinuousComponentA\space def + /e 2.718 def + /AR1 \psk@Oscillo@dampingA\space def + /offset1 \psk@Oscillo@OffsetA\space def + /SA \psk@ChannelA\space def + t \psk@Oscillo@WaveA\space + offset1 add + } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \parametricplot[style=\psk@Oscillo@PlotStyleB]{0}{360}{% /fourier \psk@Oscillo@Fourier\space def @@ -310,6 +345,7 @@ t \psk@Oscillo@WaveA\space \space offset3 add} \fi \endpsclip\fi -\endpspicture}} +\endpspicture% +\endgroup\ignorespaces} \catcode`\@=\PstAtCode\relax \endinput diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index 68508375775..01b77c4a427 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -26,8 +26,8 @@ \ifx\MultidoLoaded\endinput\else \input multido \fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{2.79} -\def\filedate{2006/09/23} +\def\fileversion{2.80} +\def\filedate{2006/09/25} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -161,7 +161,7 @@ \define@key[psset]{pstricksadd}{transpalpha}{\pst@checknum{#1}\pstranspalpha } %\psset[pstricksadd]{transpalpha=1} \def\psfs@transparent{% - \addto@pscode{/Normal .setblendmode \pstranspalpha .setshapealpha } + \addto@pscode{/Normal .setblendmode \pstranspalpha .setshapealpha }% \psfs@solid} % \def\defineTColor{\@ifnextchar[{\defineTColor@i}{\defineTColor@i[]}} |