From: fred Date: Sun, 24 Mar 2002 19:45:20 +0000 (+0000) Subject: lilypond-0.0.67 X-Git-Tag: release/1.5.59~4612 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f367f2d9cabe2685cf456d36747fee9331795f4d;p=lilypond.git lilypond-0.0.67 --- diff --git a/lily/command-request.cc b/lily/command-request.cc index 83cb258ffb..7a70fced2e 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -10,7 +10,10 @@ #include "debug.hh" #include "musical-request.hh" - +void +Command_script_req::do_print() const +{} +IMPLEMENT_STATIC_NAME(Command_script_req); IMPLEMENT_STATIC_NAME(Cadenza_req); void @@ -193,7 +196,7 @@ Key_change_req::Key_change_req() 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()->melodic() ); + melodic_p_arr_.push( c.melodic_p_arr_[i]->clone()->musical()->melodic() ); minor_b_ = c.minor_b_; multi_octave_b_ = c.multi_octave_b_; } diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index d1b99f9a6c..c4676c76af 100644 --- a/lily/include/command-request.hh +++ b/lily/include/command-request.hh @@ -21,7 +21,6 @@ public: virtual Terminate_voice_req *terminate() {return 0;} virtual Group_change_req * groupchange() { return 0;} virtual Group_feature_req * groupfeature() { return 0; } - virtual Measure_grouping_req * measuregrouping() { return 0; } virtual Clef_change_req * clefchange() { return 0; } virtual Key_change_req * keychange() { return 0; } @@ -30,9 +29,17 @@ public: virtual Bar_req *bar() { return 0; } virtual Cadenza_req *cadenza() { return 0; } virtual Timing_req*timing() { return 0; } + virtual Command_script_req*commandscript() { return 0;} }; +class Command_script_req : public Command_req, public Script_req { +public: + REQUESTMETHODS(Command_script_req, commandscript); +}; + + + /** Baseclass for meter/partial req. It has to be handled by Staff_{walker,column} baseclass. */ class Timing_req : public Command_req {