X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusical-request.cc;h=147fce3fa2cbce1143d66df4cda8d34a3a8bc1ae;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=597a60ac7608536d5a872cc22948d4e66d99acf0;hpb=dbed556ca13bc2371e83774890eaa06bc8b04def;p=lilypond.git

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 597a60ac76..147fce3fa2 100644
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -1,398 +1,98 @@
 /*
   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>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "musical-request.hh"
 #include "misc.hh"
 #include "debug.hh"
-#include "script-def.hh"
-#include "text-def.hh"
-#include "voice.hh"
-#include "voice-element.hh"
+#include "music-list.hh"
 
-void
-Stem_req::do_print() const
-{
-    Rhythmic_req::do_print();
-    mtor << "dir : " << dir_i_;
-}
-
-Stem_req::Stem_req(int s, int d)
-    : Rhythmic_req(s,d)
-{
-    dir_i_ = 0;
-}
-
-/* ************** */
-void Musical_req::do_print()const{}
-void Request::do_print() const{}
-
-/* *************** */
-
-void
-Request::print() const
-{
-#ifndef NPRINT
-    mtor << name() << " {";
-    do_print();
-    mtor << "}\n";
-#endif
-}
-     
-
-
-void
-Span_req::do_print() const    
-{
-#ifndef NPRINT
-    mtor  << spantype ;
-#endif
-}
 
-Request::Request()
-{
-    elt_l_ = 0;
-    defined_ch_c_l_ = 0;
-}
-Request::Request(Request const&src)
-{
-    elt_l_ = 0;
-    defined_ch_c_l_ = src.defined_ch_c_l_;
-}
-/* *************** */
-Spacing_req::Spacing_req()
-{
-    next = 0;
-    distance = 0;
-    strength = 0;
-}
-void
-Spacing_req::do_print()const
+Tremolo_req::Tremolo_req ()
 {
-#ifndef NPRINT
-    mtor << "next " << next << "dist " << distance << "strength\n";
-#endif
 }
 
-void
-Blank_req::do_print()const
-{
-    Spacing_req::do_print();
-}
-/* *************** */
-Melodic_req::Melodic_req()
+bool
+Melodic_req::do_equal_b (Request const* r) const
 {
-    notename_i_ = 0;
-    octave_i_ = 0;
-    accidental_i_ = 0;
+  Melodic_req const* m= dynamic_cast <Melodic_req const*> (r);
+  return m; // && !compare (*m, *this);
 }
 
-void
-Melodic_req::transpose(Melodic_req const & delta)
+bool
+Rhythmic_req::do_equal_b (Request const* r) const
 {
-    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) {
-	warning("transposition makes accidental larger than 2", 
-		delta.defined_ch_c_l_);
-    }
-}
+  Rhythmic_req const* rh = dynamic_cast <Rhythmic_req const*> (r);
 
-void
-Melodic_req::do_print() const
-{
-#ifndef NPRINT
-	mtor << "notename: " << notename_i_ << " acc: " <<accidental_i_<<" oct: "<< octave_i_;
-#endif
+  return rh; // ;  && !compare (*this, *rh);
 }
 
-int
-Melodic_req::height() const
-{
-    return  notename_i_ + octave_i_*7;
-}
-
-/*
- should be settable from input to allow "viola"-mode
- */
-static Byte pitch_byte_a[ 7 ] = { 0, 2, 4, 5, 7, 9, 11 };	
-
-int
-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;
-}
-
-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)
-{
-    return sign(r1.duration() - r2.duration());
-}
-Rhythmic_req::Rhythmic_req(int b, int d)
-{
-    plet_factor = 1;
-    balltype = b;
-    dots = d;
-}
-
-Rhythmic_req::Rhythmic_req()
-{
-    plet_factor = 1;
-    balltype = 1;
-    dots = 0;
-}
-
-void
-Rhythmic_req::do_print() const
-{
-#ifndef NPRINT
-    mtor << "ball: " << balltype ;
-    int d =dots;
-    while (d--)
-	mtor << '.';
-    
-    mtor<<", plet factor"<<plet_factor<<"\n";
-#endif
-}
-
-
 Moment
-Rhythmic_req::duration() const {    
-    return wholes(balltype,dots)*plet_factor;
-}
-/* *************** */
-
-Lyric_req::Lyric_req(Text_def* def_p)
-    :Text_req(0, def_p)
+Rhythmic_req::length_mom () const
 {
-    def_p->align_i_ = 0;	// centre
-    dir_i_ = -1;		// lyrics below (invisible) staff
+  Duration *d = unsmob_duration (get_mus_property ("duration"));
+  if (!d){
+    Moment m ;
+    programming_error("Rhythmic_req has no duration");
+    return m;
+  }
+  return d->length_mom ();
 }
 
 void
-Lyric_req::do_print() const
-{    
-    Rhythmic_req::do_print();
-    Text_req::do_print();
-}
-
-/* *************** */
-Note_req::Note_req()
+Rhythmic_req::compress (Moment m)
 {
-    forceacc_b_ = false;
-}
-void
-Note_req::do_print() const
-{
-#ifndef NPRINT
-    mtor << " forceacc_b_ " << forceacc_b_ << '\n';
-    Melodic_req::do_print();
-    Rhythmic_req::do_print();
-#endif
-}
-/* *************** */
-void
-Rest_req::do_print() const
-{
-        Rhythmic_req::do_print();
-}
-
-/* *************** */
-Beam_req::Beam_req()
-{
-    nplet = 0;
-}
-
-void Beam_req::do_print()const{}
-/* *************** */
-void Slur_req::do_print()const{}
-/* *************** */
-int
-Span_req:: compare(Span_req const &r1, Span_req const &r2)
-{
-     return r1.spantype - r2.spantype;
-}
-
-Span_req::Span_req()
-{
-    spantype = NOSPAN;
-}
-
-/* *************** */
-Script_req::Script_req(int d , Script_def*def)
-{
-    dir_i_ = d;
-    scriptdef_p_ = def;
-}
-
-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_);
-}
-
-Script_req::Script_req(Script_req const &s)
-    : Request( s )
-{
-    dir_i_ = s.dir_i_;
-    scriptdef_p_ = new Script_def(*s.scriptdef_p_);
-}
-
-void
-Script_req::do_print() const
-{
-    mtor << " dir " << dir_i_ ;
-    scriptdef_p_->print();
-}
-
-
-Script_req::~Script_req()
-{
-    delete scriptdef_p_;
-}
-/* *************** */
-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_));
-    return b1 && b2;
-}
-Text_req::~Text_req()
-{
-    delete tdef_p_;
-    tdef_p_ = 0;
+  Duration *d =  unsmob_duration (get_mus_property ("duration"));
+  if (d)
+    set_mus_property ("duration", d ->compressed (m.main_part_).smobbed_copy ());
 }
 
-Text_req::Text_req(Text_req const& src)
+bool
+Note_req::do_equal_b (Request const* r) const
 {
-    tdef_p_ = new Text_def(*src.tdef_p_);
-    dir_i_ = src.dir_i_;
+  Note_req const* n = dynamic_cast<Note_req const*> (r);
+  return n&& Rhythmic_req::do_equal_b (n) && Melodic_req::do_equal_b (n);
 }
 
-Text_req::Text_req(int dir_i, Text_def* tdef_p)	
-{
-    dir_i_ = dir_i;
-    tdef_p_ = tdef_p;
-}
 
-void
-Text_req::do_print() const
+Note_req::Note_req ()
 {
-#ifndef NPRINT
-
-    mtor << " dir " << dir_i_ ;
-    tdef_p_->print();
-#endif
 }
 
-/* *************** */
 
-Moment
-Skip_req::duration() const
+bool
+Span_req::do_equal_b (Request const*r) const
 {
-    return duration_;
+  Span_req const* s = dynamic_cast <Span_req const*> (r);
+  return s && get_span_dir () == s->get_span_dir ();
 }
 
-void
-Skip_req::do_print() const
+Span_req::Span_req ()
 {
-#ifndef NPRINT
-
-    mtor << "duration: " << duration();
-#endif
 }
 
-Voice *
-Request::voice_l()
-{
-    if (!elt_l_)
-	return 0;
-    else
-	return (Voice*)elt_l_->voice_l_;
-}
-/* *************** */
 
-void
-Subtle_req::do_print() const
+bool
+Text_script_req::do_equal_b (Request const* r) const
 {
-#ifndef NPRINT
-	mtor << " subtime " <<  subtime_;
-#endif
+  Text_script_req const* t  = dynamic_cast<Text_script_req const*> (r);
+  return t && gh_equal_p (get_mus_property ("text"),
+			  t->get_mus_property ("text"));
 }
 
-void
-Dynamic_req::do_print() const
+bool
+Articulation_req::do_equal_b (Request const* r) const
 {
-    Subtle_req::do_print();
+  Articulation_req const* a = dynamic_cast<Articulation_req const*> (r);
+  
+  return a && gh_equal_p (get_mus_property ("articulation-type"),
+			  r->get_mus_property ("articulation-type"))
+    && get_direction () == a->get_direction ();
 }
 
-void
-Absolute_dynamic_req::do_print() const
-{
-    Dynamic_req::do_print();
-    mtor << " loudness_" <<loudness_;
-}
-
-String
-Dynamic_req::loudness_str(Loudness l) 
-{
-    switch (l) {
-    case FFF: return "fff";
-    case FF: return "ff";
-    case F: return "f";
-    case MF: return "mf";
-    case MP: return "mp";
-    case P: return "p";
-    case PP: return "pp";
-    case PPP: return "ppp";
-    }
-    assert(false);
-    return "";
-}
 
-Absolute_dynamic_req::Absolute_dynamic_req()
-{
-    loudness_ = MF;
-}
 
-
-Span_dynamic_req::Span_dynamic_req()
-{
-    dynamic_dir_i_  = 0;
-}
-
-void
-Span_dynamic_req::do_print()const
-{
-#ifndef NPRINT
-    Span_req::do_print();
-    mtor << "louder/louder: " <<dynamic_dir_i_;
-#endif
-}