Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index ad8b108e78320c0b64128265ce5825ac1a079ea2..281296c506157dc570f3cb93d95fc5d9cb649f2a 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -2,13 +2,12 @@
   lyric-extender.cc -- implement Lyric_extender
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys
 */
 
 #include "lyric-extender.hh"
 
-#include <math.h>
 
 #include "warn.hh"
 #include "lookup.hh"
@@ -31,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->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   extract_grob_set (me, "heads", heads);
 
@@ -58,7 +57,7 @@ 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;