summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex26
1 files changed, 21 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex
index 0002a30507b..8541b57607a 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz.code.tex
@@ -1,4 +1,4 @@
-\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/frontendlayer/tikz.code.tex,v 1.32 2005/10/18 08:03:44 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/frontendlayer/tikz.code.tex,v 1.35 2005/11/09 15:49:25 tantau Exp $
% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
%
@@ -362,7 +362,7 @@
\def\tikz@test{#3}%
\ifx\tikz@test\@empty%
\else%
- \pgf@x=#3\relax%
+ \setlength{\pgf@x}{#3}%
\pgf@x=#2\pgf@x\relax%
\edef\tikz@marshal{\noexpand\tikz@addtransform{%
\expandafter\noexpand\csname pgftransform#1shift\endcsname{\the\pgf@x}}}%
@@ -383,6 +383,7 @@
% Text options
\define@key{tikz}{text}{\def\tikz@textcolor{#1}}
\define@key{tikz}{font}{\def\tikz@textfont{#1}}
+\define@key{tikz}{text opacity}{\def\tikz@textopacity{#1}}
\define@key{tikz}{text width}{\def\tikz@text@width{#1}}
\define@key{tikz}{text ragged}[]%
{\def\tikz@text@action{\raggedright\rightskip\z@ plus2em \spaceskip.3333em \xspaceskip.5em\relax}}
@@ -408,6 +409,7 @@
\let\tikz@text@width=\@empty
\let\tikz@textcolor=\@empty
\let\tikz@textfont=\@empty
+\let\tikz@textopacity=\@empty
\def\tikz@text@action{\raggedright\rightskip\z@ plus2em \spaceskip.3333em \xspaceskip.5em\relax}
@@ -1495,6 +1497,16 @@
\fi%
}
+% snake or lineto?
+\def\tikz@path@close#1{%
+ \iftikz@snaked%
+ \pgfpathsnakesto{\tikz@presnake,{\tikz@snake}{\tikz@mainsnakelength},\tikz@postsnake}{#1}%
+ \pgfpathclose%
+ \else%
+ \pgfpathclose%
+ \fi%
+}
+
% Syntax for lineto horizontal/vertical:
% -| <point>
@@ -1570,7 +1582,7 @@
{\tikz@@close c}}%
\def\tikz@@close cycle{%
\tikz@flush@moveto%
- \pgfpathclose%
+ \tikz@path@close{\expandafter\pgfpoint\pgfsyssoftpath@lastmoveto}%
\def\pgfstrokehook{}%
\let\tikz@timer=\@undefined%
\tikz@scan@next@command%
@@ -1710,8 +1722,7 @@
\tikz@path@lineto{\pgfpoint{\pgf@xa}{\tikz@lasty}}%
\tikz@path@lineto{\pgfpoint{\tikz@lastx}{\tikz@lasty}}%
\tikz@path@lineto{\pgfpoint{\tikz@lastx}{\pgf@ya}}%
- \tikz@path@lineto{\pgfpoint{\pgf@xa}{\pgf@ya}}%
- \pgfpathclose%
+ \tikz@path@close{\pgfpoint{\pgf@xa}{\pgf@ya}}%
\pgfpathmoveto{\pgfpoint{\tikz@lastx}{\tikz@lasty}}%
\def\pgfstrokehook{}%
\tikz@scan@next@command%
@@ -2048,6 +2059,11 @@
\setbox\pgfnodeparttextbox=\hbox%
\bgroup%
\tikz@every@style{every text node part}%
+ \ifx\tikz@textopacity\@empty%
+ \else%
+ \pgfsetfillopacity{\tikz@textopacity}%
+ \pgfsetstrokeopacity{\tikz@textopacity}%
+ \fi%
\pgfinterruptpicture%
\ifx\tikz@text@width\@empty%
\else%