patch::: 1.3.58.jcn2

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 509e2780a9f2dbcfb65967ff32825274434d0fb5..cdcda7ac0160ae4c634aa92163c461e23d9a774b 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -15,7 +15,7 @@ void
 Span_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << span_dir_;
+  DEBUG_OUT << span_dir_;
 #endif
 }
 
@@ -28,7 +28,7 @@ void
 Tremolo_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "type " << type_i_ << '\n';
+  DEBUG_OUT << "type " << type_i_ << '\n';
 #endif
 }
 
@@ -86,7 +86,7 @@ void
 Rhythmic_req::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "duration { " <<duration_.str () << "}";
+  DEBUG_OUT << "duration { " <<duration_.str () << "}";
 #endif
 }
 
@@ -108,7 +108,7 @@ Lyric_req::do_print () const
 {
 #ifndef NPRINT
   Rhythmic_req::do_print ();
-  DOUT <<  "text = " << text_str_;
+  DEBUG_OUT <<  "text = " << text_str_;
 #endif
 }
 
@@ -136,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
@@ -159,23 +159,10 @@ Span_req::Span_req ()
   span_dir_ = CENTER;
 }
 
-Chord_tremolo_req::Chord_tremolo_req ()
-{
-  type_i_ = 0;
-}
-
-void
-Chord_tremolo_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << type_i_;
-#endif
-}
-
 void
 Text_script_req::do_print () const
 {
-  DOUT << "text" << text_str_
+  DEBUG_OUT << "text" << text_str_
        << ", style = " << style_str_;
 }
 
@@ -189,7 +176,7 @@ Text_script_req::do_equal_b (Request const* r) const
 void
 Articulation_req::do_print () const
 {
-  DOUT << articulation_str_;
+  DEBUG_OUT << articulation_str_;
 }
 
 bool
@@ -203,5 +190,5 @@ Articulation_req::do_equal_b (Request const* r) const
 
 Script_req::Script_req ()
 {
-  dir_ = CENTER;
+  set_direction (CENTER);
 }