/*
- auto-beam-engraver.cc -- implement Auto_beam_engraver
+ auto-beam-engraver.cc -- implement Auto_beam_engraver
source file of the GNU LilyPond music typesetter
- (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
*/
+#include "engraver.hh"
#include "beaming.hh"
-#include "musical-request.hh"
#include "beam.hh"
#include "stem.hh"
#include "warn.hh"
-#include "engraver-group-engraver.hh"
#include "bar-line.hh"
#include "rest.hh"
-#include "engraver.hh"
#include "item.hh"
#include "spanner.hh"
+#include "context.hh"
-/*
- TODO: figure what to do in grace?
-
- TODO: documentme.
- */
class Auto_beam_engraver : public Engraver
{
- TRANSLATOR_DECLARATIONS(Auto_beam_engraver);
+ TRANSLATOR_DECLARATIONS (Auto_beam_engraver);
+
protected:
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
+ virtual void process_music ();
+ virtual bool try_music (Music*);
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
virtual void process_acknowledged_grobs ();
void begin_beam ();
void end_beam ();
void junk_beam ();
- bool same_grace_state_b (Grob* e);
+ bool is_same_grace_state (Grob* e);
void typeset_beam ();
+ Music *forbid_;
/*
shortest_mom is the shortest note in the beam.
*/
Beaming_info_list*finished_grouping_;
};
+void
+Auto_beam_engraver::process_music ()
+{
+ if (scm_is_string (get_property ("whichBar")))
+ {
+ consider_end (shortest_mom_);
+ junk_beam ();
+ }
+
+ if (forbid_)
+ {
+ consider_end (shortest_mom_);
+ junk_beam ();
+ }
+}
Auto_beam_engraver::Auto_beam_engraver ()
{
+ forbid_ = 0;
count_ = 0;
stems_ = 0;
shortest_mom_ = Moment (Rational (1, 8));
beam_settings_ = SCM_EOL;
}
+
+bool
+Auto_beam_engraver::try_music (Music*m)
+{
+ if (m->is_mus_type ("beam-forbid-event"))
+ {
+ forbid_ = m;
+ return true;
+ }
+
+ return false;
+}
+
/*
Determine end moment for auto beaming (or begin moment, but mostly
- 0==anywhere) In order of increasing priority:
+ 0== anywhere) In order of increasing priority:
i. begin anywhere, end at every beat
ii. end * <num> <den>
bool
Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
{
- Moment now = now_mom();
+ Moment now = now_mom ();
if (dir == START
&& now.grace_part_)
{
function = scm_list_n (ly_symbol2scm ("begin"), SCM_UNDEFINED);
else
function = scm_list_n (ly_symbol2scm ("end"), SCM_UNDEFINED);
+
+ Moment beat_length (1, 4);
+ if (Moment * m = unsmob_moment (get_property ("beatLength")))
+ {
+ beat_length = *m;
+ }
+ Moment measure_length (1, 1);
+ int num = 4;
+ if (Moment* m = unsmob_moment (get_property ("measureLength")))
+ {
+ num = int ((*m / beat_length).main_part_);
+ }
+
+ int den = beat_length.den ();
+ SCM time = scm_list_n (scm_int2num (num), scm_int2num (den), SCM_UNDEFINED);
- Moment one_beat = *unsmob_moment (get_property ("beatLength"));
- int num = int ((*unsmob_moment (get_property ("measureLength")) / one_beat).main_part_);
- int den = one_beat.den ();
- SCM time = scm_list_n (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
-
- SCM type = scm_list_n (gh_int2scm (test_mom.num ()),
- gh_int2scm (test_mom.den ()), SCM_UNDEFINED);
+ SCM type = scm_list_n (scm_int2num (test_mom.num ()),
+ scm_int2num (test_mom.den ()), SCM_UNDEFINED);
+ /*
+ UGH UGH.
+ settings aren't grob-properties.
+ */
SCM settings = get_property ("autoBeamSettings");
/* first guess */
/* end beam at end of beat */
if (dir == STOP)
{
- SCM beat (get_property ("beatLength"));
-
- if (unsmob_moment (beat))
- moment = *unsmob_moment (beat);
+ moment = robust_scm2moment (get_property ("beatLength"), moment);
}
/* second guess: property generic time exception */
- SCM m = gh_assoc (gh_append3 (function, wild, time), settings);
+ SCM m = scm_assoc (ly_append3 (function, wild, time), settings);
- if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
- moment = * unsmob_moment (ly_cdr (m));
+ if (m != SCM_BOOL_F && unsmob_moment (scm_cdr (m)))
+ moment = * unsmob_moment (scm_cdr (m));
/* third guess: property time exception, specific for duration type */
- m = gh_assoc (gh_append3 (function, type, time), settings);
- if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
- moment = * unsmob_moment (ly_cdr (m));
+ m = scm_assoc (ly_append3 (function, type, time), settings);
+ if (m != SCM_BOOL_F && unsmob_moment (scm_cdr (m)))
+ moment = * unsmob_moment (scm_cdr (m));
/* fourth guess [user override]: property plain generic */
- m = gh_assoc (gh_append3 (function, wild, wild), settings);
- if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
- moment = * unsmob_moment (ly_cdr (m));
+ m = scm_assoc (ly_append3 (function, wild, wild), settings);
+ if (m != SCM_BOOL_F && unsmob_moment (scm_cdr (m)))
+ moment = * unsmob_moment (scm_cdr (m));
/* fifth guess [user override]: property plain, specific for duration type */
- m = gh_assoc (gh_append3 (function, type, wild), settings);
- if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
- moment = * unsmob_moment (ly_cdr (m));
+ m = scm_assoc (ly_append3 (function, type, wild), settings);
+ if (m != SCM_BOOL_F && unsmob_moment (scm_cdr (m)))
+ moment = * unsmob_moment (scm_cdr (m));
Rational r;
if (moment.to_bool ())
We may have to fix this elsewhere (timing translator)
r = unsmob_moment (get_property ("measurePosition"))->mod_rat (moment);
*/
- Moment pos = * unsmob_moment (get_property ("measurePosition"));
+ Moment pos (0);
+ if (Moment *m = unsmob_moment (get_property ("measurePosition")))
+ {
+ pos = *m;
+ }
+
if (pos < Moment (0))
{
- Moment length = * unsmob_moment (get_property ("measureLength"));
+ Moment length(1);
+
+ if ( Moment *m = unsmob_moment (get_property ("measureLength")))
+ {
+ length = *m;
+ }
pos = length - pos;
}
r = pos.main_part_.mod_rat (moment.main_part_);
Auto_beam_engraver::consider_begin (Moment test_mom)
{
bool on = to_boolean (get_property ("autoBeaming"));
- if (!stems_ && on)
+ if (!stems_ && on
+ && !forbid_)
{
bool b = test_moment (START, test_mom);
if (b)
}
}
-Spanner*
+Spanner *
Auto_beam_engraver::create_beam ()
{
if (to_boolean (get_property ("skipTypesetting")))
- {
- return 0;
- }
+ return 0;
- Spanner* beam = new Spanner (beam_settings_);
+ Spanner *beam = new Spanner (beam_settings_, context ()->get_grob_key ("Beam"));
for (int i = 0; i < stems_->size (); i++)
{
/*
Beam::add_stem (beam, (*stems_)[i]);
}
- announce_grob(beam, SCM_EOL);
+ announce_grob (beam, (*stems_)[0]->self_scm ());
return beam;
}
void
Auto_beam_engraver::begin_beam ()
{
- assert (!stems_);
+ if (stems_ || grouping_ )
+ {
+ programming_error ("already have autobeam");
+ return;
+ }
+
stems_ = new Link_array<Item>;
- assert (!grouping_);
grouping_ = new Beaming_info_list;
- beam_settings_ = get_property ("Beam");
+ beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
beam_start_moment_ = now_mom ();
- beam_start_location_ = *unsmob_moment (get_property ("measurePosition"));
- subdivide_beams_ = gh_scm2bool(get_property("subdivideBeams"));
- beat_length_ = *unsmob_moment (get_property ("beatLength"));
+ beam_start_location_ =
+ robust_scm2moment (get_property ("measurePosition"), Moment(0));
+ subdivide_beams_ = ly_scm2bool (get_property ("subdivideBeams"));
+ beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment(1, 4));
}
-
void
Auto_beam_engraver::junk_beam ()
{
- assert (stems_);
+ if (!stems_)
+ return ;
delete stems_;
stems_ = 0;
junk_beam ();
}
else
-
{
finished_beam_ = create_beam ();
if (finished_beam_)
{
if (finished_beam_)
{
- finished_grouping_->beamify(beat_length_, subdivide_beams_);
+ finished_grouping_->beamify (beat_length_, subdivide_beams_);
Beam::set_beaming (finished_beam_, finished_grouping_);
- typeset_grob (finished_beam_);
finished_beam_ = 0;
delete finished_grouping_;
- finished_grouping_= 0;
+ finished_grouping_ = 0;
}
}
end_beam ();
}
}
+ forbid_ = 0;
}
void
void
Auto_beam_engraver::acknowledge_grob (Grob_info info)
{
+ /*
+ Duplicated from process_music(), since
+ Repeat_acknowledge_engraver::process_music() may also set whichBar
+ */
+ if (scm_is_string (get_property ("whichBar"))
+ && beam_start_moment_ < now_mom())
+ {
+ consider_end (shortest_mom_);
+ junk_beam ();
+ }
+
if (stems_)
{
if (Beam::has_interface (info.grob_))
if (Stem::has_interface (info.grob_))
{
Item* stem = dynamic_cast<Item *> (info.grob_);
-
- Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.music_cause ());
- if (!rhythmic_req)
+ Music* m = info.music_cause ();
+ if (!m->is_mus_type ("rhythmic-event"))
{
programming_error ("Stem must have rhythmic structure");
return;
return ;
}
- int durlog = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->duration_log ();
+ int durlog = unsmob_duration (m->get_property ("duration"))->duration_log ();
if (durlog <= 2)
{
return ;
- Moment dur = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom ();
+ Moment dur = unsmob_duration (m->get_property ("duration"))->get_length ();
/* FIXME:
This comment has been here since long:
durlog - 2);
stems_->push (stem);
last_add_mom_ = now;
- extend_mom_ = (extend_mom_ >? now) + rhythmic_req->length_mom ();
+ extend_mom_ = (extend_mom_ >? now) + m->get_length ();
}
}
}
}
}
-
- /*
- count_++ ->
-
- auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */
- count_ = count_ + 1;
+
+ count_ ++;
}
-ENTER_DESCRIPTION(Auto_beam_engraver,
-/* descr */ "Generate beams based on measure characteristics and observed
-Stems. Uses beatLength, measureLength and measurePosition to decide
-when to start and stop a beam. Overriding beaming is done through
-@ref{Stem_engraver} properties stemLeftBeamCount and
-stemRightBeamCount.
-",
+
+ADD_TRANSLATOR (Auto_beam_engraver,
+/* descr */ "Generate beams based on measure characteristics and observed "
+"Stems. Uses beatLength, measureLength and measurePosition to decide "
+"when to start and stop a beam. Overriding beaming is done through "
+"@ref{Stem_engraver} properties @code{stemLeftBeamCount} and "
+"@code{stemRightBeamCount}. "
+,
/* creats*/ "Beam",
-/* acks */ "stem-interface rest-interface beam-interface bar-line-interface",
+/* accepts */ "beam-forbid-event",
+/* acks */ "stem-interface rest-interface beam-interface bar-line-interface",
/* reads */ "autoBeaming autoBeamSettings beatLength subdivideBeams",
/* write */ "");
projects / lilypond.git / blobdiff