* lily/spacing-engraver.cc (finalize): robustifications.

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index d35b6da16f67ade0181924527947d0be94cfa1b8..5f523ea26b13fdcebfc6f7cf4cccb2d3ae671a7d 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>              // ceil
 
 #include "axis-group-interface.hh"
 #include "note-column.hh"
 #include "stem.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "group-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "rest.hh"
 #include "note-head.hh"
+#include "accidental-placement.hh"
 
 bool
 Note_column::rest_b (Grob*me) 
@@ -35,7 +36,7 @@ Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
 }
 
 Item *
-Note_column::stem_l (Grob*me) 
+Note_column::get_stem (Grob*me) 
 {
   SCM s = me->get_grob_property ("stem");
   return  unsmob_item (s);
@@ -53,7 +54,7 @@ Note_column::head_positions_interval (Grob *me)
     {
       Grob *se = unsmob_grob (ly_car (h));
       
-      int j = int (Staff_symbol_referencer::position_f (se));
+      int j = int (Staff_symbol_referencer::get_position (se));
       iv.unite (Slice (j,j));
     }
   return iv;
@@ -74,11 +75,11 @@ Note_column::dir (Grob*  me)
 
 
 void
-Note_column::set_stem (Grob*me,Grob * stem_l)
+Note_column::set_stem (Grob*me,Grob * stem)
 {
-  me->set_grob_property ("stem", stem_l->self_scm ());
-  me->add_dependency (stem_l);
-  Axis_group_interface::add_element (me, stem_l);
+  me->set_grob_property ("stem", stem->self_scm ());
+  me->add_dependency (stem);
+  Axis_group_interface::add_element (me, stem);
 }
 
 void
@@ -122,15 +123,10 @@ Note_column::set_dotcol (Grob*me,Grob *d)
 Grob*
 Note_column::first_head (Grob*me) 
 {
-  Grob * st = stem_l (me);
+  Grob * st = get_stem (me);
   return st?  Stem::first_head (st): 0; 
 }
 
-bool
-Note_column::has_interface (Grob*me)
-{
-  return me && me->has_interface (ly_symbol2scm ("note-column-interface"));
-}
 
 /*
   Return the first Accidentals grob that we find in a note-head. 
@@ -139,15 +135,23 @@ Grob*
 Note_column::accidentals (Grob *me)
 {
   SCM heads = me->get_grob_property ("note-heads");
+  Grob * acc = 0;
   for (;gh_pair_p (heads); heads =gh_cdr (heads))
     {
       Grob * h = unsmob_grob (gh_car (heads));
-      Grob *a = h ? unsmob_grob(h->get_grob_property ("accidentals-grob")) : 0;
-      if (a)
-       return a;
+      acc = h ? unsmob_grob (h->get_grob_property ("accidental-grob")) : 0;
+      if (acc)
+       break;
     }
 
-  return 0;
+  if (!acc)
+    return 0;
+  
+  if (Accidental_placement::has_interface (acc->get_parent (X_AXIS)))
+    return acc->get_parent (X_AXIS);
+
+  /* compatibility. */
+  return  acc;
 }