synttree update (30nov09)

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

1 files changed, 14 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/synttree/synttree.sty b/Master/texmf-dist/tex/latex/synttree/synttree.sty
index 4a0c345f3e1..7f87e6789c1 100644
--- a/Master/texmf-dist/tex/latex/synttree/synttree.sty
+++ b/Master/texmf-dist/tex/latex/synttree/synttree.sty
@@ -20,10 +20,10 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-%% \CheckSum{747}
+%% \CheckSum{753}
 %% synttree.dtx
 %% Package `synttree' for use with LaTeX 2e
-%% Version 1.4.1
+%% Version 1.4.2
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -187,7 +187,7 @@
     \ifx#2b\MTr@bottomnodetrue\else%
     \ifx#2x\MTr@bottomnodetrue\MTr@mytriangletrue\else%
     \ifx#2t\MTr@mytriangletrue\else%
-    \typeout{synttree Warning: unknown dot option #1 in tree}%
+    \typeout{synttree Warning: unknown dot option #2 in tree}%
     \fi\fi\fi%
     \MTr@parsedot#3\END
   \fi
@@ -318,6 +318,17 @@
   \advance\MTr@tempcnta\MTr@lineoffset%
   \expandafter
   \ifnum\csname MTr@child#1triangle\endcsname=1%
+    \MTr@drawchildlinetriangle{#1}%
+  \else%
+    \MTr@drawchildlineline{#1}%
+  \fi%
+}
+\def\MTr@drawchildlineline#1{%
+    \put(0,0){\MTr@drawline%
+      (\MTr@treev,\MTr@parenty)%
+      (\MTr@childparam{#1}{x},\MTr@tempcnta)}%
+}
+\def\MTr@drawchildlinetriangle#1{%
     \MTr@tempcntb\MTr@childparam{#1}{x}%
     \MTr@tempcntc\MTr@tempcntb%
     \advance\MTr@tempcntb \MTr@childparam{#1}{w}%
@@ -331,11 +342,6 @@
     \put(0,0){\MTr@drawline%
         (\MTr@tempcntc,\MTr@tempcnta)%
         (\MTr@tempcntb,\MTr@tempcnta)}%
-  \else%
-    \put(0,0){\MTr@drawline%
-      (\MTr@treev,\MTr@parenty)%
-      (\MTr@childparam{#1}{x},\MTr@tempcnta)}%
-  \fi%
 }
 \def\MTr@maketreebox{%
   \MTr@labelheight\ht\MTr@labelbox%