release: 1.5.29

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

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 93e191401083f9bf3d71d3d19dda00e7ed22c6ca..62cbac4fa305b0b00f42e15b449e6b017b230677 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -3,20 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 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;
-}
-
 Tempo_req::Tempo_req ()
 {
   set_mus_property ("duration", Duration (2,0).smobbed_copy ());
@@ -29,8 +22,8 @@ Key_change_req::transpose (Pitch p)
   SCM pa = get_mus_property ("pitch-alist");
   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 (ly_car (key)),
@@ -56,7 +49,7 @@ Key_change_req::transpose (Pitch p)
        }
     }
 
-  set_mus_property ("pitch-alist", newlist);
+  set_mus_property ("pitch-alist", gh_reverse (newlist));
 }
 
 
@@ -66,8 +59,8 @@ alist_equal_p (SCM a, SCM b)
   for (SCM s = a;
        gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM key = gh_caar (s);
-      SCM val = gh_cdar (s);
+      SCM key = ly_caar (s);
+      SCM val = ly_cdar (s);
       SCM l = scm_assoc (key, b);
 
       if (l == SCM_BOOL_F
@@ -101,7 +94,6 @@ Mark_req::do_equal_b (Request const * r) const
 
 
 ADD_MUSIC (Articulation_req);
-ADD_MUSIC (Barcheck_req);
 ADD_MUSIC (Break_req);
 ADD_MUSIC (Breathing_sign_req);
 ADD_MUSIC (Busy_playing_req);