X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-extender.cc;h=d30a53d6681b05ddb67bcf772f1ef3d6135c61b0;hb=a69eb3b3dfed77344ffd4d54580fa8985c27568e;hp=5f74e457235031ea77bda9839be04d84d7d484bf;hpb=4b5d14fc3b5ea19d4cf71d2222ddb3964122eeb2;p=lilypond.git

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 5f74e45723..d30a53d668 100644
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -8,10 +8,10 @@
 
 #include "lyric-extender.hh"
 
-
+#include "spanner.hh"
+#include "item.hh"
 #include "warn.hh"
 #include "lookup.hh"
-#include "paper-column.hh"
 #include "output-def.hh"
 #include "note-head.hh"
 #include "pointer-group-interface.hh"
@@ -60,16 +60,17 @@ Lyric_extender::print (SCM smob)
     right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]);
 
   Real h = sl * robust_scm2double (me->get_property ("thickness"), 0);
-  Real pad = 2 * h;
+  Drul_array<Real> paddings (robust_scm2double (me->get_property ("left-padding"), h),
+			     robust_scm2double (me->get_property ("right-padding"), h));
 
   if (right_text)
-    right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - pad));
+    right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - paddings[RIGHT]));
 
   /* run to end of line. */
   if (me->get_bound (RIGHT)->break_status_dir ())
-    right_point = max (right_point, (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - pad));
+    right_point = max (right_point, (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - paddings[RIGHT]));
 
-  left_point += pad;
+  left_point += paddings[LEFT];
   Real w = right_point - left_point;
 
   if (w < 1.5 * h)
@@ -83,7 +84,13 @@ Lyric_extender::print (SCM smob)
   return mol.smobbed_copy ();
 }
 
-ADD_INTERFACE (Lyric_extender, "lyric-extender-interface",
+ADD_INTERFACE (Lyric_extender,
 	       "The extender is a simple line at the baseline of the lyric "
 	       "that helps show the length of a melissima (tied/slurred note).",
-	       "next thickness heads");
+
+	       "heads "
+	       "left-padding "
+	       "next "
+	       "right-padding "
+	       "thickness "
+	       );