patch::: 1.3.141.jcn3

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

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 8ea0ef54dd175a2b63e1f3f7e40702d9137d5f14..ea7e0a4a20cdad1578ae20cf289c636707285ec8 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -3,19 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "command-request.hh"
 #include "debug.hh"
 #include "musical-request.hh"
 
-
-Bar_req::Bar_req (String s)
-{
-  set_mus_property ("type", ly_str02scm (s.ch_C()));
-}
-
 bool
 Barcheck_req::do_equal_b (Request const *r) const
 {
@@ -23,86 +17,42 @@ Barcheck_req::do_equal_b (Request const *r) const
   return b;
 }
 
-
-Clef_change_req::Clef_change_req (String s)
-{
-  clef_str_ = s;
-}
-
-
-bool
-Time_signature_change_req::do_equal_b (Request const *r) const
-{
-  Time_signature_change_req  const* m
-    = dynamic_cast <Time_signature_change_req  const*> (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;
+  set_mus_property ("duration", Duration (2,0).smobbed_copy ());
 }
 
-
-
-bool
-Tempo_req::do_equal_b (Request const *r) const
-{
-  Tempo_req const *t = dynamic_cast <Tempo_req const*> (r);
-
-  return t&& t->dur_.length_mom ()== dur_.length_mom () && metronome_i_ == t->metronome_i_;
-}
-
-
-
-
-bool
-Key_change_req::do_equal_b (Request const * req) const
-{
-  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"));
-}
-
-
 void
-Key_change_req::transpose (Musical_pitch p)
+Key_change_req::transpose (Pitch p)
 {
   SCM newlist = SCM_EOL;
   SCM pa = get_mus_property ("pitch-alist");
   for (SCM s = pa; gh_pair_p (s); s = gh_cdr (s))
     {
-      SCM k = gh_caar (s);
-
-      if (gh_pair_p (k))
+      SCM key = gh_caar (s);
+      SCM alter = gh_cdar (s);
+      if (gh_pair_p (key))
        {
-         Musical_pitch orig (gh_list (gh_car (k), gh_cdr (k), gh_cdr (s), SCM_UNDEFINED));
+         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_),
+         SCM key = gh_cons (gh_int2scm (orig.octave_i ()),
                             gh_int2scm (orig.notename_i_));
 
-         newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)),
+         newlist = gh_cons (gh_cons (key, gh_int2scm (orig.alteration_i_)),
                             newlist);
        }
-      else if (gh_number_p (k))
+      else if (gh_number_p (key))
        {
-         Musical_pitch orig (gh_list (gh_int2scm (0), k, gh_cdar (s), SCM_UNDEFINED));
+         Pitch orig (0, gh_scm2int (key), gh_scm2int (alter));
          orig.transpose (p);
 
-         SCM key =gh_int2scm (orig.notename_i_);
-         newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)),
-                            newlist);
+         key =gh_int2scm (orig.notename_i_);
+         alter = gh_int2scm (orig.alteration_i_);
+         newlist = gh_cons (gh_cons (key, alter), newlist);
        }
     }
 
@@ -119,5 +69,31 @@ 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 ("mark-label"),
-                              get_mus_property ("mark-label"));
+                              get_mus_property ("mark-label")) == SCM_BOOL_T;
 }
+
+
+ADD_MUSIC (Articulation_req);
+ADD_MUSIC (Barcheck_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 (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);