release: 1.3.93

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index c5f9de2d56a96eca5c6d2998b9c2f0babee4f334..dccf2e3fd5b82cd97be0fc70c0effd0cc7f5efca 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"
@@ -11,26 +11,12 @@
 #include "debug.hh"
 #include "music-list.hh"
 
-void
-Span_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << span_dir_;
-#endif
-}
 
 Tremolo_req::Tremolo_req ()
 {
   type_i_ = 0;
 }
 
-void
-Tremolo_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << "type " << type_i_ << '\n';
-#endif
-}
 
 void
 Melodic_req::transpose (Musical_pitch delta)
@@ -39,7 +25,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 ()));
     }
 }
@@ -59,11 +45,6 @@ Melodic_req::compare (Melodic_req const &m1 , Melodic_req const&m2)
   return Musical_pitch::compare (m1.pitch_, m2.pitch_);
 }
 
-void
-Melodic_req::do_print () const
-{
-  pitch_.print ();
-}
 
 
 
@@ -82,13 +63,6 @@ Rhythmic_req::do_equal_b (Request const* r) const
   return rh && !compare (*this, *rh);
 }
 
-void
-Rhythmic_req::do_print () const
-{
-#ifndef NPRINT
-  DOUT << "duration { " <<duration_.str () << "}";
-#endif
-}
 
 
 Moment
@@ -103,14 +77,6 @@ Rhythmic_req::compress (Moment m)
   duration_.compress (m);
 }
 
-void
-Lyric_req::do_print () const
-{
-#ifndef NPRINT
-  Rhythmic_req::do_print ();
-  DOUT <<  "text = " << text_str_;
-#endif
-}
 
 
 bool
@@ -129,22 +95,6 @@ Note_req::Note_req ()
 
 
 
-void
-Note_req::do_print () const
-{
-#ifndef NPRINT
-  Melodic_req::do_print ();
-  if (cautionary_b_)
-    {
-       DOUT << " force cautionary accidental\n";
-    }
-  else if (forceacc_b_)
-    {
-       DOUT << " force accidental\n";
-    }
-  Rhythmic_req::do_print ();
-#endif
-}
 
 
 bool
@@ -159,25 +109,6 @@ 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_
-       << ", style = " << style_str_;
-}
 
 bool
 Text_script_req::do_equal_b (Request const* r) const
@@ -186,11 +117,6 @@ Text_script_req::do_equal_b (Request const* r) const
   return t && t->text_str_ == text_str_ && t->style_str_ == style_str_;
 }
 
-void
-Articulation_req::do_print () const
-{
-  DOUT << articulation_str_;
-}
 
 bool
 Articulation_req::do_equal_b (Request const* r) const
@@ -203,5 +129,5 @@ Articulation_req::do_equal_b (Request const* r) const
 
 Script_req::Script_req ()
 {
-  dir_ = CENTER;
+  set_direction (CENTER);
 }