summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex26
1 files changed, 8 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex
index 15fcecb70df..27f0ed4aba5 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/graphs/tikzlibrarygraphs.code.tex
@@ -542,10 +542,10 @@
}%
\def\tikz@lib@graph@quote@parser@done{%
- {\expandafter\pgfutil@scantokens\expandafter{%
+ {\expandafter\scantokens\expandafter{%
\expandafter\expandafter\expandafter\tikzlibgraphactivations\expandafter\expandafter\expandafter\tikzlibgraphdoedef\expandafter{\the\pgfkeys@temptoks}%
}}%
- {\expandafter\pgfutil@scantokens\expandafter{\expandafter\tikzlibgraphactivationsbrace\expandafter\xdef\expandafter\tikzlibgraphreplaced\expandafter<\tikzlibgraphreplaced>\catcode`\}=2\relax}}%
+ {\expandafter\scantokens\expandafter{\expandafter\tikzlibgraphactivationsbrace\expandafter\xdef\expandafter\tikzlibgraphreplaced\expandafter<\tikzlibgraphreplaced>\catcode`\}=2\relax}}%
\edef\tikzlibgraphreplaced{\expandafter\detokenize\expandafter{\tikzlibgraphreplaced}}
\pgfutil@ifnextchar/\tikz@lib@graph@quotes@slash\tikz@lib@graph@quotes@no@slash%
}%
@@ -563,7 +563,7 @@
\def\tikz@lib@prepare@active#1#2#3{%
{%
\catcode`#1=13\relax%
- \pgfutil@scantokens{\gdef\tikzlibgraphactivator{\def#2{@#3@}}}%
+ \scantokens{\gdef\tikzlibgraphactivator{\def#2{@#3@}}}%
}%
\pgfutil@g@addto@macro\tikzlibgraphactivations{\catcode`#1=13\relax}%
\expandafter\pgfutil@g@addto@macro\expandafter\tikzlibgraphactivations\expandafter{\tikzlibgraphactivator}%
@@ -646,16 +646,7 @@
\def\tikz@lib@graph@node{\tikz@lib@graph@check@quotes\tikz@lib@graph@node@normal}%
-\def\tikz@lib@graph@node@normal{%
- \pgfutil@ifnextchar({\tikz@lib@graph@node@dressed}{\tikz@lib@graph@node@naked}%
-}%
-
-\def\tikz@lib@graph@node@dressed(#1){%
- % Add extra braces around nodes to protect dashes
- \tikz@lib@graph@node@naked{(#1)}%
-}%
-
-\def\tikz@lib@graph@node@naked#1-{%
+\def\tikz@lib@graph@node@normal#1-{%
% Detect trailing <
\tikz@lib@graph@@node#1<\pgf@stop%
}%
@@ -892,8 +883,7 @@
\ifpgfutil@in@%
\tikz@lib@parse@node@with@doubleunder#1\pgf@stop%
\else
- \edef\pgf@marshal{\noexpand\pgfkeys@spdef\noexpand\tikz@lib@graph@name@only{#1}}%
- \pgf@marshal%
+ \pgfkeys@spdef\tikz@lib@graph@name@only{#1}%
\let\tikz@lib@graph@node@text\tikz@lib@graph@name@only%
\edef\tikz@lib@graph@name{\tikz@lib@graph@path\tikz@lib@graph@name@only}%
\fi%
@@ -912,7 +902,7 @@
}%
\def\tikz@lg@slash@quote"#1"#2\pgf@stop{%
\iftikz@handle@active@nodes%
- \def\tikz@lib@graph@node@text{\csname pgfutil@scantokens\endcsname{#1}}%
+ \def\tikz@lib@graph@node@text{\scantokens{#1}}%
\else
\def\tikz@lib@graph@node@text{#1}%
\fi%
@@ -920,7 +910,7 @@
{\catcode`\"=13\relax
\gdef\tikz@lg@slash@quote@active"#1"#2\pgf@stop{%
\iftikz@handle@active@nodes%
- \def\tikz@lib@graph@node@text{\csname pgfutil@scantokens\endcsname{#1}}%
+ \def\tikz@lib@graph@node@text{\scantokens{#1}}%
\else
\def\tikz@lib@graph@node@text{#1}%
\fi%
@@ -928,7 +918,7 @@
}%
\def\tikz@lg@slash@cont#1\pgf@stop{%
\iftikz@handle@active@nodes%
- \def\tikz@lib@graph@node@text{\csname pgfutil@scantokens\endcsname{#1}}%
+ \def\tikz@lib@graph@node@text{\scantokens{#1}}%
\else
\def\tikz@lib@graph@node@text{#1}%
\fi%