cleanups in Note_spacing

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

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index f601a1054b4e24a76bfdd39caea676f129d730f6..ed18b919138782d6fea80806fcb6c5f8ed7547b2 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-spacing.hh"
@@ -64,7 +64,8 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
              continue;
            }
 
-         if (d == LEFT)
+         if (d == LEFT
+             && Note_column::has_interface (it))
            {
              SCM r = it->get_object ("rest");
              Grob *g = unsmob_grob (r);
@@ -78,7 +79,7 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
              if (g)
                {
                  if (g->common_refpoint (it_col, X_AXIS) != it_col)
-                   programming_error ("Note_spacing::get_spacing(): Common refpoint incorrect");
+                   programming_error ("Note_spacing::get_spacing (): Common refpoint incorrect");
                  else
                    left_head_wid = g->extent (it_col, X_AXIS);
                }
@@ -151,30 +152,6 @@ 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 ()
-      && (Paper_column::is_breakable (right_col)))
-    {
-      /*
-       This is for the situation
-
-       rest | 3/4 (eol)
-
-       Since we only take half of the right-object space above, the
-       barline will bump into the notes preceding it, if the right
-       thing is big. We add the rest of the extents here:
-      */
-
-      *space += -extents[RIGHT][LEFT] / 2;
-      *fixed += -extents[RIGHT][LEFT] / 2;
-    }
-#endif
-  
   stem_dir_correction (me, right_col, increment, space, fixed);
 }
 
@@ -189,8 +166,8 @@ Note_spacing::left_column (Grob *me)
 
 /*
   Compute the column of the right-items.  This is a big function,
-  since RIGHT-ITEMS may span more columns (eg. if a clef if inserted,
-  this will add a new columns to RIGHT-ITEMS. Here we look at the
+  since RIGHT-ITEMS may span more columns (eg. if a clef is inserted,
+  this will add a new column to RIGHT-ITEMS. Here we look at the
   columns, and return the left-most. If there are multiple columns, we
   prune RIGHT-ITEMS.
 */
@@ -231,9 +208,6 @@ Note_spacing::right_column (Grob *me)
        }
     }
 
-  if (!mincol)
-    return 0;
-
   return mincol;
 }
 
@@ -355,6 +329,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
     {
       stem_dirs[RIGHT] = -stem_dirs[LEFT];
       stem_posns[RIGHT] = bar_yextent;
+      stem_posns[RIGHT] *= 2;
     }
 
   if (correct_stem_dirs && stem_dirs[LEFT] * stem_dirs[RIGHT] == -1)