* Documentation/windows/zlily-profile.sh:

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 56a29d08a3d313501e0d8db8241e2fe28018206a..9e6c4cdc1c1ab2a7cf4ff878c2e740bc67116c67 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,7 +3,7 @@
 
   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
 
@@ -16,6 +16,7 @@
 #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) 
 {
   SCM s = me->get_grob_property ("stem");
-  return  dynamic_cast<Item*> (unsmob_grob (s));
+  return  unsmob_item (s);
 }
   
 Slice
@@ -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, ly_symbol2scm ("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);
     }
@@ -135,8 +127,36 @@ Note_column::first_head (Grob*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");
+