* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 8493dd93261e5b60f59efa2de36bf302d77a7e08..bc95433a78e8fc0a07d7021d7f616dbf6ec30fc7 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -18,12 +18,7 @@
 #include "staff-symbol-referencer.hh"
 #include "note-column.hh"
 #include "stem.hh"
-
-bool
-Staff_spacing::has_interface (Grob* g)
-{
-  return g && g->has_interface (ly_symbol2scm ("staff-spacing-interface"));
-}
+#include "accidental-placement.hh"
 
 /*
   Insert some more space for the next note, in case it has a stem in
@@ -38,13 +33,29 @@ Staff_spacing::next_note_correction (Grob * me,
   if (!g || !Note_column::has_interface (g))
     return 0.0;
 
-  Item *col =dynamic_cast<Item*> (g)->column_l ();
+  Item *col =dynamic_cast<Item*> (g)->get_column ();
   Real max_corr = 0. >? (- g->extent (col, X_AXIS)[LEFT]);
+
+  /*
+    Duh. If this gets out of hand, we should invent something more generic.
+   */
   if (Grob * a = Note_column::accidentals (g))
+    {
+      Interval v;
+      if (Accidental_placement::has_interface (a))
+       {
+         v = Accidental_placement::get_relevant_accidental_extent(a, col, me);
+       }
+      else
+       v = a->extent (col, X_AXIS);
+      
+      max_corr = max_corr >? (- v[LEFT]);
+    }
+  if (Grob* a = unsmob_grob (g->get_grob_property ("arpeggio")))
     {
       max_corr = max_corr >? (- a->extent (col, X_AXIS)[LEFT]);
     }
-
+  
   /*
     Let's decrease the space a little if the problem is not located
     after a barline.
@@ -53,7 +64,7 @@ Staff_spacing::next_note_correction (Grob * me,
     max_corr *= 0.75;
   
   if (!bar_size.empty_b())
-    if (Grob *stem = Note_column::stem_l  (g))
+    if (Grob *stem = Note_column::get_stem (g))
       {
        Direction d = Stem::get_direction (stem);
        if (d == DOWN)
@@ -90,8 +101,8 @@ Staff_spacing::bar_y_positions (Grob *bar_grob)
     {
       SCM glyph = bar_grob->get_grob_property ("glyph");
       
-      String glyph_str = gh_string_p (glyph) ? ly_scm2string (glyph) : "";
-      if (glyph_str.left_str (1) == "|" || glyph_str.left_str (1) == ".")
+      String glyph_string = gh_string_p (glyph) ? ly_scm2string (glyph) : "";
+      if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".")
        {
          SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm());
          bar_size = Interval (-1,1);
@@ -136,7 +147,7 @@ Grob*
 Staff_spacing::extremal_break_aligned_grob (Grob *separation_item, Direction d,
                                   Interval * last_ext)
 {
-  Grob *left_col = dynamic_cast<Item*> (separation_item)->column_l ();
+  Grob *left_col = dynamic_cast<Item*> (separation_item)->get_column ();
   last_ext->set_empty ();
   Grob *last_grob = 0;
   for (SCM s = separation_item->get_grob_property ("elements");
@@ -162,8 +173,6 @@ Staff_spacing::extremal_break_aligned_grob (Grob *separation_item, Direction d,
   return last_grob;  
 }
 
-/*
-*/
 void
 Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
 {
@@ -171,7 +180,8 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
   *fixed = 1.0;
 
   Grob * separation_item=0;
-  
+  Item * me_item  = dynamic_cast<Item*> (me);
+    
   for (SCM s = me->get_grob_property ("left-items");
        gh_pair_p (s); s = gh_cdr(s))
     {
@@ -180,7 +190,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
        separation_item = cand ;
     }
 
-  //  printf ("doing col %d\n" , Paper_column::rank_i(left_col));
+  //  printf ("doing col %d\n" , Paper_column::get_rank (left_col));
 
   if (!separation_item)
     {
@@ -193,7 +203,17 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
                                                 &last_ext);
   if (!last_grob)
     {
-      programming_error ("empty break column? --fixme");
+      /*
+       TODO:
+       
+       Should  insert a adjustable space here? For excercises, you might want to
+       use a staff without a clef in the beginning. 
+       */
+      
+      /*
+       we used to have a warning here, but itgenerates a lot of
+       spurious error messages.
+      */
       return ;
     }
 
@@ -204,7 +224,15 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
   if (!scm_list_p (alist))
     return ;
 
-  SCM space_def = scm_sloppy_assq (ly_symbol2scm ("begin-of-note"), alist);
+  
+  SCM space_def = scm_sloppy_assq (ly_symbol2scm ("first-note"), alist);
+  if (me_item->break_status_dir () == CENTER)
+    {
+      SCM nndef = scm_sloppy_assq (ly_symbol2scm ("next-note"), alist);
+      if (gh_pair_p (nndef ))
+       space_def = nndef;
+    }
+
   if (!gh_pair_p (space_def))
     {
       programming_error ("Unknown prefatory spacing. "); 
@@ -223,11 +251,9 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
 
 
   *space += next_notes_correction (me, last_grob);
-
-  if (dynamic_cast<Item*> (me)-> break_status_dir () == RIGHT)
-    {
-      /* Start of line: this space is not stretchable */
-      *fixed = *space;
-    }
-  
 }
+
+
+ADD_INTERFACE (Staff_spacing,"staff-spacing-interface",
+  "",
+  "stem-spacing-correction left-items right-items");