/*
- 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@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "command-request.hh"
#include "musical-request.hh"
void
-Command_script_req::do_print() const
-{}
-Command_script_req::Command_script_req(){}
-Command_script_req::~Command_script_req(){}
-
-
-
-
-
-
-void
-Cadenza_req::do_print() const
+Cadenza_req::do_print () const
{
#ifndef NPRINT
- DOUT << on_b_;
+ DOUT << (int)on_b_;
#endif
}
bool
-Cadenza_req::do_equal_b (Request*r) const
+Cadenza_req::do_equal_b (Request const *r) const
{
- Cadenza_req*cad = dynamic_cast <Cadenza_req *> (r);
+ Cadenza_req const*cad = dynamic_cast <Cadenza_req const *> (r);
return cad && cad->on_b_ == on_b_;
}
bool
-Bar_req::do_equal_b (Request*r) const
+Bar_req::do_equal_b (Request const *r) const
{
- Bar_req * b = dynamic_cast <Bar_req *> (r);
+ Bar_req const* b = dynamic_cast <Bar_req const *> (r);
return b && type_str_ == b->type_str_;
}
void
-Command_tie_req::do_print () const
-{}
-
-
-
-
-
-void
-Bar_req::do_print() const
+Bar_req::do_print () const
{
+#ifndef NPRINT
DOUT << type_str_;
-}
-
-void
-Bracket_req::do_print () const
-{
- Span_req::do_print ();
+#endif
}
Bar_req::Bar_req (String s)
Partial_measure_req::Partial_measure_req (Moment m)
{
- duration_ =m;
+ length_mom_ =m;
}
bool
-Partial_measure_req::do_equal_b (Request* r) const
+Partial_measure_req::do_equal_b (Request const* r) const
{
- Partial_measure_req *p = dynamic_cast <Partial_measure_req *> (r);
+ Partial_measure_req const*p = dynamic_cast <Partial_measure_req const*> (r);
- return p&& p->duration_ == duration_;
+ return p&& p->length_mom_ == length_mom_;
}
-
-
-
-void
-Timing_req::do_print() const{}
-
-
-
-
-void
-Command_req::do_print() const{}
-
-
-
-void
-Barcheck_req::do_print() const{}
-
bool
-Barcheck_req::do_equal_b (Request*r) const
+Barcheck_req::do_equal_b (Request const *r) const
{
- Barcheck_req *b = dynamic_cast<Barcheck_req*> (r);
+ Barcheck_req const*b = dynamic_cast<Barcheck_req const*> (r);
return b;
}
-
-
-
void
-Clef_change_req::do_print() const
+Clef_change_req::do_print () const
{
#ifndef NPRINT
DOUT << clef_str_ ;
clef_str_ = s;
}
-
-
-
-
-
void
-Partial_measure_req::do_print() const
+Partial_measure_req::do_print () const
{
- DOUT << duration_;
+ DOUT << length_mom_;
}
-
-
-
void
-Time_signature_change_req::do_print() const
+Time_signature_change_req::do_print () const
{
#ifndef NPRINT
DOUT << beats_i_ << "/" << one_beat_i_;
}
bool
-Time_signature_change_req::do_equal_b (Request * r) const
+Time_signature_change_req::do_equal_b (Request const *r) const
{
- Time_signature_change_req * m = dynamic_cast <Time_signature_change_req *> (r);
+ Time_signature_change_req const* m
+ = dynamic_cast <Time_signature_change_req const*> (r);
return m && m->beats_i_ == beats_i_
&& one_beat_i_ == m->one_beat_i_;
}
-Time_signature_change_req::Time_signature_change_req()
+Time_signature_change_req::Time_signature_change_req ()
{
beats_i_ = 0;
one_beat_i_ =0;
}
-Tempo_req::Tempo_req()
+Tempo_req::Tempo_req ()
{
metronome_i_ = 60;
dur_. durlog_i_ = 2;
}
void
-Tempo_req::do_print() const
+Tempo_req::do_print () const
{
- DOUT << dur_.str() << " = " << metronome_i_;
+ DOUT << dur_.str () << " = " << metronome_i_;
}
bool
-Tempo_req::do_equal_b (Request *r) const
-{
- Tempo_req *t = dynamic_cast <Tempo_req *> (r);
-
- return t&& t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_;
-}
-
-
-
-
-
-
-void
-Measure_grouping_req::do_print() const
+Tempo_req::do_equal_b (Request const *r) const
{
- for (int i=0; i < elt_length_arr_.size(); i++)
- {
- DOUT << beat_i_arr_[i] << "*" << elt_length_arr_[i].str () << " ";
- }
-}
+ Tempo_req const *t = dynamic_cast <Tempo_req const*> (r);
-
-bool
-Measure_grouping_req::do_equal_b (Request*) const
-{
- return false; // todo
+ return t&& t->dur_.length_mom ()== dur_.length_mom () && metronome_i_ == t->metronome_i_;
}
-void
-Key_change_req::transpose (Musical_pitch d)
-{
- if (ordinary_key_b_ )
- {
- if (pitch_arr_.size () > 0)
- pitch_arr_[0].transpose(d);
- else
- {
- warning(_ ("don't know how handle empty keys")); // TODO
- }
- }
- else
- {
- Array<Musical_pitch> old_pitch_arr_;
- for (int i = 0; i < pitch_arr_.size(); i++)
- {
- old_pitch_arr_.push(pitch_arr_[i]);
- }
- // set accidentals for \key d (as in Key_engraver::read_req)
- // (later called "new accidentals")
- int p = d.semitone_pitch ();
- /* Solve the equation 7*no_of_acc mod 12 = p, -6 <= no_of_acc <= 5 */
- int no_of_acc = (7*p) % 12;
- no_of_acc = (no_of_acc + 18) % 12 -6;
-
- /* Correct from flats to sharps or vice versa */
- if (no_of_acc * d.accidental_i_ < 0)
- no_of_acc += 12 * sign (d.accidental_i_);
-
- pitch_arr_.clear ();
- if (no_of_acc < 0)
- {
- int accidental = 6 ; // First accidental: bes
- for ( ; no_of_acc < 0 ; no_of_acc++ )
- {
- Musical_pitch m;
- m.accidental_i_ = -1;
- m.notename_i_ = accidental;
- pitch_arr_.push(m);
-
- accidental = (accidental + 3) % 7 ;
- }
- }
- else
- {
- int accidental = 3 ; // First accidental: fis
- for ( ; no_of_acc > 0 ; no_of_acc-- )
- {
- Musical_pitch m;
- m.accidental_i_ = 1;
- m.notename_i_ = accidental;
- pitch_arr_.push(m);
-
- accidental = (accidental + 4) % 7 ;
- }
- }
- // Check if transposed old accidentals and the new ones coincide
- no_of_acc = pitch_arr_.size();
- int acc_found;
- Musical_pitch mm;
- for (int i=0; i < old_pitch_arr_.size(); i++)
- {
- acc_found = 0;
- mm = old_pitch_arr_[i];
- mm.transpose(d);
- for (int j=0; ((j < no_of_acc) && (acc_found == 0)); j++)
- {
- if (pitch_arr_[j].notename_i_ == mm.notename_i_)
- {
- if (mm.accidental_i_ == 0)
- {
- // remove new accidental
- pitch_arr_.del(j);
- no_of_acc--;
- acc_found = 1;
- }
- else
- {
- // change new accidental
- pitch_arr_[j].accidental_i_ = mm.accidental_i_;
- acc_found = 1;
- }
- }
- }
- if (acc_found == 0)
- {
- // add transposed old accidental
- pitch_arr_.push(mm);
- }
- }
- }
-}
-void
-Key_change_req::squash_octaves()
-{
- for (int i=0; i < pitch_arr_.size(); i++)
- {
- pitch_arr_[i].octave_i_ = 0;
- }
-}
void
-Key_change_req::do_print() const
+Key_change_req::do_print () const
{
#ifndef NPRINT
- for (int i=0; i < pitch_arr_.size(); i++)
+ for (int i=0; i < key_.pitch_arr_.size (); i++)
{
- pitch_arr_[i].print();
+ key_.pitch_arr_[i].print ();
}
#endif
}
-Key_change_req::Key_change_req()
+Key_change_req::Key_change_req ()
{
- modality_i_ = 0;
- ordinary_key_b_= false;
}
-
-
Break_req::Break_req ()
{
penalty_i_ = 0;
}
-void
-Break_req::do_print () const
-{
-}
-
-
-
Mark_req::Mark_req (String s)
{
str_ = s;
{
DOUT << str_;
}
-
-int
-Key_change_req::flats_i()
+void
+Key_change_req::transpose (Musical_pitch p)
{
- int flats_i = 0;
- for (int i = 0; i < pitch_arr_.size(); i++)
- {
- if (pitch_arr_[i].accidental_i_ < 0)
- flats_i -= pitch_arr_[i].accidental_i_;
- }
- return flats_i;
+ key_.transpose (p);
}
-bool
-Key_change_req::minor_b() const
-{
- return modality_i_ == 3;
-}
-int
-Key_change_req::sharps_i()
-{
- int sharps_i = 0;
- for (int i = 0; i < pitch_arr_.size(); i++)
- {
- if (pitch_arr_[i].accidental_i_ > 0)
- sharps_i += pitch_arr_[i].accidental_i_;
- }
- return sharps_i;
-}
+
projects / lilypond.git / blobdiff