release: 1.5.29

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

diff --git a/lily/command-request.cc b/lily/command-request.cc
index fea2de22a4a8bdd6e6af1c873290b3d19e22fce1..62cbac4fa305b0b00f42e15b449e6b017b230677 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -3,124 +3,83 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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"
 
-
-bool
-Bar_req::do_equal_b (Request const *r) const
-{
-  Bar_req  const* b = dynamic_cast <Bar_req const *> (r);
-  return b && type_str_ == b->type_str_;
-}
-
-void
-Bar_req::do_print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << type_str_;
-#endif
-}
-
-Bar_req::Bar_req (String s)
-{
-  type_str_ = s;
-}
-
-bool
-Barcheck_req::do_equal_b (Request const *r) const
-{
-  Barcheck_req  const*b = dynamic_cast<Barcheck_req const*> (r);
-  return b;
-}
-
-void
-Clef_change_req::do_print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << 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
-Time_signature_change_req::do_print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << beats_i_ << "/" << one_beat_i_;
-#endif
-}
-
-bool
-Time_signature_change_req::do_equal_b (Request const *r) const
+Key_change_req::transpose (Pitch p)
 {
-  Time_signature_change_req  const* m
-    = dynamic_cast <Time_signature_change_req  const*> (r);
+  SCM newlist = SCM_EOL;
+  SCM pa = get_mus_property ("pitch-alist");
+  for (SCM s = pa; gh_pair_p (s); s = ly_cdr (s))
+    {
+      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));
 
-  return m && m->beats_i_ == beats_i_
-    && one_beat_i_ == m->one_beat_i_;
-}
+         orig.transpose (p);
 
-Time_signature_change_req::Time_signature_change_req ()
-{
-  beats_i_ = 0;
-  one_beat_i_ =0;
-}
+         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);
 
-Tempo_req::Tempo_req ()
-{
-  metronome_i_ = 60;
-  dur_. durlog_i_ = 2;
-}
+         key =gh_int2scm (orig.notename_i_);
+         alter = gh_int2scm (orig.alteration_i_);
+         newlist = gh_cons (gh_cons (key, alter), newlist);
+       }
+    }
 
-void
-Tempo_req::do_print () const
-{
-  DEBUG_OUT << dur_.str () << " = " << metronome_i_;
+  set_mus_property ("pitch-alist", gh_reverse (newlist));
 }
 
 
 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_;
-}
-
-void
-Key_change_req::do_print () const
+alist_equal_p (SCM a, SCM b)
 {
-}
+  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);
 
-Key_change_req::Key_change_req ()
-{
-  key_ = 0;
-}
+      if (l == SCM_BOOL_F
+         || !gh_equal_p ( ly_cdr (l), val))
 
-Key_change_req::Key_change_req (Key_change_req const&s)
-  : Request (s)
-{
-  key_ = s.key_ ?  new Newkey_def (*s.key_) : 0;
+       return false;
+    }
+  return true;
 }
 
-Key_change_req::~Key_change_req ()
+bool
+Key_change_req::do_equal_b (Request const * m )const
 {
-  delete key_;
-}
+  Key_change_req const * kc =dynamic_cast<Key_change_req const*> (m);
 
-Break_req::Break_req ()
-{
+  if(!kc)
+    return false;
+  return alist_equal_p (get_mus_property ("pitch-alist"),
+                       kc->get_mus_property ("pitch-alist"));
 }
 
 
@@ -129,12 +88,32 @@ bool
 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->mark_label_,  mark_label_);
-}
-
-void
-Key_change_req::transpose (Musical_pitch p)
-{
-  key_->transpose (p);
-}
-
+  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);