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

[lilypond.git] / lily / staff-spacing.cc

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index a4cf1d368a4f7721dbe4b17a7344a17783c3e641..f89113187ed1c435adc678efc7e518c5374873f9 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -102,8 +102,9 @@ Staff_spacing::bar_y_positions (Grob *bar_grob)
       SCM glyph = bar_grob->get_property ("glyph-name");
       Grob *staff_sym = Staff_symbol_referencer::get_staff_symbol (bar_grob);
 
-      String glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
-      if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".")
+      string glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
+      if (glyph_string.substr (0, 1) == "|"
+         || glyph_string.substr (0, 1) == ".")
        {
          Grob *common = bar_grob->common_refpoint (staff_sym, Y_AXIS);
          Interval bar_size = bar_grob->extent (common, Y_AXIS);
@@ -133,7 +134,7 @@ Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob,
   *compound_space = 0.0;
   int wish_count = 0;
   
-  for (int i = right_items.size (); i--;)
+  for (vsize i = right_items.size (); i--;)
     {
       Grob *g = right_items[i];
 
@@ -147,7 +148,7 @@ Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob,
       wish_count ++;
       
       extract_grob_set (g, "elements", elts);
-      for (int j = elts.size (); j--;)
+      for (vsize j = elts.size (); j--;)
        {
          Real space = 0.0;
          Real fixed = 0.0;
@@ -175,7 +176,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed)
   Item *me_item = dynamic_cast<Item *> (me);
 
   extract_grob_set (me, "left-items", items);
-  for (int i = items.size (); i--;)
+  for (vsize i = items.size (); i--;)
     {
       Grob *cand = items[i];
       if (cand && Separation_item::has_interface (cand))
@@ -260,7 +261,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real *space, Real *fixed)
   *fixed += correction_fixed;
 }
 
-ADD_INTERFACE (Staff_spacing, "staff-spacing-interface",
+ADD_INTERFACE (Staff_spacing,
               "This object calculates spacing details from a "
               " breakable symbol (left) to another object. For example, it takes care "
               " of  optical spacing from  a bar lines to a note.",