#include "stem.hh"
#include "rhythmic-head.hh"
#include "engraver-group-engraver.hh"
-#include "musical-request.hh"
+#include "request.hh"
#include "warn.hh"
#include "misc.hh"
#include "note-head.hh"
/// moment (global time) where beam started.
Moment start_mom_;
Moment stop_mom_;
-
+ int flags_ ;
/// location within measure where beam started.
Moment beam_start_location_;
- int note_head_i_;
- int dots_i_;
-
bool sequential_body_b_;
- Spanner * beam_p_;
- Spanner * finished_beam_p_;
+ Spanner * beam_;
+ Spanner * finished_beam_;
Item * stem_tremolo_;
protected:
virtual void finalize ();
Chord_tremolo_engraver::Chord_tremolo_engraver ()
{
- beam_p_ = finished_beam_p_ = 0;
+ beam_ = finished_beam_ = 0;
repeat_ =0;
- note_head_i_ = 0;
- dots_i_ = 0;
+ flags_ = 0;
stem_tremolo_ = 0;
sequential_body_b_ = false;
}
{
Repeated_music * rp = dynamic_cast<Repeated_music*> (m);
if (rp
- && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_cxx_function
+ && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc
&& !repeat_)
{
- Moment l = rp->length_mom ();
+ Moment l = rp->get_length ();
repeat_ = rp;
start_mom_ = now_mom ();
stop_mom_ = start_mom_ + l;
sequential_body_b_ = dynamic_cast<Sequential_music*> (rp->body ());
- // ugh. should generate triplet beams.
- note_head_i_ = int (ceil (double(l.den ()) / l.num ()));
- dots_i_ = intlog2 (1+l.num ()) -1 ; // 1->0, 3->1, 7->2
- note_head_i_ = note_head_i_ <? 4;
+ Rational total_dur = l.main_part_;
+ Rational note_dur = (total_dur / Rational (repeat_->repeat_count ()));
+ flags_ = intlog2 ((total_dur / note_dur).num ());
+
return true;
}
{
if (repeat_)
{
- if (sequential_body_b_ && !beam_p_)
+ if (sequential_body_b_ && !beam_)
{
- beam_p_ = new Spanner (get_property ("Beam"));
- beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T);
-
+ beam_ = new Spanner (get_property ("Beam"));
+ beam_->set_grob_property ("chord-tremolo", SCM_BOOL_T);
SCM smp = get_property ("measurePosition");
Moment mp
= (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
beam_start_location_ = mp;
- announce_grob(beam_p_, repeat_->self_scm());
+ announce_grob(beam_, repeat_->self_scm());
}
else if (!sequential_body_b_ && !stem_tremolo_)
{
- int flags = intlog2 (note_head_i_ * repeat_->repeat_count ()) -2;
- if (flags)
+
+ if (flags_)
{
stem_tremolo_ = new Item (get_property ("StemTremolo"));
announce_grob(stem_tremolo_, repeat_->self_scm());
stem_tremolo_->set_grob_property ("flag-count",
- gh_int2scm (flags));
+ scm_int2num (flags_));
}
}
Chord_tremolo_engraver::finalize ()
{
typeset_beam ();
- if (beam_p_)
+ if (beam_)
{
repeat_->origin ()->warning (_ ("unterminated chord tremolo"));
- beam_p_->suicide ();
+ beam_->suicide ();
}
}
void
Chord_tremolo_engraver::typeset_beam ()
{
- if (finished_beam_p_)
+ if (finished_beam_)
{
- typeset_grob (finished_beam_p_);
- finished_beam_p_ = 0;
+ typeset_grob (finished_beam_);
+ finished_beam_ = 0;
}
}
void
Chord_tremolo_engraver::acknowledge_grob (Grob_info info)
{
- if (beam_p_)
+ if (beam_ && Stem::has_interface (info.grob_))
{
- if (Stem::has_interface (info.grob_l_))
- {
- Grob * s = info.grob_l_;
- int f = Stem::duration_log (s);
- f = (f > 2) ? f - 2 : 1;
- Stem::set_beaming (s, f, LEFT);
- Stem::set_beaming (s, f, RIGHT);
+ Grob * s = info.grob_;
+ Stem::set_beaming (s, flags_, LEFT);
+ Stem::set_beaming (s, flags_, RIGHT);
- SCM d = s->get_grob_property ("direction");
- if (Stem::type_i (s) != 1)
- {
- int gap_i =Stem::duration_log (s) - ((Stem::type_i (s) >? 2) - 2);
- beam_p_->set_grob_property ("gap", gh_int2scm (gap_i));
- }
- s->set_grob_property ("direction", d);
+ SCM d = s->get_grob_property ("direction");
+ if (Stem::duration_log (s) != 1)
+ {
+ beam_->set_grob_property ("gap", gh_double2scm (0.8));
+ }
+ s->set_grob_property ("direction", d);
- if (dynamic_cast <Rhythmic_req *> (info.music_cause ()))
- {
- Beam::add_stem (beam_p_, s);
- }
+ if (info.music_cause ()->is_mus_type ("rhythmic-event"))
+ {
+ Beam::add_stem (beam_, s);
+ }
+ else
+ {
+ String s = _ ("stem must have Rhythmic structure");
+ if (info.music_cause ())
+ info.music_cause ()->origin ()->warning (s);
else
- {
- String s = _ ("stem must have Rhythmic structure");
- if (info.music_cause ())
- info.music_cause ()->origin ()->warning (s);
- else
- ::warning (s);
- }
+ ::warning (s);
}
}
- else if (stem_tremolo_ && Stem::has_interface (info.grob_l_))
- {
- Stem_tremolo::set_stem (stem_tremolo_, info.grob_l_);
-
- info.grob_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
- }
-
-
- if (repeat_ && Note_head::has_interface (info.grob_l_))
+ else if (stem_tremolo_ && Stem::has_interface (info.grob_))
{
- info.grob_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_)));
- if (dots_i_ > 0)
- {
- Item * d = new Item (get_property ("Dots"));
- Rhythmic_head::set_dots (info.grob_l_, d);
-
- d->set_grob_property ("dot-count", gh_int2scm (dots_i_));
-
- d->set_parent (info.grob_l_, Y_AXIS);
- announce_grob (d, SCM_EOL);
- }
+ Stem_tremolo::set_stem (stem_tremolo_, info.grob_);
+ stem_tremolo_->set_parent (info.grob_,X_AXIS);
}
}
void
Chord_tremolo_engraver::start_translation_timestep ()
{
- if (beam_p_ && stop_mom_ == now_mom ())
+ if (beam_ && stop_mom_ == now_mom ())
{
- finished_beam_p_ = beam_p_;
+ finished_beam_ = beam_;
repeat_ = 0;
- beam_p_ = 0;
+ beam_ = 0;
}
}
ENTER_DESCRIPTION(Chord_tremolo_engraver,
/* descr */ "Generates beams for tremolo repeats.",
/* creats*/ "Beam",
-/* acks */ "stem-interface note-head-interface",
+/* accepts */ "repeated-music",
+/* acks */ "stem-interface note-head-interface",
/* reads */ "",
/* write */ "");
projects / lilypond.git / blobdiff