patch::: 1.3.130.jcn6

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

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 218d283f1bce04f2e4f94c26763f218594c18098..f37c73825c450744dc96df79faed03f528d7e94d 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -3,178 +3,97 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "command-request.hh"
 #include "debug.hh"
 #include "musical-request.hh"
 
-void
-Cadenza_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << (int)on_b_;
-#endif
-}
 
 bool
-Cadenza_req::do_equal_b (Request*r) const
+Barcheck_req::do_equal_b (Request const *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
-{
-#ifndef NPRINT
-  DOUT << type_str_;
-#endif
-}
-
-Bar_req::Bar_req (String s)
-{
-  type_str_ = s;
-}
-
-Partial_measure_req::Partial_measure_req (Moment m)
-{
-  length_mom_ =m;
+  Barcheck_req  const*b = dynamic_cast<Barcheck_req const*> (r);
+  return b;
 }
 
-bool
-Partial_measure_req::do_equal_b (Request* r) const
-{
-  Partial_measure_req *p = dynamic_cast <Partial_measure_req *> (r);
 
-  return p&& p->length_mom_ == length_mom_;
-}
 
-bool
-Barcheck_req::do_equal_b (Request*r) const
-{
-  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)
+Tempo_req::Tempo_req ()
 {
-  clef_str_ = s;
+  set_mus_property ("duration", Duration(2,0).smobbed_copy ());
 }
 
-void
-Partial_measure_req::do_print () const
-{
-  DOUT << length_mom_;
-}
 
-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
+Tempo_req::do_equal_b (Request const *r) const
 {
-  Time_signature_change_req * m
-    = dynamic_cast <Time_signature_change_req *> (r);
+  Tempo_req const *t = dynamic_cast <Tempo_req const*> (r);
 
-  return m && m->beats_i_ == beats_i_
-    && one_beat_i_ == m->one_beat_i_;
+  return t; //  && t->dur_.length_mom ()== dur_.length_mom ();
+  // && metronome_i_ == t->metronome_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
+Key_change_req::do_equal_b (Request const * req) const
 {
-  Tempo_req *t = dynamic_cast <Tempo_req *> (r);
-
-  return t&& t->dur_.length_mom ()== dur_.length_mom () && metronome_i_ == t->metronome_i_;
+  Key_change_req const * k = dynamic_cast<Key_change_req const*> (req);
+  return k  && scm_equal_p (get_mus_property ("pitch-alist"), k->get_mus_property ("pitch-alist")) == SCM_BOOL_T;
 }
 
 
-
-
 void
-Key_change_req::do_print () const
+Key_change_req::transpose (Pitch p)
 {
-#ifndef NPRINT
-  for (int i=0; i < key_.pitch_arr_.size (); i++)
+  SCM newlist = SCM_EOL;
+  SCM pa = get_mus_property ("pitch-alist");
+  for (SCM s = pa; gh_pair_p (s); s = gh_cdr (s))
     {
-      key_.pitch_arr_[i].print ();
+      SCM key = gh_caar (s);
+      SCM alter = gh_cdar (s);
+      if (gh_pair_p (key))
+       {
+         Pitch orig (gh_scm2int (gh_car (key)),
+                             gh_scm2int (gh_cdr (key)),
+                             gh_scm2int (alter));
+
+         orig.transpose (p);
+
+         SCM key = gh_cons (gh_int2scm (orig.octave_i () ),
+                            gh_int2scm (orig.notename_i_));
+
+         newlist = gh_cons (gh_cons (key, gh_int2scm (orig.alteration_i_)),
+                            newlist);
+       }
+      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);
+       }
     }
-#endif
-}
 
-Key_change_req::Key_change_req ()
-{
+  set_mus_property ("pitch-alist", newlist);
 }
 
 Break_req::Break_req ()
 {
-  penalty_i_ = 0;
 }
 
-Mark_req::Mark_req (String s)
-{
-  str_ = s;
-}
 
-void
-Mark_req::do_print () const
-{
-  DOUT << str_;
-}
-void
-Key_change_req::transpose (Musical_pitch p)
+bool
+Mark_req::do_equal_b (Request const * r) const
 {
-  key_.transpose (p);
+  Mark_req const * other = dynamic_cast<Mark_req const*> (r);
+  return other && scm_equal_p (other->get_mus_property ("mark-label"),
+                              get_mus_property ("mark-label")) == SCM_BOOL_T;
 }
-
-
-