]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/command-request.cc
release: 1.5.29
[lilypond.git] / lily / command-request.cc
index 1ab0353bc558ab32d3c74da961a4e5e34e09e678..62cbac4fa305b0b00f42e15b449e6b017b230677 100644 (file)
 /*
-  commandrequest.cc -- implement Nonmusical reqs
+  command-request.cc -- implement non-musical reqs
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 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(){}
-Command_script_req::~Command_script_req(){}
-
-
-
-
-
-
-void
-Cadenza_req::do_print() const
-{
-#ifndef NPRINT
-  DOUT << on_b_;
-#endif
-}
-
-bool
-Cadenza_req::do_equal_b (Request*r) const
-{
-  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 = dynamic_cast <Bar_req *> (r);
-  return b && type_str_ == b->type_str_;
-}
-
-
-
-
-
-
-void
-Bar_req::do_print() const
-{
-  DOUT << type_str_;
-}
-
-void
-Bracket_req::do_print () const
-{
-  Span_req::do_print ();
-}
-
-Bar_req::Bar_req (String s)
-{
-  type_str_ = s;
-}
-
-Partial_measure_req::Partial_measure_req (Moment m)
-{
-  duration_ =m;
-}
-
-bool
-Partial_measure_req::do_equal_b (Request* r) const
+Tempo_req::Tempo_req ()
 {
-  Partial_measure_req *p = dynamic_cast <Partial_measure_req *> (r);
-
-  return p&& p->duration_ == duration_;
+  set_mus_property ("duration", Duration (2,0).smobbed_copy ());
 }
 
-
-
-
 void
-Timing_req::do_print() const{}
-
-
-
-
-void
-Command_req::do_print() const{}
-
-
-
-void
-Barcheck_req::do_print() const{}
-
-bool
-Barcheck_req::do_equal_b (Request*r) const
+Key_change_req::transpose (Pitch p)
 {
-  Barcheck_req *b = dynamic_cast<Barcheck_req*> (r);
-  return b;
-}
-
-
-
-
-void
-Clef_change_req::do_print() const
-{
-#ifndef NPRINT
-  DOUT << clef_str_ ;
-#endif
-}
-
-Clef_change_req::Clef_change_req (String s)
-{
-  clef_str_ = s;
-}
-
-
-
-
-
-
-void
-Partial_measure_req::do_print() const
-{
-  DOUT << duration_;
-}
-
-
-
-
-void
-Time_signature_change_req::do_print() const
-{
-#ifndef NPRINT
-  DOUT << beats_i_ << "/" << one_beat_i_;
-#endif
-}
-
-bool
-Time_signature_change_req::do_equal_b (Request * r) const
-{
-  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_;
-}
-
-Time_signature_change_req::Time_signature_change_req()
-{
-  beats_i_ = 0;
-  one_beat_i_ =0;
-}
-
-
-Tempo_req::Tempo_req()
-{
-  metronome_i_ = 60;
-  dur_. durlog_i_ = 2;
-}
-
-void
-Tempo_req::do_print() const
-{
-  DOUT << dur_.str() << " = " << metronome_i_;
-}
-
-
-bool
-Tempo_req::do_equal_b (Request *r) const
-{
-  Tempo_req *t = dynamic_cast <Tempo_req *> (r);
-
-  return t&& t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_;
-}
-
-
-
-
-
-
-void
-Measure_grouping_req::do_print() const
-{
-  for (int i=0; i < elt_length_arr_.size(); i++)
+  SCM newlist = SCM_EOL;
+  SCM pa = get_mus_property ("pitch-alist");
+  for (SCM s = pa; gh_pair_p (s); s = ly_cdr (s))
     {
-      DOUT << beat_i_arr_[i] << "*" << elt_length_arr_[i].str () << " ";
-    }
-}
+      SCM key = ly_caar (s);
+      SCM alter = ly_cdar (s);
+      if (gh_pair_p (key))
+       {
+         Pitch orig (gh_scm2int (ly_car (key)),
+                             gh_scm2int (ly_cdr (key)),
+                             gh_scm2int (alter));
 
+         orig.transpose (p);
 
-bool
-Measure_grouping_req::do_equal_b (Request*) const
-{
-  return false;                // todo
-}
+         SCM key = gh_cons (gh_int2scm (orig.octave_i ()),
+                            gh_int2scm (orig.notename_i_));
 
-void
-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
-    {
-      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 ;
-           }
+         newlist = gh_cons (gh_cons (key, gh_int2scm (orig.alteration_i_)),
+                            newlist);
        }
-      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 ;
-           }
+      else if (gh_number_p (key))
+       {
+         Pitch orig (0, gh_scm2int (key), gh_scm2int (alter));
+         orig.transpose (p);
+
+         key =gh_int2scm (orig.notename_i_);
+         alter = gh_int2scm (orig.alteration_i_);
+         newlist = gh_cons (gh_cons (key, alter), newlist);
        }
-      // 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);
-            }
-        }
     }
-}
-
 
-void
-Key_change_req::squash_octaves()
-{
-  for (int i=0; i < pitch_arr_.size(); i++)
-    {
-      pitch_arr_[i].octave_i_ = 0;
-    }
+  set_mus_property ("pitch-alist", gh_reverse (newlist));
 }
 
-void
-Key_change_req::do_print() const
-{
-#ifndef NPRINT
-  for (int i=0; i < pitch_arr_.size(); i++)
-    {
-      pitch_arr_[i].print();
-    }
-#endif
-}
 
-Key_change_req::Key_change_req()
+bool
+alist_equal_p (SCM a, SCM b)
 {
-  modality_i_ = 0;
-  ordinary_key_b_= false;
-}
-
+  for (SCM s = a;
+       gh_pair_p (s); s = ly_cdr (s))
+    {
+      SCM key = ly_caar (s);
+      SCM val = ly_cdar (s);
+      SCM l = scm_assoc (key, b);
 
+      if (l == SCM_BOOL_F
+         || !gh_equal_p ( ly_cdr (l), val))
 
-Break_req::Break_req ()
-{
-  penalty_i_ = 0;
+       return false;
+    }
+  return true;
 }
 
-void
-Break_req::do_print () const
+bool
+Key_change_req::do_equal_b (Request const * m )const
 {
-}
-
-
+  Key_change_req const * kc =dynamic_cast<Key_change_req const*> (m);
 
-Mark_req::Mark_req (String s)
-{
-  str_ = s;
+  if(!kc)
+    return false;
+  return alist_equal_p (get_mus_property ("pitch-alist"),
+                       kc->get_mus_property ("pitch-alist"));
 }
 
-void
-Mark_req::do_print () const
-{
-  DOUT << str_;
-}
 
-int
-Key_change_req::flats_i()
-{
-  int flats_i = 0;
-  for (int i = 0; i < pitch_arr_.size(); i++)
-    {
-      if (pitch_arr_[i].accidental_i_ < 0)
-       flats_i -= pitch_arr_[i].accidental_i_;
-    }
-  return flats_i;
-}
 
 bool
-Key_change_req::minor_b() const
-{
-  return modality_i_ == 3;
-}
-
-int
-Key_change_req::sharps_i()
-{
-  int sharps_i = 0;
-  for (int i = 0; i < pitch_arr_.size(); i++)
-    {
-      if (pitch_arr_[i].accidental_i_ > 0)
-       sharps_i += pitch_arr_[i].accidental_i_;
-    }
-  return sharps_i;
-}
+Mark_req::do_equal_b (Request const * r) const
+{
+  Mark_req const * other = dynamic_cast<Mark_req const*> (r);
+  return other && scm_equal_p (other->get_mus_property ("label"),
+                              get_mus_property ("label")) == SCM_BOOL_T;
+}
+
+
+ADD_MUSIC (Articulation_req);
+ADD_MUSIC (Break_req);
+ADD_MUSIC (Breathing_sign_req);
+ADD_MUSIC (Busy_playing_req);
+ADD_MUSIC (Extender_req);
+ADD_MUSIC (Glissando_req);
+ADD_MUSIC (Hyphen_req);
+ADD_MUSIC (Key_change_req);
+ADD_MUSIC (Lyric_req);
+ADD_MUSIC (Mark_req);
+ADD_MUSIC (Melisma_playing_req);
+ADD_MUSIC (Melisma_req);
+ADD_MUSIC (Melodic_req);
+ADD_MUSIC (Note_req);
+ADD_MUSIC (Porrectus_req);
+ADD_MUSIC (Rest_req);
+ADD_MUSIC (Rhythmic_req);
+ADD_MUSIC (Script_req);
+ADD_MUSIC (Skip_req);
+ADD_MUSIC (Span_req);
+ADD_MUSIC (Tempo_req);
+ADD_MUSIC (Text_script_req);
+ADD_MUSIC (Tie_req);
+ADD_MUSIC (Tremolo_req);