/*
- commandrequest.cc -- implement Nonmusical reqs
+ command-request.cc -- implement non-musical reqs
source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--2000 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
-{}
-Command_script_req::Command_script_req(){}
-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
-{
- Cadenza_req*cad = r->command()->timing ()->cadenza ();
-
- return cad->on_b_ == on_b_;
-}
-
-Cadenza_req::Cadenza_req (bool b)
-{
- on_b_ =b;
-}
-/* *************** */
-
-
-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
-{
- DOUT << type_str_;
-}
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{}
-
-
-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
-{
+ set_mus_property ("type", ly_str02scm (s.ch_C()));
}
-/* *************** */
-
-IMPLEMENT_IS_TYPE_B1(Barcheck_req,Timing_req);
-
-void
-Barcheck_req::do_print() const{}
bool
-Barcheck_req::do_equal_b (Request*) const
+Barcheck_req::do_equal_b (Request const *r) const
{
- return true;
+ Barcheck_req const*b = dynamic_cast<Barcheck_req const*> (r);
+ return b;
}
-/* *************** */
-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)
{
clef_str_ = s;
}
-/* *************** */
-
-
-IMPLEMENT_IS_TYPE_B1(Partial_measure_req,Timing_req);
-
-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
-}
bool
-Meter_change_req::do_equal_b (Request * r) const
+Time_signature_change_req::do_equal_b (Request const *r) const
{
- Meter_change_req * m = r->command()->timing ()->meterchange ();
+ Time_signature_change_req const* m
+ = dynamic_cast <Time_signature_change_req const*> (r);
- return m->beats_i_ == beats_i_
+ return m && m->beats_i_ == beats_i_
&& one_beat_i_ == m->one_beat_i_;
}
-Meter_change_req::Meter_change_req()
+Time_signature_change_req::Time_signature_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;
-}
-
-Tempo_req::Tempo_req()
+Tempo_req::Tempo_req ()
{
metronome_i_ = 60;
dur_. durlog_i_ = 2;
}
-void
-Tempo_req::do_print() const
-{
- DOUT << dur_.str() << " = " <<metronome_i_ ;
-}
-IMPLEMENT_IS_TYPE_B1(Tempo_req, Timing_req);
+
bool
-Tempo_req::do_equal_b (Request *r) const
+Tempo_req::do_equal_b (Request const *r) const
{
- Tempo_req *t = r->command()->timing ()->tempo ();
+ Tempo_req const *t = dynamic_cast <Tempo_req const*> (r);
- return t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_;
+ return t&& t->dur_.length_mom ()== dur_.length_mom () && 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
+Key_change_req::do_equal_b (Request const * req) 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);
- }
+ Key_change_req const * k = dynamic_cast<Key_change_req const*> (req);
+ return k && scm_equal_p (get_mus_property ("pitch-alist"), k->get_mus_property ("pitch-alist"));
}
-IMPLEMENT_IS_TYPE_B1(Key_change_req,Command_req);
void
-Key_change_req::squash_octaves()
+Key_change_req::transpose (Musical_pitch p)
{
- for (int i=0; i < melodic_p_arr_.size(); i++)
+ SCM newlist = SCM_EOL;
+ SCM pa = get_mus_property ("pitch-alist");
+ for (SCM s = pa; gh_pair_p (s); s = gh_cdr (s))
{
- melodic_p_arr_[i]->octave_i_ = 0;
- }
-}
+ SCM k = gh_caar (s);
-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
-}
+ if (gh_pair_p (k))
+ {
+ Musical_pitch orig (gh_list (gh_car (k), gh_cdr (k), gh_cdr (s), SCM_UNDEFINED));
-Key_change_req::Key_change_req()
-{
- minor_b_ = false;
- multi_octave_b_= false;
-}
+ orig.transpose (p);
-void
-Break_force_req::do_print () const
-{
-}
+ SCM key = gh_cons (gh_int2scm (orig.octave_i_),
+ gh_int2scm (orig.notename_i_));
-IMPLEMENT_IS_TYPE_B1(Break_force_req, Command_req);
+ newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)),
+ newlist);
+ }
+ else if (gh_number_p (k))
+ {
+ Musical_pitch orig (gh_list (gh_int2scm (0), k, gh_cdar (s), SCM_UNDEFINED));
+ orig.transpose (p);
-Key_change_req::Key_change_req (Key_change_req const&c)
- : Command_req (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_;
-}
+ SCM key =gh_int2scm (orig.notename_i_);
+ newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)),
+ newlist);
+ }
+ }
-Key_change_req::~Key_change_req()
-{
- for (int i=0; i < melodic_p_arr_.size(); i++)
- delete melodic_p_arr_[i];
+ set_mus_property ("pitch-alist", newlist);
}
-int
-Key_change_req::flats_i()
+Break_req::Break_req ()
{
- 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()
+bool
+Mark_req::do_equal_b (Request const * r) const
{
- 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 const * other = dynamic_cast<Mark_req const*> (r);
+ return other && scm_equal_p (other->get_mus_property ("mark-label"),
+ get_mus_property ("mark-label"));
}
projects / lilypond.git / blobdiff