#include "music-list.hh"
-IMPLEMENT_IS_TYPE_B1(Stem_req,Rhythmic_req);
-
-void
-Stem_req::do_print() const
-{
-#ifndef NPRINT
- Rhythmic_req::do_print();
- mtor << "dir : " << dir_i_;
-#endif
-}
-
-Stem_req::Stem_req()
-{
- dir_i_ = 0;
-}
-
-/* ************** */
IMPLEMENT_IS_TYPE_B1(Musical_req,Request);
void
-Musical_req::do_print()const{}
+Musical_req::do_print() const{}
void
-Tie_req::do_print()const{}
+Tie_req::do_print() const{}
/* *************** */
Span_req::do_print() const
{
#ifndef NPRINT
- mtor << spantype ;
+ DOUT << spantype ;
#endif
}
Spacing_req::Spacing_req()
{
- next = 0;
- distance = 0;
- strength = 0;
+ next = 0;
+ distance = 0;
+ strength = 0;
}
IMPLEMENT_IS_TYPE_B1(Spacing_req,Request);
void
-Spacing_req::do_print()const
+Spacing_req::do_print() const
{
#ifndef NPRINT
- mtor << "next " << next << "dist " << distance << "strength\n";
+ DOUT << "next " << next << "dist " << distance << "strength\n";
#endif
}
IMPLEMENT_IS_TYPE_B2(Blank_req,Spacing_req,Rhythmic_req);
void
-Blank_req::do_print()const
+Blank_req::do_print() const
{
- Spacing_req::do_print();
+ Spacing_req::do_print();
}
/* *************** */
Melodic_req::Melodic_req()
{
- notename_i_ = 0;
- octave_i_ = 0;
- accidental_i_ = 0;
+ notename_i_ = 0;
+ octave_i_ = 0;
+ accidental_i_ = 0;
}
void
-Melodic_req::transpose(Melodic_req const & delta)
-{
- int old_pitch = pitch();
- int delta_pitch = delta.pitch();
- octave_i_ += delta.octave_i_;
- notename_i_ += delta.notename_i_;
- while (notename_i_ >= 7 ) {
+Melodic_req::transpose (Melodic_req const & delta)
+{
+ int old_pitch = pitch();
+ int delta_pitch = delta.pitch();
+ octave_i_ += delta.octave_i_;
+ notename_i_ += delta.notename_i_;
+ while (notename_i_ >= 7)
+ {
notename_i_ -= 7;
octave_i_ ++;
}
- int new_pitch = pitch();
- int delta_acc = new_pitch - old_pitch - delta_pitch;
-
- accidental_i_ -= delta_acc;
- if (abs(accidental_i_) > 2) {
- delta.warning("transposition makes accidental larger than 2");
+ int new_pitch = pitch();
+ int delta_acc = new_pitch - old_pitch - delta_pitch;
+
+ accidental_i_ -= delta_acc;
+ if (abs (accidental_i_) > 2)
+ {
+ delta.warning ("transposition makes accidental larger than 2");
}
}
IMPLEMENT_IS_TYPE_B1(Melodic_req,Musical_req);
bool
-Melodic_req::do_equal_b(Request*r)const
+Melodic_req::do_equal_b (Request*r) const
{
- Melodic_req* m= r->musical()->melodic();
- return !compare( *m, *this);
+ Melodic_req* m= r->musical()->melodic ();
+ return !compare (*m, *this);
}
int
-Melodic_req::compare(Melodic_req const &m1 , Melodic_req const&m2)
+Melodic_req::compare (Melodic_req const &m1 , Melodic_req const&m2)
{
- int o= m1.octave_i_ - m2.octave_i_;
- int n = m1.notename_i_ - m2.notename_i_;
- int a = m1.accidental_i_ - m2.accidental_i_;
-
- if (o)
+ int o= m1.octave_i_ - m2.octave_i_;
+ int n = m1.notename_i_ - m2.notename_i_;
+ int a = m1.accidental_i_ - m2.accidental_i_;
+
+ if (o)
return o;
- if ( n)
+ if (n)
return n;
- if (a)
+ if (a)
return a;
- return 0;
+ return 0;
}
void
Melodic_req::do_print() const
{
#ifndef NPRINT
- mtor << "notename: " << notename_i_
+ DOUT << "notename: " << notename_i_
<< " acc: " <<accidental_i_<<" oct: "<< octave_i_;
#endif
}
int
Melodic_req::height() const
{
- return notename_i_ + octave_i_*7;
+ return notename_i_ + octave_i_*7;
}
/*
int
Melodic_req::pitch() const
{
- return pitch_byte_a[ notename_i_ % 7 ] + accidental_i_ + octave_i_ * 12;
+ return pitch_byte_a[ notename_i_ % 7 ] + accidental_i_ + octave_i_ * 12;
}
/* *************** */
int
-Rhythmic_req::compare(Rhythmic_req const &r1, Rhythmic_req const &r2)
+Rhythmic_req::compare (Rhythmic_req const &r1, Rhythmic_req const &r2)
{
- return (r1.duration() - r2.duration());
+ return (r1.duration() - r2.duration ());
}
bool
-Rhythmic_req::do_equal_b(Request*r)const
+Rhythmic_req::do_equal_b (Request*r) const
{
- Rhythmic_req* rh = r->musical()->rhythmic();
+ Rhythmic_req* rh = r->musical()->rhythmic ();
- return !compare(*this, *rh);
+ return !compare (*this, *rh);
}
void
-Rhythmic_req::set_duration(Duration d)
+Rhythmic_req::set_duration (Duration d)
{
- duration_ = d;
+ duration_ = d;
}
Rhythmic_req::Rhythmic_req()
Rhythmic_req::do_print() const
{
#ifndef NPRINT
- mtor << "duration { " <<duration_.str() << "}";
+ DOUT << "duration { " <<duration_.str() << "}";
#endif
}
Moment
Rhythmic_req::duration() const {
- return duration_.length();
+ return duration_.length();
}
/* *************** */
-Lyric_req::Lyric_req(Text_def* def_p)
- :Text_req(0, def_p)
+Lyric_req::Lyric_req (Text_def* def_p)
+ :Text_req (0, def_p)
{
- def_p->align_i_ = 0; // centre
- dir_i_ = -1; // lyrics below (invisible) staff
+ def_p->align_i_ = 0; // centre
+ dir_ = DOWN; // lyrics below (invisible) staff
}
void
Lyric_req::do_print() const
{
- Rhythmic_req::do_print();
- Text_req::do_print();
+ Rhythmic_req::do_print();
+ Text_req::do_print();
}
/* *************** */
bool
-Note_req::do_equal_b(Request*r)const
+Note_req::do_equal_b (Request*r) const
{
- return Rhythmic_req::do_equal_b(r) && Melodic_req::do_equal_b(r);
+ return Rhythmic_req::do_equal_b (r) && Melodic_req::do_equal_b (r);
}
Note_req::Note_req()
{
- forceacc_b_ = false;
+ forceacc_b_ = false;
}
IMPLEMENT_IS_TYPE_B2(Note_req,Melodic_req,Rhythmic_req);
Note_req::do_print() const
{
#ifndef NPRINT
- Melodic_req::do_print();
- if (forceacc_b_) {
- mtor << " force accidental\n";
+ Melodic_req::do_print();
+ if (forceacc_b_)
+ {
+ DOUT << " force accidental\n";
}
- Rhythmic_req::do_print();
+ Rhythmic_req::do_print();
#endif
}
/* *************** */
void
Rest_req::do_print() const
{
- Rhythmic_req::do_print();
+ Rhythmic_req::do_print();
}
/* *************** */
Beam_req::Beam_req()
{
- nplet = 0;
+ nplet = 0;
}
IMPLEMENT_IS_TYPE_B1(Beam_req,Span_req);
void
-Beam_req::do_print()const{}
+Beam_req::do_print() const{}
/* *************** */
IMPLEMENT_IS_TYPE_B1(Slur_req,Span_req);
void
-Slur_req::do_print()const{}
+Slur_req::do_print() const{}
/* *************** */
bool
-Span_req:: do_equal_b(Request*r)const
+Span_req:: do_equal_b (Request*r) const
{
- Span_req * s = r->span();
- return spantype - s->spantype;
+ Span_req * s = r->span();
+ return spantype - s->spantype;
}
Span_req::Span_req()
{
- spantype = NOSPAN;
+ spantype = NOSPAN;
}
/* *************** */
-Script_req::Script_req(Script_req const&s)
+Script_req::Script_req (Script_req const&s)
{
- dir_i_ = s.dir_i_;
- scriptdef_p_ = s.scriptdef_p_ ? s.scriptdef_p_->clone() : 0;
+ dir_ = s.dir_;
+ scriptdef_p_ = s.scriptdef_p_ ? s.scriptdef_p_->clone() : 0;
}
/*
don't check dirs?
- (d1.dir_i_ == d2.dir_i_ )
+ (d1.dir_ == d2.dir_)
*/
bool
-Script_req::do_equal_b(Request*r)const
+Script_req::do_equal_b (Request*r) const
{
- Script_req * s = r->script();
-
- return scriptdef_p_->equal_b(*s->scriptdef_p_);
+ Script_req * s = r->script();
+
+ return scriptdef_p_->equal_b (*s->scriptdef_p_);
}
Script_req::Script_req()
{
- dir_i_ = 0;
- scriptdef_p_ = 0;
+ dir_ = CENTER;
+ scriptdef_p_ = 0;
}
Script_req::do_print() const
{
#ifndef NPRINT
- mtor << " dir " << dir_i_ ;
- scriptdef_p_->print();
+ DOUT << " dir " << dir_ ;
+ scriptdef_p_->print();
#endif
}
void
Musical_script_req::do_print() const
{
- Script_req::do_print();
+ Script_req::do_print();
}
Script_req::~Script_req()
{
- delete scriptdef_p_;
+ delete scriptdef_p_;
}
/* *************** */
Text_req::~Text_req()
{
- delete tdef_p_;
- tdef_p_ = 0;
+ delete tdef_p_;
+ tdef_p_ = 0;
}
-Text_req::Text_req(Text_req const& src)
+Text_req::Text_req (Text_req const& src)
{
- tdef_p_ = new Text_def(*src.tdef_p_);
- dir_i_ = src.dir_i_;
+ tdef_p_ = new Text_def (*src.tdef_p_);
+ dir_ = src.dir_;
}
-Text_req::Text_req(int dir_i, Text_def* tdef_p)
+Text_req::Text_req (int dir_i, Text_def* tdef_p)
{
- dir_i_ = dir_i;
- tdef_p_ = tdef_p;
+ dir_ = Direction(dir_i);
+ tdef_p_ = tdef_p;
}
Text_req::do_print() const
{
#ifndef NPRINT
- mtor << " dir " << dir_i_ ;
- tdef_p_->print();
+ DOUT << " dir " << dir_ ;
+ tdef_p_->print();
#endif
}
{
#ifndef NPRINT
- mtor << "duration: " << duration();
+ DOUT << "duration: " << duration();
#endif
}
void
Dynamic_req::do_print() const
{
- Musical_req::do_print();
+ Musical_req::do_print();
}
Absolute_dynamic_req::do_print() const
{
#ifndef NPRINT
- Dynamic_req::do_print();
- mtor << " loudness " <<loudness_str(loudness_);
+ Dynamic_req::do_print();
+ DOUT << " loudness " <<loudness_str (loudness_);
#endif
}
String
-Dynamic_req::loudness_str(Loudness l)
-{
- switch (l) {
- case FFF: return "fff";
- case FF: return "ff";
- case F: return "f";
- case MF: return "mf";
- case MP: return "mp";
- case P: return "p";
- case PP: return "pp";
- case PPP: return "ppp";
+Dynamic_req::loudness_str (Loudness l)
+{
+ switch (l)
+ {
+ case FFF: return "fff";
+ case FF: return "ff";
+ case F: return "f";
+ case MF: return "mf";
+ case MP: return "mp";
+ case P: return "p";
+ case PP: return "pp";
+ case PPP: return "ppp";
}
- assert(false);
- return "";
+ assert (false);
+ return "";
}
Absolute_dynamic_req::Absolute_dynamic_req()
{
- loudness_ = MF;
+ loudness_ = MF;
}
Span_dynamic_req::Span_dynamic_req()
{
- dynamic_dir_i_ = 0;
+ dynamic_dir_ = CENTER;
}
IMPLEMENT_IS_TYPE_B1(Span_dynamic_req,Musical_req);
void
-Span_dynamic_req::do_print()const
+Span_dynamic_req::do_print() const
{
#ifndef NPRINT
- Span_req::do_print();
- mtor << "louder/louder: " <<dynamic_dir_i_;
+ Span_req::do_print();
+ DOUT << "softer/louder: " <<dynamic_dir_;
#endif
}
projects / lilypond.git / blobdiff