release: 0.0.46.jcn1

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index be9667c1a0e893cebe9d1b5d26e8ed15b9f2ab76..1ba4fd7801d1306efb1d05b8969528fa5198b736 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -14,21 +14,28 @@
 #include "voice.hh"
 #include "voice-element.hh"
 
+IMPLEMENT_STATIC_NAME(Stem_req);
 void
 Stem_req::do_print() const
 {
+#ifndef NPRINT
     Rhythmic_req::do_print();
     mtor << "dir : " << dir_i_;
+#endif
 }
 
-Stem_req::Stem_req(int s, int d)
-    : Rhythmic_req(s,d)
+Stem_req::Stem_req()
 {
     dir_i_ = 0;
 }
 
 /* ************** */
-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{}
 
 /* *************** */
@@ -36,13 +43,17 @@ void Request::do_print() const{}
 void
 Request::print() const
 {
+#ifndef NPRINT
     mtor << name() << " {";
     do_print();
     mtor << "}\n";
+#endif
 }
      
 
 
+IMPLEMENT_STATIC_NAME(Span_req);
+
 void
 Span_req::do_print() const    
 {
@@ -54,12 +65,11 @@ Span_req::do_print() const
 Request::Request()
 {
     elt_l_ = 0;
-    defined_ch_c_l_ = 0;
 }
 Request::Request(Request const&src)
+    :Input(src)
 {
     elt_l_ = 0;
-    defined_ch_c_l_ = src.defined_ch_c_l_;
 }
 /* *************** */
 Spacing_req::Spacing_req()
@@ -68,6 +78,8 @@ Spacing_req::Spacing_req()
     distance = 0;
     strength = 0;
 }
+IMPLEMENT_STATIC_NAME(Spacing_req);
+
 void
 Spacing_req::do_print()const
 {
@@ -76,6 +88,8 @@ Spacing_req::do_print()const
 #endif
 }
 
+IMPLEMENT_STATIC_NAME(Blank_req);
+
 void
 Blank_req::do_print()const
 {
@@ -87,13 +101,31 @@ Melodic_req::Melodic_req()
     notename_i_ = 0;
     octave_i_ = 0;
     accidental_i_ = 0;
-    forceacc_b_ = false;
 }
 
+void
+Melodic_req::transpose(Melodic_req const & delta)
+{
+    octave_i_ += delta.octave_i_;
+    notename_i_ += delta.notename_i_;
+    while  (notename_i_ >= 7 ) {
+       notename_i_ -= 7;
+       octave_i_ ++;
+    }
+    accidental_i_ += delta.accidental_i_;
+    if (abs(accidental_i_) > 2) {
+       delta.warning("transposition makes accidental larger than 2");
+    }
+}
+
+IMPLEMENT_STATIC_NAME(Melodic_req);
+
 void
 Melodic_req::do_print() const
 {
-    mtor << "notename: " << notename_i_ << " acc: " <<accidental_i_<<" oct: "<< octave_i_;
+#ifndef NPRINT
+       mtor << "notename: " << notename_i_ << " acc: " <<accidental_i_<<" oct: "<< octave_i_;
+#endif
 }
 
 int
@@ -120,47 +152,47 @@ Plet_req::Plet_req()
     type_i_ = 1;
 }
 
+IMPLEMENT_STATIC_NAME(Plet_req);
+
 void
 Plet_req::do_print() const
 {
+#ifndef NPRINT
     mtor << "plet: " << type_c_ << ": " << dur_i_ << "/" << type_i_;
+#endif
 }
 
 /* *************** */
 int
-Rhythmic_req::compare(const Rhythmic_req &r1, const Rhythmic_req &r2)
+Rhythmic_req::compare(Rhythmic_req const &r1, Rhythmic_req const &r2)
 {
     return sign(r1.duration() - r2.duration());
 }
-Rhythmic_req::Rhythmic_req(int b, int d)
+
+void
+Rhythmic_req::set_duration(Duration d)
 {
-    plet_factor = 1;
-    balltype = b;
-    dots = d;
+    duration_ = d;
 }
 
 Rhythmic_req::Rhythmic_req()
 {
-    plet_factor = 1;
-    balltype = 1;
-    dots = 0;
 }
 
+IMPLEMENT_STATIC_NAME(Rhythmic_req);
+
 void
 Rhythmic_req::do_print() const
 {
-    mtor << "ball: " << balltype ;
-    int d =dots;
-    while (d--)
-       mtor << '.';
-    
-    mtor<<", plet factor"<<plet_factor<<"\n";
+#ifndef NPRINT
+    mtor << "duration { " <<duration_.str() << "}";
+#endif
 }
 
 
 Moment
 Rhythmic_req::duration() const {    
-    return wholes(balltype,dots)*plet_factor;
+    return duration_.length();
 }
 /* *************** */
 
@@ -171,20 +203,36 @@ 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
 {    
     Rhythmic_req::do_print();
     Text_req::do_print();
 }
+
 /* *************** */
+Note_req::Note_req()
+{
+    forceacc_b_ = false;
+}
+IMPLEMENT_STATIC_NAME(Note_req);
+
 void
 Note_req::do_print() const
 {
+#ifndef NPRINT
     Melodic_req::do_print();
+    if (forceacc_b_) {
+       mtor << " force accidental\n";
+    }
     Rhythmic_req::do_print();
+#endif
 }
 /* *************** */
+IMPLEMENT_STATIC_NAME(Rest_req);
+
 void
 Rest_req::do_print() const
 {
@@ -196,13 +244,16 @@ 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(const Span_req &r1, const Span_req &r2)
+Span_req:: compare(Span_req const &r1, Span_req const &r2)
 {
      return r1.spantype - r2.spantype;
 }
@@ -220,7 +271,7 @@ Script_req::Script_req(int d , Script_def*def)
 }
 
 int
-Script_req::compare(const Script_req &d1, const Script_req &d2)
+Script_req::compare(Script_req const &d1, Script_req const &d2)
 {
     return d1.dir_i_ == d2.dir_i_ &&
        d1.scriptdef_p_->compare(*d2.scriptdef_p_);
@@ -233,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
 {
@@ -247,7 +300,7 @@ Script_req::~Script_req()
 }
 /* *************** */
 int
-Text_req:: compare(const Text_req &r1, const Text_req &r2)
+Text_req:: compare(Text_req const &r1, Text_req const &r2)
 {
     bool b1 = (r1.dir_i_ == r2.dir_i_);
     bool b2 = (r1.tdef_p_ ->compare(*r2.tdef_p_));
@@ -271,11 +324,16 @@ 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
 {
+#ifndef NPRINT
+
     mtor << " dir " << dir_i_ ;
     tdef_p_->print();
+#endif
 }
 
 /* *************** */
@@ -286,10 +344,15 @@ Skip_req::duration() const
     return duration_;
 }
 
+IMPLEMENT_STATIC_NAME(Skip_req);
+
 void
 Skip_req::do_print() const
 {
+#ifndef NPRINT
+
     mtor << "duration: " << duration();
+#endif
 }
 
 Voice *
@@ -298,27 +361,35 @@ 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
 {
-    mtor << " subtime " <<  subtime_;
+#ifndef NPRINT
+       mtor << " subtime " <<  subtime_;
+#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
@@ -349,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
 {