X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver-group.cc;h=3c7e7ca86b5670959a4e2db110c29d9c7af71d06;hb=2862b1027f316a2f0444fa92e441ee28acf7a463;hp=aae1051fb2360c6ec213b091a1456e42e18e9d60;hpb=68ffccad7c4d4ce0386cb60c537c99523e61c4d9;p=lilypond.git

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index aae1051fb2..3c7e7ca86b 100644
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -18,7 +18,7 @@
 Engraver* get_engraver_p (String);
 
 void
-Engraver_group_engraver::print()const
+Engraver_group_engraver::print() const
 { 
   Engraver::print(); 
 }
@@ -33,16 +33,16 @@ Engraver_group_engraver::check_removal()
 {
   for (int i =0; i < group_l_arr_.size();) 
     {
-	group_l_arr_[i]->check_removal();
-	if (group_l_arr_[i]->removable_b())
-	    terminate_engraver (group_l_arr_[i]);
-	else 
-	    i++;
+      group_l_arr_[i]->check_removal();
+      if (group_l_arr_[i]->removable_b())
+	terminate_engraver (group_l_arr_[i]);
+      else 
+	i++;
     }
 }
 
 bool
-Engraver_group_engraver::removable_b()const
+Engraver_group_engraver::removable_b() const
 {
   return !iterator_count_&& !group_l_arr_.size() ;
 }
@@ -59,9 +59,9 @@ Engraver_group_engraver::set_feature (Feature d)
   // why the while construct?
   while (i.ok()) 
     {
-	// this construction to ensure clean deletion
-	Engraver *grav_l = i++; 
-	grav_l->set_feature (d);
+      // this construction to ensure clean deletion
+      Engraver *grav_l = i++; 
+      grav_l->set_feature (d);
     }
 }
 
@@ -71,8 +71,8 @@ Engraver_group_engraver::sync_features()
   PCursor<Engraver*> i (grav_list_.top());
   while (i.ok()) 
     {
-	Engraver *grav_l = i++; 
-	grav_l->sync_features();
+      Engraver *grav_l = i++; 
+      grav_l->sync_features();
     }
 }
 
@@ -82,8 +82,8 @@ Engraver_group_engraver::do_pre_move_processing()
   PCursor<Engraver*> i (grav_list_.top());
   while (i.ok()) 
     {
-	Engraver *grav_l = i++; 
-	grav_l->pre_move_processing();
+      Engraver *grav_l = i++; 
+      grav_l->pre_move_processing();
     }
 }
 
@@ -93,8 +93,8 @@ Engraver_group_engraver::do_process_requests()
   PCursor<Engraver*> i (grav_list_.top());
   while (i.ok()) 
     {
-	Engraver *grav_l = i++; 
-	grav_l->process_requests();
+      Engraver *grav_l = i++; 
+      grav_l->process_requests();
     }
 }
 
@@ -105,23 +105,23 @@ Engraver_group_engraver::do_post_move_processing()
   PCursor<Engraver*> i (grav_list_.top());
   while (i.ok()) 
     {
-		// this construction to ensure clean deletion
-	Engraver *grav_l = i++; 
-	grav_l->post_move_processing();
+      // this construction to ensure clean deletion
+      Engraver *grav_l = i++; 
+      grav_l->post_move_processing();
     }
 }
 
 
 bool
-Engraver_group_engraver::contains_b (Engraver* grav_l)const
+Engraver_group_engraver::contains_b (Engraver* grav_l) const
 {
   bool parent_b = Engraver::contains_b (grav_l);
   
   if (parent_b)
-	return true;
+    return true;
   for (PCursor<Engraver*> i (grav_list_.top()); i.ok (); i++)
-	if (i->contains_b (grav_l))
-	    return true;
+    if (i->contains_b (grav_l))
+      return true;
   return false;
 }
 	
@@ -132,9 +132,9 @@ Engraver_group_engraver::do_try_request (Request*req_l)
 {
   bool hebbes_b =false;
   for (int i =0; !hebbes_b && i < nongroup_l_arr_.size() ; i++)
-	hebbes_b =nongroup_l_arr_[i]->try_request (req_l);
+    hebbes_b =nongroup_l_arr_[i]->try_request (req_l);
   if (!hebbes_b && daddy_grav_l_)
-	hebbes_b = daddy_grav_l_->try_request (req_l);
+    hebbes_b = daddy_grav_l_->try_request (req_l);
   return hebbes_b ;
 }
 
@@ -152,11 +152,11 @@ Engraver_group_engraver::add (Engraver *grav_p)
 
   if (grav_p->is_type_b (Engraver_group_engraver::static_name())) 
     {
-	group_l_arr_.push ((Engraver_group_engraver*)grav_p);
+      group_l_arr_.push ((Engraver_group_engraver*)grav_p);
     }
   else 
     {
-	nongroup_l_arr_ .push (grav_p);
+      nongroup_l_arr_ .push (grav_p);
     }
 }
 
@@ -186,15 +186,15 @@ IMPLEMENT_IS_TYPE_B2(Engraver_group_engraver,Engraver, Translator);
 ADD_THIS_ENGRAVER(Engraver_group_engraver);
 
 void
-Engraver_group_engraver::do_print()const
+Engraver_group_engraver::do_print() const
 {
 #ifndef NPRINT
-  if ( !check_debug)
-	return ;
+  if (!check_debug)
+    return ;
   DOUT << "ID: " << id_str_ ;
   DOUT << " iterators: " << iterator_count_<< "\n";
   for (PCursor<Engraver*> i (grav_list_.top()); i.ok (); i++)
-	i->print();
+    i->print();
 #endif
 }
 
@@ -203,11 +203,11 @@ Engraver_group_engraver*
 Engraver_group_engraver::find_engraver_l (String n, String id)
 {
   if (name() == n && id_str_ == id)
-	return this;
+    return this;
   Engraver_group_engraver * r = 0;
   for (int i =0; !r && i<  group_l_arr_.size(); i++) 
     {
-	r = group_l_arr_[i]->find_engraver_l (n,id);
+      r = group_l_arr_[i]->find_engraver_l (n,id);
     }
   
   return r;
@@ -217,37 +217,37 @@ Translator*
 Engraver_group_engraver::find_get_translator_l (String n,String id)
 {
   Translator * ret=0;
-  Input_translator * itrans_l= itrans_l_-> recursive_find ( n);
+  Input_translator * itrans_l= itrans_l_-> recursive_find (n);
   if (itrans_l) 
     {
-	ret = find_engraver_l (n,id);
-	if (!ret) 
-	  {
-	    Engraver_group_engraver * group = 
-		itrans_l-> get_group_engraver_p();
+      ret = find_engraver_l (n,id);
+      if (!ret) 
+	{
+	  Engraver_group_engraver * group = 
+	    itrans_l-> get_group_engraver_p();
 	    
-	    add (group);
-	    ret = group;
+	  add (group);
+	  ret = group;
 	    
-	    if (group->itrans_l_->is_name_b (n) )
-		ret ->id_str_ = id;
-	    else
-		return ret->find_get_translator_l (n,id);
+	  if (group->itrans_l_->is_name_b (n))
+	    ret ->id_str_ = id;
+	  else
+	    return ret->find_get_translator_l (n,id);
 
-	  }
+	}
     }
   else if (daddy_grav_l_)
-	ret =daddy_grav_l_->find_get_translator_l (n,id);
+    ret =daddy_grav_l_->find_get_translator_l (n,id);
   else 
     {
-	warning ("Can't find or create `" + n + "' called `" + id + "'\n");
-	ret =0;
+      warning ("Can't find or create `" + n + "' called `" + id + "'\n");
+      ret =0;
     }
   return ret;
 }
 
 int
-Engraver_group_engraver::depth_i()const
+Engraver_group_engraver::depth_i() const
 {
   return daddy_grav_l_->depth_i()  + 1;
 }
@@ -256,7 +256,7 @@ Translator*
 Engraver_group_engraver::ancestor_l (int l)
 {
   if (!l || !daddy_grav_l_)
-	return this;
+    return this;
   
   return daddy_grav_l_->ancestor_l (l-1);
 }
@@ -273,21 +273,21 @@ Engraver_group_engraver::do_announces()
 {
   for (int i=0; i < group_l_arr_.size(); i++) 
     {
-	group_l_arr_[i]->do_announces();
+      group_l_arr_[i]->do_announces();
     }
   
   Request dummy_req;
  
   for (int j =0; j < announce_info_arr_.size(); j++)
     {
-     Score_elem_info info = announce_info_arr_[j];
+      Score_elem_info info = announce_info_arr_[j];
      
-     if (!info.req_l_)
-	    info.req_l_ = &dummy_req;
-     for (int i=0; i < nongroup_l_arr_.size(); i++) {	// Is this good enough?6
-	   if (nongroup_l_arr_[i] != info.origin_grav_l_arr_[0])
-	       nongroup_l_arr_[i]->acknowledge_element (info);
-       }
+      if (!info.req_l_)
+	info.req_l_ = &dummy_req;
+      for (int i=0; i < nongroup_l_arr_.size(); i++) {	// Is this good enough?6
+	if (nongroup_l_arr_[i] != info.origin_grav_l_arr_[0])
+	  nongroup_l_arr_[i]->acknowledge_element (info);
+      }
     }
   announce_info_arr_.clear();
 }
@@ -297,16 +297,16 @@ void
 Engraver_group_engraver::do_removal_processing()
 {
   for (PCursor<Engraver*> i (grav_list_.top()); i.ok (); i++)
-	i->removal_processing();
+    i->removal_processing();
 }
 
 Staff_info
-Engraver_group_engraver::get_staff_info()const
+Engraver_group_engraver::get_staff_info() const
 {
   Staff_info inf = Engraver::get_staff_info();
 
   for (int i=0; i < nongroup_l_arr_.size(); i++)
-	nongroup_l_arr_[i]->fill_staff_info (inf);
+    nongroup_l_arr_[i]->fill_staff_info (inf);
   
   return inf;
 }
@@ -315,34 +315,34 @@ Translator*
 Engraver_group_engraver::get_default_interpreter()
 {
   // ? 
-  if ( is_bottom_engraver_b())
-	return daddy_grav_l_->get_default_interpreter();
+  if (is_bottom_engraver_b())
+    return daddy_grav_l_->get_default_interpreter();
 
   Engraver_group_engraver *grav_p= itrans_l_->
-	get_default_itrans_l()->get_group_engraver_p ();
+    get_default_itrans_l()->get_group_engraver_p ();
   add (grav_p);
   if (grav_p->is_bottom_engraver_b())
-	return grav_p;
+    return grav_p;
   else
-	return grav_p->get_default_interpreter();
+    return grav_p->get_default_interpreter();
 }
 
 bool
-Engraver_group_engraver::is_bottom_engraver_b()const
+Engraver_group_engraver::is_bottom_engraver_b() const
 {
   return !itrans_l_->get_default_itrans_l();
 }
 
 Engraver*
-Engraver_group_engraver::get_simple_engraver (char const *type)const
+Engraver_group_engraver::get_simple_engraver (char const *type) const
 {
   for (int i=0; i < nongroup_l_arr_.size(); i++) 
     {
-	if (nongroup_l_arr_[i]->name() == type)
-	    return nongroup_l_arr_[i];
+      if (nongroup_l_arr_[i]->name() == type)
+	return nongroup_l_arr_[i];
     }
-  if ( daddy_grav_l_)
-	return daddy_grav_l_->get_simple_engraver (type);
+  if (daddy_grav_l_)
+    return daddy_grav_l_->get_simple_engraver (type);
   return 0;
 }