Little improvements for matrix/inner style

hmenke · Jun 1, 2020 · 5c96618 · 5c96618
1 parent 65bcaaf
commit 5c96618
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/doc/generic/pgf/text-en/pgfmanual-en-tikz-matrices.tex b/doc/generic/pgf/text-en/pgfmanual-en-tikz-matrices.tex
@@ -496,7 +496,7 @@ \subsubsection{Cell Styles and Options}
 \begin{stylekey}{/tikz/matrix/inner style/even odd row}
     Wraps |/tikz/every even row| and |/tikz/every odd row|.
 \end{stylekey}
-\begin{stylekey}{/tikz/matrix/inner style/this cell}
+\begin{stylekey}{/tikz/matrix/inner style/cell}
     Wraps |/tikz/row |\meta{number}| column |\meta{number}.
 \end{stylekey}
 
@@ -512,7 +512,7 @@ \subsubsection{Cell Styles and Options}
     even odd column,
     row,
     even odd row,
-    this cell
+    cell
   }
 }
 \end{codeexample}
@@ -535,7 +535,7 @@ \subsubsection{Cell Styles and Options}
       even odd row,
       column,
       row,
-      this cell,
+      cell,
       /tikz/my style
   }
 }

diff --git a/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex b/tex/generic/pgf/frontendlayer/tikz/tikz.code.tex
@@ -4023,7 +4023,7 @@
       \tikzset{every even row/.try}%
     \fi
   },
-  matrix/inner style/this cell/.code={%
+  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,
@@ -4033,7 +4033,7 @@
     even odd column,
     row,
     even odd row,
-    this cell
+    cell
   },
 }%
 
@@ -4089,8 +4089,12 @@
                     \let\tikz@options=\pgfutil@empty%
                     \let\tikz@mode=\pgfutil@empty%
                     \pgfutil@for\pgf@temp:=\tikz@common@matrix@code@styleorder\do{%
-                      \expandafter\def\expandafter\pgf@temp\expandafter{\romannumeral-`0\expandafter\pgfutil@trimspaces\expandafter{\pgf@temp}}%
-                      \pgfutil@ifempty\pgf@temp{}{\expandafter\tikzset\expandafter{matrix/inner style/.cd,\pgf@temp/.try}}%
+                      \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%
                   }%