* lily/horizontal-bracket.cc (make_bracket): new function.

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

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 24838b9be03369ca04b588b2350ea588e9255e01..b5b64edbbdb840753c2bf63ec2064919014317d7 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -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,12 +29,11 @@ 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 ());
     }
 
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), e);
-  me->add_dependency (e);
 }
 
 bool
@@ -52,7 +51,7 @@ Axis_group_interface::relative_group_extent (Link_array<Grob> const &elts,
                                             Grob *common, Axis a)
 {
   Interval r;
-  for (int i = 0; i < elts.size(); i++)
+  for (int i = 0; i < elts.size (); i++)
     {
       Grob *se = elts[i];
       Interval dims = se->extent (common, a);
@@ -62,8 +61,6 @@ Axis_group_interface::relative_group_extent (Link_array<Grob> const &elts,
   return r;
 }
 
-
-
 MAKE_SCHEME_CALLBACK (Axis_group_interface, group_extent_callback, 2);
 SCM
 Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
@@ -83,8 +80,8 @@ Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
 void
 Axis_group_interface::set_axes (Grob *me, Axis a1, Axis a2)
 {
-  SCM sa1 = scm_int2num (a1);
-  SCM sa2 = scm_int2num (a2);
+  SCM sa1 = scm_from_int (a1);
+  SCM sa2 = scm_from_int (a2);
 
   SCM axes = me->get_property ("axes");