source file of the GNU LilyPond music typesetter
- (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "beaming.hh"
ADD_THIS_TRANSLATOR (Auto_beam_engraver);
+
+/*
+ TODO: remove all references to Timing_engraver; should read properties.
+
+ */
Auto_beam_engraver::Auto_beam_engraver ()
{
stem_l_arr_p_ = 0;
}
void
-Auto_beam_engraver::do_process_requests ()
+Auto_beam_engraver::do_process_music ()
{
consider_end_and_begin (shortest_mom_);
}
Auto_beam_engraver::consider_end_and_begin (Moment test_mom)
{
if (!timer_l_)
- return;
+ return;
+
+ int num;
+ int den;
+ timer_l_->get_time_signature (&num, &den);
- Time_description const *time = &timer_l_->time_;
- int num = time->whole_per_measure_ / time->one_beat_;
- int den = time->one_beat_.den_i ();
String time_str = String ("time") + to_str (num) + "_" + to_str (den);
String type_str;
/*
first guess: end beam at end of beat
*/
- Moment end_mom = time->one_beat_;
+ SCM one (get_property ("beatLength"));
+
+ Moment end_mom;
+ if (SMOB_IS_TYPE_B(Moment, one))
+ end_mom = *SMOB_TO_TYPE (Moment, one);
/*
second guess: property generic time exception
*/
- SCM begin = get_property (time_str + "beamAutoBegin", 0);
+ SCM begin = get_property (time_str + "beamAutoBegin");
if (SMOB_IS_TYPE_B(Moment, begin))
begin_mom = * SMOB_TO_TYPE(Moment, begin);
- SCM end = get_property (time_str + "beamAutoEnd", 0);
+ SCM end = get_property (time_str + "beamAutoEnd");
if (SMOB_IS_TYPE_B (Moment, end))
end_mom = * SMOB_TO_TYPE(Moment,end);
*/
if (type_str.length_i ())
{
- SCM end_mult = get_property (time_str + "beamAutoEnd" + type_str, 0);
+ SCM end_mult = get_property ( time_str + "beamAutoEnd" + type_str);
if (SMOB_IS_TYPE_B (Moment, end_mult))
end_mom = * SMOB_TO_TYPE (Moment,end_mult);
- SCM begin_mult = get_property (time_str + "beamAutoBegin" + type_str, 0);
+ SCM begin_mult = get_property (time_str + "beamAutoBegin" + type_str);
if (SMOB_IS_TYPE_B (Moment, begin_mult))
begin_mom = * SMOB_TO_TYPE (Moment,begin_mult);
}
/*
fourth guess [user override]: property plain generic
*/
- begin = get_property ("beamAutoBegin", 0);
+ begin = get_property ("beamAutoBegin");
if (SMOB_IS_TYPE_B(Moment, begin))
begin_mom = * SMOB_TO_TYPE(Moment, begin);
- end = get_property ("beamAutoEnd", 0);
+ end = get_property ("beamAutoEnd");
if (SMOB_IS_TYPE_B (Moment, end))
end_mom = * SMOB_TO_TYPE (Moment,end);
*/
if (type_str.length_i ())
{
- SCM end_mult = get_property (String ("beamAutoEnd") + type_str, 0);
+ SCM end_mult = get_property (String ("beamAutoEnd") + type_str);
if (SMOB_IS_TYPE_B (Moment, end_mult))
end_mom = * SMOB_TO_TYPE (Moment,end_mult);
- SCM begin_mult = get_property (String ("beamAutoBegin") + type_str, 0);
+ SCM begin_mult = get_property (String ("beamAutoBegin") + type_str);
if (SMOB_IS_TYPE_B (Moment, begin_mult))
begin_mom = * SMOB_TO_TYPE (Moment,begin_mult);
}
Rational r;
if (end_mom)
- r = time->whole_in_measure_.mod_rat (end_mom);
+ r = timer_l_->measure_position ().mod_rat (end_mom);
else
r = Moment (1);
/*
Allow already started autobeam to end
*/
- SCM on = get_property ("noAutoBeaming", 0);
- if (gh_boolean_p (on) && gh_scm2bool (on))
+ SCM on = get_property ("noAutoBeaming");
+ if (to_boolean (on))
return;
if (begin_mom)
- r = time->whole_in_measure_.mod_rat (begin_mom);
+ r = timer_l_->measure_position ().mod_rat (begin_mom);
if (!stem_l_arr_p_ && (!begin_mom || !r))
begin_beam ();
}
assert (!grouping_p_);
grouping_p_ = new Beaming_info_list;
beam_start_moment_ = now_mom ();
- beam_start_location_ = timer_l_->time_.whole_in_measure_;
+ beam_start_location_ = timer_l_->measure_position ();
}
Beam*
/*
watch out for stem tremolos and abbreviation beams
*/
- if ((*stem_l_arr_p_)[i]->beam_l_)
+ if ((*stem_l_arr_p_)[i]->beam_l ())
{
return 0;
}
Auto_beam_engraver::same_grace_state_b (Score_element* e)
{
bool gr = e->get_elt_property ("grace") == SCM_BOOL_T;
- SCM wg =get_property ("weAreGraceContext",0);
- return (gh_boolean_p (wg) && gh_scm2bool (wg)) == gr;
+ SCM wg =get_property ("weAreGraceContext");
+ return (to_boolean (wg)) == gr;
}
void
/*
Don't (start) auto-beam over empty stems; skips or rests
*/
- if (!stem_l->head_l_arr_.size ())
+ if (!stem_l->heads_i ())
{
if (stem_l_arr_p_)
end_beam ();
return;
}
- if (stem_l->beam_l_)
+ if (stem_l->beam_l ())
{
if (stem_l_arr_p_)
junk_beam ();