lilypond-1.3.114

diff --git a/lily/command-request.cc b/lily/command-request.cc
index d292d55027c5242b920d27ed7e0682b4cc067900..f37c73825c450744dc96df79faed03f528d7e94d 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -44,7 +44,7 @@ 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"));
+  return k  && scm_equal_p (get_mus_property ("pitch-alist"), k->get_mus_property ("pitch-alist")) == SCM_BOOL_T;
 }
 
 
@@ -95,5 +95,5 @@ 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;
 }

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 75f2bc58928b0d29ffdd48212097ccb36ab4fad6..460ccec319827a46c47331f59ca653c3c52c4f32 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -76,7 +76,7 @@ Multi_measure_rest_engraver::try_music (Music* req_l)
     {
       
       if (scm_equal_p (sp->get_mus_property ("span-type"),
-                      ly_str02scm ("rest")))
+                      ly_str02scm ("rest")) == SCM_BOOL_T)
        {
          if (sp->get_span_dir() == STOP)
            {