* 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 a002d50dc25ed0f8922768ab1beffbea12bffb10..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,
@@ -34,17 +29,19 @@ Note_spacing::get_spacing (Grob *me, Item* right_col,
   Direction d = LEFT;
   Direction col_dir =  right_col->break_status_dir ();
   Drul_array<Interval> extents;
+
+  Interval left_head_wid; 
   do
     {
       for (SCM  s = props[d]; gh_pair_p (s); s = gh_cdr (s))
        {
          Item * it= dynamic_cast<Item*> (unsmob_grob (gh_car(s)));
-
+         
          if (d == RIGHT && it->break_status_dir () != col_dir)
            {
              it = it -> find_prebroken_piece (col_dir);
-           }
 
+           }
          /*
            some kind of mismatch, eg. a note column, that is behind a
            linebreak.
@@ -52,16 +49,28 @@ Note_spacing::get_spacing (Grob *me, Item* right_col,
          if (!it)
            continue; 
 
-         if (d == RIGHT && right_col != it->column_l ())
+         Item *it_col = it->column_l ();
+         if (d == RIGHT && right_col != it_col)
            continue;
          
          if (Separation_item::has_interface (it))
            {
-             extents[d].unite (Separation_item::my_width (it));
+             extents[d].unite (Separation_item::width (it));
              continue;
            }
+
+         if (d == LEFT)
+           {
+             SCM r = it->get_grob_property ("rest");
+             Grob * g = unsmob_grob (r);
+             if (!g)
+               g =  Note_column::first_head (it);
+
+             if (g)
+               left_head_wid = g->extent(it_col, X_AXIS);
+           }
          
-         extents[d].unite (it->extent (it->column_l (), X_AXIS));
+         extents[d].unite (it->extent (it_col, X_AXIS));
          if (d == RIGHT)
            {
              Grob * accs = Note_column::accidentals (it);
@@ -69,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->column_l (), X_AXIS));
+               {
+                 Interval v =
+                   Accidental_placement::get_relevant_accidental_extent (accs, it_col, me);
+                   
+                 extents[d].unite (v);
+               }
            }
        }
 
@@ -78,8 +92,18 @@ Note_spacing::get_spacing (Grob *me, Item* right_col,
     }
   while (flip (&d) != LEFT);
 
-  *fixed = (extents[LEFT][RIGHT] >? increment);
-  *space = (base_space - increment) + *fixed ;
+
+  /*
+    We look at the width of the note head, since smaller heads get less space
+    eg. a quarter rest gets almost 0.5 ss less horizontal space than a note.
+
+    What is sticking out of the note head (eg. a flag), doesn't get
+    the full amount of space.
+  */
+  *fixed = left_head_wid.empty_b () ? increment : left_head_wid[RIGHT];
+  *space = (base_space - increment) + *fixed +
+    (extents[LEFT][RIGHT] - left_head_wid[RIGHT])/ 2;
+    ;
 
   if (*space - *fixed < 2 * ((- extents[RIGHT][LEFT]) >? 0))
     {
@@ -94,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 ();
@@ -117,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");
@@ -178,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;
@@ -228,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);
@@ -243,11 +264,23 @@ 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;
 
+         /*
+           Correction doesn't seem appropriate  when there is a large flag
+           hanging from the note.
+          */
+         if (d == LEFT
+             && Stem::duration_log (stem) > 2  && !Stem::beam_l (stem))
+           {
+
+             return;
+           }
+         
+
+         
          Interval hp  = Stem::head_positions (stem);
          Real chord_start = hp[sd];      
          Real stem_end = Stem::stem_end_position (stem);
@@ -264,7 +297,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
 
   */
   if (acc_right)
-    return 0.0;
+    return ;
 
   if (!bar_yextent.empty_b())
     {
@@ -274,13 +307,14 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn,
   
   if (correct &&stem_dirs[LEFT] *stem_dirs[RIGHT] == -1)
     {
-      if (beams_drul[LEFT] == beams_drul[RIGHT])
+      if (beams_drul[LEFT] && beams_drul[LEFT] == beams_drul[RIGHT])
        {
          /*
            this is a knee: maximal correction.
          */
          
          correction = increment* stem_dirs[LEFT];
+         *fixed += increment* stem_dirs[LEFT];
        }
       else
        {
@@ -289,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 ());         
 
@@ -332,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;
@@ -346,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;
 }