summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-17 22:45:45 +0000
committerKarl Berry <karl@freefriends.org>2013-10-17 22:45:45 +0000
commitbb8ff8fc805bb2c7e053d7cba341b83db6fa4c18 (patch)
tree43bafde9f9f06a12f9b61064ebf7e1e15f5eb671 /Master/texmf-dist/tex/latex
parentc1e290ea748e1163c10db9d73fdcbac4953a5a80 (diff)
forest (17oct13)
git-svn-id: svn://tug.org/texlive/trunk@31930 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/forest/forest.sty20
1 files changed, 12 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/forest/forest.sty b/Master/texmf-dist/tex/latex/forest/forest.sty
index b34bca54e6d..a93b439a97c 100644
--- a/Master/texmf-dist/tex/latex/forest/forest.sty
+++ b/Master/texmf-dist/tex/latex/forest/forest.sty
@@ -8,7 +8,7 @@
%%
%% `forest' is a `pgf/tikz'-based package for drawing (linguistic) trees.
%%
-%% Copyright (c) 2012 Saso Zivanovic
+%% Copyright (c) 2013 Saso Zivanovic
%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
@@ -29,7 +29,7 @@
%% This work consists of the files forest.dtx and forest.ins
%% and the derived file forest.sty.
%%
-\ProvidesPackage{forest}[2013/01/28 v1.03 Drawing (linguistic) trees]
+\ProvidesPackage{forest}[2013/10/17 v1.04 Drawing (linguistic) trees]
\RequirePackage{tikz}[2010/10/13]
\usetikzlibrary{shapes}
@@ -3506,11 +3506,15 @@
\let\forest@original@tikz@parse@node\tikz@parse@node
\let\tikz@parse@node\forest@tikz@parse@node
\fi
- \forest@drawtree@beginbox
- \pgfkeysalso{/forest/begin draw}%
- \forest@node@drawtree@
- \pgfkeysalso{/forest/end draw}%
- \forest@drawtree@endbox
+ \pgfkeysgetvalue{/forest/begin draw/.@cmd}\forest@temp@begindraw
+ \pgfkeysgetvalue{/forest/end draw/.@cmd}\forest@temp@enddraw
+ \edef\forest@marshal{%
+ \noexpand\forest@drawtree@beginbox
+ \expandonce{\forest@temp@begindraw\pgfkeysnovalue\pgfeov}%
+ \noexpand\forest@node@drawtree@
+ \expandonce{\forest@temp@enddraw\pgfkeysnovalue\pgfeov}%
+ \noexpand\forest@drawtree@endbox
+ }\forest@marshal
\ifforesttikzcshack
\let\tikz@parse@node\forest@original@tikz@parse@node
\fi
@@ -4465,7 +4469,7 @@
\edef\forest@marshal{%
\noexpand\pgfutil@in@
{\expandafter\detokenize\expandafter{\forest@temp}.}
- {\expandafter\detokenize\expandafter{\jobname}.}%
+ {\expandafter\detokenize\expandafter{\pgfactualjobname}.}%
}\forest@marshal
\ifpgfutil@in@
\else