From 001858de85c02bcaae9e416f8ccfc5f1d624729b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Apr 2014 22:50:51 +0000 Subject: pst-perspective (10apr14) git-svn-id: svn://tug.org/texlive/trunk@33445 c570f23f-e606-0410-a88d-b1316a301751 --- .../pst-perspective/pst-perspective-doc.pdf | Bin 302088 -> 304874 bytes .../pst-perspective/pst-perspective-doc.tex | 5 ++- .../pst-perspective/pst-perspective-docEN.pdf | Bin 290340 -> 293096 bytes .../pst-perspective/pst-perspective-docEN.tex | 5 ++- .../generic/pst-perspective/pst-perspective.tex | 43 +++++++++++++++------ 5 files changed, 40 insertions(+), 13 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.pdf b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.pdf index 4316745149e..e05e6f46c83 100644 Binary files a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.pdf and b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.tex b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.tex index 834064376b8..24feb50f8aa 100644 --- a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-doc.tex @@ -7,7 +7,7 @@ \usepackage{multido,pst-grad,pst-eucl,pst-3dplot,pstricks-add} \usepackage{pst-perspective} -\def\fileversion{1.02} +\def\fileversion{1.03} \let\pstPerspectiveFV\fileversion \renewcommand\bgImage{\psscalebox{0.85}{% \begin{pspicture}[showgrid=false](0.5,-0.5)(11.5,8.5) @@ -710,6 +710,8 @@ Das Makro \Lcs{psboxTS} mit \Lkeyset{vkf=0.5} \Lkeyset{phi= } erzeugt einen Qua Mit der Option, z.B. \Lkeyset{hideline=true} werden die verdeckt liegenden Kanten des Quaders gezeichnet. Dabei stehen die Optionen \Lkeyset{hidelinewidth=}, \Lkeyset{hidelinestyle=} und \Lkeyset{hidecolor=} zur Verf\"{u}gung. +Die Option, z.B. \Lkeyset{differentcol=true} erlaubt die drei sichtbaren Fl\"{a}chen des Quaders unabh\"{a}ngig einzuf\"{a}rben. Dabei stehen w\"{a}hlt man \"{u}ber \Lkeyset{facecolorR=} und \Lkeyset{facecolorT=} die Farben der Deckfl\"{a}che und der rechten Fl\"{a}che. Die vordere Fl\"{a}che wird mit der Farbe des angegebenen Arguments gef\"{u}llt. + Das Makro l\"{a}sst sich, wie die anderen auch, gut mit dem Paket pst-3dplot kombinieren indem man \Lkeyset{coorType=1}, \Lkeyset{xThreeDunit=vkf} und \Lkeyset{phi = 180 Alpha sub} w\"{a}hlt. \begin{LTXexample}[pos=t] @@ -722,6 +724,7 @@ Das Makro l\"{a}sst sich, wie die anderen auch, gut mit dem Paket pst-3dplot kom \psboxTS(0,2,3){3}{4}{1}{blue} \psboxTS[hideline=true,dash=2pt 2pt,hidelinewidth=0.5pt](4,0,0){2}{1}{4}{yellow} \psboxTS[opacity=0.75,hideline=true,hidelinewidth=1.2pt,hidelinestyle=dotted,hidecolor=green,dotsep=1.5pt](3,4,0){4}{2}{1}{brown} +\psboxTS[differentcol=true,facecolorR=blue,facecolorT=orange](0,0,1){1}{2}{0.5}{green} %-------------------------------------- \end{pspicture} \end{LTXexample} diff --git a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.pdf b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.pdf index df065fd0b5c..ea148da0d0d 100644 Binary files a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.pdf and b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.tex b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.tex index 23895c58c54..05574b9d6de 100644 --- a/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.tex +++ b/Master/texmf-dist/doc/generic/pst-perspective/pst-perspective-docEN.tex @@ -9,7 +9,7 @@ \lstset{language=PSTricks,morekeywords={pstransTSK,pstransTSX,pstransTS,pstMarkAngle,psIntersectionPoint,psboxTS}} -\def\fileversion{1.02} +\def\fileversion{1.03} \let\pstPerspectiveFV\fileversion \renewcommand\bgImage{\psscalebox{0.85}{% \begin{pspicture}[showgrid=false](0.5,-0.5)(11.5,8.5) @@ -711,6 +711,8 @@ With the macro \Lcs{psboxTS} we can easily draw cuboids. For its three coordinat With the option \Lkeyset{hideline=true} the hidden lines are shown with the keys \Lkeyset{hidelinewidth=}, \Lkeyset{hidelinestyle=} and \Lkeyset{hidecolor=}. +With the option \Lkeyset{differentcol=true} we can give the three visible faces different colors. The color of the right side can changed with \Lkeyset{facecolorR=}, the color of the top can changed with \Lkeyset{facecolorT=}. The frontcolor is the color in curly braces. + This macro and the others as well can be used in combination with the pst-3dplot package with the settings: \Lkeyset{coorType=1}, \Lkeyset{xThreeDunit=vkf} and \Lkeyset{phi = 180 Alpha sub}. \begin{LTXexample}[pos=t] @@ -723,6 +725,7 @@ This macro and the others as well can be used in combination with the pst-3dplot \psboxTS(0,2,3){3}{4}{1}{blue} \psboxTS[hideline=true,dash=2pt 2pt,hidelinewidth=0.5pt](4,0,0){2}{1}{4}{yellow} \psboxTS[opacity=0.75,hideline=true,hidelinewidth=1.2pt,hidelinestyle=dotted,hidecolor=green,dotsep=1.5pt](3,4,0){4}{2}{1}{brown} +\psboxTS[differentcol=true,facecolorR=blue,facecolorT=orange](0,0,1){1}{2}{0.5}{green} %-------------------------------------- \end{pspicture} \end{LTXexample} diff --git a/Master/texmf-dist/tex/generic/pst-perspective/pst-perspective.tex b/Master/texmf-dist/tex/generic/pst-perspective/pst-perspective.tex index b5f79335af6..76274535f8b 100644 --- a/Master/texmf-dist/tex/generic/pst-perspective/pst-perspective.tex +++ b/Master/texmf-dist/tex/generic/pst-perspective/pst-perspective.tex @@ -27,10 +27,13 @@ \define@boolkey[psset]{pst-perspective}[Pst@]{translineA}[false]{} % showtransline \define@boolkey[psset]{pst-perspective}[Pst@]{translineB}[false]{} % showtransline \define@boolkey[psset]{pst-perspective}[Pst@]{translineK}[true]{} % show transline -\define@boolkey[psset]{pst-perspective}[Pst@]{hideline}[false]{} % showhideline +\define@boolkey[psset]{pst-perspective}[Pst@]{hideline}[false]{} % show hideline +\define@boolkey[psset]{pst-perspective}[Pst@]{differentcol}[false]{} % unterschiedliche Farben der Fl\"{a}chen \define@boolkey[psset]{pst-perspective}[Pst@]{LowPoint}[false]{} % Basis durch z.B. tief liegenden Pkt \define@boolkey[psset]{pst-perspective}[Pst@]{symX}[true]{} % Symmetrieachse bei spiegelverkehrten Bildern \define@key[psset]{pst-perspective}{hidecolor}[black!80]{\def\psk@transTS@hidecolor{#1}} +\define@key[psset]{pst-perspective}{facecolorT}[yellow]{\def\psk@transTS@facecolorT{#1}} +\define@key[psset]{pst-perspective}{facecolorR}[red]{\def\psk@transTS@facecolorR{#1}} \define@key[psset]{pst-perspective}{hidelinestyle}[solid]{\def\psk@transTS@hidelinestyle{#1}} \define@key[psset]{pst-perspective}{hidelinewidth}[0.7pt]{\def\psk@transTS@hidelinewidth{#1}} \define@key[psset]{pst-perspective}{transcolor}[blue]{\def\psk@transTS@transcolor{#1}} @@ -49,9 +52,10 @@ \define@key[psset]{pst-perspective}{phi}[45]{\def\psk@transTS@phi{#1 }}% Winkel f\"{u}r das Schr\"{a}gbild \define@key[psset]{pst-perspective}{deltaphi}[0]{\def\psk@transTS@deltaphi{#1 }}% zus\"{a}tzlicher Winkel f\"{u}r das Schr\"{a}gbild \define@key[psset]{pst-perspective}{vkf}[0.5]{\def\psk@transTS@vkf{#1 }} % Verk\"{u}rzungsfaktor -\psset[pst-perspective]{phi=45,vkf=0.5,base=0,translineA=false,translineB=false,transAcolor=green,transBcolor=blue,% -transAlinewidth=0.7pt,transBlinewidth=0.7pt,transAlinestyle=dashed,transBlinestyle=dashed,deltaphi=0,symline=0,symX=true,hidecolor=black!80,% -translineK=true,transcolor=blue,translinewidth=0.8pt,translinestyle=solid,LowPoint=false,LowP={0,0},originT={0,0},hideline=false,hidelinewidth=0.7pt,hidelinestyle=dashed}% +\psset[pst-perspective]{phi=45,vkf=0.5,base=0,translineA=false,translineB=false,transAcolor=green,transBcolor=blue,differentcol=false,% +transAlinewidth=0.7pt,transBlinewidth=0.7pt,transAlinestyle=dashed,transBlinestyle=dashed,deltaphi=0,facecolorT=yellow,facecolorR=red,% +symline=0,symX=true,hidecolor=black!80,translineK=true,transcolor=blue,translinewidth=0.8pt,translinestyle=solid,% +LowPoint=false,LowP={0,0},originT={0,0},hideline=false,hidelinewidth=0.7pt,hidelinestyle=dashed}% \SpecialCoor% \def\ba{\psk@transTS@base} \def\pstransTS{\pst@object{pstpstransTS}}% @@ -165,7 +169,12 @@ l2 \psk@transTS@phi PtoC){#4}} \pst@killglue \use@par %------------------------------------------------- -\pspolygon[fillstyle=solid,fillcolor=#7!60]% +{\ifPst@differentcol +\psset{fillstyle=solid,fillcolor=#7}% +\else +\psset{fillstyle=solid,fillcolor=#7!60}% +\fi +\pspolygon% (!/l1 #1 #4 add def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 add exch)% @@ -181,8 +190,14 @@ l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 #5 add add exch)% (!/l1 #1 #4 add def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 add exch)% +}% %------------------------------------------------- -\pspolygon[fillstyle=solid,fillcolor=#7!90]% +{\ifPst@differentcol +\psset{fillstyle=solid,fillcolor=\psk@transTS@facecolorR}% +\else +\psset{fillstyle=solid,fillcolor=#7!90}% +\fi +\pspolygon% (!/l1 #1 #4 add def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 #5 add add exch)% @@ -198,9 +213,14 @@ l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 #5 add add exch)% (!/l1 #1 #4 add def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 #5 add add exch)% - +}% %%------------------------------------------------- -\pspolygon[fillstyle=solid,fillcolor=#7!40]% +{\ifPst@differentcol +\psset{fillstyle=solid,fillcolor=\psk@transTS@facecolorT}% +\else +\psset{fillstyle=solid,fillcolor=#7!40}% +\fi +\pspolygon% (!/l1 #1 #4 add def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 #5 add add exch)% @@ -216,9 +236,10 @@ l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 add exch)% (!/l1 #1 #4 add def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 add exch)% +}% %------------------------------------------------- \ifPst@hideline -\psline[linecolor=\psk@transTS@hidecolor,linestyle=\psk@transTS@hidelinestyle,linewidth=\psk@transTS@hidelinewidth]% +\pcline[nodesep=1.1pt,linecolor=\psk@transTS@hidecolor,linestyle=\psk@transTS@hidelinestyle,linewidth=\psk@transTS@hidelinewidth]% (!/l1 #1 def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 add exch)% @@ -226,7 +247,7 @@ l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 add exch)% /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 add exch)% %------------------------------------------------- -\psline[linecolor=\psk@transTS@hidecolor,linestyle=\psk@transTS@hidelinestyle,linewidth=\psk@transTS@hidelinewidth]% +\pcline[nodesep=1.1pt,linecolor=\psk@transTS@hidecolor,linestyle=\psk@transTS@hidelinestyle,linewidth=\psk@transTS@hidelinewidth]% (!/l1 #1 def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 add exch)% @@ -234,7 +255,7 @@ l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 add exch)% /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 #6 add add exch #2 add exch)% %------------------------------------------------- -\psline[linecolor=\psk@transTS@hidecolor,linestyle=\psk@transTS@hidelinestyle,linewidth=\psk@transTS@hidelinewidth]% +\pcline[nodesep=1.1pt,linecolor=\psk@transTS@hidecolor,linestyle=\psk@transTS@hidelinestyle,linewidth=\psk@transTS@hidelinewidth]% (!/l1 #1 def /l2 l1 \psk@transTS@vkf mul def l2 \psk@transTS@phi 180 add PtoC #3 add exch #2 add exch)% -- cgit v1.2.3