release: 1.3.109

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index cd3badc526d83dd2cae796d88b3a89d40e500a27..552c98de7017d188437927d02ad7cac740d11113 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -7,6 +7,7 @@
   
  */
 
+#include "spanner.hh"
 #include "tie-column.hh"
 #include "group-interface.hh"
 #include "tie.hh"
@@ -16,38 +17,41 @@
 
 
 void
-Tie_column::set_interface (Score_element*me)
+Tie_column::set_interface (Grob*me)
 {
-  me-> set_elt_property ("ties", SCM_EOL);
-  me->set_interface (ly_symbol2scm ("tie-column"));
-  me->set_extent_callback (0, X_AXIS);
-  me->set_extent_callback (0, Y_AXIS);  
+  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 (Score_element*me)
+Tie_column::has_interface (Grob*me)
 {
-  return  me->has_interface (ly_symbol2scm ("tie-column"));
+  return  me->has_interface (ly_symbol2scm ("tie-column-interface"));
 }
 
+
+/*
+  tie dir depends on what Tie_column does.
+*/
+
 void
-Tie_column::add_tie (Score_element*me,Tie *s)
+Tie_column::add_tie (Grob*me,Grob *s)
 {
-  Pointer_group_interface g (me, "ties");
-  if (!g.count ())
+  if (!  Pointer_group_interface ::count (me, "ties"))
     {
       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 (me, "ties").add_element (s);
+  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 (Tie::position_f (s1) - Tie::position_f(s2));
 }
@@ -62,55 +66,59 @@ tie_compare (Tie* const & s1,
   Ross forgets about the tie that is *on* the middle staff line. We
   assume it goes UP. (TODO: make me settable) */
 void
-Tie_column::set_directions (Score_element*me)
+Tie_column::set_directions (Grob*me)
 {
-  Link_array<Tie> ties =
-    Pointer_group_interface__extract_elements (me, (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_interface (me).get ();
+  if(!ties.size())
+    return ;
+  
 
+  Direction d = Directional_element_interface::get (me);
   if (d)
     {
       for (int i = ties.size (); i--;)
        {
-         Tie * t = ties[i];
-         Directional_element_interface (t).set (d);
+         Grob *  t = ties[i];
+         Directional_element_interface::set (t, d);
        }
       return;
     }
   
   if (ties.size () == 1)
     {
-      Tie * t = ties[0];      
-      Directional_element_interface (t).set (Tie::get_default_dir (t));
+      Grob *  t = ties[0];      
+      Directional_element_interface::set (t,Tie::get_default_dir (t));
       return;
     }
   
   ties.sort (tie_compare);
-  Directional_element_interface tie0(ties[0]);
-  tie0.set (DOWN);
+  Directional_element_interface::set( ties[0], DOWN);
   ties.del (0);
   
-  Directional_element_interface tietop(ties.pop ());
-  tietop.set (UP);
-
+  Directional_element_interface ::set(ties.pop (), UP);
   for (int i=ties.size(); i--; )
     {
-      Tie * t = ties[i];
+      Grob *  t = ties[i];
       Real p = Tie::position_f (t);
       Direction d = (Direction) sign (p);
       if (!d)
        d = UP;
-      Directional_element_interface (t).set (d);
+      Directional_element_interface::set (t, d);
     }
   
 }
 
-MAKE_SCHEME_CALLBACK(Tie_column,after_line_breaking);
+MAKE_SCHEME_CALLBACK(Tie_column,after_line_breaking,1);
 SCM
 Tie_column::after_line_breaking (SCM smob)
 {
   set_directions (unsmob_element (smob));
-  return SCM_UNDEFINED;
+  return SCM_UNSPECIFIED;
 }