X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=95b2cd67ed9f8ace6e4e59cff8aa628d6a7d4894;hb=8dbb0048c1ac59125562d5adc1c68512eab8541b;hp=9af2cd3fd430c5d1aaa641907b86f286fdedcb23;hpb=04f01c7e890bd4f1b358378e5911fb7c117c3802;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 9af2cd3fd4..95b2cd67ed 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,77 +3,157 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2001 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 "script.hh"
+#include "paper-def.hh"
+#include "group-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "rest.hh"
 #include "note-head.hh"
-#include "stem.hh"
 
-IMPLEMENT_STATIC_NAME(Note_column);
+bool
+Note_column::rest_b (Grob*me) 
+{
+  return unsmob_grob (me->get_grob_property ("rest"));
+}
 
-void
-Note_column::add(Stem*stem_l)
+int
+Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
 {
-    stem_l_ = stem_l;
-    add_support(stem_l);
+  SCM s1 = p1->get_grob_property ("horizontal-shift");
+  SCM s2 = p2->get_grob_property ("horizontal-shift");
+
+  int h1 = (gh_number_p (s1))?  gh_scm2int (s1) :0;
+  int h2 = (gh_number_p (s2)) ? gh_scm2int (s2):0;
+  return h1 - h2;
 }
 
 void
-Note_column::add(Note_head* n_l)
+Note_column::set_interface (Grob* me)
 {
-    assert(!n_l->rest_b_);
-    head_l_arr_.push(n_l);
-    add_support(n_l);
+  me->set_interface (ly_symbol2scm ("note-column-interface"));
+  
+  Axis_group_interface::set_interface (me);
+  Axis_group_interface::set_axes (me, X_AXIS, Y_AXIS);
 }
 
-Note_column::Note_column()
+Item *
+Note_column::stem_l (Grob*me) 
 {
-    stem_l_ = 0;
-    h_shift_b_ =false;
-    dir_i_ =0;
+  SCM s = me->get_grob_property ("stem");
+  return  dynamic_cast<Item*> (unsmob_grob (s));
 }
-
-void
-Note_column::sort()
+  
+Slice
+Note_column::head_positions_interval (Grob *me)
 {
-    head_l_arr_.sort( Note_head::compare);
+  Slice  iv;
+
+  iv.set_empty ();
+
+  SCM h = me->get_grob_property ("note-heads");
+  for (; gh_pair_p (h); h = ly_cdr (h))
+    {
+      Grob *se = unsmob_grob (ly_car (h));
+      
+      int j = int (Staff_symbol_referencer::position_f (se));
+      iv.unite (Slice (j,j));
+    }
+  return iv;
 }
-    
-Interval_t<int>
-Note_column::head_positions_interval()const
+
+Direction
+Note_column::dir (Grob*  me)
 {
-    (    (Note_column*)this)->sort();
-    return Interval_t<int> ( head_l_arr_[0]->position_i_, 
-			     head_l_arr_.top()->position_i_);
+  Grob *stem = unsmob_grob (me->get_grob_property ("stem"));
+  if (stem && Stem::has_interface (stem))
+    return Stem::get_direction (stem);
+  else if (gh_pair_p (me->get_grob_property ("note-heads")))
+    return (Direction)sign (head_positions_interval (me).center ());
 
+  programming_error ("Note column without heads and stem!");
+  return CENTER;
 }
 
 
 void
-Note_column::do_pre_processing()
+Note_column::set_stem (Grob*me,Grob * stem_l)
 {
-    if (!dir_i_){
-	if (stem_l_)
-	    dir_i_ = stem_l_->dir_i_;
-	else 
-	    dir_i_ = (head_positions_interval().center() >=  5) ? -1 : 1;
-    }
+  me->set_grob_property ("stem", stem_l->self_scm ());
+  me->add_dependency (stem_l);
+  Axis_group_interface::add_element (me, stem_l);
 }
 
-    
+void
+Note_column::add_head (Grob*me,Grob *h)
+{
+  if (Rest::has_interface (h))
+    {
+      me->set_grob_property ("rest", h->self_scm ());
+    }
+  else if (Note_head::has_interface (h))
+    {
+      Pointer_group_interface::add_element (me, ly_symbol2scm ("note-heads"),h);
+    }
+  Axis_group_interface::add_element (me, h);
+}
 
+/**
+  translate the rest symbols vertically by amount DY_I.
+ */
 void
-Note_column::do_substitute_dependency(Score_elem*o,Score_elem*n)
+Note_column::translate_rests (Grob*me,int dy_i)
 {
-    Script_column::do_substitute_dependency(o,n);
-    if (o->name() == Note_head::static_name()) {
-	head_l_arr_.substitute( (Note_head*)o->item(), 
-				(n)? (Note_head*)n->item() : 0);
+  Grob * r = unsmob_grob (me->get_grob_property ("rest"));
+  if (r)
+    {
+      r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
     }
-    if (stem_l_ == o) {
-	stem_l_ = n ? (Stem*)n->item():0;
+}
+
+
+void
+Note_column::set_dotcol (Grob*me,Grob *d)
+{
+  Axis_group_interface::add_element (me, d);
+}
+
+
+
+
+Grob*
+Note_column::first_head (Grob*me) 
+{
+  Grob * st = stem_l (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. 
+ */
+Grob* 
+Note_column::accidentals (Grob *me)
+{
+  SCM heads = me->get_grob_property ("note-heads");
+  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")) : 0;
+      if (a)
+	return a;
     }
+
+  return 0;
 }