diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-06-02 14:43:30 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-06-02 14:43:30 +0000 |
commit | 7b1f9f0f229b2167fb139083f23d7ca61b43c629 (patch) | |
tree | 448e837cf13310772f5abc93e2341fdee2451bac /Master/texmf-dist | |
parent | 82d52884d37b1a23afa751837ee5df24e03a99a4 (diff) |
pstricks-add v3.04 2008/06/02
git-svn-id: svn://tug.org/texlive/trunk@8484 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks-add/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf | bin | 1669809 -> 1669803 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks-add/sfg_test.tex | 35 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex | 20 |
5 files changed, 13 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index dcd89dc3a6e..3ebbd17c231 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/Changes +++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes @@ -33,6 +33,7 @@ pstricks-add.sty ----------- (hv) pstricks-add.tex ----------- (Dominik Rodriguez/hv) + v 3.04 2008-06-02 - make \pslinewidth and \psfillstyle available in \psbrace v 3.03 2008-05-20 - fix introduced bug with ps.pro v 3.02 2008-04-25 - set correct labelFontSize for math mode - add macro \psPie with some additional diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf Binary files differindex e672d042e3d..58e9702f744 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex index ccfe20c18ea..5014cd7dea0 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add-doc.tex 20 2008-04-15 18:40:18Z herbert $ +%% $Id: pstricks-add-doc.tex 24 2008-05-16 18:33:45Z herbert $ \documentclass[12pt]{article} \listfiles \usepackage{filecontents} @@ -1572,7 +1572,7 @@ or \verb|t| (top), where the default is \verb|c|, the center of the object. \psbrace[rot=180,nodesepA=-5pt,ref=rb](B)(A){Two} \psbrace[linecolor=blue,bracePos=0.25,ref=lB](8,1)(1,7){Three} \psbrace[braceWidth=-1mm,rot=180,ref=rB](8,1)(1,7){Four} -\psbrace*[linearc=0.5,linecolor=red,linewidth=3pt,braceWidth=1.5pt, +\psbrace*[linearc=0.5,fillstyle=none,linewidth=1pt,braceWidth=1.5pt, bracePos=0.25,ref=lC](8,1)(8,9){A} \psbrace(4,9)(6,9){} \psbrace(6,9)(6,7){} diff --git a/Master/texmf-dist/doc/generic/pstricks-add/sfg_test.tex b/Master/texmf-dist/doc/generic/pstricks-add/sfg_test.tex deleted file mode 100644 index f9a1cc2f3d5..00000000000 --- a/Master/texmf-dist/doc/generic/pstricks-add/sfg_test.tex +++ /dev/null @@ -1,35 +0,0 @@ -\documentclass[11pt,a4paper]{article} -\usepackage{graphics,pstricks,sfg} -\pagestyle{empty} -\setlength{\parindent}{0pt} - -\begin{document} -\sfgsetunit{0.5cm} -\sfgsetsize{0.12}{0.4}{0.5}{0.3} -\sfgsetcompass -\begin{picture}(27,4) - % branches related to node 2 - \put(6,2){\sfgbranch{3}{0}\S{$\frac{1}{R_1}$}} - \put(9,2){\sfgbranch{3}{0}\N{\boldmath $Z_2$}} - \put(18,2){\sfgcurve{-9}{0}{2}\S{$\frac{1}{R_2}$}} - \put(24,2){\sfgcurve{-15}{0}{-2}\N{$sC_1$}} - % branches related to node 3 - \put(12,2){\sfgbranch{3}{0}\N{$\frac{1}{R_2}$}} - \put(15,2){\sfgbranch{3}{0}\N{\boldmath $Z_3$}} - % input, voltage gain, output - \put(0,2){\sfgcurve{6}{0}{2}\N{$1$}} - \put(18,2){\sfgcurve{6}{0}{-2}\S{$\alpha_{\mathrm{V}}$}} - \put(24,2){\sfgbranch{3}{0}\S{$1$}} - % nodes - \put(0,2){\sfgtermnode\S{$V_{\mathrm{in}}$}} - \put(3,2){\sfgnode\S{$I_1$}} - \put(6,2){\sfgnode\S{$V_1$}} - \put(9,2){\sfgnode\S{$I_2$}} - \put(12,2){\sfgnode\S{$V_2$}} - \put(15,2){\sfgnode\S{$I_3$}} - \put(18,2){\sfgnode\S{$V_3$}} - \put(21,2){\sfgnode\S{$I_4$}} - \put(24,2){\sfgnode\S{$V_4$}} - \put(27,2){\sfgtermnode\S{$V_{\mathrm{out}}$}} -\end{picture} -\end{document} 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 36d3d8a8150..b8520590dcf 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -29,8 +29,8 @@ \ifx\MultidoLoaded\endinput\else \input multido \fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{3.03} -\def\filedate{2008/05/20} +\def\fileversion{3.04} +\def\filedate{2008/06/02} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -39,7 +39,7 @@ % %% prologue for postcript \pstheader{pstricks-add.pro}% -%\pstheader{pst-algparser.pro}% done by pstricks.tex +%\pstheader{pst-algparser.pro}% now done by pstricks.tex % %-------------------------------- pstricks ------------------------------------ % @@ -341,7 +341,7 @@ % \def\psbrace{\pst@object{psbrace}} \def\psbrace@i(#1)(#2)#3{% - \addbefore@par{ref=lb,linewidth=0.01pt,fillstyle=solid,fillcolor=black} + \addbefore@par{ref=lb,linewidth=0.01pt,fillstyle=solid,fillcolor=black}% default setting \begin@SpecialObj \if@star\def\pst@tempC{true }\else\def\pst@tempC{false }\fi \ifx\psk@rot\empty\def\psk@@rot{0}\else\let\psk@@rot\psk@rot\fi @@ -376,10 +376,13 @@ Left radius2 sub radius1 sub neg 0 rlineto radius2 Width neg radius2 270 180 arcn 0 0 lineto - gsave - ifStar { \pst@usecolor\pslinecolor }{ \pst@usecolor\psfillcolor } ifelse fill + \ifx\psk@fillstyle\relax\else + gsave + ifStar { \pst@usecolor\pslinecolor }{ \pst@usecolor\psfillcolor } ifelse + fill grestore - 0.01 setlinewidth \pst@usecolor\pslinecolor stroke + \fi + \pst@number\pslinewidth setlinewidth \pst@usecolor\pslinecolor stroke 0 0 moveto grestore % now calculate the label pos @@ -1486,9 +1489,6 @@ %% #2 decimals %% #3 dot \def\@stripDecimals#1.#2.#3\@nil{% -\typeout{1: #1} -\typeout{2: #2} -\typeout{3: #3} \def\pst@dummy{#1}% \ifx\pst@dummy\@empty\the\@zero\else#1\fi% the integer part } |