From e240dc11a49f89d14320be45ca0f3ff0f9fcd5f9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Mar 2011 00:08:35 +0000 Subject: pst-sigsys (9mar11) git-svn-id: svn://tug.org/texlive/trunk@21667 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-sigsys/pst-sigsys.tex | 34 ++++++++++++++-------- .../texmf-dist/tex/latex/pst-sigsys/pst-sigsys.sty | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/pst-sigsys/pst-sigsys.tex b/Master/texmf-dist/tex/generic/pst-sigsys/pst-sigsys.tex index 5314ffa2afa..729bea69c6d 100644 --- a/Master/texmf-dist/tex/generic/pst-sigsys/pst-sigsys.tex +++ b/Master/texmf-dist/tex/generic/pst-sigsys/pst-sigsys.tex @@ -1,5 +1,5 @@ %% -%% This is file `pst-sigsys.tex' v 1.3. +%% This is file `pst-sigsys.tex' v 1.4. %% %% IMPORTANT NOTICE: %% @@ -10,7 +10,7 @@ %% v 1.1: 04/01/2009 %% v 1.2: 01/15/2010 %% v 1.3: 06/18/2010 -%% v 1.31: 03/04/2011 (hv) +%% v 1.4: 03/07/2011 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -28,8 +28,8 @@ \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi -\def\pstsigsysFV{1.31} -\def\pstsigsysFD{2011/03/03} +\def\pstsigsysFV{1.4} +\def\pstsigsysFD{2011/03/07} \message{`PST-SigSys' v\pstsigsysFV, \pstsigsysFD\space (fd)} @@ -143,6 +143,15 @@ % \newpsstyle{inv@frame}{fillstyle=none,linestyle=none,framearc=0} % +%%% ss@ifneqdim %%% +\newdimen\ss@if@dimA +\newdimen\ss@if@dimB +\def\ss@ifneqdim#1#2#3{% +\pssetlength{\ss@if@dimA}{#1}% +\pssetlength{\ss@if@dimB}{#2}% +\ifdim\ss@if@dimA=\ss@if@dimB\else% +#3\fi} +% %%% This is my parser. %%% \def\ss@parse@temp{} \def\ss@parseA{} @@ -215,6 +224,7 @@ \define@key[psset]{pst-sigsys}{gratioHh}{\pst@gratio@height{#1}{1.618033989}} \define@key[psset]{pst-sigsys}{gratioHv}{\pst@gratio@height{#1}{.6180339887}} \define@key[psset]{pst-sigsys}{aoffset}{\pssetlength{\ss@aoffset}{#1}} +\define@key[psset]{pst-sigsys}{afac}{\def\ss@afac{#1}} \define@key[psset]{pst-sigsys}{knoblength}{\pssetlength{\ss@knoblength}{#1}} \define@key[psset]{pst-sigsys}{knobwidth}{\pssetlength{\ss@knobwidth}{#1}} \define@key[psset]{pst-sigsys}{knobangle}{\def\ss@knobangle{#1}} @@ -235,7 +245,7 @@ \psset[pst-sigsys]{polewidth=.7pt,polelength=.12}% pspole \psset[pst-sigsys]{opwidth=.7pt,oplength=.125,opsep=.1,operation=plus}% pscircleop and psframeop \psset[pst-sigsys]{ldotssize=.05,ldotssep=.15}% psldots -\psset[pst-sigsys]{aoffset=0}% psadaptive +\psset[pst-sigsys]{aoffset=0,afac=1}% psadaptive \psset[pst-sigsys]{knobwidth=.7pt,knoblength=1,knobangle=45}% psknob %--- end default key values ------------------------------ @@ -247,8 +257,8 @@ \def\psaxeslabels@i{\pst@getarrows\psaxeslabels@ii} \def\psaxeslabels@ii(#1,#2)(#3,#4)(#5,#6)#7#8{{% \use@par% -\psline(#3,#2)(#5,#2)% -\psline(#1,#4)(#1,#6)% +\ss@ifneqdim{#3}{#5}{\psline(#3,#2)(#5,#2)}% +\ss@ifneqdim{#4}{#6}{\psline(#1,#4)(#1,#6)}% % \if\ss@xlpos t% \rput(#5,#2){\rput[rb](0,\pslabelsep){#7}}% @@ -404,7 +414,7 @@ \def\psdisk{\def\pst@par{}\pst@object{psdisk}} \def\psdisk@i(#1)#2{{% \use@par% -\pscircle*[linewidth=0pt,linecolor=\psfillcolor](#1){#2}% +\pscircle*[linestyle=none,linecolor=\psfillcolor](#1){#2}% }\ignorespaces} %--- end psdisk ------------------------------------------ @@ -432,7 +442,7 @@ \else% \pssetlength{\ss@temp@dimC}{1.5\ss@temp@dimB}% \fi% -\psclip{\rput(#1){\psframe[linewidth=0pt,linecolor=\psfillcolor](-#2,-#3)(#2,#3)}}% +\psclip{\rput(#1){\psframe[linestyle=none,linecolor=\psfillcolor](-#2,-#3)(#2,#3)}}% \psring@i(#1){#4}{\ss@temp@dimC}% \endpsclip% }\ignorespaces} @@ -494,9 +504,9 @@ \def\psadaptive@i{\check@arrow{\psadaptive@ii}} \def\psadaptive@ii#1(#2)#3{{% \use@par% -\rput(#1){\pnode(#2){ss@nodeA}}% -\rput(ss@nodeA){\pnode(\ss@aoffset,0){#3}}% -\psLNode(#1)(ss@nodeA){-1}{ss@nodeB}% +\nodexn{(#1)+(#2)}{ss@nodeA}% +\nodexn{(ss@nodeA)+(\ss@aoffset,0)}{#3}% +\psLNode(#1)(ss@nodeA){-\ss@afac}{ss@nodeB}% \ifdim\ss@aoffset>\z@% \ncdiagg[armA=\ss@aoffset,angleA=180]{-}{#3}{#1}% \else% diff --git a/Master/texmf-dist/tex/latex/pst-sigsys/pst-sigsys.sty b/Master/texmf-dist/tex/latex/pst-sigsys/pst-sigsys.sty index eebb6596d6f..f429c384166 100644 --- a/Master/texmf-dist/tex/latex/pst-sigsys/pst-sigsys.sty +++ b/Master/texmf-dist/tex/latex/pst-sigsys/pst-sigsys.sty @@ -1,5 +1,5 @@ \RequirePackage{pstricks} -\ProvidesPackage{pst-sigsys}[2010/06/18 package wrapper for pst-sigsys.tex (fd)] +\ProvidesPackage{pst-sigsys}[2011/03/07 package wrapper for pst-sigsys.tex (fd)] \input{pst-sigsys.tex} \ProvidesFile{pst-sigsys.tex}[\pstsigsysFD\space v\pstsigsysFV\space `PST-sigsys' (fd)] -- cgit v1.2.3