catch GUILE errors

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

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 0b615681a44bb9ebb011ed158a5f062d2b23bd14..9bcd708a0673b4ee4d3680bb6b4177e2de3ef252 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -3,72 +3,39 @@
 
   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
-Barcheck_req::do_equal_b (Request const *r) const
-{
-  Barcheck_req  const*b = dynamic_cast<Barcheck_req const*> (r);
-  return b;
-}
-
-
 
+#include "musical-request.hh"
 
 Tempo_req::Tempo_req ()
 {
-  set_mus_property ("duration", Duration(2,0).smobbed_copy ());
+  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 (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))
+  for (SCM s = pa; gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM key = gh_caar (s);
-      SCM alter = gh_cdar (s);
+      SCM key = ly_caar (s);
+      SCM alter = ly_cdar (s);
       if (gh_pair_p (key))
        {
-         Pitch orig (gh_scm2int (gh_car (key)),
-                             gh_scm2int (gh_cdr (key)),
+         Pitch orig (gh_scm2int (ly_car (key)),
+                             gh_scm2int (ly_cdr (key)),
                              gh_scm2int (alter));
 
          orig.transpose (p);
 
-         SCM key = gh_cons (gh_int2scm (orig.octave_i () ),
-                            gh_int2scm (orig.notename_i_));
+         SCM key = gh_cons (gh_int2scm (orig.get_octave ()),
+                            gh_int2scm (orig.notename_));
 
-         newlist = gh_cons (gh_cons (key, gh_int2scm (orig.alteration_i_)),
+         newlist = gh_cons (gh_cons (key, gh_int2scm (orig.alteration_)),
                             newlist);
        }
       else if (gh_number_p (key))
@@ -76,24 +43,77 @@ Key_change_req::transpose (Pitch p)
          Pitch orig (0, gh_scm2int (key), gh_scm2int (alter));
          orig.transpose (p);
 
-         key =gh_int2scm (orig.notename_i_);
-         alter = gh_int2scm (orig.alteration_i_);
+         key =gh_int2scm (orig.notename_);
+         alter = gh_int2scm (orig.alteration_);
          newlist = gh_cons (gh_cons (key, alter), newlist);
        }
     }
 
-  set_mus_property ("pitch-alist", newlist);
+  set_mus_property ("pitch-alist", gh_reverse (newlist));
+}
+
+
+bool
+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);
+
+      if (l == SCM_BOOL_F
+         || !gh_equal_p ( ly_cdr (l), val))
+
+       return false;
+    }
+  return true;
 }
 
-Break_req::Break_req ()
+bool
+Key_change_req::do_equal_b (Request const * m )const
 {
+  Key_change_req const * kc =dynamic_cast<Key_change_req const*> (m);
+
+  if(!kc)
+    return false;
+  return alist_equal_p (get_mus_property ("pitch-alist"),
+                       kc->get_mus_property ("pitch-alist"));
 }
 
 
+
 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->get_mus_property ("mark-label"),
-                              get_mus_property ("mark-label"));
+  return other && scm_equal_p (other->get_mus_property ("label"),
+                              get_mus_property ("label")) == SCM_BOOL_T;
 }
+
+ADD_MUSIC(Bass_figure_req);
+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);