source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "musical-request.hh"
Tie_req::do_print () const{}
-/* *************** */
+IMPLEMENT_IS_TYPE_B1(Span_req,Request);
+IMPLEMENT_IS_TYPE_B2(Musical_span_req, Span_req, Musical_span_req);
-
-IMPLEMENT_IS_TYPE_B1 (Span_req,Musical_req);
+void
+Musical_span_req::do_print () const
+{
+ Span_req::do_print ();
+}
+
void
Span_req::do_print () const
{
#ifndef NPRINT
- DOUT << spantype ;
+ DOUT << spantype;
#endif
}
Abbreviation_req::do_print () const
{
#ifndef NPRINT
- DOUT << "type " << type_i_ << "\n";
+ DOUT << "type " << type_i_ << '\n';
#endif
}
{
Spacing_req::do_print ();
}
-/* *************** */
Melodic_req::Melodic_req ()
{
- notename_i_ = 0;
- octave_i_ = 0;
- accidental_i_ = 0;
}
void
-Melodic_req::transpose (Melodic_req const * delta)
+Melodic_req::transpose (Musical_pitch delta)
{
- int old_pitch = pitch ();
- int delta_pitch = delta->pitch ();
- octave_i_ += delta->octave_i_;
- notename_i_ += delta->notename_i_;
- while (notename_i_ >= 7)
+ pitch_.transpose (delta);
+
+ if (abs (pitch_.accidental_i_) > 2)
{
- 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"));
+ warning (_f ("transposition by %s makes accidental larger than two",
+ delta.str ()));
}
}
bool
Melodic_req::do_equal_b (Request*r) const
{
- Melodic_req* m= r->musical ()->melodic ();
+ Melodic_req* m= r->access_Musical_req ()->access_Melodic_req ();
return !compare (*m, *this);
}
int
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)
- return o;
- if (n)
- return n;
- if (a)
- return a;
- return 0;
+ return Musical_pitch::compare (m1.pitch_, m2.pitch_);
}
void
Melodic_req::do_print () const
{
-#ifndef NPRINT
- DOUT << "notename: " << notename_i_
- << " acc: " <<accidental_i_<<" oct: "<< octave_i_;
-#endif
-}
-
-int
-Melodic_req::height () const
-{
- return notename_i_ + octave_i_*7;
-}
-
-/*
- should be settable from input to allow "viola"-mode
- */
-static Byte pitch_byte_a[ ] = { 0, 2, 4, 5, 7, 9, 11 };
-
-int
-Melodic_req::pitch () const
-{
- return pitch_byte_a[ notename_i_ % 7 ] + accidental_i_ + octave_i_ * 12;
+pitch_.print ();
}
-/* *************** */
int
Rhythmic_req::compare (Rhythmic_req const &r1, Rhythmic_req const &r2)
{
bool
Rhythmic_req::do_equal_b (Request*r) const
{
- Rhythmic_req* rh = r->musical ()->rhythmic ();
+ Rhythmic_req* rh = r->access_Musical_req ()->access_Rhythmic_req ();
return !compare (*this, *rh);
}
-void
-Rhythmic_req::set_duration (Duration d)
-{
- duration_ = d;
-}
Rhythmic_req::Rhythmic_req ()
{
{
return duration_.length ();
}
-/* *************** */
-Lyric_req::Lyric_req (Text_def* def_p)
- :Text_req (0, def_p)
+void
+Rhythmic_req::compress (Moment m)
{
- def_p->align_i_ = CENTER; // centre
- dir_ = DOWN; // lyrics below (invisible) staff
+ duration_.compress (m);
}
+
-IMPLEMENT_IS_TYPE_B2 (Lyric_req,Musical_req,Rhythmic_req);
+
+IMPLEMENT_IS_TYPE_B1 (Lyric_req,Rhythmic_req);
void
Lyric_req::do_print () const
{
Rhythmic_req::do_print ();
- Text_req::do_print ();
}
-/* *************** */
+
bool
Note_req::do_equal_b (Request*r) const
{
Rhythmic_req::do_print ();
#endif
}
-/* *************** */
IMPLEMENT_IS_TYPE_B1 (Rest_req, Rhythmic_req);
Rhythmic_req::do_print ();
}
-/* *************** */
+
+
IMPLEMENT_IS_TYPE_B1 (Multi_measure_rest_req, Rhythmic_req);
Rhythmic_req::do_print ();
}
-/* *************** */
+
IMPLEMENT_IS_TYPE_B1 (Beam_req,Span_req);
{
}
-/* *************** */
IMPLEMENT_IS_TYPE_B1 (Abbreviation_beam_req, Span_req);
{
}
-/* *************** */
bool
Span_req:: do_equal_b (Request*r) const
{
- Span_req * s = r->span ();
+ Span_req * s = r->access_Span_req ();
return spantype == s->spantype;
}
spantype = NOSPAN;
}
-/* *************** */
Script_req::Script_req (Script_req const&s)
{
dir_ = s.dir_;
bool
Script_req::do_equal_b (Request*r) const
{
- Script_req * s = r->script ();
+ Script_req * s = r->access_Script_req ();
return scriptdef_p_->equal_b (*s->scriptdef_p_);
}
Script_req::do_print () const
{
#ifndef NPRINT
- DOUT << " dir " << dir_ ;
+ DOUT << " dir " << dir_;
scriptdef_p_->print ();
#endif
}
{
delete scriptdef_p_;
}
-/* *************** */
Text_req::~Text_req ()
Text_req::do_print () const
{
#ifndef NPRINT
- DOUT << " dir " << dir_ ;
+ DOUT << " dir " << dir_;
tdef_p_->print ();
#endif
}
-/* *************** */
IMPLEMENT_IS_TYPE_B1 (Skip_req,Musical_req);
bool
Absolute_dynamic_req::do_equal_b (Request *r) const
{
- Absolute_dynamic_req *a = r->musical ()->dynamic ()->absdynamic ();
+ Absolute_dynamic_req *a = r->access_Musical_req ()->access_Dynamic_req ()->access_Absolute_dynamic_req ();
return loudness_ == a->loudness_;
}
String
Absolute_dynamic_req::loudness_str () const
{
- String s = loudness_static_str (loudness_);
- if (s.empty_b ())
+ String str = loudness_static_str (loudness_);
+ if (str.empty_b ())
{
- s = "mf";
- warning (String (_ ("Never heard of dynamic scale "))
- + loudness_ + _ (" assuming mf"));
+ String s = "mf";
+ warning (_f ("never heard of dynamic scale `\%s\', assuming %s",
+ str, s));
+ str = s;
}
- return s;
+ return str;
}
}
+
+bool
+Span_dynamic_req::do_equal_b (Request *req) const
+{
+ Span_dynamic_req * s = req->access_Musical_req ()->access_Span_dynamic_req ();
+
+ return Span_req::do_equal_b (req) && s->dynamic_dir_ == dynamic_dir_;
+}
+
Span_dynamic_req::Span_dynamic_req ()
{
dynamic_dir_ = CENTER;
{
#ifndef NPRINT
Span_req::do_print ();
- DOUT << "softer/louder: " <<dynamic_dir_;
+ DOUT << "softer/louder: " << dynamic_dir_;
#endif
}
projects / lilypond.git / blobdiff