release: 1.3.109

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 146e94d3a107f66c795b2a48b5525684614e6ce3..552c98de7017d188437927d02ad7cac740d11113 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -7,41 +7,53 @@
   
  */
 
+#include "spanner.hh"
 #include "tie-column.hh"
 #include "group-interface.hh"
 #include "tie.hh"
 #include "directional-element-interface.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
 
-Tie_column::Tie_column (SCM s)
-  : Spanner (s)
+
+
+void
+Tie_column::set_interface (Grob*me)
+{
+  me->set_interface (ly_symbol2scm ("tie-column-interface"));
+  me->set_extent_callback (SCM_EOL, X_AXIS);
+  me->set_extent_callback (SCM_EOL, Y_AXIS) ; 
+}
+
+bool
+Tie_column::has_interface (Grob*me)
 {
-  set_elt_pointer ("ties", SCM_EOL);
-  set_extent_callback (0, X_AXIS);
-  set_extent_callback (0, Y_AXIS);  
-  set_elt_property ("transparent", SCM_BOOL_T);
+  return  me->has_interface (ly_symbol2scm ("tie-column-interface"));
 }
 
+
+/*
+  tie dir depends on what Tie_column does.
+*/
+
 void
-Tie_column::add_tie (Tie *s)
+Tie_column::add_tie (Grob*me,Grob *s)
 {
-  Pointer_group_interface g (this, "ties");
-  if (!g.count ())
+  if (!  Pointer_group_interface ::count (me, "ties"))
     {
-      set_bound (LEFT, s->head (LEFT));
-      set_bound (RIGHT, s->head (RIGHT));
+      dynamic_cast<Spanner*> (me)->set_bound (LEFT, Tie::head (s,LEFT));
+      dynamic_cast<Spanner*> (me)->set_bound (RIGHT, Tie::head (s,RIGHT));
     }
   
-  Pointer_group_interface (this, "ties").add_element (s);
-  s->add_dependency (this);
+  Pointer_group_interface::add_element (me, "ties",s);
+  s->add_dependency (me);
 }
 
 
 int
-tie_compare (Tie* const & s1,
-            Tie* const & s2)
+tie_compare (Grob* const & s1,
+            Grob* const & s2)
 {
-  return sign (s1->position_f () - s2->position_f());
+  return sign (Tie::position_f (s1) - Tie::position_f(s2));
 }
 
 /*
@@ -52,48 +64,61 @@ tie_compare (Tie* const & s1,
   direction of the rest is determined by their staff position.
 
   Ross forgets about the tie that is *on* the middle staff line. We
-  assume it goes UP. (TODO: make this settable) */
+  assume it goes UP. (TODO: make me settable) */
 void
-Tie_column::set_directions ()
+Tie_column::set_directions (Grob*me)
 {
-  Link_array<Tie> s =
-    Pointer_group_interface__extract_elements (this, (Tie*)0, "ties");
+  Link_array<Grob> ties =
+    Pointer_group_interface__extract_elements (me, (Grob*)0, "ties");
 
+  for (int i = ties.size (); i--; )
+    if (Directional_element_interface::get (ties[i]))
+      ties.del (i);
+  
 
-  Direction d = directional_element (this).get ();
+  if(!ties.size())
+    return ;
+  
 
+  Direction d = Directional_element_interface::get (me);
   if (d)
     {
-      for (int i = s.size (); i--;)
-       directional_element (s[i]).set (d);
+      for (int i = ties.size (); i--;)
+       {
+         Grob *  t = ties[i];
+         Directional_element_interface::set (t, d);
+       }
       return;
     }
   
-  if (s.size () == 1)
+  if (ties.size () == 1)
     {
-      directional_element (s[0]).set (s[0]->get_default_dir ());
+      Grob *  t = ties[0];      
+      Directional_element_interface::set (t,Tie::get_default_dir (t));
       return;
     }
   
-  s.sort (tie_compare);
-  directional_element (s[0]).set (DOWN);
-  s.del (0);
-  directional_element (s.pop ()).set (UP);
-
-  for (int i=s.size(); i--; )
+  ties.sort (tie_compare);
+  Directional_element_interface::set( ties[0], DOWN);
+  ties.del (0);
+  
+  Directional_element_interface ::set(ties.pop (), UP);
+  for (int i=ties.size(); i--; )
     {
-      Real p = s[i]->position_f ();
+      Grob *  t = ties[i];
+      Real p = Tie::position_f (t);
       Direction d = (Direction) sign (p);
       if (!d)
        d = UP;
-
-      directional_element (s[i]).set (d);
+      Directional_element_interface::set (t, d);
     }
   
 }
 
-void
-Tie_column::after_line_breaking ()
+MAKE_SCHEME_CALLBACK(Tie_column,after_line_breaking,1);
+SCM
+Tie_column::after_line_breaking (SCM smob)
 {
-  set_directions ();
+  set_directions (unsmob_element (smob));
+  return SCM_UNSPECIFIED;
 }