patch::: 1.3.108.jcn3

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 343414c03591feb53d185828943708156b09f79e..10956eefbbab528d5dbd1ec39c2fe95faf050aa9 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,52 +3,140 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <math.h>              // ceil
 
+#include "axis-group-interface.hh"
 #include "note-column.hh"
-#include "script.hh"
-#include "note-head.hh"
 #include "stem.hh"
+#include "debug.hh"
+#include "paper-def.hh"
+#include "group-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "rest.hh"
+#include "note-head.hh"
 
+bool
+Note_column::rest_b (Score_element*me) 
+{
+  return unsmob_element (me->get_elt_property ("rest"));
+}
 
-IMPLEMENT_IS_TYPE_B1(Note_column,Head_column);
+int
+Note_column::shift_compare (Score_element *const &p1, Score_element *const&p2)
+{
+  SCM s1 = p1->get_elt_property ("horizontal-shift");
+  SCM s2 = p2->get_elt_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::set (Stem*s)
+Note_column::set_interface (Score_element* me)
 {
-    stem_l_ = s;
-    add_support (s);
+  me->set_elt_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);
 }
 
-Note_column::Note_column()
+Item *
+Note_column::stem_l (Score_element*me) 
 {
-    h_shift_b_ =false;
+  SCM s = me->get_elt_property ("stem");
+  return  dynamic_cast<Item*>(unsmob_element (s));
 }
+  
+Slice
+Note_column::head_positions_interval(Score_element *me)
+{
+  Slice  iv;
+
+  iv.set_empty ();
+
+  SCM h = me->get_elt_property ("note-heads");
+  for (; gh_pair_p (h); h = gh_cdr (h))
+    {
+      Score_element *se = unsmob_element (gh_car (h));
+      
+      int j = int (Staff_symbol_referencer::position_f (se));
+      iv.unite (Slice (j,j));
+    }
+  return iv;
+}
+
+Direction
+Note_column::dir (Score_element*  me)
+{
+  Score_element *stem = unsmob_element (me->get_elt_property ("stem"));
+  if (stem && Stem::has_interface (stem))
+    return Stem::get_direction (stem);
+  else if (gh_pair_p (me->get_elt_property ("note-heads")))
+    return (Direction)sign (head_positions_interval (me).center ());
+
+  programming_error ("Note column without heads and stem!");
+  return CENTER;
+}
+
 
 void
-Note_column::sort()
+Note_column::set_stem (Score_element*me,Score_element * stem_l)
 {
-    head_l_arr_.sort (Note_head::compare);
+  me->set_elt_property ("stem", stem_l->self_scm ());
+  me->add_dependency (stem_l);
+  Axis_group_interface::add_element (me, stem_l);
 }
-    
-Interval_t<int>
-Note_column::head_positions_interval()const
+
+void
+Note_column::add_head (Score_element*me,Score_element *h)
 {
-    ((Note_column*)this)->sort();
-    return Interval_t<int> ( head_l_arr_[0]->position_i_, 
-                            head_l_arr_.top()->position_i_);
+  if (Rest::has_interface (h))
+    {
+      me->set_elt_property ("rest", h->self_scm ());
+    }
+  else if (Note_head::has_interface (h))
+    {
+      Pointer_group_interface::add_element (me, "note-heads",h);
+    }
+  Axis_group_interface::add_element (me, h);
+}
 
+/**
+  translate the rest symbols vertically by amount DY_I.
+ */
+void
+Note_column::translate_rests (Score_element*me,int dy_i)
+{
+  Score_element * r = unsmob_element (me->get_elt_property ("rest"));
+  if (r)
+    {
+      r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
+    }
 }
 
 
 void
-Note_column::do_pre_processing()
+Note_column::set_dotcol (Score_element*me,Score_element *d)
 {
-    if (!dir_i_&& !stem_l_){
-       dir_i_ = (head_positions_interval().center () >=  5) ? -1 : 1;
-    }
-    Head_column::do_pre_processing();
+  Axis_group_interface::add_element (me, d);
 }
 
-    
+
+
+
+Score_element*
+Note_column::first_head (Score_element*me) 
+{
+  Score_element * st = stem_l (me);
+  return st?  Stem::first_head (st): 0; 
+}
+
+bool
+Note_column::has_interface (Score_element*me)
+{
+  return me && me->has_interface (ly_symbol2scm ("note-column-interface"));
+}