]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/command-request.cc
release: 1.1.43
[lilypond.git] / lily / command-request.cc
index 69e7f4b7dbbb23d91c831d95ffbd8779a81cc075..335c92904251d2de49e8a0dbf46790dda6e176cb 100644 (file)
@@ -3,23 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "command-request.hh"
 #include "debug.hh"
 #include "musical-request.hh"
 
-void
-Command_script_req::do_print() const
-{}
-Command_script_req::Command_script_req(){}
-
-IMPLEMENT_IS_TYPE_B1(Command_script_req,Command_req);
-
-
-IMPLEMENT_IS_TYPE_B1(Cadenza_req, Timing_req);
-
 void
 Cadenza_req::do_print() const
 {
@@ -31,32 +21,30 @@ Cadenza_req::do_print() const
 bool
 Cadenza_req::do_equal_b (Request*r) const
 {
-  Cadenza_req*cad =  r->command()->timing ()->cadenza ();
-  
-  return cad->on_b_ == on_b_;
+  Cadenza_req*cad =  dynamic_cast <Cadenza_req *> (r);
+  return cad && cad->on_b_ == on_b_;
 }
 
 Cadenza_req::Cadenza_req (bool b)
 {
   on_b_ =b;
 }
-/* *************** */
+
 
 
 bool
 Bar_req::do_equal_b (Request*r) const
 {
-  Bar_req * b = r->command()->bar ();
-  return type_str_ == b->type_str_;
+  Bar_req * b = dynamic_cast <Bar_req *> (r);
+  return b && type_str_ == b->type_str_;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Bar_req,Command_req);
-
 void
 Bar_req::do_print() const
 {
+#ifndef NPRINT
   DOUT << type_str_;
+#endif
 }
 
 Bar_req::Bar_req (String s)
@@ -66,50 +54,23 @@ Bar_req::Bar_req (String s)
 
 Partial_measure_req::Partial_measure_req (Moment m)
 {
-  duration_ =m;
+  length_mom_ =m;
 }
 
 bool
 Partial_measure_req::do_equal_b (Request* r) const
 {
-  Partial_measure_req *p = r->command()->timing ()->partial ();
+  Partial_measure_req *p = dynamic_cast <Partial_measure_req *> (r);
 
-  return p->duration_ == duration_;
+  return p&& p->length_mom_ == length_mom_;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Timing_req,Command_req);
-
-void
-Timing_req::do_print() const{}
-
-
-IMPLEMENT_IS_TYPE_B1(Command_req,Request);
-
-void
-Command_req::do_print() const{}
-
-IMPLEMENT_IS_TYPE_B1(Disallow_break_req,Command_req);
-
-void
-Disallow_break_req::do_print() const
-{
-}
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Barcheck_req,Timing_req);
-
-void
-Barcheck_req::do_print() const{}
-
 bool
-Barcheck_req::do_equal_b (Request*) const
+Barcheck_req::do_equal_b (Request*r) const
 {
-  return true;
+  Barcheck_req *b = dynamic_cast<Barcheck_req*> (r);
+  return b;
 }
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Clef_change_req,Command_req);
 
 void
 Clef_change_req::do_print() const
@@ -123,34 +84,18 @@ Clef_change_req::Clef_change_req (String s)
 {
   clef_str_ = s;
 }
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Group_feature_req,Command_req);
-
-void
-Group_feature_req::do_print() const
-{
-#ifndef NPRINT
-  DOUT << type_str_ << "=" << value_str_;
-#endif
-}
-
-/* *************** */
-
-
-IMPLEMENT_IS_TYPE_B1(Partial_measure_req,Timing_req);
 
 void
 Partial_measure_req::do_print() const
 {
-  DOUT << duration_;
+  DOUT << length_mom_;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Meter_change_req,Timing_req);
+
 
 void
-Meter_change_req::do_print() const
+Time_signature_change_req::do_print() const
 {
 #ifndef NPRINT
   DOUT << beats_i_ << "/" << one_beat_i_;
@@ -158,27 +103,20 @@ Meter_change_req::do_print() const
 }
 
 bool
-Meter_change_req::do_equal_b (Request * r) const
+Time_signature_change_req::do_equal_b (Request * r) const
 {
-  Meter_change_req * m = r->command()->timing ()->meterchange ();
-  
-  return m->beats_i_ == beats_i_ 
+  Time_signature_change_req * m = dynamic_cast <Time_signature_change_req *> (r);
+
+  return m && m->beats_i_ == beats_i_
     && one_beat_i_ == m->one_beat_i_;
 }
 
-Meter_change_req::Meter_change_req()
+Time_signature_change_req::Time_signature_change_req()
 {
   beats_i_ = 0;
   one_beat_i_ =0;
 }
 
-void
-Meter_change_req::set (int b,int o)
-{
-  beats_i_=b;
-  one_beat_i_=o;
-}
-
 
 Tempo_req::Tempo_req()
 {
@@ -189,59 +127,135 @@ Tempo_req::Tempo_req()
 void
 Tempo_req::do_print() const
 {
-  DOUT << dur_.str() << " = " <<metronome_i_ ;
+  DOUT << dur_.str() << " = " << metronome_i_;
 }
-IMPLEMENT_IS_TYPE_B1(Tempo_req, Timing_req);
+
 
 bool
 Tempo_req::do_equal_b (Request *r) const
 {
-  Tempo_req *t = r->command()->timing ()->tempo ();
-  
-  return t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_;
-}
-
-/* *************** */
+  Tempo_req *t = dynamic_cast <Tempo_req *> (r);
 
-
-IMPLEMENT_IS_TYPE_B1(Measure_grouping_req,Timing_req);
+  return t&& t->dur_.length_mom ()== dur_.length_mom () && metronome_i_ == t->metronome_i_;
+}
 
 void
 Measure_grouping_req::do_print() const
 {
-  for (int i=0; i < elt_length_arr_.size(); i++) 
+  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].str () << " ";
     }
 }
 
 
-bool 
+bool
 Measure_grouping_req::do_equal_b (Request*) const
 {
   return false;                // todo
 }
 
-/* *************** */
-
 void
-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++) 
+Key_change_req::transpose (Musical_pitch d) 
+{
+  if (ordinary_key_b_ ) 
+    { 
+      if (pitch_arr_.size () > 0) 
+        pitch_arr_[0].transpose(d);
+      else
+        {
+          warning(_ ("don't know how handle empty keys")); // TODO 
+        }
+    }
+  else
     {
-      melodic_p_arr_[i]->transpose (d);
+      Array<Musical_pitch> old_pitch_arr_;
+      for (int i = 0; i < pitch_arr_.size(); i++)
+        {
+          old_pitch_arr_.push(pitch_arr_[i]);
+        }
+      // set accidentals for \key d (as in Key_engraver::read_req)
+      // (later called "new accidentals")
+      int p = d.semitone_pitch ();
+      /* Solve the equation 7*no_of_acc mod 12 = p, -6 <= no_of_acc <= 5 */
+      int no_of_acc = (7*p) % 12;
+      no_of_acc = (no_of_acc + 18) % 12 -6;
+
+      /* Correct from flats to sharps or vice versa */
+      if (no_of_acc * d.accidental_i_ < 0)
+      no_of_acc += 12 * sign (d.accidental_i_);
+    
+      pitch_arr_.clear ();
+      if (no_of_acc < 0) 
+        {
+         int accidental = 6 ; // First accidental: bes
+          for ( ; no_of_acc < 0 ; no_of_acc++ ) 
+           {
+             Musical_pitch m;
+             m.accidental_i_ = -1;
+             m.notename_i_ = accidental;
+             pitch_arr_.push(m);
+     
+             accidental = (accidental + 3) % 7 ;
+           }
+       }
+      else 
+       { 
+         int accidental = 3 ; // First accidental: fis
+         for ( ; no_of_acc > 0 ; no_of_acc-- ) 
+           {
+             Musical_pitch m;
+             m.accidental_i_ = 1;
+             m.notename_i_ = accidental;
+             pitch_arr_.push(m);
+   
+             accidental = (accidental + 4) % 7 ;
+           }
+       }
+      // Check if transposed old accidentals and the new ones coincide
+      no_of_acc = pitch_arr_.size();
+      int acc_found;
+      Musical_pitch mm;
+      for (int i=0; i < old_pitch_arr_.size(); i++)
+        {
+          acc_found = 0;
+          mm = old_pitch_arr_[i];
+         mm.transpose(d);
+          for (int j=0; ((j < no_of_acc) && (acc_found == 0)); j++)
+            {
+              if (pitch_arr_[j].notename_i_ == mm.notename_i_)
+                {
+                  if (mm.accidental_i_ == 0)
+                    {
+                      // remove new accidental 
+                      pitch_arr_.del(j);
+                      no_of_acc--;
+                      acc_found = 1;
+                   }
+                 else
+                    {
+                      // change new accidental 
+                      pitch_arr_[j].accidental_i_ = mm.accidental_i_;
+                      acc_found = 1;
+                   }
+                }
+            }
+          if (acc_found == 0)
+            {
+              // add transposed old accidental 
+             pitch_arr_.push(mm);
+            }
+        }
     }
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Key_change_req,Command_req);
 void
 Key_change_req::squash_octaves()
 {
-  for (int i=0; i < melodic_p_arr_.size(); i++) 
+  for (int i=0; i < pitch_arr_.size(); i++)
     {
-      melodic_p_arr_[i]->octave_i_ = 0;
+      pitch_arr_[i].octave_i_ = 0;
     }
 }
 
@@ -249,64 +263,63 @@ void
 Key_change_req::do_print() const
 {
 #ifndef NPRINT
-  for (int i=0; i < melodic_p_arr_.size(); i++) 
+  for (int i=0; i < pitch_arr_.size(); i++)
     {
-      melodic_p_arr_[i]->print();
+      pitch_arr_[i].print();
     }
 #endif
 }
 
 Key_change_req::Key_change_req()
 {
-  minor_b_ = false;
-  multi_octave_b_= false;
+  modality_i_ = 0;
+  ordinary_key_b_= false;
 }
 
-Key_change_req::Key_change_req (Key_change_req const&c)
+
+
+Break_req::Break_req ()
 {
-  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_;
+  penalty_i_ = 0;
 }
 
-Key_change_req::~Key_change_req()
+Mark_req::Mark_req (String s)
 {
-  for (int i=0; i < melodic_p_arr_.size(); i++)
-    delete melodic_p_arr_[i];
+  str_ = s;
+}
+
+void
+Mark_req::do_print () const
+{
+  DOUT << str_;
 }
 
 int
 Key_change_req::flats_i()
 {
   int flats_i = 0;
-  for (int i = 0; i < melodic_p_arr_.size(); i++) 
+  for (int i = 0; i < pitch_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_;
+      if (pitch_arr_[i].accidental_i_ < 0)
+       flats_i -= pitch_arr_[i].accidental_i_;
     }
   return flats_i;
 }
 
-int
-Key_change_req::minor_b()
+bool
+Key_change_req::minor_b() const
 {
-  return minor_b_;     
+  return modality_i_ == 3;
 }
 
 int
 Key_change_req::sharps_i()
 {
   int sharps_i = 0;
-  for (int i = 0; i < melodic_p_arr_.size(); i++) 
+  for (int i = 0; i < pitch_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_;
+      if (pitch_arr_[i].accidental_i_ > 0)
+       sharps_i += pitch_arr_[i].accidental_i_;
     }
   return sharps_i;
 }
-