tikz-qtree (10oct11)

git-svn-id: svn://tug.org/texlive/trunk@24259 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 6 insertions, 81 deletions

diff --git a/Master/texmf-dist/doc/latex/tikz-qtree/README b/Master/texmf-dist/doc/latex/tikz-qtree/README
index 6950707eb89..58ae6cd4a77 100644
--- a/Master/texmf-dist/doc/latex/tikz-qtree/README
+++ b/Master/texmf-dist/doc/latex/tikz-qtree/README
@@ -1,6 +1,6 @@
 tikz-qtree 
 David Chiang <chiang at isi dot edu>
-Version 1.11 (Christmas 2010)
+Version 1.12 (October 2011)
 
 This package provides a macro for drawing trees with TikZ using the
 easy syntax of Alexis Dimitriadis' Qtree. It improves on TikZ's
@@ -12,6 +12,8 @@ pst-qtree in being usable with pdfTeX and XeTeX.
 Please see tikztree-manual.pdf for instructions and examples.
 
 Version history:
+1.12 (2011/10/10)
+ - fixed bug that was inserting spaces
 
 1.11 (2010/12/25):
  - options don't break options for standard TikZ trees
diff --git a/Master/texmf-dist/doc/latex/tikz-qtree/tests.tex b/Master/texmf-dist/doc/latex/tikz-qtree/tests.tex
deleted file mode 100644
index 98bdf9ac41e..00000000000
--- a/Master/texmf-dist/doc/latex/tikz-qtree/tests.tex
+++ /dev/null
@@ -1,77 +0,0 @@
-\documentclass{minimal}
-
-\usepackage{tikz,tikz-qtree}
-
-\begin{document}
-
-\pgfnewsubpicture{s}
-
-\begin{pgfpicture}
-\begin{pgfsubpicture}
-\pgfnode{rectangle}{center}{A}{a}{\pgfusepath{stroke}}
-\end{pgfsubpicture}
-\pgfsavesubpicture{s}
-
-\begin{pgfsubpicture}
-{\pgftransformshift{\pgfpoint{30pt}{0pt}}
-\pgfnode{rectangle}{center}{B}{b}{\pgfusepath{stroke}}}
-\end{pgfsubpicture}
-\pgfmergesubpicture{s}
-
-\pgfrestoresubpicture{s}
-
-{\pgftransformrotate{30}
-\pgftransformscale{0.75}{0.75}
-\pgfplacesubpicture
-}
-
-{\pgftransformshift{\pgfpoint{0pt}{-30pt}}
-\pgfnode{rectangle}{center}{C}{c}{\pgfusepath{stroke}}}
-{\pgftransformshift{\pgfpoint{30pt}{-30pt}}
-\pgfnode{rectangle}{center}{D}{d}{\pgfusepath{stroke}}}
-
-\pgfpathmoveto{\pgfpointanchor{a}{east}}
-\pgfpathlineto{\pgfpointanchor{b}{west}}
-\pgfusepath{stroke}
-
-\pgfpathmoveto{\pgfpointanchor{a}{south}}
-\pgfpathlineto{\pgfpointanchor{c}{north}}
-\pgfusepath{stroke}
-
-\pgfpathmoveto{\pgfpointanchor{b}{south}}
-\pgfpathlineto{\pgfpointanchor{d}{north}}
-\pgfusepath{stroke}
-
-\pgfpathmoveto{\pgfpointanchor{c}{east}}
-\pgfpathlineto{\pgfpointanchor{d}{west}}
-\pgfusepath{stroke}
-
-\end{pgfpicture}
-
-\Tree [.S [.NP [.Adj colorless ] [.Adj green ] [.N ideas ] ] [.VP [.VP [.V sleep ] ] [.Adv furiously ] ] ]
-\Tree [.X 
-	a a a a a a a a a a
-	a a a a a a a a a a
-	a a a a a a a a a a
-	a a a a a a a a a a
-	a a a a a a a a a a 
-	]
-	
-\Tree 
-  [.a [.a [.a [.a [.a [.a [.a [.a [.a [.a
-  ] ] ] ] ] ] ] ] ] ]
-  
-  
-  
-\section{Testing tikz trees compatibility}
-
-\begin{tikzpicture}[grow=right,level distance=1in]
-\node {A} child {node {B}} child {node {C}};
-\end{tikzpicture}
-\begin{tikzpicture}[grow'=right,sibling distance=1in]
-\node {A} child {node {B}} child {node {C}};
-\end{tikzpicture}
-
-  
-
-\end{document}
diff --git a/Master/texmf-dist/tex/latex/tikz-qtree/tikz-qtree.tex b/Master/texmf-dist/tex/latex/tikz-qtree/tikz-qtree.tex
index 8e8d09f2c47..17c8f3cb135 100644
--- a/Master/texmf-dist/tex/latex/tikz-qtree/tikz-qtree.tex
+++ b/Master/texmf-dist/tex/latex/tikz-qtree/tikz-qtree.tex
@@ -74,7 +74,7 @@
 \@@@@@@subtree
 }
 \def\@@@@@@subtree{%
-\@ifequal{\the\root@node}{\pgfutil@empty}
+\@ifequal{\the\root@node}{\pgfutil@empty}%
 \edef\act{\noexpand\@result={\noexpand\pgfsubtree{\noexpand\path coordinate (\noexpand\nodename);}{\the\child@list}}}%
 \else
 \edef\act{\noexpand\@result={\noexpand\pgfsubtree{\the\root@node}{\the\child@list}}}%
@@ -105,11 +105,11 @@
 \fi
 \scanned@edgefalse
 \pgfutil@ifnextchar[{\@call\@subtree\@@@children}% subtree
-{\@call\@leaf\@@@children} % leaf
+{\@call\@leaf\@@@children}% leaf
 }}}
 \def\@@@children{%
 % wrap child inside curly braces
-\expandafter\@result\expandafter{\expandafter{\the\@result}}
+\expandafter\@result\expandafter{\expandafter{\the\@result}}%
 \edef\act{\noexpand\child@list{\the\child@list \the\@result}}\act
 \@@children
 }