release: 0.0.76

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

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index e9793572e7c5fa85a912c60638f730c14730f127..396870dd36a8effed905a614fa9ad7be9b150cfa 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -1,7 +1,7 @@
 /*
   request.cc -- implement all musical requests.
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -11,10 +11,11 @@
 #include "debug.hh"
 #include "script-def.hh"
 #include "text-def.hh"
-#include "voice.hh"
-#include "voice-element.hh"
+#include "music-list.hh"
 
 IMPLEMENT_STATIC_NAME(Stem_req);
+IMPLEMENT_IS_TYPE_B1(Stem_req,Rhythmic_req);
+
 void
 Stem_req::do_print() const
 {
@@ -31,28 +32,19 @@ Stem_req::Stem_req()
 
 /* ************** */
 IMPLEMENT_STATIC_NAME(Musical_req);
+IMPLEMENT_IS_TYPE_B1(Musical_req,Request);
 void
 Musical_req::do_print()const{}
+void
+Tie_req::do_print()const{}
 
-IMPLEMENT_STATIC_NAME(Request);
-
-void Request::do_print() const{}
 
 /* *************** */
-
-void
-Request::print() const
-{
-#ifndef NPRINT
-    mtor << name() << " {";
-    do_print();
-    mtor << "}\n";
-#endif
-}
-     
+   
 
 
 IMPLEMENT_STATIC_NAME(Span_req);
+IMPLEMENT_IS_TYPE_B1(Span_req,Musical_req);
 
 void
 Span_req::do_print() const    
@@ -62,16 +54,6 @@ Span_req::do_print() const
 #endif
 }
 
-Request::Request()
-{
-    elt_l_ = 0;
-}
-Request::Request(Request const&src)
-    :Input(src)
-{
-    elt_l_ = 0;
-}
-/* *************** */
 Spacing_req::Spacing_req()
 {
     next = 0;
@@ -79,6 +61,7 @@ Spacing_req::Spacing_req()
     strength = 0;
 }
 IMPLEMENT_STATIC_NAME(Spacing_req);
+IMPLEMENT_IS_TYPE_B1(Spacing_req,Request);
 
 void
 Spacing_req::do_print()const
@@ -89,6 +72,7 @@ Spacing_req::do_print()const
 }
 
 IMPLEMENT_STATIC_NAME(Blank_req);
+IMPLEMENT_IS_TYPE_B2(Blank_req,Spacing_req,Rhythmic_req);
 
 void
 Blank_req::do_print()const
@@ -124,12 +108,25 @@ Melodic_req::transpose(Melodic_req const & delta)
 }
 
 IMPLEMENT_STATIC_NAME(Melodic_req);
+IMPLEMENT_IS_TYPE_B1(Melodic_req,Musical_req);
+
+int
+Melodic_req::compare(Melodic_req const&m1, Melodic_req const&m2)
+{
+    if (m1.octave_i_ != m2.octave_i_)
+       return m1.octave_i_ -m2.octave_i_;
+    else if (m1.notename_i_ != m2.notename_i_)
+       return m1.notename_i_ - m2.notename_i_;
+    else  if (m1.accidental_i_ != m2.accidental_i_)
+       return m1.accidental_i_ - m2.accidental_i_;
+    return 0;
+}
 
 void
 Melodic_req::do_print() const
 {
 #ifndef NPRINT
-       mtor << "notename: " << notename_i_ << " acc: " <<accidental_i_<<" oct: "<< octave_i_;
+    mtor << "notename: " << notename_i_ << " acc: " <<accidental_i_<<" oct: "<< octave_i_;
 #endif
 }
 
@@ -150,23 +147,6 @@ Melodic_req::pitch() const
     return  pitch_byte_a[ notename_i_ % 7 ] + accidental_i_ + octave_i_ * 12;
 }
 
-Plet_req::Plet_req()
-{
-    type_c_ = ']';
-    dur_i_ = 1;
-    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(Rhythmic_req const &r1, Rhythmic_req const &r2)
@@ -185,6 +165,7 @@ Rhythmic_req::Rhythmic_req()
 }
 
 IMPLEMENT_STATIC_NAME(Rhythmic_req);
+IMPLEMENT_IS_TYPE_B1(Rhythmic_req,Musical_req);
 
 void
 Rhythmic_req::do_print() const
@@ -209,6 +190,7 @@ Lyric_req::Lyric_req(Text_def* def_p)
 }
 
 IMPLEMENT_STATIC_NAME(Lyric_req);
+IMPLEMENT_IS_TYPE_B2(Lyric_req,Musical_req,Rhythmic_req);
 
 void
 Lyric_req::do_print() const
@@ -223,6 +205,7 @@ Note_req::Note_req()
     forceacc_b_ = false;
 }
 IMPLEMENT_STATIC_NAME(Note_req);
+IMPLEMENT_IS_TYPE_B2(Note_req,Melodic_req,Rhythmic_req);
 
 void
 Note_req::do_print() const
@@ -237,6 +220,7 @@ Note_req::do_print() const
 }
 /* *************** */
 IMPLEMENT_STATIC_NAME(Rest_req);
+IMPLEMENT_IS_TYPE_B1(Rest_req,Rhythmic_req);
 
 void
 Rest_req::do_print() const
@@ -250,10 +234,12 @@ Beam_req::Beam_req()
     nplet = 0;
 }
 IMPLEMENT_STATIC_NAME(Beam_req);
+IMPLEMENT_IS_TYPE_B1(Beam_req,Span_req);
 void
 Beam_req::do_print()const{}
 /* *************** */
 IMPLEMENT_STATIC_NAME(Slur_req);
+IMPLEMENT_IS_TYPE_B1(Slur_req,Span_req);
 void
 Slur_req::do_print()const{}
 /* *************** */
@@ -269,35 +255,46 @@ Span_req::Span_req()
 }
 
 /* *************** */
-Script_req::Script_req(int d , Script_def*def)
+Script_req::Script_req(Script_req const&s)
 {
-    dir_i_ = d;
-    scriptdef_p_ = def;
+    dir_i_ = s.dir_i_;
+    scriptdef_p_ = s.scriptdef_p_ ? s.scriptdef_p_->clone() : 0;
 }
 
 int
 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_);
+    return !(d1.dir_i_ == d2.dir_i_ &&
+       d1.scriptdef_p_->equal_b(*d2.scriptdef_p_));
 }
 
-Script_req::Script_req(Script_req const &s)
-    : Request( s )
+Script_req::Script_req()
 {
-    dir_i_ = s.dir_i_;
-    scriptdef_p_ = new Script_def(*s.scriptdef_p_);
+    dir_i_ = 0;
+    scriptdef_p_ = 0;
 }
 
 IMPLEMENT_STATIC_NAME(Script_req);
+IMPLEMENT_IS_TYPE_B1(Script_req,Request);
 
 void
 Script_req::do_print() const
 {
+#ifndef NPRINT
     mtor << " dir " << dir_i_ ;
     scriptdef_p_->print();
+#endif
+}
+
+void
+Musical_script_req::do_print() const
+{
+    Script_req::do_print();
 }
 
+IMPLEMENT_STATIC_NAME(Musical_script_req);
+IMPLEMENT_IS_TYPE_B2(Musical_script_req,Musical_req, Script_req);
+
 
 Script_req::~Script_req()
 {
@@ -308,7 +305,7 @@ int
 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_));
+    bool b2 = (r1.tdef_p_ ->equal_b(*r2.tdef_p_));
     return b1 && b2;
 }
 Text_req::~Text_req()
@@ -330,6 +327,7 @@ Text_req::Text_req(int dir_i, Text_def* tdef_p)
 }
 
 IMPLEMENT_STATIC_NAME(Text_req);
+IMPLEMENT_IS_TYPE_B1(Text_req,Musical_req);
 
 void
 Text_req::do_print() const
@@ -343,13 +341,8 @@ Text_req::do_print() const
 
 /* *************** */
 
-Moment
-Skip_req::duration() const
-{
-    return duration_;
-}
-
 IMPLEMENT_STATIC_NAME(Skip_req);
+IMPLEMENT_IS_TYPE_B1(Skip_req,Musical_req);
 
 void
 Skip_req::do_print() const
@@ -363,38 +356,32 @@ Skip_req::do_print() const
 Voice *
 Request::voice_l()
 {
-    if (!elt_l_)
+    if (!parent_music_l_)
        return 0;
     else
-       return (Voice*)elt_l_->voice_C_;
+       return (Voice*)parent_music_l_;
 }
 /* *************** */
 
-IMPLEMENT_STATIC_NAME(Subtle_req);
-
-void
-Subtle_req::do_print() const
-{
-#ifndef NPRINT
-       mtor << " subtime " <<  subtime_;
-#endif
-}
-
 IMPLEMENT_STATIC_NAME(Dynamic_req);
+IMPLEMENT_IS_TYPE_B1(Dynamic_req,Musical_req);
 
 void
 Dynamic_req::do_print() const
 {
-    Subtle_req::do_print();
+    Musical_req::do_print();
 }
 
 IMPLEMENT_STATIC_NAME(Absolute_dynamic_req);
+IMPLEMENT_IS_TYPE_B1(Absolute_dynamic_req,Musical_req);
 
 void
 Absolute_dynamic_req::do_print() const
 {
+#ifndef NPRINT
     Dynamic_req::do_print();
-    mtor << " loudness " <<loudness_;
+    mtor << " loudness " <<loudness_str(loudness_);
+#endif
 }
 
 String
@@ -426,6 +413,7 @@ Span_dynamic_req::Span_dynamic_req()
 }
 
 IMPLEMENT_STATIC_NAME(Span_dynamic_req);
+IMPLEMENT_IS_TYPE_B1(Span_dynamic_req,Musical_req);
 
 void
 Span_dynamic_req::do_print()const
@@ -435,3 +423,8 @@ Span_dynamic_req::do_print()const
     mtor << "louder/louder: " <<dynamic_dir_i_;
 #endif
 }
+
+IMPLEMENT_STATIC_NAME(Tie_req);
+IMPLEMENT_IS_TYPE_B1(Tie_req,Musical_req);
+
+