summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex169
1 files changed, 85 insertions, 84 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex
index b308c5aef8f..54b5afcf6ae 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepatterns.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepatterns.code.tex,v 1.3 2009/07/02 11:43:15 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepatterns.code.tex,v 1.5 2013/11/07 15:45:46 tantau Exp $
% Creates a new uncolored pattern
%
@@ -53,8 +53,8 @@
% }
%
\def\pgfdeclarepatternformonly{%
- \def\pgf@pattern@type{formonly}%
- \pgfutil@ifnextchar[{\pgf@declarepattern@checkarg}{\pgf@declarepattern@checkarg[]}%
+ \def\pgf@pattern@type{formonly}%
+ \pgfutil@ifnextchar[{\pgf@declarepattern@checkarg}{\pgf@declarepattern@checkarg[]}%
}
@@ -92,8 +92,8 @@
% }
%
\def\pgfdeclarepatterninherentlycolored{%
- \def\pgf@pattern@type{inherentlycolored}%
- \pgfutil@ifnextchar[{\pgf@declarepattern@checkarg}{\pgf@declarepattern@checkarg[]}%
+ \def\pgf@pattern@type{inherentlycolored}%
+ \pgfutil@ifnextchar[{\pgf@declarepattern@checkarg}{\pgf@declarepattern@checkarg[]}%
}
@@ -101,26 +101,26 @@
\def\pgf@declarepattern@checkarg[#1]{%
- \def\pgf@pattern@tempvars{#1}%
- \ifx\pgf@pattern@tempvars\pgfutil@empty%
- \expandafter\let\expandafter\pgf@next\csname pgf@declarepattern\pgf@pattern@type\endcsname%
- \else%
- \expandafter\let\expandafter\pgf@next\csname pgf@declarepattern\pgf@pattern@type @mutable\endcsname%
- \fi%
- \pgf@next}
+ \def\pgf@pattern@tempvars{#1}%
+ \ifx\pgf@pattern@tempvars\pgfutil@empty%
+ \expandafter\let\expandafter\pgf@next\csname pgf@declarepattern\pgf@pattern@type\endcsname%
+ \else%
+ \expandafter\let\expandafter\pgf@next\csname pgf@declarepattern\pgf@pattern@type @mutable\endcsname%
+ \fi%
+ \pgf@next}
\long\def\pgf@declarepatternformonly#1#2#3#4#5{\pgf@declarepattern{#1}{#2}{#3}{#4}{#5}{0}}
-
+
\long\def\pgf@declarepatterninherentlycolored#1#2#3#4#5{\pgf@declarepattern{#1}{#2}{#3}{#4}{#5}{1}}
-
+
\long\def\pgf@declarepatternformonly@mutable#1#2#3#4#5{%
- \def\pgf@marshal{\pgf@declarepatternmutable{#1}}%
- \expandafter\pgf@marshal\expandafter{\pgf@pattern@tempvars}{#2}{#3}{#4}{#5}{2}%
+ \def\pgf@marshal{\pgf@declarepatternmutable{#1}}%
+ \expandafter\pgf@marshal\expandafter{\pgf@pattern@tempvars}{#2}{#3}{#4}{#5}{2}%
}
\long\def\pgf@declarepatterninherentlycolored@mutable#1#2#3#4#5#6{%
- \def\pgf@marshal{\pgf@declarepatternmutable{#1}}%
- \expandafter\pgf@marshal\expandafter{\pgf@pattern@tempvars}{#2}{#3}{#4}{#5}{3}%
+ \def\pgf@marshal{\pgf@declarepatternmutable{#1}}%
+ \expandafter\pgf@marshal\expandafter{\pgf@pattern@tempvars}{#2}{#3}{#4}{#5}{3}%
}
\def\pgf@declarepattern#1#2#3#4#5#6{%
@@ -134,6 +134,7 @@
\pgfsysprotocol@setcurrentprotocol\pgfutil@empty%
\pgfsysprotocol@bufferedtrue%
\pgfsys@beginscope%
+ \pgfsetarrows{-}%
#5%
\pgfsys@endscope%
\pgfsysprotocol@getcurrentprotocol\pgf@pattern@code%
@@ -162,22 +163,22 @@
\expandafter\global\expandafter\let\csname pgf@pattern@instantiate@#1\endcsname=\pgf@marshal%
}
{%
- \PackageError{pgfcorepatterns}{Pattern `#1' already defined}{}%
+ \pgferror{Pattern `#1' already defined}%
}%
}
\def\pgf@pattern@number{0}%
\def\pgf@declarepatternmutable#1#2#3#4#5#6#7{%
- \pgfutil@ifundefined{pgf@pattern@name@#1}{%
- \expandafter\gdef\csname pgf@pattern@name@#1\endcsname{#1}%
- \expandafter\gdef\csname pgf@pattern@variables@#1\endcsname{#2}%
- \expandafter\gdef\csname pgf@pattern@lowerleft@#1\endcsname{#3}%
- \expandafter\gdef\csname pgf@pattern@upperright@#1\endcsname{#4}%
- \expandafter\gdef\csname pgf@pattern@tilesize@#1\endcsname{#5}%
- \expandafter\long\expandafter\gdef\csname pgf@pattern@code@#1\endcsname{#6}%
- \expandafter\gdef\csname pgf@pattern@type@#1\endcsname{7}%
- }{\PackageError{pgfcorepatterns}{The pattern `#1' is already defined}{}}%
+ \pgfutil@ifundefined{pgf@pattern@name@#1}{%
+ \expandafter\gdef\csname pgf@pattern@name@#1\endcsname{#1}%
+ \expandafter\gdef\csname pgf@pattern@variables@#1\endcsname{#2}%
+ \expandafter\gdef\csname pgf@pattern@lowerleft@#1\endcsname{#3}%
+ \expandafter\gdef\csname pgf@pattern@upperright@#1\endcsname{#4}%
+ \expandafter\gdef\csname pgf@pattern@tilesize@#1\endcsname{#5}%
+ \expandafter\long\expandafter\gdef\csname pgf@pattern@code@#1\endcsname{#6}%
+ \expandafter\gdef\csname pgf@pattern@type@#1\endcsname{7}%
+ }{\pgferror{The pattern `#1' is already defined}}%
}
\def\pgf@ifpatternisinherentlycolored#1#2#3{%
@@ -210,49 +211,49 @@
% \pgfsetfillpattern{stars}{red}
%
\def\pgfsetfillpattern#1#2{%
- \pgfutil@ifundefined{pgf@pattern@name@#1}%
- {%
- \PackageError{pgfcorepatterns}{Undefined pattern `#1'}{}%
- }%
- {%
- \pgf@ifpatternismutable{#1}%
- {%
- % So, a mutable pattern. Check to see if the pattern
- % has been used with the current variable values...
- \let\pgf@pattern@tempvars\pgfutil@empty%
- \expandafter\expandafter\expandafter\pgf@pattern@check@vars%
- \csname pgf@pattern@variables@#1\endcsname,\pgf@stop,%
- \edef\pgf@pattern@nametemp{pgf@pattern@#1@\pgf@pattern@tempvars}%
- \expandafter\pgfutil@ifundefined\expandafter{\pgf@pattern@nametemp}%
- {%
- % ...Nope. So declare a new instance of the mutable pattern.
- \pgf@ifpatternisinherentlycolored{#1}%
- {\let\pgf@set@fillpattern@declare\pgfdeclarepatterninherentlycolored}%
- {\let\pgf@set@fillpattern@declare\pgfdeclarepatternformonly}%
- \pgf@set@fillpattern@declare%
- {\pgf@pattern@nametemp}%
- {\csname pgf@pattern@lowerleft@#1\endcsname}%
- {\csname pgf@pattern@upperright@#1\endcsname}%
- {\csname pgf@pattern@tilesize@#1\endcsname}%
- {\csname pgf@pattern@code@#1\endcsname}%
- }%
- {%
- % ...Yep. So do nothing.
- }%
- \expandafter\pgf@set@fillpattern\expandafter{\pgf@pattern@nametemp}{#2}%
- \expandafter\gdef\csname\pgf@pattern@nametemp\endcsname{#1}%
- }%
- {%
- % A non-mutable pattern.
- \pgf@set@fillpattern{#1}{#2}%
- }%
- }%
+ \pgfutil@ifundefined{pgf@pattern@name@#1}%
+ {%
+ \pgferror{Undefined pattern `#1'}%
+ }%
+ {%
+ \pgf@ifpatternismutable{#1}%
+ {%
+ % So, a mutable pattern. Check to see if the pattern
+ % has been used with the current variable values...
+ \let\pgf@pattern@tempvars\pgfutil@empty%
+ \expandafter\expandafter\expandafter\pgf@pattern@check@vars%
+ \csname pgf@pattern@variables@#1\endcsname,\pgf@stop,%
+ \edef\pgf@pattern@nametemp{pgf@pattern@#1@\pgf@pattern@tempvars}%
+ \expandafter\pgfutil@ifundefined\expandafter{\pgf@pattern@nametemp}%
+ {%
+ % ...Nope. So declare a new instance of the mutable pattern.
+ \pgf@ifpatternisinherentlycolored{#1}%
+ {\let\pgf@set@fillpattern@declare\pgfdeclarepatterninherentlycolored}%
+ {\let\pgf@set@fillpattern@declare\pgfdeclarepatternformonly}%
+ \pgf@set@fillpattern@declare%
+ {\pgf@pattern@nametemp}%
+ {\csname pgf@pattern@lowerleft@#1\endcsname}%
+ {\csname pgf@pattern@upperright@#1\endcsname}%
+ {\csname pgf@pattern@tilesize@#1\endcsname}%
+ {\csname pgf@pattern@code@#1\endcsname}%
+ }%
+ {%
+ % ...Yep. So do nothing.
+ }%
+ \expandafter\pgf@set@fillpattern\expandafter{\pgf@pattern@nametemp}{#2}%
+ \expandafter\gdef\csname\pgf@pattern@nametemp\endcsname{#1}%
+ }%
+ {%
+ % A non-mutable pattern.
+ \pgf@set@fillpattern{#1}{#2}%
+ }%
+ }%
}
\def\pgf@set@fillpattern#1#2{%
\pgfutil@ifundefined{pgf@pattern@name@#1}{%
- \PackageError{pgfcorepatterns}{Undefined pattern `#1'}{}}
+ \pgferror{Undefined pattern `#1'}}
{%
\csname pgf@pattern@instantiate@#1\endcsname%
\expandafter\global\expandafter\let\csname pgf@pattern@instantiate@#1\endcsname=\relax%
@@ -273,24 +274,24 @@
}
\def\pgf@pattern@check@vars#1,{%
- \ifx#1\pgf@stop%
- \let\pgf@next\relax%
- \else%
- \afterassignment\pgfmath@gobbletilpgfmath@%
- \expandafter\let\expandafter\pgf@pattern@char#1#1\pgfmath@%
- \ifx\pgf@pattern@char/%
- \edef\pgf@pattern@tempvar{(\pgfkeysvalueof{#1})}%
- \else%
- \expandafter\ifcat\pgf@pattern@char\relax%
- \edef\pgf@pattern@tempvar{(\the#1)}%
- \else%
- \edef\pgf@pattern@tempvar{(#1)}%
- \fi%
- \fi%
- \edef\pgf@pattern@tempvars{\pgf@pattern@tempvars\pgf@pattern@tempvar}%
- \let\pgf@next\pgf@pattern@check@vars%
- \fi%
- \pgf@next%
+ \ifx#1\pgf@stop%
+ \let\pgf@next\relax%
+ \else%
+ \afterassignment\pgfmath@gobbletilpgfmath@%
+ \expandafter\let\expandafter\pgf@pattern@char#1#1\pgfmath@%
+ \ifx\pgf@pattern@char/%
+ \edef\pgf@pattern@tempvar{(\pgfkeysvalueof{#1})}%
+ \else%
+ \expandafter\ifcat\pgf@pattern@char\relax%
+ \edef\pgf@pattern@tempvar{(\the#1)}%
+ \else%
+ \edef\pgf@pattern@tempvar{(#1)}%
+ \fi%
+ \fi%
+ \edef\pgf@pattern@tempvars{\pgf@pattern@tempvars\pgf@pattern@tempvar}%
+ \let\pgf@next\pgf@pattern@check@vars%
+ \fi%
+ \pgf@next%
}
\endinput