release: 0.0.76

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 5f9723a0a57f01ec08345819e98f2098684029e6..396870dd36a8effed905a614fa9ad7be9b150cfa 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -15,6 +15,7 @@
 
 IMPLEMENT_STATIC_NAME(Stem_req);
 IMPLEMENT_IS_TYPE_B1(Stem_req,Rhythmic_req);
+
 void
 Stem_req::do_print() const
 {
@@ -263,8 +264,8 @@ Script_req::Script_req(Script_req const&s)
 int
 Script_req::compare(Script_req const &d1, Script_req const &d2)
 {
-    return d1.dir_i_ == d2.dir_i_ &&
-       d1.scriptdef_p_->equal_b(*d2.scriptdef_p_);
+    return !(d1.dir_i_ == d2.dir_i_ &&
+       d1.scriptdef_p_->equal_b(*d2.scriptdef_p_));
 }
 
 Script_req::Script_req()
@@ -279,13 +280,17 @@ IMPLEMENT_IS_TYPE_B1(Script_req,Request);
 void
 Script_req::do_print() const
 {
+#ifndef NPRINT
     mtor << " dir " << dir_i_ ;
     scriptdef_p_->print();
+#endif
 }
 
 void
 Musical_script_req::do_print() const
-{}
+{
+    Script_req::do_print();
+}
 
 IMPLEMENT_STATIC_NAME(Musical_script_req);
 IMPLEMENT_IS_TYPE_B2(Musical_script_req,Musical_req, Script_req);
@@ -358,24 +363,13 @@ Request::voice_l()
 }
 /* *************** */
 
-IMPLEMENT_STATIC_NAME(Subtle_req);
-IMPLEMENT_IS_TYPE_B1(Subtle_req,Musical_req);
-
-void
-Subtle_req::do_print() const
-{
-#ifndef NPRINT
-       mtor << " subtime " <<  subtime_;
-#endif
-}
-
 IMPLEMENT_STATIC_NAME(Dynamic_req);
 IMPLEMENT_IS_TYPE_B1(Dynamic_req,Musical_req);
 
 void
 Dynamic_req::do_print() const
 {
-    Subtle_req::do_print();
+    Musical_req::do_print();
 }
 
 IMPLEMENT_STATIC_NAME(Absolute_dynamic_req);
@@ -384,8 +378,10 @@ IMPLEMENT_IS_TYPE_B1(Absolute_dynamic_req,Musical_req);
 void
 Absolute_dynamic_req::do_print() const
 {
+#ifndef NPRINT
     Dynamic_req::do_print();
-    mtor << " loudness " <<loudness_;
+    mtor << " loudness " <<loudness_str(loudness_);
+#endif
 }
 
 String