* lily/beam.cc (get_default_dir): take extreme note head as input

[lilypond.git] / lily / side-position-interface.cc

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index a035ca45a039c4efb075b7f62b867afcbccedb23..72dfbb838018b7da1918bd4dd233fa2138c2d700 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -74,7 +74,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
        dim.unite (staff_extents);
     }
 
-  for (int i = 0; i < support.size (); i++)
+  for (vsize i = 0; i < support.size (); i++)
     {
       Grob *e = support[i];
       if (e)
@@ -106,7 +106,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
   /* FIXME: 1000 should relate to paper size.  */
   if (fabs (total_off) > 1000)
     {
-      std::string msg
+      string msg
        = String_convert::form_string ("Improbable offset for grob %s: %f%s",
                                       me->name ().c_str (), total_off,
                                       INTERNAL_UNIT);
@@ -184,7 +184,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a)
              || (Note_head::has_interface (head)
                  && sign (Staff_symbol_referencer::get_position (head)) == - dir))
            {
-             o += dir *(rounded - position) * 0.5 * ss;
+             o += (rounded - position) * 0.5 * ss;
              if (Staff_symbol_referencer::on_line (me, int (rounded)))
                o += dir * 0.5 * ss;
            }
@@ -240,10 +240,10 @@ ADD_INTERFACE (Side_position_interface, "side-position-interface",
               "direction-source "
               "minimum-space "
               "padding "
+              "quantize-position "
               "side-axis "
               "side-relative-direction "
               "side-support-elements "
               "slur-padding "
               "staff-padding "
-              "quantize-position "
               );