Merge with master

[lilypond.git] / lily / text-spanner.cc

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index be24e02e05a9d25935e564557ca80cad6ae9af6b..e98ae0f7dfa9afcd81c412e9c08ba504b87f5d07 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Revised over good by Han-Wen.
 */
@@ -147,7 +147,9 @@ Text_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
-  if (!span_points.is_empty ())
+  
+  if (!span_points.is_empty ()
+      && span_points.length () > robust_scm2double (me->get_property ("dash-period"), 0.0))
     {
       Stencil l = Line_spanner::line_stencil (me,
                                              Offset (span_points[LEFT], 0),
@@ -158,7 +160,19 @@ Text_spanner::print (SCM smob)
   return m.smobbed_copy ();
 }
 
-ADD_INTERFACE (Text_spanner, "text-spanner-interface",
+ADD_INTERFACE (Text_spanner,
+
               "generic text spanner",
-              "bound-padding dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");
+
+              "bound-padding "
+              "bracket-flare "
+              "dash-fraction "
+              "dash-period "
+              "edge-height "
+              "edge-text "
+              "enclose-bounds "
+              "shorten-pair "
+              "style "
+              "thickness "
+              );