partial: 0.1.13.jcn

[lilypond.git] / lily / input-translator.cc

diff --git a/lily/input-translator.cc b/lily/input-translator.cc
index 47e93160fb3dbc4b012f6cdd78081fb507ff4c74..ff277cc672cf4fe94d2821ac08b490c9492e5e5e 100644 (file)
--- a/lily/input-translator.cc
+++ b/lily/input-translator.cc
@@ -15,119 +15,123 @@
 #include "performer-group-performer.hh"
 
 bool
-Input_translator::is_name_b(String n)
+Input_translator::is_name_b (String n)
 {
-    for (int i=0; i < alias_str_arr_.size(); i++)
+  for (int i=0; i < alias_str_arr_.size(); i++)
        if (alias_str_arr_[i] == n)
            return true;
-    return false;
+  return false;
 }
 
 void
 Input_translator::print() const
 {
 #ifndef NPRINT
-    if ( ! check_debug)
+  if (! check_debug)
        return ;
-    mtor << base_str_ <<" " << type_str_<<" {\n";
-    mtor << "Consists of ";
-    for (int i=0; i< consists_str_arr_.size(); i++)
-       mtor << consists_str_arr_[i] << ',';
-    if (contains_itrans_p_list_.size())
-       mtor << "\nContains " ;
-    for (PCursor<Input_translator*> i(contains_itrans_p_list_.top()); i.ok(); i++) 
+  DOUT << base_str_ <<" " << type_str_<<" {\n";
+  DOUT << "Consists of ";
+  for (int i=0; i< consists_str_arr_.size(); i++)
+       DOUT << consists_str_arr_[i] << ',';
+  if (contains_itrans_p_list_.size())
+       DOUT << "\nContains " ;
+  for (PCursor<Input_translator*> i (contains_itrans_p_list_.top()); i.ok (); i++) 
        i->print();
-    mtor << "}\n";
+  DOUT << "}\n";
 #endif 
 }
 
 
 
 Input_translator *
-Input_translator::recursive_find(String nm)
+Input_translator::recursive_find (String nm)
 {
-    if ( is_name_b( nm) )
+  if (is_name_b (nm))
        return this;
 
-    Input_translator * r =0;
-    // what bout for() ?
-    PCursor<Input_translator*> i(contains_itrans_p_list_.top());
-    for (; !r &&i.ok(); i++) {
-       if (i->recursive_find(nm))
+  Input_translator * r =0;
+  // what bout for() ?
+  PCursor<Input_translator*> i (contains_itrans_p_list_.top());
+  for (; !r &&i.ok(); i++) 
+    {
+       if (i->recursive_find (nm))
            r = i.ptr();
     }
 
-    return r;
+  return r;
 }
 
 Input_translator *
-Input_translator::find_itrans_l(String nm)
+Input_translator::find_itrans_l (String nm)
 {
-    for (PCursor<Input_translator*> i(contains_itrans_p_list_.top()); i.ok(); i++) 
-       if (i->is_name_b( nm))
+  for (PCursor<Input_translator*> i (contains_itrans_p_list_.top()); i.ok (); i++) 
+       if (i->is_name_b (nm))
            return i;
 
-    return 0;
+  return 0;
 }
 
 
 Engraver_group_engraver *
 Input_translator::get_group_engraver_p()
 {
-    assert (base_str_ == "Engraver");
-    Engraver_group_engraver * grav_p = (Engraver_group_engraver*)
-       get_engraver_p(type_str_);
+  assert (base_str_ == "Engraver");
+  Engraver_group_engraver * grav_p = (Engraver_group_engraver*)
+       get_engraver_p (type_str_);
 
-    for (int i=0; i < consists_str_arr_.size(); i++) {
-       grav_p->add( get_engraver_p( consists_str_arr_[i]) );
+  for (int i=0; i < consists_str_arr_.size(); i++) 
+    {
+       grav_p->add (get_engraver_p (consists_str_arr_[i]));
     }
-    grav_p->itrans_l_ = this;
-    grav_p->id_str_ = default_id_str_;
-    return grav_p;
+  grav_p->itrans_l_ = this;
+  grav_p->id_str_ = default_id_str_;
+  return grav_p;
 }
 
 Performer_group_performer*
 Input_translator::get_group_performer_p()
 {    
-    assert (base_str_ == "Performer");
-    Performer_group_performer * perf_p = (Performer_group_performer*)
-       get_performer_p(type_str_);
+  assert (base_str_ == "Performer");
+  Performer_group_performer * perf_p = (Performer_group_performer*)
+       get_performer_p (type_str_);
 
-    for (int i=0; i < consists_str_arr_.size(); i++) {
-       perf_p->add( get_performer_p( consists_str_arr_[i]) );
+  for (int i=0; i < consists_str_arr_.size(); i++) 
+    {
+       perf_p->add (get_performer_p (consists_str_arr_[i]));
     }
-    perf_p->itrans_l_ = this;
-    perf_p->id_str_ = default_id_str_;
-    return perf_p;
+  perf_p->itrans_l_ = this;
+  perf_p->id_str_ = default_id_str_;
+  return perf_p;
 }
 
 bool
 Input_translator::accept_req_b()
 {
-    return ! contains_itrans_p_list_.size();
+  return ! contains_itrans_p_list_.size();
 }
 
 void
-Input_translator::add(Input_translator *ip)
+Input_translator::add (Input_translator *ip)
 {
-    contains_itrans_p_list_.bottom().add(ip);
+  contains_itrans_p_list_.bottom().add (ip);
 }
 
 Input_translator*
 Input_translator::get_default_itrans_l()
 {
-    if ( contains_itrans_p_list_.size() )
+  if (contains_itrans_p_list_.size())
        return contains_itrans_p_list_.top();
-    else
+  else
        return 0;
 }
 
 
-Input_translator_list::Input_translator_list(Input_translator_list const &s)
+Input_translator_list::Input_translator_list (Input_translator_list const &s)
 {
-    for (PCursor<Input_translator*> pc(s); pc.ok(); pc++) {
+  for (PCursor<Input_translator*> pc (s); pc.ok(); pc++) 
+    {
        Input_translator *q = pc;
-       Input_translator *p=new Input_translator(*q) ; 
-       bottom().add(p);
+       Input_translator *p=new Input_translator (*q) ; 
+       bottom().add (p);
     }
 }