* flower

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

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 842641d18166b176d2d85d715e60e6f1cb671698..dde37ac72e0152a667ba319ad587f6aa01b14243 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -1,44 +1,42 @@
-/*   
+/*
   axis-group-interface.cc -- implement Axis_group_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
 
 #include "axis-group-interface.hh"
 #include "hara-kiri-group-spanner.hh"
 
 void
-Axis_group_interface::add_element (Grob*me, Grob *e)
+Axis_group_interface::add_element (Grob *me, Grob *e)
 {
-  for (SCM ax = me->get_property ("axes"); ax != SCM_EOL ; ax = scm_cdr (ax))
+  for (SCM ax = me->get_property ("axes"); ax != SCM_EOL; ax = scm_cdr (ax))
     {
       Axis a = (Axis) scm_to_int (scm_car (ax));
-      
+
       if (!e->get_parent (a))
        e->set_parent (me, a);
 
       e->internal_set_property ((a == X_AXIS)
                                ? ly_symbol2scm ("axis-group-parent-X")
                                : ly_symbol2scm ("axis-group-parent-Y"),
-                               me->self_scm ()
-                               );
+                               me->self_scm ());
     }
-    
+
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), e);
   me->add_dependency (e);
 }
 
 bool
-Axis_group_interface::has_axis (Grob*me, Axis a)
+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));
+  */
+  return me->has_extent_callback (group_extent_callback_proc, a)
+    || (me->has_extent_callback (Hara_kiri_group_spanner::y_extent_proc, a));
 }
 
 Interval
@@ -47,7 +45,7 @@ Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts)
   Interval r;
   for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * se = unsmob_grob (scm_car (s));
+      Grob *se = unsmob_grob (scm_car (s));
       Interval dims = se->extent (common, a);
       if (!dims.is_empty ())
        r.unite (dims);
@@ -63,7 +61,7 @@ Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
   Axis a = (Axis) scm_to_int (scm_axis);
 
   SCM elts = me->get_property ("elements");
-  Grob * common = common_refpoint_of_list (elts, me, a);
+  Grob *common = common_refpoint_of_list (elts, me, a);
 
   Real my_coord = me->relative_coordinate (common, a);
   Interval r (relative_group_extent (a, common, elts));
@@ -72,13 +70,13 @@ 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::set_axes (Grob *me, Axis a1, Axis a2)
 {
   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)
@@ -95,35 +93,33 @@ Axis_group_interface::set_axes (Grob*me, Axis a1, Axis a2)
     me->set_extent (SCM_EOL, Y_AXIS);
 
   /*
-    why so convoluted ? (fixme/documentme?) 
-   */
+    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);
 }
 
-Link_array<Grob> 
-Axis_group_interface::get_children (Grob*me)
+Link_array<Grob>
+Axis_group_interface::get_children (Grob *me)
 {
   Link_array<Grob> childs;
-  childs.push (me) ;
+  childs.push (me);
 
   if (!has_interface (me))
     return childs;
-  
+
   for (SCM ep = me->get_property ("elements"); scm_is_pair (ep); ep = scm_cdr (ep))
     {
-      Grob* e = unsmob_grob (scm_car (ep));
+      Grob *e = unsmob_grob (scm_car (ep));
       if (e)
        childs.concat (Axis_group_interface::get_children (e));
     }
-  
+
   return childs;
 }
 
-
-
 ADD_INTERFACE (Axis_group_interface, "axis-group-interface",
-  "An object that groups other layout objects.",
-  "axes elements");
+              "An object that groups other layout objects.",
+              "axes elements");