release: 1.1.3

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index c12cd16c29ab476e27dd9c02a4c5f93daf8aa701..e02877ad31d183a0d932ba40feeaf3de2eaf147f 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -131,12 +131,7 @@ Rhythmic_req::do_equal_b (Request*r) const
 {
   Rhythmic_req* rh = dynamic_cast <Rhythmic_req *> (r);
 
-  return rh&& !compare (*this, *rh);
-}
-
-
-Rhythmic_req::Rhythmic_req ()
-{
+  return rh && !compare (*this, *rh);
 }
 
 
@@ -185,6 +180,7 @@ Note_req::do_equal_b (Request*r) const
 
 Note_req::Note_req ()
 {
+  cautionary_b_ = false;
   forceacc_b_ = false;
 }
 
@@ -195,7 +191,11 @@ Note_req::do_print () const
 {
 #ifndef NPRINT
   Melodic_req::do_print ();
-  if (forceacc_b_)
+  if (cautionary_b_)
+    {
+       DOUT << " force cautionary accidental\n";
+    }
+  else if (forceacc_b_)
     {
        DOUT << " force accidental\n";
     }
@@ -226,9 +226,6 @@ Multi_measure_rest_req::do_print () const
 
 IMPLEMENT_IS_TYPE_B1 (Beam_req,Span_req);
 
-Beam_req::Beam_req ()
-{
-}
 
 void
 Beam_req::do_print () const
@@ -268,10 +265,10 @@ Plet_req::do_print () const
 
 
 bool
-Span_req:: do_equal_b (Request*r) const
+Span_req::do_equal_b (Request*r) const
 {
   Span_req * s = dynamic_cast <Span_req *> (r);
-  return s&& spantype == s->spantype;
+  return s && spantype == s->spantype;
 }
 
 Span_req::Span_req ()