X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcommand-request.cc;h=aac1ebe576fc16d628f3f26a10c83293197bc40f;hb=6eb2e2f71f9895b58a01693a94ea84a432bb3766;hp=1c77d60f0f80d16cc04cc213833e0562045c14fd;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git diff --git a/lily/command-request.cc b/lily/command-request.cc index 1c77d60f0f..aac1ebe576 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -1,306 +1,126 @@ /* - commandrequest.cc -- implement Nonmusical reqs + command-request.cc -- implement non-musical reqs source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "command-request.hh" #include "debug.hh" #include "musical-request.hh" -void -Command_script_req::do_print() const -{} -Command_script_req::Command_script_req(){} - -IMPLEMENT_IS_TYPE_B1(Command_script_req,Command_req); - - -IMPLEMENT_IS_TYPE_B1(Cadenza_req, Timing_req); - -void -Cadenza_req::do_print()const -{ -#ifndef NPRINT - DOUT << on_b_; -#endif -} - bool -Cadenza_req::do_equal_b (Request*r)const +Barcheck_req::do_equal_b (Request const *r) const { - Cadenza_req*cad = r->command()->timing ()->cadenza (); - - return cad->on_b_ == on_b_; + Barcheck_req const*b = dynamic_cast (r); + return b; } -Cadenza_req::Cadenza_req (bool b) +Tempo_req::Tempo_req () { - on_b_ =b; + set_mus_property ("duration", Duration (2,0).smobbed_copy ()); } -/* *************** */ - - -bool -Bar_req::do_equal_b (Request*r)const -{ - Bar_req * b = r->command()->bar (); - return type_str_ == b->type_str_; -} - - -IMPLEMENT_IS_TYPE_B1(Bar_req,Command_req); void -Bar_req::do_print() const +Key_change_req::transpose (Pitch p) { - DOUT << type_str_; -} + SCM newlist = SCM_EOL; + SCM pa = get_mus_property ("pitch-alist"); + for (SCM s = pa; gh_pair_p (s); s = gh_cdr (s)) + { + SCM key = gh_caar (s); + SCM alter = gh_cdar (s); + if (gh_pair_p (key)) + { + Pitch orig (gh_scm2int (gh_car (key)), + gh_scm2int (gh_cdr (key)), + gh_scm2int (alter)); -Bar_req::Bar_req (String s) -{ - type_str_ = s; -} - -Partial_measure_req::Partial_measure_req (Moment m) -{ - duration_ =m; -} - -bool -Partial_measure_req::do_equal_b (Request* r)const -{ - Partial_measure_req *p = r->command()->timing ()->partial (); - - return p->duration_ == duration_; -} - - -IMPLEMENT_IS_TYPE_B1(Timing_req,Command_req); - -void -Timing_req::do_print()const{} + orig.transpose (p); + SCM key = gh_cons (gh_int2scm (orig.octave_i ()), + gh_int2scm (orig.notename_i_)); -IMPLEMENT_IS_TYPE_B1(Command_req,Request); - -void -Command_req::do_print()const{} - -IMPLEMENT_IS_TYPE_B1(Disallow_break_req,Command_req); + newlist = gh_cons (gh_cons (key, gh_int2scm (orig.alteration_i_)), + newlist); + } + else if (gh_number_p (key)) + { + Pitch orig (0, gh_scm2int (key), gh_scm2int (alter)); + orig.transpose (p); + + key =gh_int2scm (orig.notename_i_); + alter = gh_int2scm (orig.alteration_i_); + newlist = gh_cons (gh_cons (key, alter), newlist); + } + } -void -Disallow_break_req::do_print()const -{ + set_mus_property ("pitch-alist", newlist); } -/* *************** */ -IMPLEMENT_IS_TYPE_B1(Barcheck_req,Timing_req); - -void -Barcheck_req::do_print() const{} bool -Barcheck_req::do_equal_b (Request*)const -{ - return true; -} -/* *************** */ - -IMPLEMENT_IS_TYPE_B1(Clef_change_req,Command_req); - -void -Clef_change_req::do_print() const -{ -#ifndef NPRINT - DOUT << clef_str_ ; -#endif -} - -Clef_change_req::Clef_change_req (String s) +alist_equal_p (SCM a, SCM b) { - clef_str_ = s; -} -/* *************** */ - -IMPLEMENT_IS_TYPE_B1(Group_feature_req,Command_req); - -void -Group_feature_req::do_print() const -{ -#ifndef NPRINT - DOUT << type_str_ << "=" << value_str_; -#endif -} - -/* *************** */ - + for (SCM s = a; + gh_pair_p (s); s = gh_cdr (s)) + { + SCM key = gh_caar (s); + SCM val = gh_cdar (s); + SCM l = scm_assoc (key, b); -IMPLEMENT_IS_TYPE_B1(Partial_measure_req,Timing_req); + if (l == SCM_BOOL_F + || !gh_equal_p ( gh_cdr (l), val)) -void -Partial_measure_req::do_print() const -{ - DOUT << duration_; -} - - -IMPLEMENT_IS_TYPE_B1(Meter_change_req,Timing_req); - -void -Meter_change_req::do_print() const -{ -#ifndef NPRINT - DOUT << beats_i_ << "/" << one_beat_i_; -#endif + return false; + } + return true; } bool -Meter_change_req::do_equal_b (Request * r)const +Key_change_req::do_equal_b (Request const * m )const { - Meter_change_req * m = r->command()->timing ()->meterchange (); - - return m->beats_i_ == beats_i_ - && one_beat_i_ == m->one_beat_i_; -} + Key_change_req const * kc =dynamic_cast (m); -Meter_change_req::Meter_change_req() -{ - beats_i_ = 0; - one_beat_i_ =0; -} - -void -Meter_change_req::set (int b,int o) -{ - beats_i_=b; - one_beat_i_=o; + if(!kc) + return false; + return alist_equal_p (get_mus_property ("pitch-alist"), + kc->get_mus_property ("pitch-alist")); } -Tempo_req::Tempo_req() -{ - metronome_i_ = 60; - dur_. type_i_ = 4; -} - -void -Tempo_req::do_print()const -{ - DOUT << dur_.str() << " = " <command()->timing ()->tempo (); - - return t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_; -} - -/* *************** */ - - -IMPLEMENT_IS_TYPE_B1(Measure_grouping_req,Timing_req); - -void -Measure_grouping_req::do_print() const -{ - for (int i=0; i < elt_length_arr_.size(); i++) { - DOUT << beat_i_arr_[i] <<"*" << elt_length_arr_[i]<<" "; - } -} - - -bool -Measure_grouping_req::do_equal_b (Request*)const -{ - return false; // todo -} - -/* *************** */ - -void -Key_change_req::transpose (Melodic_req const & d)const -{ - WARN << "don't know how to transpose a key. \n"; - for (int i=0; i < melodic_p_arr_.size(); i++) { - melodic_p_arr_[i]->transpose (d); - } -} - - -IMPLEMENT_IS_TYPE_B1(Key_change_req,Command_req); -void -Key_change_req::squash_octaves() -{ - for (int i=0; i < melodic_p_arr_.size(); i++) { - melodic_p_arr_[i]->octave_i_ = 0; - } -} - -void -Key_change_req::do_print() const -{ -#ifndef NPRINT - for (int i=0; i < melodic_p_arr_.size(); i++) { - melodic_p_arr_[i]->print(); - } -#endif -} - -Key_change_req::Key_change_req() -{ - minor_b_ = false; - multi_octave_b_= false; -} - -Key_change_req::Key_change_req (Key_change_req const&c) -{ - for (int i=0; i < c.melodic_p_arr_.size(); i++) - melodic_p_arr_.push (c.melodic_p_arr_[i]->clone()->musical ()->melodic ()); - minor_b_ = c.minor_b_; - multi_octave_b_ = c.multi_octave_b_; -} - -Key_change_req::~Key_change_req() -{ - for (int i=0; i < melodic_p_arr_.size(); i++) - delete melodic_p_arr_[i]; -} - -int -Key_change_req::flats_i() -{ - int flats_i = 0; - for ( int i = 0; i < melodic_p_arr_.size(); i++) { - Melodic_req* mel_l = melodic_p_arr_[i]->melodic(); - assert (mel_l); - if ( mel_l->accidental_i_ < 0) - flats_i -= mel_l->accidental_i_; - } - return flats_i; -} - -int -Key_change_req::minor_b() -{ - return minor_b_; -} - -int -Key_change_req::sharps_i() -{ - int sharps_i = 0; - for ( int i = 0; i < melodic_p_arr_.size(); i++) { - Melodic_req* mel_l = melodic_p_arr_[i]->melodic(); - assert (mel_l); - if ( mel_l->accidental_i_ > 0) - sharps_i+= mel_l->accidental_i_; - } - return sharps_i; -} - +Mark_req::do_equal_b (Request const * r) const +{ + Mark_req const * other = dynamic_cast (r); + return other && scm_equal_p (other->get_mus_property ("label"), + get_mus_property ("label")) == SCM_BOOL_T; +} + + +ADD_MUSIC (Articulation_req); +ADD_MUSIC (Barcheck_req); +ADD_MUSIC (Break_req); +ADD_MUSIC (Breathing_sign_req); +ADD_MUSIC (Busy_playing_req); +ADD_MUSIC (Extender_req); +ADD_MUSIC (Glissando_req); +ADD_MUSIC (Hyphen_req); +ADD_MUSIC (Key_change_req); +ADD_MUSIC (Lyric_req); +ADD_MUSIC (Mark_req); +ADD_MUSIC (Melisma_playing_req); +ADD_MUSIC (Melisma_req); +ADD_MUSIC (Melodic_req); +ADD_MUSIC (Note_req); +ADD_MUSIC (Rest_req); +ADD_MUSIC (Rhythmic_req); +ADD_MUSIC (Script_req); +ADD_MUSIC (Skip_req); +ADD_MUSIC (Span_req); +ADD_MUSIC (Tempo_req); +ADD_MUSIC (Text_script_req); +ADD_MUSIC (Tie_req); +ADD_MUSIC (Tremolo_req);