release: 0.1.11

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

diff --git a/lily/axis-group.cc b/lily/axis-group.cc
index b6b5eec4fc59b8529d47a5707f894ecae36ccea5..ac5a334e318e3bd54336f38a3ab57f713c6212d6 100644 (file)
--- a/lily/axis-group.cc
+++ b/lily/axis-group.cc
@@ -12,57 +12,58 @@
 
 /** don't copy anything: an element can only be in one
   Axis_group_element at one time.  */
-Axis_group_administration::Axis_group_administration(
-    Axis_group_administration const&)
+Axis_group_administration::Axis_group_administration (
+                                                     Axis_group_administration const&)
 {
 }
 
 bool 
-Axis_group_administration::contains_b(Score_elem const *e)const
+Axis_group_administration::contains_b (Score_elem const *e) const
 {
-    return elem_l_arr_.find_l(e);
+  return elem_l_arr_.find_l (e);
 }
 
 Interval
-Axis_group_administration::extent(Axis axis)const
+Axis_group_administration::extent (Axis axis) const
 {
-    Interval r;
-    for (int i=0; i < elem_l_arr_.size(); i++) 
-       r.unite(elem_l_arr_[i]->extent(axis));
-    return r;
+  Interval r;
+  for (int i=0; i < elem_l_arr_.size(); i++) 
+    r.unite (elem_l_arr_[i]->extent (axis));
+  return r;
 }
 
 void
-Axis_group_administration::add_element(Score_elem*e,
-                                      Axis_group_element*g, Axis a1, Axis a2)
+Axis_group_administration::add_element (Score_elem*e,
+                                       Axis_group_element*g, Axis a1, Axis a2)
 {
-    assert( ! e->axis_group_l_a_[a1] && !e->axis_group_l_a_[a2] );
-    e->axis_group_l_a_[a1] = g;
-    e->axis_group_l_a_[a2] = g;    
-    elem_l_arr_.push ( e);
+  assert (! e->axis_group_l_a_[a1] && !e->axis_group_l_a_[a2]);
+  e->axis_group_l_a_[a1] = g;
+  e->axis_group_l_a_[a2] = g;    
+  elem_l_arr_.push (e);
 }
 
 
 
 void
-Axis_group_administration::remove_element(Score_elem*e, Axis a1, Axis a2)
+Axis_group_administration::remove_element (Score_elem*e, Axis a1, Axis a2)
 {
-    assert( contains_b( e));
-    elem_l_arr_.unordered_substitute(e,0);
-    
-    e->axis_group_l_a_[a1] = 0;
-    e->axis_group_l_a_[a2] = 0;    
+  assert (contains_b (e));
+  elem_l_arr_.unordered_substitute (e,0);
+  
+  e->axis_group_l_a_[a1] = 0;
+  e->axis_group_l_a_[a2] = 0;    
 }
 
 void
-Axis_group_administration::remove_all(Axis a1, Axis a2)
+Axis_group_administration::remove_all (Axis a1, Axis a2)
 {
-    for (int i=0; i < elem_l_arr_.size(); i++) { 
-       Score_elem*e=elem_l_arr_[i];
-       e->axis_group_l_a_[a1] = 0;
-       e->axis_group_l_a_[a2] = 0;  
+  for (int i=0; i < elem_l_arr_.size(); i++) 
+    {
+      Score_elem*e=elem_l_arr_[i];
+      e->axis_group_l_a_[a1] = 0;
+      e->axis_group_l_a_[a2] = 0;  
     }
-    elem_l_arr_.clear();
+  elem_l_arr_.clear();
 }
 
 
@@ -70,7 +71,7 @@ void
 Axis_group_administration::print() const
 {
 #ifndef NPRINT
-    for (int i=0; i < elem_l_arr_.size(); i++) 
-       mtor << elem_l_arr_[i]->name() << ' ';
+  for (int i=0; i < elem_l_arr_.size(); i++) 
+    DOUT << elem_l_arr_[i]->name() << ' ';
 #endif
 }