release: 1.3.96

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index ce660a24a287549ae3550f090d78dd96468d3b8c..a9838ae13b25609a68a41bbdde03ab62c0443896 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -16,47 +16,17 @@
 #include "axis-group-interface.hh"
 
 
-// todo: dots and elements duplicate each other.
-void
-Dot_column::add_dots (Item *d)
-{
-  Pointer_group_interface gi (this, "dots");
-  gi.add_element (d);
 
-  add_dependency (d);
-  Axis_group_interface (this).add_element (d);
-}
+
 
 void
-Dot_column::add_head (Rhythmic_head *r)
+Dot_column::set_interface (Score_element* me)
 {
-  if (!r->dots_l ())
-    return ;
 
-  Side_position_interface (this).add_support (r);
-  add_dots (r->dots_l ());
-}
-
-
-int
-Dot_column::compare (Item * const &d1, Item * const &d2)
-{
-  Staff_symbol_referencer_interface s1(d1);
-  Staff_symbol_referencer_interface s2(d2);  
+  Directional_element_interface::set (me, RIGHT);
   
-  return int (s1.position_f () - s2.position_f ());
-}
-
-
-Dot_column::Dot_column (SCM s)
-  : Item (s)
-{
-  Pointer_group_interface gi (this, "dots");
-  gi.set_interface ();
-  Directional_element_interface (this).set (RIGHT);
-  
-  Axis_group_interface (this).set_interface ();
-  Axis_group_interface (this).set_axes(X_AXIS,X_AXIS);
+  Axis_group_interface::set_interface (me);
+  Axis_group_interface::set_axes (me, X_AXIS,X_AXIS);
 }
 
 /*
@@ -75,15 +45,34 @@ Dot_column::Dot_column (SCM s)
    Should be smarter.
  */
 
-GLUE_SCORE_ELEMENT(Dot_column,after_line_breaking);
+
+MAKE_SCHEME_CALLBACK(Dot_column,force_shift_callback,2);
+SCM
+Dot_column::force_shift_callback (SCM element_smob, SCM axis)
+{
+  Score_element *me = unsmob_element (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  assert (a == Y_AXIS);
+ me = me->parent_l (X_AXIS);
+  SCM dots = me->get_elt_property ("dots");
+  do_shifts (dots);
+  return gh_double2scm (0.0);
+}
+
 SCM
-Dot_column::member_after_line_breaking ()
+Dot_column::do_shifts (SCM l)
 {
-  Link_array<Item> dots = Pointer_group_interface__extract_elements (this, (Item*)0 , "dots"); 
-  dots.sort (Dot_column::compare);
+  Link_array<Score_element> dots;
+  while (gh_pair_p (l))
+    {
+      dots.push (unsmob_element (gh_car (l)));
+      l = gh_cdr (l);
+    }
+  
+  dots.sort (compare_position);
   
   if (dots.size () < 2)
-    return SCM_UNDEFINED;
+    return SCM_UNSPECIFIED;
   Slice s;
   s.set_empty ();
 
@@ -91,7 +80,7 @@ Dot_column::member_after_line_breaking ()
   int conflicts = 0;
   for (int i=0; i < dots.size (); i++)
     {
-      Real p = Staff_symbol_referencer_interface (dots[i]).position_f ();
+      Real p = Staff_symbol_referencer::position_f (dots[i]);
       for (int j=0; j < taken_posns.size (); j++)
        {
          if (taken_posns[j] == (int) p)
@@ -103,8 +92,7 @@ Dot_column::member_after_line_breaking ()
     }
 
   if (!conflicts)
-  return SCM_UNDEFINED;
-
+    return SCM_UNSPECIFIED;
   
   int  middle = s.center ();
   /*
@@ -116,8 +104,31 @@ Dot_column::member_after_line_breaking ()
 
   for (int i=0; i < dots.size (); pos += 2, i++)
     {
-      staff_symbol_referencer (dots[i]).set_position(pos);
+      Score_element * d = dots[i];
+      Staff_symbol_referencer::set_position (d,pos);
     }
 
-  return SCM_UNDEFINED;
+  return SCM_UNSPECIFIED;
 }
+
+bool
+Dot_column::has_interface (Score_element*m)
+{
+  return m && m->has_interface (ly_symbol2scm ("dot-column-interface"));
+}
+
+
+void
+Dot_column::add_head (Score_element * me, Score_element *rh)
+{
+  Score_element * d = unsmob_element (rh->get_elt_property ("dot"));
+  if (d)
+    {
+      Side_position::add_support (me,rh);
+
+      Pointer_group_interface ::add_element (me, "dots",d);
+      d->add_offset_callback (Dot_column::force_shift_callback_proc , Y_AXIS);
+      Axis_group_interface::add_element (me, d);
+    }
+}
+