diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex | 77 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty | 2 |
2 files changed, 48 insertions, 31 deletions
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 a0fc87423af..f30244f185b 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -27,8 +27,8 @@ \ifx\MultidoLoaded\endinput\else \input multido \fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{2.89} -\def\filedate{2007/08/18} +\def\fileversion{2.90} +\def\filedate{2007/09/25} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -158,16 +158,6 @@ \define@boolkey[psset]{pstricks-add}[Pst@]{CMYK}[true]{} \psset[pstricks-add]{CMYK=true} % -% transalpha needs a run through latex -> dvips -> ps2pdf14(!) -% and view with Acrobat >= 5.0 -% use transpalpha=<mumber> to the the opacity level -% -\define@key[psset]{pstricks-add}{transpalpha}{\pst@checknum{#1}\psk@transpalpha } -%\psset[pstricks-add]{transpalpha=1} -\def\psfs@transparent{% - \addto@pscode{/Normal .setblendmode \psk@transpalpha .setshapealpha }% - \psfs@solid} -% \def\defineTColor{\@ifnextchar[{\defineTColor@i}{\defineTColor@i[]}} \def\defineTColor@i[#1]#2#3{% "semi transparency colors" \def\pst@tempA{#1}% @@ -224,25 +214,18 @@ % % [#1]: obtargs; (#2,#3): center; {#4}: factor; {#5}: object \def\psHomothetie{\pst@object{psHomothetie}} -% make it a PStricks object: reads the optional Arguments and an -% optional star automatically. Continiue with <object>@i \def\psHomothetie@i(#1)#2{% - \begingroup\use@par% hold all locally and set all read optional arguments - \pst@makebox{\psHomothetie@ii(#1){#2}}}% put the contents into a box - % continiue \psHomothetie@ii -\def\psHomothetie@ii(#1)#2{% + \begin@SpecialObj% \pst@getcoor{#1}\pst@tempA% converts the coordinates without a unit into pt - % and save them in \pst@tempA, eg: 0 28.82 - \leavevmode% go into the horizontal TeX mode - \pst@Verb{ % insert the following PostScript sequence - \pst@tempA /yH ED /xH ED % cave coordinates into /yh and /xh - % ED is the same as exch def - { [#2 0 0 #2 #2 xH mul neg xH add #2 % build the transformation matrix - yH mul neg yH add] concat } \tx@TMChange }% add it to the current one - % and make it active - \box\pst@hbox% use the box - \pst@Verb{ \tx@TMRestore }% restore the old transformation matrix - \endgroup}% close the group + \pst@makebox{\psHomothetie@ii{#2}}}% put the contents into a box +\def\psHomothetie@ii#1{% + \pst@Verb{% + { \pst@tempA /yH ED /xH ED + [#1 0 0 #1 #1 xH mul neg xH add #1 yH mul neg yH add] concat } + \tx@TMChange }% + \box\pst@hbox% + \pst@Verb{\tx@TMRestore}% + \end@SpecialObj} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Begin patch TN; Date (YY-MM-DD): 04-07-17; first part @@ -1332,6 +1315,38 @@ \ncput[npos=1]{#4}% \end@SpecialObj }% +\define@cmdkeys[psset]{pstricks-add}[PSTPSPNk@]{% Christophe Jorssen 2007 + blName,bcName,brName, + clName,ccName,crName, + tlName,tcName,trName}[]{}% +\psset[pstricks-add]{% + blName=PSPbl,bcName=PSPbc,brName=PSPbr, + clName=PSPcl,ccName=PSPcc,crName=PSPcr, + tlName=PSPtl,tcName=PSPtc,trName=PSPtr} +\def\psDefPSPNodes{\pst@object{psDefPSPNodes}} +\def\psDefPSPNodes@i{% + \pst@killglue + \begingroup + \use@par + \expandafter\psDefPSPNodes@ii\pic@coor} +% +\def\psDefPSPNodes@ii(#1)(#2)(#3){% +% \pnode(#1){PSPN@temp}\pnode([nodesep=.75,angle=45]PSPN@temp){\PSTPSPNk@blName} +% \pnode(#3){PSPN@temp}\pnode([nodesep=.75,angle=-135]PSPN@temp){\PSTPSPNk@trName} + \pnode(#1){PSPN@temp}\pnode([angle=45]PSPN@temp){\PSTPSPNk@blName} + \pnode(#3){PSPN@temp}\pnode([angle=-135]PSPN@temp){\PSTPSPNk@trName} + \pnode(\PSTPSPNk@blName|\PSTPSPNk@trName){\PSTPSPNk@tlName} + \pnode(\PSTPSPNk@trName|\PSTPSPNk@blName){\PSTPSPNk@brName} + \ncline[linestyle=none]{\PSTPSPNk@blName}{\PSTPSPNk@tlName} + \ncput[npos=.5]{\pnode{\PSTPSPNk@clName}} + \ncline[linestyle=none]{\PSTPSPNk@blName}{\PSTPSPNk@brName} + \ncput[npos=.5]{\pnode{\PSTPSPNk@bcName}} + \pnode(\PSTPSPNk@brName|\PSTPSPNk@clName){\PSTPSPNk@crName} + \pnode(\PSTPSPNk@bcName|\PSTPSPNk@trName){\PSTPSPNk@tcName} + \pnode(\PSTPSPNk@bcName|\PSTPSPNk@clName){\PSTPSPNk@ccName} + \endgroup + \ignorespaces} +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%% %%%%%%%%%% %%%%%%%%%%% pst-plot %%%%%%%%%% @@ -3034,7 +3049,6 @@ \@zero=0% \def\pst@linetype{0}% \psset[pstricks-add]{% - transpalpha=1, hooklength=3mm, hookwidth=1mm, ArrowFill=true, ArrowInside={}, ArrowInsidePos=0.5, @@ -3068,6 +3082,9 @@ } \psset{% %%%% pstricks %%%%%%%% + opacity=1, + blendmode=0, + shapealpha=0.6, unit=1cm,% swapaxes=false,% showpoints=false,% diff --git a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty index 65753ef459f..f25c298db43 100644 --- a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty +++ b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty @@ -6,7 +6,7 @@ [\filedate\space v\fileversion\space `PSTricks-add' (hv)] \IfFileExists{pstricks-add.pro}{% \ProvidesFile{pstricks-add.pro} - [2007/09/04 v. 0.12, PostScript prologue file (hv)] + [2007/09/04 v. 0.14, PostScript prologue file (hv)] \@addtofilelist{pstricks-add.pro}}{}% \InputIfFileExists{pstricks-add.cfg}{% \PackageInfo{pstricks-add}{Local config file pstricks-add.cfg used} |