source file of the GNU LilyPond music typesetter
- (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "beam.hh"
Spanner *beam_;
Stream_event *prev_start_ev_;
- Stream_event *now_stop_ev_;
+ Stream_event *stop_ev_;
Beaming_pattern *beam_info_;
Beaming_pattern *finished_beam_info_;
/// moment (global time) where beam started.
Moment beam_start_mom_;
- bool subdivide_beams_;
- Moment beat_length_;
-
+ Beaming_options beaming_options_;
+ Beaming_options finished_beaming_options_;
+
void typeset_beam ();
void set_melisma (bool);
finished_beam_ = 0;
finished_beam_info_ = 0;
beam_info_ = 0;
- now_stop_ev_ = 0;
+ stop_ev_ = 0;
start_ev_ = 0;
prev_start_ev_ = 0;
}
if (d == START && valid_start_point ())
ASSIGN_EVENT_ONCE (start_ev_, ev);
else if (d == STOP && valid_end_point ())
- ASSIGN_EVENT_ONCE (now_stop_ev_, ev);
+ ASSIGN_EVENT_ONCE (stop_ev_, ev);
}
void
void
Beam_engraver::process_music ()
{
- if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
- context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
-
if (start_ev_)
{
if (beam_)
beam_start_location_ = mp;
beam_start_mom_ = now_mom ();
+ beaming_options_.from_context (context ());
beam_info_ = new Beaming_pattern;
/* urg, must copy to Auto_beam_engraver too */
}
+
+ typeset_beam ();
+ if (stop_ev_ && beam_)
+ {
+ announce_end_grob (beam_, stop_ev_->self_scm ());
+
+ }
}
void
{
if (!finished_beam_->get_bound (RIGHT))
finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
-
- finished_beam_info_->beamify (context ());
+
+ finished_beam_info_->beamify (finished_beaming_options_);
Beam::set_beaming (finished_beam_, finished_beam_info_);
delete finished_beam_info_;
void
Beam_engraver::stop_translation_timestep ()
{
- typeset_beam ();
- if (now_stop_ev_)
+ if (stop_ev_)
{
finished_beam_ = beam_;
finished_beam_info_ = beam_info_;
-
- now_stop_ev_ = 0;
+ finished_beaming_options_ = beaming_options_;
+
+ stop_ev_ = 0;
beam_ = 0;
beam_info_ = 0;
typeset_beam ();
if (beam_
&& !scm_is_number (info.grob ()->get_property_data ("staff-position")))
{
- chain_offset_callback (info.grob(),
+ chain_offset_callback (info.grob (),
Beam::rest_collision_callback_proc, Y_AXIS);
}
}
scm_from_int (durlog));
Moment stem_location = now - beam_start_mom_ + beam_start_location_;
beam_info_->add_stem (stem_location,
- max (durlog- 2, 0));
+ max (durlog- 2, 0),
+ Stem::is_invisible (stem));
Beam::add_stem (beam_, stem);
}
ADD_TRANSLATOR (Beam_engraver,
/* doc */
-
- "Handles Beam events by engraving Beams. If omitted, then notes will be "
- "printed with flags instead of beams.",
+ "Handle @code{Beam} events by engraving beams. If omitted,"
+ " then notes are printed with flags instead of beams.",
- /* create */ "Beam",
+ /* create */
+ "Beam ",
/* read */
"beamMelismaBusy "
"beatLength "
- "subdivideBeams "
- ,
+ "subdivideBeams ",
+
/* write */
- "forbidBreak");
+ "forbidBreak"
+ );
class Grace_beam_engraver : public Beam_engraver
{
if (d == START && valid_start_point ())
start_ev_ = ev;
else if (d == STOP && valid_end_point ())
- now_stop_ev_ = ev;
+ stop_ev_ = ev;
}
ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
ADD_TRANSLATOR (Grace_beam_engraver,
-
/* doc */
-
- "Handles Beam events by engraving Beams. If omitted, then notes will "
- "be printed with flags instead of beams. Only engraves beams when we "
- " are at grace points in time. ",
+ "Handle @code{Beam} events by engraving beams. If omitted,"
+ " then notes are printed with flags instead of beams. Only"
+ " engraves beams when we are at grace points in time.",
- /* create */ "Beam",
+ /* create */
+ "Beam ",
+
/* read */
"beamMelismaBusy "
"beatLength "
- "allowBeamBreak "
- "subdivideBeams "
- ,
- /* write */ "");
+ "subdivideBeams ",
+
+ /* write */
+ ""
+ );