tikz-qtree (4jan11)

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

3 files changed, 80 insertions, 4 deletions

diff --git a/Master/texmf-dist/doc/latex/tikz-qtree/tests.tex b/Master/texmf-dist/doc/latex/tikz-qtree/tests.tex
new file mode 100644
index 00000000000..98bdf9ac41e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tikz-qtree/tests.tex
@@ -0,0 +1,77 @@
+\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/doc/latex/tikz-qtree/tikz-qtree-manual.pdf b/Master/texmf-dist/doc/latex/tikz-qtree/tikz-qtree-manual.pdf
index a8381bd46e0..c7060287b84 100644
--- a/Master/texmf-dist/doc/latex/tikz-qtree/tikz-qtree-manual.pdf
+++ b/Master/texmf-dist/doc/latex/tikz-qtree/tikz-qtree-manual.pdf
diff --git a/Master/texmf-dist/doc/latex/tikz-qtree/tikz-qtree-manual.tex b/Master/texmf-dist/doc/latex/tikz-qtree/tikz-qtree-manual.tex
index 7a0432bc577..7092a4d17ba 100644
--- a/Master/texmf-dist/doc/latex/tikz-qtree/tikz-qtree-manual.tex
+++ b/Master/texmf-dist/doc/latex/tikz-qtree/tikz-qtree-manual.tex
@@ -49,7 +49,7 @@ improves on TikZ's standard tree-drawing facility by laying out tree
 nodes without collisions; it improves on Qtree by adding lots of
 features from TikZ; and it improves on \verb|pst-qtree| in being
 usable with pdf\TeX{} and
-\XeTeX{}.
+\XeTeX{}.\footnote{Although \XeTeX{} works with \verb|pst-qtree| using the \verb|xetex-pstricks| package. For typesetting very large trees or a large number of trees, this may be the better option.}
 
 \section{Basics}
 
@@ -187,11 +187,11 @@ You can make the nodes in a sideways tree line up on their left edge using \verb
 \end{SideBySideExample}
 \end{center}
 
-In Qtree, it was allowed to use a line break (\verb|\\|) inside a node, but TikZ nodes by default don't allow this. You can enable it like so:
+In Qtree, it was allowed to use a line break (\verb|\\|) inside a node. TikZ nodes by default don't allow this, but the \verb|align| option (in PGF/TikZ version 2.1 or later) enables it as a side effect:\footnote{Thanks to Alan Munn for figuring this out. Prior to PGF/TikZ version 2.1, the fix was to use the options \verb|text width=2em,text centered|.}
 \begin{center}
 \begin{SideBySideExample}
 \begin{tikzpicture}
-\tikzset{every tree node/.style={text width=2em,text centered}}
+\tikzset{every tree node/.style={align=center,anchor=north}}
 \Tree [.S [.NP Det\\the N\\cat ]
           [.VP V\\sat
                [.PP P\\on
@@ -199,7 +199,6 @@ In Qtree, it was allowed to use a line break (\verb|\\|) inside a node, but TikZ
 \end{tikzpicture}
 \end{SideBySideExample}
 \end{center}
-The downside is that you must specify a fixed node width. In the next release of TikZ, it will be possible to use instead a new \verb|align=center| option without the fixed width.\footnote{Thanks to Alan Munn for figuring this out.}
 
 You can also define a style for all the edges in a tree. For example, if you want the edges to be a little darker:
 \begin{center}