release: 0.1.9

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 266912313336a07ae012412d1883a10335a62fa4..ea11129e2543602e1d9ea9deb98dd8b4b6765ff8 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -4,7 +4,7 @@
   source file of the GNU LilyPond music typesetter
 
   (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+               Jan Nieuwenhuizen <jan@digicash.com>
  */
 
 #include "performer-group-performer.hh"
@@ -22,12 +22,15 @@ Performer_group_performer::~Performer_group_performer()
 void
 Performer_group_performer::add (Performer *perf_p)
 {
-    perf_p_list_.bottom().add (perf_p);
-    perf_p->daddy_perf_l_ = this;
+  perf_p_list_.bottom().add (perf_p);
+  perf_p->daddy_perf_l_ = this;
 
-    if (perf_p->is_type_b (Performer_group_performer::static_name())) {
+  if (perf_p->is_type_b (Performer_group_performer::static_name())) 
+    {
        group_l_arr_.push ((Performer_group_performer*)perf_p);
-    } else {
+    }
+  else 
+    {
        nongroup_l_arr_ .push (perf_p);
     }
 }
@@ -35,22 +38,22 @@ Performer_group_performer::add (Performer *perf_p)
 Translator*
 Performer_group_performer::ancestor_l (int l)
 {
-    if (!l || !daddy_perf_l_)
+  if (!l || !daddy_perf_l_)
        return this;
-    
-    return daddy_perf_l_->ancestor_l (l - 1);
+  
+  return daddy_perf_l_->ancestor_l (l - 1);
 }
 
 int
 Performer_group_performer::depth_i() const
 {
-    return daddy_perf_l_->depth_i() + 1;
+  return daddy_perf_l_->depth_i() + 1;
 }
 
 void
 Performer_group_performer::do_creation_processing()
 {
-    for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
+  for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
        i->creation_processing();
 }
 
@@ -58,9 +61,9 @@ void
 Performer_group_performer::do_print()const
 {
 #ifndef NPRINT
-    if ( !check_debug)
+  if ( !check_debug)
        return ;
-    for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
+  for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
        i->print();
 #endif
 }
@@ -68,29 +71,31 @@ Performer_group_performer::do_print()const
 void
 Performer_group_performer::do_removal_processing()
 {
-    for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
+  for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
        i->do_removal_processing();
 }
 
 bool
 Performer_group_performer::do_try_request (Request* req_l)
 {
-    bool hebbes_b =false;
-    for (int i =0; !hebbes_b && i < nongroup_l_arr_.size() ; i++)
+  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);
-    if ( !hebbes_b && daddy_perf_l_)
+  if ( !hebbes_b && daddy_perf_l_)
        hebbes_b = daddy_perf_l_->try_request (req_l);
-    return hebbes_b ;
+  return hebbes_b ;
 }
 
 Translator*
 Performer_group_performer::find_get_translator_l (String n,String id)
 {
-    Translator * ret=0;
-    Input_translator* itrans_l= itrans_l_-> recursive_find ( n);
-    if (itrans_l) {
+  Translator * ret=0;
+  Input_translator* itrans_l= itrans_l_-> recursive_find ( n);
+  if (itrans_l) 
+    {
        ret = find_performer_l (n,id);
-       if (!ret) {
+       if (!ret) 
+         {
            Performer_group_performer * group = 
                itrans_l-> get_group_performer_p();
            
@@ -102,66 +107,69 @@ Performer_group_performer::find_get_translator_l (String n,String id)
            else
                return ret->find_get_translator_l (n,id);
 
-       }
-    } else if (daddy_perf_l_)
+         }
+    }
+  else if (daddy_perf_l_)
        ret =daddy_perf_l_->find_get_translator_l (n,id);
-    else {
+  else 
+    {
        warning ("Can't find or create `" + n + "' called `" + id + "'\n");
        ret =0;
     }
-    return ret;
+  return ret;
 }
 
 Performer_group_performer*
 Performer_group_performer::find_performer_l (String n, String id)
 {
-    if (name() == n && id_str_ == id)
+  if (name() == n && id_str_ == id)
        return this;
-    Performer_group_performer * r = 0;
-    for (int i =0; !r && i<  group_l_arr_.size(); i++) {
+  Performer_group_performer * r = 0;
+  for (int i =0; !r && i<  group_l_arr_.size(); i++) 
+    {
        r = group_l_arr_[i]->find_performer_l (n,id);
     }
-    
-    return r;
+  
+  return r;
 }
 
 Translator*
 Performer_group_performer::get_default_interpreter()
 {
-    // ? 
-    if ( is_bottom_performer_b())
+  // ? 
+  if ( is_bottom_performer_b())
        return daddy_perf_l_->get_default_interpreter();
 
-    Performer_group_performer *perf_p= itrans_l_->
+  Performer_group_performer *perf_p= itrans_l_->
        get_default_itrans_l()->get_group_performer_p ();
-    add (perf_p);
-    if (perf_p->is_bottom_performer_b())
+  add (perf_p);
+  if (perf_p->is_bottom_performer_b())
        return perf_p;
-    else
+  else
        return perf_p->get_default_interpreter();
 }
 
 bool
 Performer_group_performer::is_bottom_performer_b() const
 {
-    return !itrans_l_->get_default_itrans_l();
+  return !itrans_l_->get_default_itrans_l();
 }
 
 void
 Performer_group_performer::print() const 
 { 
-    Performer::print();
+  Performer::print();
 }
 
 void
 Performer_group_performer::process_requests()
 {
-    for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
+  for ( PCursor<Performer*> i (perf_p_list_.top()); i.ok (); i++ )
        i->process_requests();
 }
 
 bool 
 Performer_group_performer::try_request (Request* r)
 {
-    return Performer::try_request (r); 
+  return Performer::try_request (r); 
 }