summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-16 22:51:34 +0000
committerKarl Berry <karl@freefriends.org>2010-09-16 22:51:34 +0000
commitacbaadf738a2897e6f3bd3842989eea824eebcd0 (patch)
treefa6777a82857cf778a138f6e454babb1918a9281
parent944371719471a1fb7a344efe0d194be241436d0e (diff)
pstricks 2.12 (16sep10)
git-svn-id: svn://tug.org/texlive/trunk@19761 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/Changes.generic3
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex20
2 files changed, 14 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 35690cad057..276651d595c 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,7 @@
pstricks.tex --------
+2.12 2010-09-16 - new optional argument for setflat
+ - fix bug with doubled linecap definition
+ - fix bug with missing linejoin in \psls@solid
2.11 2010-09-09 - new optional arguments for setting a variable
linewidth and variable color
2.10 2010-08-27 - new optional argument noCurrentPoint, which is
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 36467cd0dd2..084e7a17e9c 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -65,8 +65,8 @@
\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.11}
-\def\filedate{2010/09/09}
+\def\fileversion{2.12}
+\def\filedate{2010/09/16}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -904,15 +904,15 @@
\ifpsshadow 1\else \z@\fi\fi\fi}}
%
\def\psls@none{}
-\def\psls@solid{\psk@linecap\space setlinecap stroke }
+\def\psls@solid{\psk@linejoin\space setlinejoin \psk@linecap\space setlinecap stroke }
%
\newdimen\pslinewidth
\define@key[psset]{pstricks}{linewidth}[0.8pt]{\pssetlength\pslinewidth{#1}}
\psset[pstricks]{linewidth=.8pt}
\define@key[psset]{pstricks}{linecolor}[black]{\pst@getcolor{#1}\pslinecolor}
\psset[pstricks]{linecolor=black}
-\define@key[psset]{pstricks}{linecap}[0]{\pst@getint{#1}\psk@linecap}% hv 2007-12-01
-\psset[pstricks]{linecap=0}
+%\define@key[psset]{pstricks}{linecap}[0]{\pst@getint{#1}\psk@linecap}% hv 2007-12-01
+%\psset[pstricks]{linecap=0} >>>>>>>>>>>>> siehe unten
\define@key[psset]{pstricks}{linejoin}[0]{\pst@getint{#1}\psk@linejoin}% hv 2007-10-13
\psset[pstricks]{linejoin=0}
\def\tx@setlinejoin{\psk@linejoin\space setlinejoin }% hv 2007-10-13
@@ -1106,7 +1106,9 @@
\define@key[psset]{pstricks}{endWL}[780]{\pst@getint{#1}\psk@endWL}%
\define@boolkey[psset]{pstricks}[Pst@]{variableLW}[true]{}
\define@boolkey[psset]{pstricks}[Pst@]{variableColor}[true]{}
-\psset[pstricks]{startLW=\pslinewidth,endLW=\pslinewidth,variableColor=false,variableLW=false,startWL=380,endWL=780}
+\define@key[psset]{pstricks}{setflat}[0.1]{\pst@checknum{#1}\psk@setflat}%
+\psset[pstricks]{startLW=\pslinewidth,endLW=\pslinewidth,variableColor=false,
+ variableLW=false,startWL=380,endWL=780,setflat=0.1}
%
\def\pst@flattenpath{
/Coors [] def % the array of all points
@@ -1115,7 +1117,7 @@
/add2Values { Coors aload length 2 add array astore /Coors exch def } def
/add6Values { Coors aload length 6 add array astore /Coors exch def } def
%
- 0.1 setflat % the value for the line snippets
+ \psk@setflat\space setflat % the value for the line snippets
flattenpath % flatten the existing path into line segments
%
{ add2Values } % what to do with moveto
@@ -1125,8 +1127,8 @@
pathforall % do it for the existing path
%
\pst@number\psk@startLW setlinewidth
- 2 setlinejoin
- 0 setlinecap
+ \tx@setlinejoin
+ \psk@linecap\space setlinecap
Coors aload length 2 sub 2 div cvi /N0 exch def % set number of points
/NN 0 def
/N N0 def