summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex80
1 files changed, 57 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
index 01b1b9d346f..a371ddfc7cf 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
@@ -1,4 +1,4 @@
-% Copyright 2006 by Till Tantau
+% Copyright 2019 by Till Tantau
%
% This file may be distributed and/or modified
%
@@ -790,13 +790,9 @@
\pgf@xc=\pgf@x%
\pgf@yc=\pgf@y%
\tikz@label@simplefalse%
- \iftikz@fullytransformed%
- \tikz@label@simpletrue%
- \else
- \ifdim\pgf@xc=\pgf@xb\relax%
- \ifdim\pgf@yc=\pgf@yb\relax%
- \tikz@label@simpletrue%
- \fi%
+ \ifdim\pgf@xc=\pgf@xb\relax%
+ \ifdim\pgf@yc=\pgf@yb\relax%
+ \tikz@label@simpletrue%
\fi%
\fi%
\iftikz@label@simple%
@@ -3999,6 +3995,44 @@
{\pgfutil@ifnextchar e{\tikz@fig@mustbenamed\tikz@fig@continue}
{\ifx\tikz@after@path\pgfutil@empty\expandafter\tikz@fig@continue\else\expandafter\tikz@fig@mustbenamed\expandafter\tikz@fig@continue\fi}}}}}%}%
+\tikzset{
+ matrix/inner style/every cell/.code={%
+ \tikzset{every cell/.try={\the\pgfmatrixcurrentrow}{\the\pgfmatrixcurrentcolumn}}%
+ },
+ matrix/inner style/column/.code={%
+ \tikzset{column \the\pgfmatrixcurrentcolumn/.try}%
+ },
+ matrix/inner style/even odd column/.code={
+ \ifodd\pgfmatrixcurrentcolumn%
+ \tikzset{every odd column/.try}%
+ \else%
+ \tikzset{every even column/.try}%
+ \fi
+ },
+ matrix/inner style/row/.code={%
+ \tikzset{row \the\pgfmatrixcurrentrow/.try}%
+ },
+ matrix/inner style/even odd row/.code={%
+ \ifodd\pgfmatrixcurrentrow%
+ \tikzset{every odd row/.try}%
+ \else%
+ \tikzset{every even row/.try}%
+ \fi
+ },
+ matrix/inner style/cell/.code={%
+ \tikzset{row \the\pgfmatrixcurrentrow\space column \the\pgfmatrixcurrentcolumn/.try}%
+ },
+ matrix/inner style order/.store in=\tikz@common@matrix@code@styleorder,
+ matrix/inner style order={
+ every cell,
+ column,
+ even odd column,
+ row,
+ even odd row,
+ cell
+ },
+}%
+
\def\tikz@do@matrix{%
\tikzset{every matrix/.try}%
\tikz@node@transformations%
@@ -4050,20 +4084,14 @@
\def\tikz@common@matrix@code{%
\let\tikz@options=\pgfutil@empty%
\let\tikz@mode=\pgfutil@empty%
- \tikzset{every cell/.try={\the\pgfmatrixcurrentrow}{\the\pgfmatrixcurrentcolumn}}%
- \tikzset{column \the\pgfmatrixcurrentcolumn/.try}%
- \ifodd\pgfmatrixcurrentcolumn%
- \tikzset{every odd column/.try}%
- \else%
- \tikzset{every even column/.try}%
- \fi%
- \tikzset{row \the\pgfmatrixcurrentrow/.try}%
- \ifodd\pgfmatrixcurrentrow%
- \tikzset{every odd row/.try}%
- \else%
- \tikzset{every even row/.try}%
- \fi%
- \tikzset{row \the\pgfmatrixcurrentrow\space column \the\pgfmatrixcurrentcolumn/.try}%
+ \pgfutil@for\pgf@temp:=\tikz@common@matrix@code@styleorder\do{%
+ \toks0=\expandafter{\romannumeral-`0\expandafter\pgfutil@trimspaces\expandafter{\pgf@temp}}%
+ \def\pgf@marshal{}%
+ \pgfutil@ifempty\pgf@temp{}{%
+ \edef\pgf@marshal{\noexpand\tikzset{matrix/inner style/.cd,\the\toks0}}%
+ }%
+ \pgf@marshal
+ }%
\tikz@options%
}%
\def\pgfmatrixendcode{%
@@ -5431,7 +5459,13 @@
\tikz@shapebordertrue%
\def\tikz@shapeborder@name{\tikz@pp@name{#2}}%
\fi%
- \fi
+ \else\ifcsname pgf@sh@ns@#2\endcsname
+ \expandafter\ifx\csname pgf@sh@ns@#2\endcsname\tikz@coordinate@text%
+ \else
+ \tikz@shapebordertrue%
+ \def\tikz@shapeborder@name{#2}%
+ \fi%
+ \fi\fi
\fi%
\edef\tikz@marshal{\noexpand#1{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}}%
\tikz@marshal%