X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-spacing.cc;h=f601a1054b4e24a76bfdd39caea676f129d730f6;hb=c750e9b0ef41267a9b6be0300c880047f48b9353;hp=78b1bcaf4a3fe7e79d1b75f52789f74590686d0f;hpb=c2adb6159c233a9ef3f8a22ab25342e15bd10c8b;p=lilypond.git

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 78b1bcaf4a..f601a1054b 100644
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -39,7 +39,7 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
   Interval left_head_wid;
   do
     {
-      Link_array<Grob> const &items (ly_scm2link_array (props [d]));
+      vector<Grob*> const &items (ly_scm2link_array (props [d]));
       for (vsize i = items.size (); i--;)
 	{
 	  Item *it = dynamic_cast<Item *> (items[i]);
@@ -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
@@ -140,7 +141,7 @@ 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
@@ -157,8 +158,7 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
     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
@@ -223,7 +223,7 @@ Note_spacing::right_column (Grob *me)
 
   if (prune && a)
     {
-      Link_array<Grob> &right = a->array_reference ();
+      vector<Grob*> &right = a->array_reference ();
       for (vsize i = right.size (); i--;)
 	{
 	  if (dynamic_cast<Item *> (right[i])->get_column () != mincol)
@@ -269,7 +269,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 
   do
     {
-      Link_array<Grob> const &items (ly_scm2link_array (props [d]));
+      vector<Grob*> const &items (ly_scm2link_array (props [d]));
       for (vsize i = 0; i < items.size (); i++)
 	{
 	  Item *it = dynamic_cast<Item *> (items[i]);
@@ -306,13 +306,13 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 	  stems_drul[d] = stem;
 	  beams_drul[d] = Stem::get_beam (stem);
 
-	  Direction sd = get_grob_direction (stem);
-	  if (stem_dirs[d] && stem_dirs[d] != sd)
+	  Direction stem_dir = get_grob_direction (stem);
+	  if (stem_dirs[d] && stem_dirs[d] != stem_dir)
 	    {
 	      correct_stem_dirs = false;
 	      continue;
 	    }
-	  stem_dirs[d] = sd;
+	  stem_dirs[d] = stem_dir;
 
 	  /*
 	    Correction doesn't seem appropriate  when there is a large flag
@@ -323,12 +323,20 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 	    correct_stem_dirs = false;
 
 	  Interval hp = Stem::head_positions (stem);
-	  if (!hp.is_empty ())
+	  if (correct_stem_dirs
+	      && !hp.is_empty ())
 	    {
-	      Real chord_start = hp[sd];
-	      Real stem_end = Stem::stem_end_position (stem);
+	      Real chord_start = hp[stem_dir];
+
+	      /*
+		can't look at stem-end-position, since that triggers
+		beam slope computations.
+	      */
+	      Real stem_end = hp[stem_dir] +
+		stem_dir * robust_scm2double (stem->get_property ("length"), 7);
 
-	      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);
 	    }
 	}
@@ -447,7 +455,15 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
   */
 }
 
-ADD_INTERFACE (Note_spacing, "note-spacing-interface",
+ADD_INTERFACE (Note_spacing,
 	       "This object calculates spacing wishes for individual voices.",
-	       "left-items right-items stem-spacing-correction same-direction-correction knee-spacing-correction");
+
+	       
+	       "knee-spacing-correction "
+	       "left-items "
+	       "right-items "
+	       "same-direction-correction "
+	       "stem-spacing-correction "
+
+	       );