(unfold-repeats): remove debugging display.

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index f21432c9e72e8fd4dd3f0a54f61319a0c3043fbb..207c9f2087460130c3c571d7bbcc1004d1b3bc58 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -10,7 +10,7 @@
 
 #include "text-spanner.hh"
 
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "line-spanner.hh"
 #include "spanner.hh"
 #include "font-interface.hh"
@@ -129,15 +129,17 @@ Text_spanner::print (SCM smob)
       Interval ext = edge[d].extent (X_AXIS);
       if (!ext.is_empty ())
        {
+         Real pad = robust_scm2double (me->get_property ("bound-padding"), 0.0);
          edge[d].translate_axis (span_points[d], X_AXIS);
          m.add_stencil (edge[d]);
-         span_points[d] += -d * ext[-d];
+         span_points[d] += -d * (ext[-d] + pad);
        }
     }
   while (flip (&d) != LEFT);
+
   do
     {
-      if (d* span_points[d] > d * edge[-d].extent (X_AXIS)[d])
+      if (d * span_points[d] > d * edge[-d].extent (X_AXIS)[d])
        {
          edge_line[d].translate_axis (span_points[d], X_AXIS);
          m.add_stencil (edge_line[d]);
@@ -147,7 +149,8 @@ Text_spanner::print (SCM smob)
 
   if (!span_points.is_empty ())
     {
-      Stencil l = Line_spanner::line_stencil (me, Offset (span_points[LEFT], 0),
+      Stencil l = Line_spanner::line_stencil (me,
+                                             Offset (span_points[LEFT], 0),
                                              Offset (span_points[RIGHT], 0));
       m.add_stencil (l);
     }
@@ -157,5 +160,5 @@ Text_spanner::print (SCM smob)
 
 ADD_INTERFACE (Text_spanner, "text-spanner-interface",
               "generic text spanner",
-              "dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");
+              "bound-padding dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");