/*
- 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 <hanwen@stack.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "command-request.hh"
-#include "debug.hh"
-#include "musical-request.hh"
-
-void
-Command_script_req::do_print() const
-{}
-
-IMPLEMENT_IS_TYPE_B1(Command_script_req,Command_req);
-
-
-IMPLEMENT_IS_TYPE_B1(Cadenza_req, Timing_req);
-
-void
-Cadenza_req::do_print()const
-{
- mtor << on_b_;
-}
-
-Cadenza_req::Cadenza_req(bool b)
-{
- on_b_ =b;
-}
-/* *************** */
-
-
-int
-Bar_req::compare(Bar_req const &c1)const
-{
- return type_str_ == c1.type_str_;
-}
-
-
-IMPLEMENT_IS_TYPE_B1(Bar_req,Command_req);
-
-void
-Bar_req::do_print() const
-{
- mtor << type_str_;
-}
-
-Bar_req::Bar_req(String s)
-{
- type_str_ = s;
-}
-
-Partial_measure_req::Partial_measure_req(Moment m)
-{
- duration_ =m;
-}
-/* *************** */
+#include "musical-request.hh"
-IMPLEMENT_IS_TYPE_B1(Timing_req,Command_req);
-
-void
-Timing_req::do_print()const{}
-
-
-IMPLEMENT_IS_TYPE_B1(Command_req,Request);
-
-void
-Command_req::do_print()const{}
-
-IMPLEMENT_IS_TYPE_B1(Disallow_break_req,Command_req);
-
-void
-Disallow_break_req::do_print()const
-{
-}
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Barcheck_req,Timing_req);
-
-void
-Barcheck_req::do_print() const{}
-
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Clef_change_req,Command_req);
-
-void
-Clef_change_req::do_print() const
-{
-#ifndef NPRINT
- mtor << clef_str_ ;
-#endif
-}
-
-Clef_change_req::Clef_change_req(String s)
-{
- clef_str_ = s;
-}
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Group_feature_req,Command_req);
-
-void
-Group_feature_req::do_print() const
-{
-#ifndef NPRINT
- mtor << type_str_ << "=" << value_str_;
-#endif
-}
-
-/* *************** */
-
-
-IMPLEMENT_IS_TYPE_B1(Partial_measure_req,Timing_req);
-
-void
-Partial_measure_req::do_print() const
-{
- mtor << duration_;
-}
-
-
-IMPLEMENT_IS_TYPE_B1(Meter_change_req,Timing_req);
-
-void
-Meter_change_req::do_print() const
-{
- mtor << beats_i_ << "/" << one_beat_i_;
-}
-
-int
-Meter_change_req::compare(Meter_change_req const &m)
-{
- return m.beats_i_ == beats_i_ && one_beat_i_ == m.one_beat_i_;
-}
-
-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;
-}
-
-/* *************** */
-
-
-IMPLEMENT_IS_TYPE_B1(Measure_grouping_req,Timing_req);
-
-void
-Measure_grouping_req::do_print() const
+Tempo_req::Tempo_req ()
{
- for (int i=0; i < elt_length_arr_.size(); i++) {
- mtor << beat_i_arr_[i] <<"*" << elt_length_arr_[i]<<" ";
- }
+ set_mus_property ("duration", Duration (2,0).smobbed_copy ());
}
-/* *************** */
void
-Key_change_req::transpose(Melodic_req const & d)const
+Key_change_req::transpose (Pitch p)
{
- 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);
- }
-}
+ SCM newlist = SCM_EOL;
+ SCM pa = get_mus_property ("pitch-alist");
+ for (SCM s = pa; gh_pair_p (s); s = ly_cdr (s))
+ {
+ SCM key = ly_caar (s);
+ SCM alter = ly_cdar (s);
+ if (gh_pair_p (key))
+ {
+ Pitch orig (gh_scm2int (ly_car (key)),
+ gh_scm2int (ly_cdr (key)),
+ gh_scm2int (alter));
+ orig.transpose (p);
-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;
- }
-}
+ SCM key = gh_cons (gh_int2scm (orig.get_octave ()),
+ gh_int2scm (orig.notename_));
-void
-Key_change_req::do_print() const
-{
- for (int i=0; i < melodic_p_arr_.size(); i++) {
- melodic_p_arr_[i]->print();
+ newlist = gh_cons (gh_cons (key, gh_int2scm (orig.alteration_)),
+ newlist);
+ }
+ else if (gh_number_p (key))
+ {
+ Pitch orig (0, gh_scm2int (key), gh_scm2int (alter));
+ orig.transpose (p);
+
+ key =gh_int2scm (orig.notename_);
+ alter = gh_int2scm (orig.alteration_);
+ newlist = gh_cons (gh_cons (key, alter), newlist);
+ }
}
-}
-
-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_;
+ set_mus_property ("pitch-alist", gh_reverse (newlist));
}
-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()
+bool
+alist_equal_p (SCM a, SCM b)
{
- return minor_b_;
-}
+ for (SCM s = a;
+ gh_pair_p (s); s = ly_cdr (s))
+ {
+ SCM key = ly_caar (s);
+ SCM val = ly_cdar (s);
+ SCM l = scm_assoc (key, 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;
-}
+ if (l == SCM_BOOL_F
+ || !gh_equal_p ( ly_cdr (l), val))
+ return false;
+ }
+ return true;
+}
+
+bool
+Key_change_req::do_equal_b (Request const * m )const
+{
+ Key_change_req const * kc =dynamic_cast<Key_change_req const*> (m);
+
+ if(!kc)
+ return false;
+ return alist_equal_p (get_mus_property ("pitch-alist"),
+ kc->get_mus_property ("pitch-alist"));
+}
+
+
+
+bool
+Mark_req::do_equal_b (Request const * r) const
+{
+ Mark_req const * other = dynamic_cast<Mark_req const*> (r);
+ return other && scm_equal_p (other->get_mus_property ("label"),
+ get_mus_property ("label")) == SCM_BOOL_T;
+}
+
+ADD_MUSIC(Bass_figure_req);
+ADD_MUSIC (Articulation_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 (Porrectus_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);
projects / lilypond.git / blobdiff