release: 0.0.46.jcn1

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index e90be35ba3ccf2638acd318ad1885796b090686a..1ba4fd7801d1306efb1d05b8969528fa5198b736 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -14,6 +14,7 @@
 #include "voice.hh"
 #include "voice-element.hh"
 
+IMPLEMENT_STATIC_NAME(Stem_req);
 void
 Stem_req::do_print() const
 {
@@ -29,7 +30,12 @@ Stem_req::Stem_req()
 }
 
 /* ************** */
-void Musical_req::do_print()const{}
+IMPLEMENT_STATIC_NAME(Musical_req);
+void
+Musical_req::do_print()const{}
+
+IMPLEMENT_STATIC_NAME(Request);
+
 void Request::do_print() const{}
 
 /* *************** */
@@ -46,6 +52,8 @@ Request::print() const
      
 
 
+IMPLEMENT_STATIC_NAME(Span_req);
+
 void
 Span_req::do_print() const    
 {
@@ -57,12 +65,11 @@ Span_req::do_print() const
 Request::Request()
 {
     elt_l_ = 0;
-    defined_ch_C_ = 0;
 }
 Request::Request(Request const&src)
+    :Input(src)
 {
     elt_l_ = 0;
-    defined_ch_C_ = src.defined_ch_C_;
 }
 /* *************** */
 Spacing_req::Spacing_req()
@@ -71,6 +78,8 @@ Spacing_req::Spacing_req()
     distance = 0;
     strength = 0;
 }
+IMPLEMENT_STATIC_NAME(Spacing_req);
+
 void
 Spacing_req::do_print()const
 {
@@ -79,6 +88,8 @@ Spacing_req::do_print()const
 #endif
 }
 
+IMPLEMENT_STATIC_NAME(Blank_req);
+
 void
 Blank_req::do_print()const
 {
@@ -103,11 +114,12 @@ Melodic_req::transpose(Melodic_req const & delta)
     }
     accidental_i_ += delta.accidental_i_;
     if (abs(accidental_i_) > 2) {
-       warning("transposition makes accidental larger than 2", 
-               delta.defined_ch_C_);
+       delta.warning("transposition makes accidental larger than 2");
     }
 }
 
+IMPLEMENT_STATIC_NAME(Melodic_req);
+
 void
 Melodic_req::do_print() const
 {
@@ -140,6 +152,8 @@ Plet_req::Plet_req()
     type_i_ = 1;
 }
 
+IMPLEMENT_STATIC_NAME(Plet_req);
+
 void
 Plet_req::do_print() const
 {
@@ -165,11 +179,13 @@ Rhythmic_req::Rhythmic_req()
 {
 }
 
+IMPLEMENT_STATIC_NAME(Rhythmic_req);
+
 void
 Rhythmic_req::do_print() const
 {
 #ifndef NPRINT
-    mtor << duration_.str();
+    mtor << "duration { " <<duration_.str() << "}";
 #endif
 }
 
@@ -187,6 +203,8 @@ Lyric_req::Lyric_req(Text_def* def_p)
     dir_i_ = -1;               // lyrics below (invisible) staff
 }
 
+IMPLEMENT_STATIC_NAME(Lyric_req);
+
 void
 Lyric_req::do_print() const
 {    
@@ -199,16 +217,22 @@ Note_req::Note_req()
 {
     forceacc_b_ = false;
 }
+IMPLEMENT_STATIC_NAME(Note_req);
+
 void
 Note_req::do_print() const
 {
 #ifndef NPRINT
     Melodic_req::do_print();
-    mtor << " forceacc_b_ " << forceacc_b_ << '\n';
+    if (forceacc_b_) {
+       mtor << " force accidental\n";
+    }
     Rhythmic_req::do_print();
 #endif
 }
 /* *************** */
+IMPLEMENT_STATIC_NAME(Rest_req);
+
 void
 Rest_req::do_print() const
 {
@@ -220,10 +244,13 @@ Beam_req::Beam_req()
 {
     nplet = 0;
 }
-
-void Beam_req::do_print()const{}
+IMPLEMENT_STATIC_NAME(Beam_req);
+void
+Beam_req::do_print()const{}
 /* *************** */
-void Slur_req::do_print()const{}
+IMPLEMENT_STATIC_NAME(Slur_req);
+void
+Slur_req::do_print()const{}
 /* *************** */
 int
 Span_req:: compare(Span_req const &r1, Span_req const &r2)
@@ -257,6 +284,8 @@ Script_req::Script_req(Script_req const &s)
     scriptdef_p_ = new Script_def(*s.scriptdef_p_);
 }
 
+IMPLEMENT_STATIC_NAME(Script_req);
+
 void
 Script_req::do_print() const
 {
@@ -295,6 +324,8 @@ Text_req::Text_req(int dir_i, Text_def* tdef_p)
     tdef_p_ = tdef_p;
 }
 
+IMPLEMENT_STATIC_NAME(Text_req);
+
 void
 Text_req::do_print() const
 {
@@ -313,6 +344,8 @@ Skip_req::duration() const
     return duration_;
 }
 
+IMPLEMENT_STATIC_NAME(Skip_req);
+
 void
 Skip_req::do_print() const
 {
@@ -328,10 +361,12 @@ Request::voice_l()
     if (!elt_l_)
        return 0;
     else
-       return (Voice*)elt_l_->voice_l_;
+       return (Voice*)elt_l_->voice_C_;
 }
 /* *************** */
 
+IMPLEMENT_STATIC_NAME(Subtle_req);
+
 void
 Subtle_req::do_print() const
 {
@@ -340,17 +375,21 @@ Subtle_req::do_print() const
 #endif
 }
 
+IMPLEMENT_STATIC_NAME(Dynamic_req);
+
 void
 Dynamic_req::do_print() const
 {
     Subtle_req::do_print();
 }
 
+IMPLEMENT_STATIC_NAME(Absolute_dynamic_req);
+
 void
 Absolute_dynamic_req::do_print() const
 {
     Dynamic_req::do_print();
-    mtor << " loudness_" <<loudness_;
+    mtor << " loudness " <<loudness_;
 }
 
 String
@@ -381,6 +420,8 @@ Span_dynamic_req::Span_dynamic_req()
     dynamic_dir_i_  = 0;
 }
 
+IMPLEMENT_STATIC_NAME(Span_dynamic_req);
+
 void
 Span_dynamic_req::do_print()const
 {