patch::: 1.3.78.jcn1

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 59512ca5e17e6fe6766b741d06f772a17dc922cd..cdcda7ac0160ae4c634aa92163c461e23d9a774b 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -3,39 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "musical-request.hh"
 #include "misc.hh"
 #include "debug.hh"
-
 #include "music-list.hh"
 
 void
 Span_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << span_dir_;
+  DEBUG_OUT << span_dir_;
 #endif
 }
 
-Abbreviation_req::Abbreviation_req ()
+Tremolo_req::Tremolo_req ()
 {
   type_i_ = 0;
 }
 
 void
-Abbreviation_req::do_print () const
+Tremolo_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "type " << type_i_ << '\n';
+  DEBUG_OUT << "type " << type_i_ << '\n';
 #endif
 }
 
-
-
-
 void
 Melodic_req::transpose (Musical_pitch delta)
 {
@@ -43,7 +39,7 @@ Melodic_req::transpose (Musical_pitch delta)
   
   if (abs (pitch_.accidental_i_) > 2)
     {
-       warning (_f ("transposition by %s makes accidental larger than two",
+       warning (_f ("Transposition by %s makes accidental larger than two",
          delta.str ()));
     }
 }
@@ -51,9 +47,9 @@ Melodic_req::transpose (Musical_pitch delta)
 
 
 bool
-Melodic_req::do_equal_b (Request*r) const
+Melodic_req::do_equal_b (Request const* r) const
 {
-  Melodic_req* m= dynamic_cast <Melodic_req *> (r);
+  Melodic_req const* m= dynamic_cast <Melodic_req const*> (r);
   return m&& !compare (*m, *this);
 }
 
@@ -79,9 +75,9 @@ Rhythmic_req::compare (Rhythmic_req const &r1, Rhythmic_req const &r2)
 }
 
 bool
-Rhythmic_req::do_equal_b (Request*r) const
+Rhythmic_req::do_equal_b (Request const* r) const
 {
-  Rhythmic_req* rh = dynamic_cast <Rhythmic_req *> (r);
+  Rhythmic_req const* rh = dynamic_cast <Rhythmic_req const*> (r);
 
   return rh && !compare (*this, *rh);
 }
@@ -90,7 +86,7 @@ void
 Rhythmic_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "duration { " <<duration_.str () << "}";
+  DEBUG_OUT << "duration { " <<duration_.str () << "}";
 #endif
 }
 
@@ -112,15 +108,15 @@ Lyric_req::do_print () const
 {
 #ifndef NPRINT
   Rhythmic_req::do_print ();
-  DOUT <<  "text = " << text_str_;
+  DEBUG_OUT <<  "text = " << text_str_;
 #endif
 }
 
 
 bool
-Note_req::do_equal_b (Request*r) const
+Note_req::do_equal_b (Request const* r) const
 {
-  Note_req *n = dynamic_cast<Note_req*> (r);
+  Note_req const* n = dynamic_cast<Note_req const*> (r);
   return n&& Rhythmic_req::do_equal_b (n) && Melodic_req::do_equal_b (n);
 }
 
@@ -140,11 +136,11 @@ Note_req::do_print () const
   Melodic_req::do_print ();
   if (cautionary_b_)
     {
-       DOUT << " force cautionary accidental\n";
+       DEBUG_OUT << " force cautionary accidental\n";
     }
   else if (forceacc_b_)
     {
-       DOUT << " force accidental\n";
+       DEBUG_OUT << " force accidental\n";
     }
   Rhythmic_req::do_print ();
 #endif
@@ -152,9 +148,9 @@ Note_req::do_print () const
 
 
 bool
-Span_req::do_equal_b (Request*r) const
+Span_req::do_equal_b (Request const*r) const
 {
-  Span_req * s = dynamic_cast <Span_req *> (r);
+  Span_req const* s = dynamic_cast <Span_req const*> (r);
   return s && span_dir_ == s->span_dir_;
 }
 
@@ -163,24 +159,36 @@ Span_req::Span_req ()
   span_dir_ = CENTER;
 }
 
-
 void
 Text_script_req::do_print () const
 {
-  DOUT << "text" << text_str_
+  DEBUG_OUT << "text" << text_str_
        << ", style = " << style_str_;
 }
 
+bool
+Text_script_req::do_equal_b (Request const* r) const
+{
+  Text_script_req const* t  = dynamic_cast<Text_script_req const*> (r);
+  return t && t->text_str_ == text_str_ && t->style_str_ == style_str_;
+}
+
 void
 Articulation_req::do_print () const
 {
-  DOUT << articulation_str_;
+  DEBUG_OUT << articulation_str_;
 }
 
 bool
-Articulation_req::do_equal_b (Request*r) const
+Articulation_req::do_equal_b (Request const* r) const
 {
-  Articulation_req * a = dynamic_cast<Articulation_req*>(r);
+  Articulation_req const* a = dynamic_cast<Articulation_req const*> (r);
   
   return a &&  articulation_str_ == a->articulation_str_;
 }
+
+
+Script_req::Script_req ()
+{
+  set_direction (CENTER);
+}