X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner.cc;h=4d8b3a092f82162a3df5e0912eafbbd6c00e909c;hb=bb931bde01b84a88d2789a639df4b5be134fa17f;hp=207c9f2087460130c3c571d7bbcc1004d1b3bc58;hpb=26380ed75fbd7b32781715c043dfa5dd96dfbe4a;p=lilypond.git

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 207c9f2087..4d8b3a092f 100644
--- 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Revised over good by Han-Wen.
 */
@@ -42,7 +42,7 @@ Text_spanner::print (SCM smob)
   /* Ugh, must be same as Hairpin::print.  */
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
-  Output_def *layout = me->get_layout ();
+  Output_def *layout = me->layout ();
 
   SCM flare = me->get_property ("bracket-flare");
   SCM shorten = me->get_property ("shorten-pair");
@@ -92,7 +92,7 @@ Text_spanner::print (SCM smob)
 
 	  SCM text = index_get_cell (edge_text, d);
 
-	  if (Text_interface::markup_p (text))
+	  if (Text_interface::is_markup (text))
 	    edge[d] = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, text));
 
 	  if (!edge[d].is_empty ())
@@ -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,20 @@ Text_spanner::print (SCM smob)
   return m.smobbed_copy ();
 }
 
-ADD_INTERFACE (Text_spanner, "text-spanner-interface",
+ADD_INTERFACE (Text_spanner,
+	       "text-spanner-interface",
+
 	       "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 "
+	       );