qtree update (23jan09)

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

4 files changed, 49 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/qtree/README b/Master/texmf-dist/doc/latex/qtree/README
index 98a8ebd4b30..dfdfb1f6123 100644
--- a/Master/texmf-dist/doc/latex/qtree/README
+++ b/Master/texmf-dist/doc/latex/qtree/README
@@ -1,15 +1,15 @@
 This is the distribution directory for QTREE, a LaTeX package for
-drawing syntax trees. Qtree allows trees to be specified in a simple 
+drawing tree diagrams. Qtree allows trees to be specified in a simple 
 bracket notation, automatically calculates branch sizes, and supports 
 both DVI/PostScript and PDF output.
 
-This is Qtree version 3.1, 10 July 2006. Qtree is distributed 
+This is Qtree version 3.1b, 12 December 2008. Qtree is distributed 
 under the LaTeX Project Public License (LPPL).
 
 
 *** Source files:
 
-qtree.sty	      The style file
+qtree.sty	The style file
 qtreenotes.tex  The documentation
 qarrows.tex     Additional info on drawing movement arrows
 
diff --git a/Master/texmf-dist/doc/latex/qtree/qtreenotes.pdf b/Master/texmf-dist/doc/latex/qtree/qtreenotes.pdf
index f5e3c7349c7..17a9980f8e2 100644
--- a/Master/texmf-dist/doc/latex/qtree/qtreenotes.pdf
+++ b/Master/texmf-dist/doc/latex/qtree/qtreenotes.pdf
diff --git a/Master/texmf-dist/doc/latex/qtree/qtreenotes.tex b/Master/texmf-dist/doc/latex/qtree/qtreenotes.tex
index dcd0f6de4f1..1d7c80b55da 100644
--- a/Master/texmf-dist/doc/latex/qtree/qtreenotes.tex
+++ b/Master/texmf-dist/doc/latex/qtree/qtreenotes.tex
@@ -59,7 +59,7 @@ Please direct comments to Alexis Dimitriadis
 \large
 \\[8pt] Jeffrey Mark Siskind (tree drawing and core package)\\[4pt] 
  Alexis Dimitriadis (parser and extensions) \\[8pt]
-Version \qTreeVersion, 10 July 2006
+Version \qTreeVersion, 12 December 2008
  \\[8pt] \Large % For the paragraph spacing
 \end{center}
 
@@ -268,22 +268,7 @@ provided must be identical, token for token.
 \Tree [.S when [.NP the cat ].NP sleeps ]
 \end{verbatim}
 
-\vneed{3cm}
-\subsection{Branching without labels}
-
-Sometimes we want to draw an abbreviated tree without a label on some or all
-intermediate nodes. \QT\ will handle such trees correctly:
-
-% \medskip
-% \Tree [ [.np Eve ] [ [.(np$\backslash$s)/np ate ] [ [.np/n the ] [.n apple ]
-% ]]] 
-
-\medskip
-\Tree [.CP Spec(CP) [ C^0 [.IP I^0 Comp(IP) ] ] ] 
-\begin{verbatim}
-\Tree [.CP Spec(CP) [ C^0 [.IP I^0 Comp(IP) ] ] ] 
-\end{verbatim}
-
+\vneed {2cm}
 \subsection{Roofs}
 \DescribeMacro{\qroof}
 \DescribeMacro{\qroofx}
@@ -304,7 +289,6 @@ labeled {\it NP\/} over the phrase {\it the book,} write
 \hfil\hfil \leaf{\qroof{the book}.NP } \qobitree
 \end{flushleft}
 
-
 If the phrase contains line breaks introduced with \verb|\\|, the resulting
 lines are flush left, not centered. Again, it is possible for the ``phrase''
 to be a construction of arbitrary complexity; but the syntax of
@@ -313,12 +297,44 @@ the roof, since a roof is meant to cover material that is not
 analyzed.\footnote{%
   \QT\ internally implements a roof as a large leaf.
 } % END FOOTNOTE
-An example is given on page \pageref{roof}.
+See also the discussion of roofs in the following section.
 
 % Although the parsing messes up, it IS possible to work qroof into a
 % non-terminal label:
 % \Tree [.A this [.{\qroof{Cheat}.ME } x [ below ] ]]
 
+\vneed{3cm}
+\subsection{Branching without labels}
+
+Sometimes we want to draw an abbreviated tree without a label on some or all
+intermediate nodes. \QT\ will handle such trees correctly:
+
+% \medskip
+% \Tree [ [.np Eve ] [ [.(np$\backslash$s)/np ate ] [ [.np/n the ] [.n apple ]
+% ]]] 
+
+\medskip
+\Tree [.CP Spec(CP) [ C^0 [.IP I^0 Comp(IP) ] ] ] 
+\begin{verbatim}
+\Tree [.CP Spec(CP) [ C^0 [.IP I^0 Comp(IP) ] ] ] 
+\end{verbatim}
+
+Starting with qtree version 3.1b, a roof without a label will be attached to the tree branches above it. Note that the period between the roof text and the label does need to be given. If you use this option, you will probably want to adjust the roof angles so that they match the slope of the branch above it. For binary branching, the correct values are \verb|\qroofx=2|, \verb|\qroofy=1|.
+
+\begin{verbatim}
+\qroofx=2
+\qroofy=1
+\Tree [.S This [ [.V is ] \qroof{a simple tree}. ] ]
+\end{verbatim}
+
+\qroofx=2
+\qroofy=1
+\Tree [ [.NP This ] [ [.V is ] \qroof{an unlabeled tree}. ] ]
+
+
+
+
+
 
 \subsection{Subscripts, superscripts and primes}
 \label{s:super}
diff --git a/Master/texmf-dist/tex/latex/qtree/qtree.sty b/Master/texmf-dist/tex/latex/qtree/qtree.sty
index f0f72543a47..4db8284bcbc 100644
--- a/Master/texmf-dist/tex/latex/qtree/qtree.sty
+++ b/Master/texmf-dist/tex/latex/qtree/qtree.sty
@@ -2,8 +2,8 @@
 % qtree.sty, a LaTeX macro package for drawing trees from descriptions
 % given in bracket notation.
 %
-    \def\qTreeVersion{3.1}
-    \def\qTreeDate{2006/07/10 }
+    \def\qTreeVersion{3.1b}
+    \def\qTreeDate{2008/12/12 }
 
 % QobiTree tree macros written by Jeffrey Mark Siskind (Qobi@cis.upenn.edu).
 % Front end and extensions by Alexis Dimitriadis (alexis@ling.upenn.edu).
@@ -13,6 +13,9 @@
 
 % Most recent revisions:
 
+% 2008/12/12 -- 3.1b A roof with an empty label will be connected to the tree
+%               branches (but will look ugly because of the different angles)
+
 % 2006/03/08 -- Protected pict2e loading from possible redefinition of ^.
 %               Reported by Alan Munn. Extended documentation.
 
@@ -917,19 +920,19 @@ both pdf and PostScript is now provided by the package pict2e.sty.
 % User command for requesting a roof
 %
 \def\qroof#1.#2 {{%
-  % padding under the ``eaves'' of the roof
+  % padding under the "eaves" of the roof
   \setbox\@qrscratchbox = \hbox{\let\qtreepadding=\qroofpadding
     \qshow@text[l]{\qleafhook}{#1}}%
     % we don't pad here, since the entire roof gets padded as a leaf.
-    \def\qtreepadding{0pt}%
-    \begin{tabular}{@{}c@{}}
-      \qshow@text{\qlabelhook}{#2}\\
-      \unitlength=\wd\@qrscratchbox \qdraw@roof \\[-0.6ex] 
+  \def\qtreepadding{0pt}%
+  \begin{tabular}{@{}c@{}}
+      \setbox\@tempboxa = \hbox{\qshow@text{\qlabelhook}{#2}}%
+          \ifdim\wd\@tempboxa>0pt \box\@tempboxa \\ \fi
+      \unitlength=\wd\@qrscratchbox \qdraw@roof \\[-0.6ex]
       \box\@qrscratchbox
 \end{tabular}}}
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %                          DRAWING UTILITIES