release: 1.5.47

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 552c98de7017d188437927d02ad7cac740d11113..a2c34f6e62ff686d565b1a73d7b4f7b8b8d689da 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,13 +16,6 @@
 
 
 
-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)
@@ -44,7 +37,7 @@ Tie_column::add_tie (Grob*me,Grob *s)
       dynamic_cast<Spanner*> (me)->set_bound (RIGHT, Tie::head (s,RIGHT));
     }
   
-  Pointer_group_interface::add_element (me, "ties",s);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), s);
   s->add_dependency (me);
 }
 
@@ -53,7 +46,7 @@ int
 tie_compare (Grob* const & s1,
             Grob* const & s2)
 {
-  return sign (Tie::position_f (s1) - Tie::position_f(s2));
+  return sign (Tie::position_f (s1) - Tie::position_f (s2));
 }
 
 /*
@@ -69,14 +62,14 @@ void
 Tie_column::set_directions (Grob*me)
 {
   Link_array<Grob> ties =
-    Pointer_group_interface__extract_elements (me, (Grob*)0, "ties");
+    Pointer_group_interface__extract_grobs (me, (Grob*)0, "ties");
 
-  for (int i = ties.size (); i--; )
+  for (int i = ties.size (); i--;)
     if (Directional_element_interface::get (ties[i]))
       ties.del (i);
   
 
-  if(!ties.size())
+  if (!ties.size ())
     return ;
   
 
@@ -99,11 +92,11 @@ Tie_column::set_directions (Grob*me)
     }
   
   ties.sort (tie_compare);
-  Directional_element_interface::set( ties[0], DOWN);
+  Directional_element_interface::set (ties[0], DOWN);
   ties.del (0);
   
-  Directional_element_interface ::set(ties.pop (), UP);
-  for (int i=ties.size(); i--; )
+  Directional_element_interface ::set (ties.pop (), UP);
+  for (int i=ties.size (); i--;)
     {
       Grob *  t = ties[i];
       Real p = Tie::position_f (t);
@@ -115,10 +108,17 @@ Tie_column::set_directions (Grob*me)
   
 }
 
-MAKE_SCHEME_CALLBACK(Tie_column,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Tie_column,after_line_breaking,1);
 SCM
 Tie_column::after_line_breaking (SCM smob)
 {
-  set_directions (unsmob_element (smob));
+  set_directions (unsmob_grob (smob));
   return SCM_UNSPECIFIED;
 }
+
+
+
+ADD_INTERFACE (Tie_column,"tie-column-interface",
+  "that sets tie directions in a tied chord",
+  "direction");
+