* lily/accidental-placement.cc (split_accidentals): new function

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

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index fee2bb8b0703286822e2f4626b24651743eca54c..8d2ac6e0a794e913100f357afe29471f80f4504d 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -17,12 +17,7 @@
 #include "stem.hh"
 #include "separation-item.hh"
 #include "staff-spacing.hh"
-
-bool
-Note_spacing::has_interface (Grob* g)
-{
-  return g && g->has_interface (ly_symbol2scm ("note-spacing-interface"));
-}
+#include "accidental-placement.hh"
 
 void
 Note_spacing::get_spacing (Grob *me, Item* right_col,
@@ -60,7 +55,7 @@ Note_spacing::get_spacing (Grob *me, Item* right_col,
          
          if (Separation_item::has_interface (it))
            {
-             extents[d].unite (Separation_item::my_width (it));
+             extents[d].unite (Separation_item::width (it));
              continue;
            }
 
@@ -83,7 +78,12 @@ Note_spacing::get_spacing (Grob *me, Item* right_col,
                accs = Note_column::accidentals (it->get_parent (X_AXIS));
              
              if (accs)
-               extents[d].unite (accs->extent (it_col, X_AXIS));
+               {
+                 Interval v =
+                   Accidental_placement::get_relevant_accidental_extent (accs, it_col, me);
+                   
+                 extents[d].unite (v);
+               }
            }
        }
 
@@ -118,13 +118,13 @@ Note_spacing::get_spacing (Grob *me, Item* right_col,
       *space += 0.5 * (( -extents[RIGHT][LEFT]) >? 0);
     }
 
-  *space += stem_dir_correction (me, right_col, increment);
+  stem_dir_correction (me, right_col, increment, space, fixed);
 }
 
 Item *
 Note_spacing::left_column (Grob *me)
 {
-  if (me->immutable_property_alist_ == SCM_EOL)
+  if (!me->live())
     return 0;
   
   return dynamic_cast<Item*> (me)->column_l ();
@@ -141,10 +141,7 @@ prune RIGHT-ITEMS.
 Item *
 Note_spacing::right_column (Grob*me)
 {
-  /*
-    ugh. should have generic is_live() method?
-   */
-  if (me->immutable_property_alist_ == SCM_EOL)
+  if (!me->live())
     return 0;
   
   SCM right = me->get_grob_property ("right-items");
@@ -202,9 +199,10 @@ Note_spacing::right_column (Grob*me)
    TODO: have to check wether the stems are in the same staff.
 
 */
-Real
+void
 Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
-                                  Real increment)  
+                                  Real increment,
+                                  Real * space, Real *fixed)  
 {
   Drul_array<Direction> stem_dirs(CENTER,CENTER);
   Drul_array<Interval> stem_posns;
@@ -252,13 +250,12 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
                  break;
                }
 
-             goto exit_func; 
+             return ;
            }
          
          if(Stem::invisible_b (stem))
            {
-             correct = false;
-             goto exit_func ;
+             return ;
            }
 
          beams_drul[d] = Stem::beam_l (stem);
@@ -267,8 +264,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
          Direction sd = Stem::get_direction (stem);
          if (stem_dirs[d] && stem_dirs[d] != sd)
            {
-             correct = false;
-             goto exit_func;
+             return ; 
            }
          stem_dirs[d] = sd;
 
@@ -279,8 +275,8 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
          if (d == LEFT
              && Stem::duration_log (stem) > 2  && !Stem::beam_l (stem))
            {
-             correct = false;
-             goto exit_func;
+
+             return;
            }
          
 
@@ -301,7 +297,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
 
   */
   if (acc_right)
-    return 0.0;
+    return ;
 
   if (!bar_yextent.empty_b())
     {
@@ -318,6 +314,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
          */
          
          correction = increment* stem_dirs[LEFT];
+         *fixed += increment* stem_dirs[LEFT];
        }
       else
        {
@@ -326,7 +323,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
          correct = correct && !intersect.empty_b ();
 
          if (!correct)
-           return 0.0;
+           return;
          
          correction = abs (intersect.length ());         
 
@@ -369,7 +366,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
       Interval hp = head_posns[LEFT];
       hp.intersect  (head_posns[RIGHT]);
       if (!hp.empty_b())
-       return 0.0;
+       return ;
 
       Direction lowest =
        (head_posns[LEFT][DOWN] > head_posns[RIGHT][UP]) ? RIGHT : LEFT;
@@ -383,9 +380,8 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
 
   if (!bar_xextent.empty_b())
     correction += - bar_xextent[LEFT];
-  
- exit_func:
-  return correction;
+
+  *space += correction;
 }