Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / ambitus.cc

diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 702d8ba7b5757caa50814557c811878fa797b1f1..1e6da083bc1d13ae654c0858d5a06aa1cd5b4a3c 100644 (file)
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -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->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->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);
@@ -66,6 +68,11 @@ Ambitus::print (SCM smob)
   return SCM_EOL;
 }
 
-ADD_INTERFACE (Ambitus, "ambitus-interface",
+ADD_INTERFACE (Ambitus ,
               "The line between note heads for a pitch range.",
-              "thickness note-heads join-heads");
+
+              /* props */
+              "join-heads "
+              "note-heads "
+              "thickness "
+              );