X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-column.cc;h=c15584ea1174cbd2f11a9ba0fa2623ae79262ede;hb=1b9fc29140bd1d9345f784595afd22158876dfb7;hp=9a0cdf8a9bc11498cb4c59a0af2b4fc42a77343c;hpb=f68bbd7a1ed1b0e7146bbbffcbcbb7f9c9bda3cc;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 9a0cdf8a9b..c15584ea11 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 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) 
@@ -34,21 +35,11 @@ Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
   return h1 - h2;
 }
 
-void
-Note_column::set_interface (Grob* me)
-{
-  me->set_grob_property ("note-heads", SCM_EOL);  
-  me->set_interface (ly_symbol2scm ("note-column-interface"));
-  
-  Axis_group_interface::set_interface (me);
-  Axis_group_interface::set_axes (me, X_AXIS, Y_AXIS);
-}
-
 Item *
-Note_column::stem_l (Grob*me) 
+Note_column::get_stem (Grob*me) 
 {
   SCM s = me->get_grob_property ("stem");
-  return  dynamic_cast<Item*> (unsmob_grob (s));
+  return  unsmob_item (s);
 }
   
 Slice
@@ -63,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;
@@ -84,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
@@ -100,19 +91,20 @@ Note_column::add_head (Grob*me,Grob *h)
     }
   else if (Note_head::has_interface (h))
     {
-      Pointer_group_interface::add_element (me, "note-heads",h);
+      Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h);
     }
   Axis_group_interface::add_element (me, h);
 }
 
 /**
-  translate the rest symbols vertically by amount DY_I.
- */
+  translate the rest symbols vertically by amount DY_I, but only if
+  they have no staff-position set.
+*/
 void
 Note_column::translate_rests (Grob*me,int dy_i)
 {
   Grob * r = unsmob_grob (me->get_grob_property ("rest"));
-  if (r)
+  if (r && !gh_number_p (r->get_grob_property ("staff-position")))
     {
       r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
     }
@@ -131,12 +123,40 @@ 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 the first Accidentals grob that we find in a note-head. 
+ */
+Grob* 
+Note_column::accidentals (Grob *me)
 {
-  return me && me->has_interface (ly_symbol2scm ("note-column-interface"));
+  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));
+      acc = h ? unsmob_grob (h->get_grob_property ("accidental-grob")) : 0;
+      if (acc)
+	break;
+    }
+
+  if (!acc)
+    return 0;
+  
+  if (Accidental_placement::has_interface (acc->get_parent (X_AXIS)))
+    return acc->get_parent (X_AXIS);
+
+  /* compatibility. */
+  return  acc;
 }
+
+
+
+ADD_INTERFACE (Note_column,"note-column-interface",
+  "Stem and noteheads combined",
+  "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
+