patch::: 1.3.96.jcn9

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 346fa9992e0af2d23d664a84686408729c8d0380..9da8e66885c44e1413bc9b93cf59c50e3f1aff06 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -19,28 +19,28 @@
 void
 Tie_column::set_interface (Score_element*me)
 {
-  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)
 {
-  return  me->has_interface (ly_symbol2scm ("tie-column"));
+  return  me->has_interface (ly_symbol2scm ("tie-column-interface"));
 }
 
 void
 Tie_column::add_tie (Score_element*me,Score_element *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);
 }
 
@@ -68,14 +68,14 @@ Tie_column::set_directions (Score_element*me)
     Pointer_group_interface__extract_elements (me, (Score_element*)0, "ties");
 
 
-  Direction d = Directional_element_interface (me).get ();
+  Direction d = Directional_element_interface::get (me);
 
   if (d)
     {
       for (int i = ties.size (); i--;)
        {
          Score_element *  t = ties[i];
-         Directional_element_interface (t).set (d);
+         Directional_element_interface::set (t, d);
        }
       return;
     }
@@ -83,18 +83,15 @@ Tie_column::set_directions (Score_element*me)
   if (ties.size () == 1)
     {
       Score_element *  t = ties[0];      
-      Directional_element_interface (t).set (Tie::get_default_dir (t));
+      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--; )
     {
       Score_element *  t = ties[i];
@@ -102,12 +99,12 @@ Tie_column::set_directions (Score_element*me)
       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)
 {