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 48e0c09f6b246569b63dd086e9deb4e643b65f9a..f89113187ed1c435adc678efc7e518c5374873f9 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-spacing.hh"
@@ -20,6 +20,7 @@ using namespace std;
 #include "stem.hh"
 #include "accidental-placement.hh"
 #include "pointer-group-interface.hh"
+#include "directional-element-interface.hh"
 
 /*
   Insert some more space for the next note, in case it has a stem in
@@ -66,7 +67,7 @@ Staff_spacing::next_note_correction (Grob *me,
   if (!bar_size.is_empty ())
     if (Grob *stem = Note_column::get_stem (g))
       {
-       Direction d = Stem::get_direction (stem);
+       Direction d = get_grob_direction (stem);
        if (d == DOWN)
          {
            Real stem_start = Stem::head_positions (stem) [DOWN];
@@ -98,15 +99,16 @@ Staff_spacing::bar_y_positions (Grob *bar_grob)
   bar_size.set_empty ();
   if (Bar_line::has_interface (bar_grob))
     {
-      SCM glyph = bar_grob->get_property ("glyph");
+      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) == ".")
        {
-         SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm ());
-         bar_size = Interval (-1, 1);
-         bar_size *= robust_scm2double (sz, 1)
-           / Staff_symbol_referencer::staff_space (bar_grob);
+         Grob *common = bar_grob->common_refpoint (staff_sym, Y_AXIS);
+         Interval bar_size = bar_grob->extent (common, Y_AXIS);
+         bar_size *= 1.0 / Staff_symbol_referencer::staff_space (bar_grob);
        }
     }
   return bar_size;
@@ -130,9 +132,9 @@ Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob,
 
   *compound_fixed = 0.0;
   *compound_space = 0.0;
-  int wishes;
+  int wish_count = 0;
   
-  for (int i = right_items.size (); i--;)
+  for (vsize i = right_items.size (); i--;)
     {
       Grob *g = right_items[i];
 
@@ -143,24 +145,24 @@ Staff_spacing::next_notes_correction (Grob *me, Grob *last_grob,
 
       *compound_space += space;
       *compound_fixed += fixed; 
-      wishes ++;
+      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;
          next_note_correction (me, elts[j], bar_size, &space, &fixed);
          *compound_fixed += fixed;
          *compound_space += space;
-         wishes ++;
+         wish_count ++;
        }
     }
 
-  if (wishes)
+  if (wish_count)
     {
-      *compound_space /= wishes;
-      *compound_fixed /= wishes;
+      *compound_space /= wish_count;
+      *compound_fixed /= wish_count;
     }
 }
 
@@ -174,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))
@@ -259,8 +261,13 @@ 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.",
-              "stem-spacing-correction left-items right-items");
+
+              /* properties */
+              "stem-spacing-correction "
+              "left-items "
+              "right-items "
+              );