diff --git a/tex/generic/pgf/utilities/pgfkeys.code.tex b/tex/generic/pgf/utilities/pgfkeys.code.tex index 84d4bd5d5..2f1765262 100644 --- 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 index 7c6d6e49c..ef70baf02 100644 --- 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