release: 1.5.47

[lilypond.git] / lily / align-interface.cc

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 0ab7a87b1b57491dc02ab35ddf04a8c73f41e5b5..03447301845f620533e005566927ef5138890c01 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -129,13 +129,10 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
   me->set_grob_property ("alignment-done", SCM_BOOL_T);
   
   SCM d =   me->get_grob_property ("stacking-dir");
-
   
   Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
   if (!stacking_dir)
     stacking_dir = DOWN;
-
-
   
   Interval threshold = Interval (0, Interval::infinity ());
   SCM thr = me->get_grob_property ("threshold");
@@ -251,7 +248,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
        FIXME: uncommenting freaks out the Y-alignment of
        line-of-score.
        */
-      // Real align_param = isdir_b (align)  ? gh_scm2double (align) : 0.0;
+      // Real align_param = ly_dir_p (align)  ? gh_scm2double (align) : 0.0;
       
       if (gh_number_p (align))
        center_offset = total.linear_combination (gh_scm2double (align));
@@ -266,25 +263,6 @@ Align_interface::axis (Grob*me)
   return  Axis (gh_scm2int (ly_car (me->get_grob_property ("axes"))));
 }
 
-
-/*
-  should  use generic Scm funcs.
- */
-int
-Align_interface::get_count (Grob*me,Grob*s)
-{
-  SCM e = me->get_grob_property ("elements");
-  int c =0;
-  while (gh_pair_p (e))
-    {
-      if (ly_car (e) == s->self_scm ())
-       break;
-      c++;
-      e = ly_cdr (e);
-    }
-  return c;
-}
-
 void
 Align_interface::add_element (Grob*me,Grob* s, SCM cb)
 {
@@ -292,15 +270,6 @@ Align_interface::add_element (Grob*me,Grob* s, SCM cb)
   Axis_group_interface::add_element (me, s);
 }
 
-
-void
-Align_interface::set_interface (Grob*me)
-{
-  me->set_interface (ly_symbol2scm ("align-interface"));
-
-  Axis_group_interface::set_interface (me);
-}
-
 void
 Align_interface::set_axis (Grob*me,Axis a)
 {
@@ -313,3 +282,13 @@ Align_interface::has_interface (Grob*me)
   return me && me->has_interface (ly_symbol2scm ("align-interface"));
 }
 
+
+ADD_INTERFACE (Align_interface, "align-interface",
+  " Order grobs top to bottom/left to right/right to left etc.",
+  "forced-distance stacking-dir align-dir threshold alignment-done center-element elements axes");
+
+
+
+ADD_INTERFACE (Foobar, "aligned-interface",
+  "read by align-interface",
+  "minimum-space-pair extra-space");