Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 3421ea5cba4bbb765531fed57be5d5893483313a..8586cc5f4cd209d6dd508117795eb587d61600d3 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -3,11 +3,12 @@
 
   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 "note-spacing.hh"
 
+#include "directional-element-interface.hh"
 #include "grob-array.hh"
 #include "paper-column.hh"
 #include "moment.hh"
@@ -20,7 +21,6 @@
 #include "output-def.hh"
 #include "pointer-group-interface.hh"
 
-
 /*
   TODO: detect hshifts due to collisions, and account for them in
   spacing?
@@ -39,16 +39,14 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
   Interval left_head_wid;
   do
     {
-      Link_array<Grob> const &items (ly_scm2link_array (props [d]));
-      for (int i = items.size (); i--;)
+      vector<Grob*> const &items (ly_scm2link_array (props [d]));
+      for (vsize i = items.size (); i--;)
        {
          Item *it = dynamic_cast<Item *> (items[i]);
 
          if (d == RIGHT && it->break_status_dir () != col_dir)
-           {
-             it = it->find_prebroken_piece (col_dir);
-           }
-         
+           it = it->find_prebroken_piece (col_dir);
+
          /*
            some kind of mismatch, eg. a note column, that is behind a
            linebreak.
@@ -78,7 +76,12 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
                first note head will be.
              */
              if (g)
-               left_head_wid = g->extent (it_col, X_AXIS);
+               {
+                 if (g->common_refpoint (it_col, X_AXIS) != it_col)
+                   programming_error ("Note_spacing::get_spacing(): Common refpoint incorrect");
+                 else
+                   left_head_wid = g->extent (it_col, X_AXIS);
+               }
            }
 
          extents[d].unite (it->extent (it_col, X_AXIS));
@@ -96,11 +99,8 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
                  extents[d].unite (v);
                }
 
-
              if (Grob *arpeggio = Note_column::arpeggio (it))
-               {
-                 extents[d].unite (arpeggio->extent (it_col, X_AXIS));
-               }
+               extents[d].unite (arpeggio->extent (it_col, X_AXIS));
            }
        }
 
@@ -111,6 +111,7 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
 
   /*
     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
@@ -139,10 +140,8 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
 
          /*
            Add that which sticks out a lot.
-          */
-         + max (0.0, -extents[RIGHT][LEFT] - (base_space - increment))));
-
-       
+         */
+         + max (0.0, -extents[RIGHT][LEFT] - (base_space - 0.5 * increment))));
 
   /*
     We don't do complicated stuff: (base_space - increment) is the
@@ -152,9 +151,14 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
   */
   *space = (base_space - increment) + *fixed;
 
+#if 0
+  /*
+    The below situation is now handled by the "sticks out a lot" case
+    above. However we keep around the code for a few releases before
+    we drop it.
+   */
   if (!extents[RIGHT].is_empty ()
-      && (Item::is_breakable (right_col)
-         || right_col->original_))
+      && (Paper_column::is_breakable (right_col)))
     {
       /*
        This is for the situation
@@ -169,7 +173,8 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
       *space += -extents[RIGHT][LEFT] / 2;
       *fixed += -extents[RIGHT][LEFT] / 2;
     }
-
+#endif
+  
   stem_dir_correction (me, right_col, increment, space, fixed);
 }
 
@@ -195,11 +200,11 @@ Note_spacing::right_column (Grob *me)
   if (!me->is_live ())
     return 0;
 
-  Grob_array * a = unsmob_grob_array (me->get_object ("right-items"));
+  Grob_array *a = unsmob_grob_array (me->get_object ("right-items"));
   Item *mincol = 0;
   int min_rank = INT_MAX;
   bool prune = false;
-  for (int i = 0; a && i <  a->size (); i++) 
+  for (vsize i = 0; a && i < a->size (); i++)
     {
       Item *ri = a->item (i);
       Item *col = ri->get_column ();
@@ -218,18 +223,16 @@ Note_spacing::right_column (Grob *me)
 
   if (prune && a)
     {
-      Link_array<Grob> & right = a->array_reference ();
-      for (int i = right.size(); i--;)  
+      vector<Grob*> &right = a->array_reference ();
+      for (vsize i = right.size (); i--;)
        {
-         if (dynamic_cast<Item*> (right[i])->get_column () != mincol)
-           right.del (i);
+         if (dynamic_cast<Item *> (right[i])->get_column () != mincol)
+           right.erase (right.begin () + i);
        }
     }
 
   if (!mincol)
-    {
-      return 0;
-    }
+    return 0;
 
   return mincol;
 }
@@ -266,8 +269,8 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 
   do
     {
-      Link_array<Grob> const &items (ly_scm2link_array (props [d]));
-      for (int i = 0; i < items.size(); i++)
+      vector<Grob*> const &items (ly_scm2link_array (props [d]));
+      for (vsize i = 0; i < items.size (); i++)
        {
          Item *it = dynamic_cast<Item *> (items[i]);
 
@@ -281,9 +284,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
              if (d == RIGHT && Separation_item::has_interface (it))
                {
                  if (it->get_column () != rcolumn)
-                   {
-                     it = it->find_prebroken_piece (rcolumn->break_status_dir ());
-                   }
+                   it = it->find_prebroken_piece (rcolumn->break_status_dir ());
 
                  Grob *last = Separation_item::extremal_break_aligned_grob (it, LEFT, &bar_xextent);
 
@@ -305,7 +306,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
          stems_drul[d] = stem;
          beams_drul[d] = Stem::get_beam (stem);
 
-         Direction sd = Stem::get_direction (stem);
+         Direction sd = get_grob_direction (stem);
          if (stem_dirs[d] && stem_dirs[d] != sd)
            {
              correct_stem_dirs = false;
@@ -319,9 +320,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
          */
          if (d == LEFT
              && Stem::duration_log (stem) > 2 && !Stem::get_beam (stem))
-           {
-             correct_stem_dirs = false;
-           }
+           correct_stem_dirs = false;
 
          Interval hp = Stem::head_positions (stem);
          if (!hp.is_empty ())
@@ -329,7 +328,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
              Real chord_start = hp[sd];
              Real stem_end = Stem::stem_end_position (stem);
 
-             stem_posns[d] = Interval (min (chord_start, stem_end), max (chord_start,  stem_end));
+             stem_posns[d] = Interval (min (chord_start, stem_end), max (chord_start, stem_end));
              head_posns[d].unite (hp);
            }
        }
@@ -402,9 +401,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
            }
 
          if (!bar_yextent.is_empty ())
-           {
-             correction *= 0.5;
-           }
+           correction *= 0.5;
        }
     }
   else if (correct_stem_dirs && stem_dirs[LEFT] * stem_dirs[RIGHT] == UP)
@@ -438,7 +435,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 
       Real delta = head_posns[-lowest][DOWN] - head_posns[lowest][UP];
       Real corr = robust_scm2double (me->get_property ("same-direction-correction"), 0);
-      
+
       if (delta > 1)
        correction = -lowest * corr;
     }