source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "stem.hh"
#include "debug.hh"
#include "engraver-group-engraver.hh"
-#include "bar.hh"
+#include "bar-line.hh"
#include "rest.hh"
#include "engraver.hh"
#include "item.hh"
*/
class Auto_beam_engraver : public Engraver
{
-public:
- Auto_beam_engraver ();
- VIRTUAL_COPY_CONS (Translator);
-
+ TRANSLATOR_DECLARATIONS(Auto_beam_engraver);
protected:
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
int count_i_;
Moment last_add_mom_;
-
/*
Projected ending of the beam we're working on.
*/
Moment extend_mom_;
Moment beam_start_moment_;
Moment beam_start_location_;
+
+ bool subdivide_beams_;
// We act as if beam were created, and start a grouping anyway.
Beaming_info_list*grouping_p_;
Beaming_info_list*finished_grouping_p_;
};
-ADD_THIS_TRANSLATOR (Auto_beam_engraver);
+
Auto_beam_engraver::Auto_beam_engraver ()
{
count_i_ = 0;
stem_l_arr_p_ = 0;
- shortest_mom_ = Moment (1, 8);
+ shortest_mom_ = Moment (Rational (1, 8));
finished_beam_p_ = 0;
finished_grouping_p_ = 0;
grouping_p_ = 0;
bool
Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
{
- SCM wild = gh_list (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED);
+ SCM wild = scm_list_n (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED);
SCM function;
if (dir == START)
- function = gh_list (ly_symbol2scm ("begin"), SCM_UNDEFINED);
+ function = scm_list_n (ly_symbol2scm ("begin"), SCM_UNDEFINED);
else
- function = gh_list (ly_symbol2scm ("end"), SCM_UNDEFINED);
+ function = scm_list_n (ly_symbol2scm ("end"), SCM_UNDEFINED);
Moment one_beat = *unsmob_moment (get_property ("beatLength"));
- int num = *unsmob_moment (get_property ("measureLength")) / one_beat;
+ int num = int ((*unsmob_moment (get_property ("measureLength")) / one_beat).main_part_);
int den = one_beat.den ();
- SCM time = gh_list (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
+ SCM time = scm_list_n (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
- SCM type = gh_list (gh_int2scm (test_mom.num ()),
+ SCM type = scm_list_n (gh_int2scm (test_mom.num ()),
gh_int2scm (test_mom.den ()), SCM_UNDEFINED);
SCM settings = get_property ("autoBeamSettings");
/* second guess: property generic time exception */
SCM m = gh_assoc (gh_append3 (function, wild, time), settings);
- if (m != SCM_BOOL_F && unsmob_moment (gh_cdr (m)))
- moment = * unsmob_moment (gh_cdr (m));
+ if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
+ moment = * unsmob_moment (ly_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 (gh_cdr (m)))
- moment = * unsmob_moment (gh_cdr (m));
+ if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
+ moment = * unsmob_moment (ly_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 (gh_cdr (m)))
- moment = * unsmob_moment (gh_cdr (m));
+ if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
+ moment = * unsmob_moment (ly_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 (gh_cdr (m)))
- moment = * unsmob_moment (gh_cdr (m));
+ if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
+ moment = * unsmob_moment (ly_cdr (m));
Rational r;
- if (moment)
+ if (moment.to_bool ())
{
/* Ugh? measurePosition can be negative, when \partial
We may have to fix this elsewhere (timing translator)
void
Auto_beam_engraver::consider_begin (Moment test_mom)
{
- bool off = to_boolean (get_property ("noAutoBeaming"));
- if (!stem_l_arr_p_ && ! off)
+ bool on = to_boolean (get_property ("autoBeaming"));
+ if (!stem_l_arr_p_ && on)
{
bool b = test_moment (START, test_mom);
if (b)
if (stem_l_arr_p_)
{
/* Allow already started autobeam to end:
- don't check for noAutoBeaming */
+ don't check for autoBeaming */
bool b = test_moment (STOP, test_mom);
if (b)
end_beam ();
Beam::add_stem (beam_p, (*stem_l_arr_p_)[i]);
}
- announce_grob (beam_p, 0);
+ announce_grob(beam_p, SCM_EOL);
return beam_p;
}
grouping_p_ = new Beaming_info_list;
beam_start_moment_ = now_mom ();
beam_start_location_ = *unsmob_moment (get_property ("measurePosition"));
+ subdivide_beams_ = gh_scm2bool(get_property("subdivideBeams"));
}
delete grouping_p_;
grouping_p_ = 0;
- shortest_mom_ = Moment (1, 8);
+ shortest_mom_ = Moment (Rational (1, 8));
}
void
grouping_p_ = 0;
}
- shortest_mom_ = Moment (1, 8);
+ shortest_mom_ = Moment (Rational (1, 8));
}
void
{
if (finished_beam_p_)
{
- finished_grouping_p_->beamify ();
+ finished_grouping_p_->beamify(*unsmob_moment (get_property ("beatLength")),
+ subdivide_beams_);
Beam::set_beaming (finished_beam_p_, finished_grouping_p_);
typeset_grob (finished_beam_p_);
finished_beam_p_ = 0;
void
Auto_beam_engraver::stop_translation_timestep ()
{
-
typeset_beam ();
}
{
if (stem_l_arr_p_)
{
- if (Beam::has_interface (info.elem_l_))
+ if (Beam::has_interface (info.grob_l_))
{
end_beam ();
}
- else if (Bar::has_interface (info.elem_l_))
+ else if (Bar_line::has_interface (info.grob_l_))
{
end_beam ();
}
- else if (Rest::has_interface (info.elem_l_))
+ else if (Rest::has_interface (info.grob_l_))
{
end_beam ();
}
}
- if (Stem::has_interface (info.elem_l_))
+ if (Stem::has_interface (info.grob_l_))
{
- Item* stem_l = dynamic_cast<Item *> (info.elem_l_);
+ Item* stem_l = dynamic_cast<Item *> (info.grob_l_);
- Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
+ Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.music_cause ());
if (!rhythmic_req)
{
programming_error ("Stem must have rhythmic structure");
/*
Don't (start) auto-beam over empty stems; skips or rests
*/
- if (!Stem::heads_i (stem_l))
+ if (!Stem::head_count (stem_l))
{
if (stem_l_arr_p_)
end_beam ();
return;
}
+
+ /*
+ ignore grace notes.
+ */
+ if (bool (beam_start_location_.grace_part_) != bool (now_mom ().grace_part_))
+ return ;
+
+
Moment dur = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom ();
/* FIXME:
auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */
count_i_ = count_i_ + 1;
}
+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.
+",
+/* creats*/ "Beam",
+/* acks */ "stem-interface rest-interface beam-interface bar-line-interface",
+/* reads */ "autoBeaming autoBeamSettings subdivideBeams",
+/* write */ "");
projects / lilypond.git / blobdiff