(get_system_specs): separate generation of

[lilypond.git] / lily / ambitus.cc

diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 472df25037b0ffec19543273a52092dceabe86e2..c27ebc468dab386e82c50a42af29ae15b157b9c6 100644 (file)
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "ambitus.hh"
@@ -30,7 +30,9 @@ Ambitus::print (SCM smob)
       && heads.size () > 1)
     {
       Grob *common
-       = common_refpoint_of_array (heads.slice (0, 2), me, Y_AXIS);
+       = common_refpoint_of_array (vector<Grob*> (heads.begin (),
+                                                      heads.begin () + 2),
+                                   me, Y_AXIS);
 
       Grob *minh = heads[0];
       Grob *maxh = heads[1];
@@ -49,9 +51,9 @@ Ambitus::print (SCM smob)
 
       if (pmin < pmax)
        {
-         Real linethickness = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"))
+         Real linethickness = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
            * robust_scm2double (me->get_property ("thickness"), 1.0);
-         Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+         Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
          Interval x_extent = 0.5 * linethickness * Interval (-1, 1);
          Interval y_extent = Interval (pmin, pmax);
          Box line_box (x_extent, y_extent);