release: 0.1.11

[lilypond.git] / lily / command-request.cc

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 051ce84465731951952cc2894cf32f607ec4158c..69e7f4b7dbbb23d91c831d95ffbd8779a81cc075 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -21,7 +21,7 @@ IMPLEMENT_IS_TYPE_B1(Command_script_req,Command_req);
 IMPLEMENT_IS_TYPE_B1(Cadenza_req, Timing_req);
 
 void
-Cadenza_req::do_print()const
+Cadenza_req::do_print() const
 {
 #ifndef NPRINT
   DOUT << on_b_;
@@ -29,7 +29,7 @@ Cadenza_req::do_print()const
 }
 
 bool
-Cadenza_req::do_equal_b (Request*r)const
+Cadenza_req::do_equal_b (Request*r) const
 {
   Cadenza_req*cad =  r->command()->timing ()->cadenza ();
   
@@ -44,7 +44,7 @@ Cadenza_req::Cadenza_req (bool b)
 
 
 bool
-Bar_req::do_equal_b (Request*r)const
+Bar_req::do_equal_b (Request*r) const
 {
   Bar_req * b = r->command()->bar ();
   return type_str_ == b->type_str_;
@@ -70,7 +70,7 @@ Partial_measure_req::Partial_measure_req (Moment m)
 }
 
 bool
-Partial_measure_req::do_equal_b (Request* r)const
+Partial_measure_req::do_equal_b (Request* r) const
 {
   Partial_measure_req *p = r->command()->timing ()->partial ();
 
@@ -81,18 +81,18 @@ Partial_measure_req::do_equal_b (Request* r)const
 IMPLEMENT_IS_TYPE_B1(Timing_req,Command_req);
 
 void
-Timing_req::do_print()const{}
+Timing_req::do_print() const{}
 
 
 IMPLEMENT_IS_TYPE_B1(Command_req,Request);
 
 void
-Command_req::do_print()const{}
+Command_req::do_print() const{}
 
 IMPLEMENT_IS_TYPE_B1(Disallow_break_req,Command_req);
 
 void
-Disallow_break_req::do_print()const
+Disallow_break_req::do_print() const
 {
 }
 /* *************** */
@@ -103,7 +103,7 @@ void
 Barcheck_req::do_print() const{}
 
 bool
-Barcheck_req::do_equal_b (Request*)const
+Barcheck_req::do_equal_b (Request*) const
 {
   return true;
 }
@@ -158,12 +158,12 @@ Meter_change_req::do_print() const
 }
 
 bool
-Meter_change_req::do_equal_b (Request * r)const
+Meter_change_req::do_equal_b (Request * r) const
 {
   Meter_change_req * m = r->command()->timing ()->meterchange ();
   
   return m->beats_i_ == beats_i_ 
-       && one_beat_i_ == m->one_beat_i_;
+    && one_beat_i_ == m->one_beat_i_;
 }
 
 Meter_change_req::Meter_change_req()
@@ -187,14 +187,14 @@ Tempo_req::Tempo_req()
 }
 
 void
-Tempo_req::do_print()const
+Tempo_req::do_print() const
 {
   DOUT << dur_.str() << " = " <<metronome_i_ ;
 }
 IMPLEMENT_IS_TYPE_B1(Tempo_req, Timing_req);
 
 bool
-Tempo_req::do_equal_b (Request *r)const
+Tempo_req::do_equal_b (Request *r) const
 {
   Tempo_req *t = r->command()->timing ()->tempo ();
   
@@ -211,13 +211,13 @@ Measure_grouping_req::do_print() const
 {
   for (int i=0; i < elt_length_arr_.size(); i++) 
     {
-       DOUT << beat_i_arr_[i] <<"*" << elt_length_arr_[i]<<" ";
+      DOUT << beat_i_arr_[i] <<"*" << elt_length_arr_[i]<<" ";
     }
 }
 
 
 bool 
-Measure_grouping_req::do_equal_b (Request*)const
+Measure_grouping_req::do_equal_b (Request*) const
 {
   return false;                // todo
 }
@@ -225,12 +225,12 @@ Measure_grouping_req::do_equal_b (Request*)const
 /* *************** */
 
 void
-Key_change_req::transpose (Melodic_req const & d)const
+Key_change_req::transpose (Melodic_req const & d) const
 {
   WARN << "don't know how to transpose a key. \n";
   for (int i=0; i < melodic_p_arr_.size(); i++) 
     {
-       melodic_p_arr_[i]->transpose (d);
+      melodic_p_arr_[i]->transpose (d);
     }
 }
 
@@ -241,7 +241,7 @@ Key_change_req::squash_octaves()
 {
   for (int i=0; i < melodic_p_arr_.size(); i++) 
     {
-       melodic_p_arr_[i]->octave_i_ = 0;
+      melodic_p_arr_[i]->octave_i_ = 0;
     }
 }
 
@@ -251,62 +251,62 @@ Key_change_req::do_print() const
 #ifndef NPRINT
   for (int i=0; i < melodic_p_arr_.size(); i++) 
     {
-       melodic_p_arr_[i]->print();
+      melodic_p_arr_[i]->print();
     }
 #endif
 }
 
 Key_change_req::Key_change_req()
 {
-       minor_b_ = false;
-       multi_octave_b_= false;
+  minor_b_ = false;
+  multi_octave_b_= false;
 }
 
 Key_change_req::Key_change_req (Key_change_req const&c)
 {
-       for (int i=0; i < c.melodic_p_arr_.size(); i++) 
-               melodic_p_arr_.push (c.melodic_p_arr_[i]->clone()->musical ()->melodic ());
-       minor_b_ = c.minor_b_;
-       multi_octave_b_ = c.multi_octave_b_;
+  for (int i=0; i < c.melodic_p_arr_.size(); i++) 
+    melodic_p_arr_.push (c.melodic_p_arr_[i]->clone()->musical ()->melodic ());
+  minor_b_ = c.minor_b_;
+  multi_octave_b_ = c.multi_octave_b_;
 }
 
 Key_change_req::~Key_change_req()
 {
-       for (int i=0; i < melodic_p_arr_.size(); i++)
-               delete melodic_p_arr_[i];
+  for (int i=0; i < melodic_p_arr_.size(); i++)
+    delete melodic_p_arr_[i];
 }
 
 int
 Key_change_req::flats_i()
 {
-       int flats_i = 0;
-       for ( int i = 0; i < melodic_p_arr_.size(); i++) 
-         {
-               Melodic_req* mel_l = melodic_p_arr_[i]->melodic();
-               assert (mel_l);
-               if ( mel_l->accidental_i_ < 0)
-                       flats_i -= mel_l->accidental_i_;
-         }
-       return flats_i;
+  int flats_i = 0;
+  for (int i = 0; i < melodic_p_arr_.size(); i++) 
+    {
+      Melodic_req* mel_l = melodic_p_arr_[i]->melodic();
+      assert (mel_l);
+      if (mel_l->accidental_i_ < 0)
+       flats_i -= mel_l->accidental_i_;
+    }
+  return flats_i;
 }
 
 int
 Key_change_req::minor_b()
 {
-       return minor_b_;        
+  return minor_b_;     
 }
 
 int
 Key_change_req::sharps_i()
 {
-       int sharps_i = 0;
-       for ( int i = 0; i < melodic_p_arr_.size(); i++) 
-         {
-               Melodic_req* mel_l = melodic_p_arr_[i]->melodic();
-               assert (mel_l);
-               if ( mel_l->accidental_i_ > 0)
-                       sharps_i+= mel_l->accidental_i_;
-         }
-       return sharps_i;
+  int sharps_i = 0;
+  for (int i = 0; i < melodic_p_arr_.size(); i++) 
+    {
+      Melodic_req* mel_l = melodic_p_arr_[i]->melodic();
+      assert (mel_l);
+      if (mel_l->accidental_i_ > 0)
+       sharps_i+= mel_l->accidental_i_;
+    }
+  return sharps_i;
 }