release: 1.1.18

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 6c72cb538ada9bff71a691b52f1d3454d72d7105..1e531211ebc0b4b6179bba4d9dfad2ebd32791b5 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -15,7 +15,7 @@
 
 
 
-IMPLEMENT_IS_TYPE_B1 (Musical_req,Request);
+
 void
 Musical_req::do_print () const{}
 void
@@ -23,9 +23,9 @@ Tie_req::do_print () const{}
 
 
 
-IMPLEMENT_IS_TYPE_B1(Span_req,Request);
 
-IMPLEMENT_IS_TYPE_B2(Musical_span_req, Span_req, Musical_span_req);
+
+
 
 void
 Musical_span_req::do_print () const
@@ -38,11 +38,11 @@ void
 Span_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << spantype;
+  DOUT << spantype_;
 #endif
 }
 
-IMPLEMENT_IS_TYPE_B1 (Spacing_req,Request);
+
 
 Spacing_req::Spacing_req ()
 {
@@ -59,7 +59,7 @@ Spacing_req::do_print () const
 #endif
 }
 
-IMPLEMENT_IS_TYPE_B1 (Abbreviation_req, Musical_req);
+
 
 Abbreviation_req::Abbreviation_req ()
 {
@@ -75,7 +75,7 @@ Abbreviation_req::do_print () const
 }
 
 
-IMPLEMENT_IS_TYPE_B2 (Blank_req,Spacing_req,Rhythmic_req);
+
 
 void
 Blank_req::do_print () const
@@ -99,13 +99,13 @@ Melodic_req::transpose (Musical_pitch delta)
     }
 }
 
-IMPLEMENT_IS_TYPE_B1 (Melodic_req,Musical_req);
+
 
 bool
 Melodic_req::do_equal_b (Request*r) const
 {
   Melodic_req* m= dynamic_cast <Melodic_req *> (r);
-  return !compare (*m, *this);
+  return m&& !compare (*m, *this);
 }
 
 int
@@ -131,17 +131,12 @@ Rhythmic_req::do_equal_b (Request*r) const
 {
   Rhythmic_req* rh = dynamic_cast <Rhythmic_req *> (r);
 
-  return !compare (*this, *rh);
+  return rh && !compare (*this, *rh);
 }
 
 
-Rhythmic_req::Rhythmic_req ()
-{
-}
 
 
-IMPLEMENT_IS_TYPE_B1 (Rhythmic_req,Musical_req);
-
 void
 Rhythmic_req::do_print () const
 {
@@ -162,11 +157,6 @@ Rhythmic_req::compress (Moment m)
 {
   duration_.compress (m);
 }
-  
-
-
-
-IMPLEMENT_IS_TYPE_B1 (Lyric_req,Rhythmic_req);
 
 void
 Lyric_req::do_print () const
@@ -178,23 +168,29 @@ Lyric_req::do_print () const
 bool
 Note_req::do_equal_b (Request*r) const
 {
-  return Rhythmic_req::do_equal_b (r) && Melodic_req::do_equal_b (r);
+  Note_req *n = dynamic_cast<Note_req*> (r);
+  return n&& Rhythmic_req::do_equal_b (n) && Melodic_req::do_equal_b (n);
 }
 
 
 Note_req::Note_req ()
 {
+  cautionary_b_ = false;
   forceacc_b_ = false;
 }
 
-IMPLEMENT_IS_TYPE_B2 (Note_req,Melodic_req,Rhythmic_req);
+
 
 void
 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";
     }
@@ -202,19 +198,12 @@ Note_req::do_print () const
 #endif
 }
 
-IMPLEMENT_IS_TYPE_B1 (Rest_req, Rhythmic_req);
-
 void
 Rest_req::do_print () const
 {
       Rhythmic_req::do_print ();
 }
 
-
-
-
-IMPLEMENT_IS_TYPE_B1 (Multi_measure_rest_req, Rhythmic_req);
-
 void
 Multi_measure_rest_req::do_print () const
 {
@@ -222,21 +211,11 @@ 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
 {
 }
 
-
-IMPLEMENT_IS_TYPE_B1 (Abbreviation_beam_req, Span_req);
-
 Abbreviation_beam_req::Abbreviation_beam_req ()
 {
   type_i_ = 0;
@@ -247,35 +226,36 @@ Abbreviation_beam_req::do_print () const
 {
 }
 
-IMPLEMENT_IS_TYPE_B1 (Slur_req,Span_req);
+
 void
 Slur_req::do_print () const
 {
 }
 
-IMPLEMENT_IS_TYPE_B1 (Plet_req,Span_req);
 
-Plet_req::Plet_req ()
+
+
+
+Extender_req::Extender_req ()
 {
-  plet_i_ = 0;
 }
 
 void
-Plet_req::do_print () const
+Extender_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 spantype == s->spantype;
+  return s && spantype_ == s->spantype_;
 }
 
 Span_req::Span_req ()
 {
-  spantype = NOSPAN;
+  spantype_ = CENTER;
 }
 
 Script_req::Script_req (Script_req const&s)
@@ -293,8 +273,7 @@ bool
 Script_req::do_equal_b (Request*r) const
 {
   Script_req * s = dynamic_cast <Script_req *> (r);
-
-  return  scriptdef_p_->equal_b (*s->scriptdef_p_);
+  return s &&  scriptdef_p_->equal_b (*s->scriptdef_p_);
 }
 
 Script_req::Script_req ()
@@ -304,7 +283,7 @@ Script_req::Script_req ()
 }
 
 
-IMPLEMENT_IS_TYPE_B1 (Script_req,Request);
+
 
 void
 Script_req::do_print () const
@@ -321,10 +300,6 @@ Musical_script_req::do_print () const
   Script_req::do_print ();
 }
 
-
-IMPLEMENT_IS_TYPE_B2 (Musical_script_req,Musical_req, Script_req);
-
-
 Script_req::~Script_req ()
 {
   delete scriptdef_p_;
@@ -349,9 +324,6 @@ Text_req::Text_req (int dir_i, Text_def* tdef_p)
   tdef_p_ = tdef_p;
 }
 
-
-IMPLEMENT_IS_TYPE_B1 (Text_req,Musical_req);
-
 void
 Text_req::do_print () const
 {
@@ -361,32 +333,20 @@ Text_req::do_print () const
 #endif
 }
 
-
-
-IMPLEMENT_IS_TYPE_B1 (Skip_req,Musical_req);
-
 void
 Skip_req::do_print () const
 {
 #ifndef NPRINT
-
   DOUT << "duration: " << duration ();
 #endif
 }
 
-
-
-IMPLEMENT_IS_TYPE_B1 (Dynamic_req,Musical_req);
-
 void
 Dynamic_req::do_print () const
 {
   Musical_req::do_print ();
 }
 
-
-IMPLEMENT_IS_TYPE_B1 (Absolute_dynamic_req,Musical_req);
-
 void
 Absolute_dynamic_req::do_print () const
 {
@@ -396,12 +356,11 @@ Absolute_dynamic_req::do_print () const
 #endif
 }
 
-
 bool
 Absolute_dynamic_req::do_equal_b (Request *r) const
 {
   Absolute_dynamic_req *a = dynamic_cast <Absolute_dynamic_req *> (r);
-  return loudness_ == a->loudness_;
+  return a&& loudness_ == a->loudness_;
 }
 
 String
@@ -451,7 +410,7 @@ Span_dynamic_req::do_equal_b (Request *req) const
 {
   Span_dynamic_req * s = dynamic_cast <Span_dynamic_req *> (req);
 
-  return Span_req::do_equal_b (req) && s->dynamic_dir_ == dynamic_dir_;
+  return s&& Span_req::do_equal_b (req) && s->dynamic_dir_ == dynamic_dir_;
 }
 
 Span_dynamic_req::Span_dynamic_req ()
@@ -459,9 +418,6 @@ Span_dynamic_req::Span_dynamic_req ()
   dynamic_dir_  = CENTER;
 }
 
-
-IMPLEMENT_IS_TYPE_B1 (Span_dynamic_req,Musical_req);
-
 void
 Span_dynamic_req::do_print () const
 {
@@ -472,4 +428,4 @@ Span_dynamic_req::do_print () const
 }
 
 
-IMPLEMENT_IS_TYPE_B1 (Tie_req,Musical_req);
+