Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / axis-group-interface.cc

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 11b00e97c8d0aee81f8df56b4d6259901dc728a5..d590813abf5cedab94f4b9dd1df4582341ad3ca0 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
@@ -19,7 +19,7 @@ Axis_group_interface::add_element (Grob *me, Grob *e)
   SCM axes = me->get_property ("axes");
   if (!scm_is_pair (axes))
     programming_error ("axes should be nonempty");
-  
+
   for (SCM ax = axes; ax != SCM_EOL; ax = scm_cdr (ax))
     {
       Axis a = (Axis) scm_to_int (scm_car (ax));
@@ -29,29 +29,29 @@ Axis_group_interface::add_element (Grob *me, Grob *e)
 
       e->internal_set_object ((a == X_AXIS)
                              ? ly_symbol2scm ("axis-group-parent-X")
-                               : ly_symbol2scm ("axis-group-parent-Y"),
+                             : ly_symbol2scm ("axis-group-parent-Y"),
                              me->self_scm ());
     }
 
+  /* must be ordered, because Align_interface also uses
+     Axis_group_interface  */
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), e);
 }
 
 bool
 Axis_group_interface::has_axis (Grob *me, Axis a)
 {
-  /*
-    urg. FIXME, check for Hara_kiri_group_spanner shouldn't be necessary?
-  */
-  return me->has_extent_callback (group_extent_callback_proc, a)
-    || (me->has_extent_callback (Hara_kiri_group_spanner::y_extent_proc, a));
+  SCM axes = me->get_property ("axes");
+
+  return (SCM_BOOL_F != scm_memq (scm_from_int (a), axes));
 }
 
 Interval
-Axis_group_interface::relative_group_extent (Link_array<Grob> const &elts,
+Axis_group_interface::relative_group_extent (vector<Grob*> const &elts,
                                             Grob *common, Axis a)
 {
   Interval r;
-  for (int i = 0; i < elts.size(); i++)
+  for (vsize i = 0; i < elts.size (); i++)
     {
       Grob *se = elts[i];
       Interval dims = se->extent (common, a);
@@ -61,15 +61,25 @@ Axis_group_interface::relative_group_extent (Link_array<Grob> const &elts,
   return r;
 }
 
-
-
-MAKE_SCHEME_CALLBACK (Axis_group_interface, group_extent_callback, 2);
+MAKE_SCHEME_CALLBACK (Axis_group_interface, width, 1);
 SCM
-Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
+Axis_group_interface::width (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) scm_to_int (scm_axis);
+  Grob *me = unsmob_grob (smob);
+  return generic_group_extent (me, X_AXIS);
+}
 
+MAKE_SCHEME_CALLBACK (Axis_group_interface, height, 1);
+SCM
+Axis_group_interface::height (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  return generic_group_extent (me, Y_AXIS);
+}
+  
+SCM
+Axis_group_interface::generic_group_extent (Grob *me, Axis a)
+{
   extract_grob_set (me, "elements", elts);
   Grob *common = common_refpoint_of_array (elts, me, a);
 
@@ -80,47 +90,15 @@ Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
 }
 
 void
-Axis_group_interface::set_axes (Grob *me, Axis a1, Axis a2)
+Axis_group_interface::get_children (Grob *me, vector<Grob*> *found)
 {
-  SCM sa1 = scm_int2num (a1);
-  SCM sa2 = scm_int2num (a2);
-
-  SCM axes = me->get_property ("axes");
-
-  if (!scm_is_pair (axes)
-      || scm_c_memq (sa1, axes) == SCM_BOOL_F
-      || scm_c_memq (sa2, axes) == SCM_BOOL_F)
-    {
-      SCM ax = scm_cons (sa1, SCM_EOL);
-      if (a1 != a2)
-       ax = scm_cons (sa2, ax);
-      me->set_property ("axes", ax);
-    }
-
-  if (a1 != X_AXIS && a2 != X_AXIS)
-    me->set_extent (SCM_EOL, X_AXIS);
-  if (a1 != Y_AXIS && a2 != Y_AXIS)
-    me->set_extent (SCM_EOL, Y_AXIS);
-
-  /*
-    why so convoluted ? (fixme/documentme?)
-  */
-  if (me->has_extent_callback (Grob::stencil_extent_proc, a1))
-    me->set_extent_callback (Axis_group_interface::group_extent_callback_proc, a1);
-  if (me->has_extent_callback (Grob::stencil_extent_proc, a2))
-    me->set_extent_callback (Axis_group_interface::group_extent_callback_proc, a2);
-}
-
-void
-Axis_group_interface::get_children (Grob *me, Link_array<Grob> *found)
-{
-  found->push (me);
+  found->push_back (me);
 
   if (!has_interface (me))
     return;
 
   extract_grob_set (me, "elements", elements);
-  for (int i = 0; i < elements.size (); i++)
+  for (vsize i = 0; i < elements.size (); i++)
     {
       Grob *e = elements[i];
       Axis_group_interface::get_children (e, found);
@@ -128,5 +106,9 @@ Axis_group_interface::get_children (Grob *me, Link_array<Grob> *found)
 }
 
 ADD_INTERFACE (Axis_group_interface, "axis-group-interface",
+
               "An object that groups other layout objects.",
-              "axes elements");
+
+              /* properties */
+              "axes "
+              "elements ");