* input/regression/stencil-color-rotation.ly: new file.

[lilypond.git] / lily / lyric-extender.cc

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index c1aa2095637d1825eea28d62b71d93b98585755e..5f74e457235031ea77bda9839be04d84d7d484bf 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -16,8 +16,8 @@
 #include "note-head.hh"
 #include "pointer-group-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1)
-  SCM
+MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1);
+SCM
 Lyric_extender::print (SCM smob)
 {
   Spanner *me = unsmob_spanner (smob);
@@ -30,7 +30,7 @@ Lyric_extender::print (SCM smob)
     common = common->common_refpoint (right_text, X_AXIS);
 
   common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   extract_grob_set (me, "heads", heads);
 
@@ -57,10 +57,10 @@ Lyric_extender::print (SCM smob)
     = left_point + (robust_scm2double (minlen, 0));
 
   if (heads.size ())
-    right_point = max (right_point, heads.top ()->extent (common, X_AXIS)[RIGHT]);
+    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;
+  Real pad = 2 * h;
 
   if (right_text)
     right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - pad));