Fix .lastretry pgf-tikz#672

It looks like after \pgfkeys@try the .lastretry suffix is already discarded so another discard will just leave an empty key. I've also added a safeguard for empty keys so that they produce slightly less obscure error messages.
hmenke · May 9, 2019 · 5397635 · 5397635
1 parent 6f21f63
commit 5397635
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tex/generic/pgf/utilities/pgfkeys.code.tex b/tex/generic/pgf/utilities/pgfkeys.code.tex
@@ -520,7 +520,11 @@
   \fi%
   \pgfkeys@splitter#2/%
 }
-\def\pgfkeys@gobbletoslash\pgfkeys@splitter/{\expandafter\pgfkeys@remove@slash\the\pgfkeys@pathtoks\relax}%
+\def\pgfkeys@gobbletoslash\pgfkeys@splitter/{%
+  \if\relax\detokenize\expandafter{\the\pgfkeys@pathtoks}\relax\else
+    \expandafter\pgfkeys@remove@slash\the\pgfkeys@pathtoks\relax
+  \fi
+}%
 \def\pgfkeys@remove@slash#1/\relax{\pgfkeys@pathtoks{#1}}
 
 

diff --git a/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex b/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex
@@ -504,8 +504,6 @@
         \ifpgfkeyssuccess\else
             \pgfkeys@try
             \ifpgfkeyssuccess\else
-                % discard the '.lastretry' suffix:
-                \edef\pgfkeyscurrentkey{\pgfkeyscurrentpath}%
                 \pgfkeys@split@path%
                 \pgfkeys@unknown
             \fi