* Documentation/user/refman.itely: remove superfluous -'s

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index d9331f89074bc6dddcfc3ded34995ebde9a4ad3e..736588a0e05282ba687abe2a9ba14682d8bce838 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
@@ -13,47 +13,52 @@
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 #include "side-position-interface.hh"
+#include "axis-group-interface.hh"
+#include "stem.hh"
 
-void
-Dot_column::add_dots (Dots *d)
-{
-  Group_interface gi (this, "dots");
-  gi.add_element (d);
-
-  add_dependency (d);
-  add_element (d);
-}
+/*
+  TODO: let Dot_column communicate with stem via Note_column.
+ */
 
-void
-Dot_column::add_head (Rhythmic_head *r)
+MAKE_SCHEME_CALLBACK (Dot_column,force_shift_callback,2);
+SCM
+Dot_column::force_shift_callback (SCM element_smob, SCM axis)
 {
-  if (!r->dots_l ())
-    return ;
-
-  side_position (this).add_support (r);
-  add_dots (r->dots_l ());
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  assert (a == Y_AXIS);
+  me = me->get_parent (X_AXIS);
+  SCM l = me->get_grob_property ("dots");
+  do_shifts (l);
+  return gh_double2scm (0.0);
 }
 
-
-int
-Dot_column::compare (Dots * const &d1, Dots * const &d2)
+MAKE_SCHEME_CALLBACK(Dot_column,side_position, 2);
+SCM
+Dot_column::side_position (SCM element_smob, SCM axis)
 {
-  Staff_symbol_referencer_interface s1(d1);
-  Staff_symbol_referencer_interface s2(d2);  
-  
-  return int (s1.position_f () - s2.position_f ());
-}
-
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  assert (a == X_AXIS);
+
+  Grob * stem = unsmob_grob (me->get_grob_property ("stem"));
+  if (stem
+      && !Stem::get_beam (stem)
+      && Stem::duration_log (stem) > 2
+      && !Stem::invisible_b (stem)
+      )
+    {
+      /*
+       trigger stem end & direction calculation.
 
-Dot_column::Dot_column ()
-{
-  Group_interface gi (this, "dots");
-  gi.set_interface ();
-  
-  directional_element (this).set (RIGHT);
-  set_axes(X_AXIS,X_AXIS);
+       This will add the stem to the support if a flag collision happens.
+       */
+      Stem::stem_end_position (stem); 
+    }
+  return Side_position_interface::aligned_side (element_smob, axis);
 }
 
+
 /*
   Will fuck up in this case.
 
@@ -69,14 +74,20 @@ Dot_column::Dot_column ()
 
    Should be smarter.
  */
-void
-Dot_column::after_line_breaking ()
+SCM
+Dot_column::do_shifts (SCM l)
 {
-  Link_array<Dots> dots = Group_interface__extract_elements (this, (Dots*)0 , "dots"); 
-  dots.sort (Dot_column::compare);
+  Link_array<Grob> dots;
+  while (gh_pair_p (l))
+    {
+      dots.push (unsmob_grob (ly_car (l)));
+      l = ly_cdr (l);
+    }
+  
+  dots.sort (compare_position);
   
   if (dots.size () < 2)
-    return;
+    return SCM_UNSPECIFIED;
   Slice s;
   s.set_empty ();
 
@@ -84,7 +95,7 @@ Dot_column::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::get_position (dots[i]);
       for (int j=0; j < taken_posns.size (); j++)
        {
          if (taken_posns[j] == (int) p)
@@ -92,22 +103,49 @@ Dot_column::after_line_breaking ()
        }
       taken_posns.push ((int)p);
       s.unite (Slice ((int)p,
-                     (int)p));      
+ (int)p));      
     }
 
   if (!conflicts)
-    return;
+    return SCM_UNSPECIFIED;
   
   int  middle = s.center ();
   /*
     +1 -> off by one 
    */
   int pos = middle - dots.size () + 1;
-  if (!(pos % 2))
+  if (! (pos % 2))
     pos ++;                    // center () rounds down.
 
-  for (int i=0; i  <dots.size (); pos += 2, i++)
+  for (int i=0; i < dots.size (); pos += 2, i++)
+    {
+      Grob * d = dots[i];
+      Staff_symbol_referencer::set_position (d,pos);
+    }
+
+  return SCM_UNSPECIFIED;
+}
+
+
+
+void
+Dot_column::add_head (Grob * me, Grob *rh)
+{
+  Grob * d = unsmob_grob (rh->get_grob_property ("dot"));
+  if (d)
     {
-      staff_symbol_referencer (dots[i]).set_position(pos);
+      Side_position_interface::add_support (me,rh);
+
+      Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d);
+      d->add_offset_callback (Dot_column::force_shift_callback_proc , Y_AXIS);
+      Axis_group_interface::add_element (me, d);
     }
 }
+
+
+
+
+ADD_INTERFACE (Dot_column, "dot-column-interface",
+  "Interface that groups dots so they form a column",
+  "direction stem");
+