source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver-group-engraver.hh"
virtual bool try_music (Music*);
virtual void process_music ();
- virtual bool valid_start_moment();
- virtual bool valid_end_moment ();
+ virtual bool valid_start_point();
+ virtual bool valid_end_point ();
public:
TRANSLATOR_DECLARATIONS( Beam_engraver );
always nested.
*/
bool
-Beam_engraver::valid_start_moment()
+Beam_engraver::valid_start_point()
{
Moment n = now_mom ();
}
bool
-Beam_engraver::valid_end_moment()
+Beam_engraver::valid_end_point()
{
- return last_stem_added_at_.grace_part_ == Rational(0);
+ return valid_start_point ();
}
-
Beam_engraver::Beam_engraver ()
{
beam_ = 0;
else if (m->is_mus_type ("beam-event"))
{
Direction d = to_dir (m->get_mus_property ("span-direction"));
-
- if (d == STOP && !valid_end_moment())
- return false;
-
- if (d == START && !valid_start_moment ())
- return false;
-
- if (d == STOP)
- {
- SCM m = get_property ("automaticMelismata");
- SCM b = get_property ("autoBeaming");
- if (to_boolean (m) && !to_boolean (b))
- {
- set_melisma (false);
- }
- }
-
- evs_drul_[d ] = m;
- return true;
- }
- else if (m->is_mus_type ("new-beam-event"))
- {
- Direction d = to_dir (m->get_mus_property ("span-direction"));
- if (d == START && !valid_start_moment ())
+ if (d == START && !valid_start_point ())
return false;
- if (d == STOP && !valid_end_moment ())
+ if (d == STOP && !valid_end_point ())
return false;
if (d == START)
- evs_drul_[d] = m;
+ {
+ evs_drul_[d] = m;
+ }
else if (d==STOP)
- now_stop_ev_ = m;
-
+ {
+ now_stop_ev_ = m;
+ }
return true;
}
return false;
}
void
-Beam_engraver::set_melisma (bool m)
+Beam_engraver::set_melisma (bool ml)
{
- daddy_trans_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+ SCM b = get_property ("autoBeaming");
+ if (!to_boolean (b))
+ daddy_trans_->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
}
void
beam_ = 0;
}
- if (beam_)
+ if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
{
top_engraver ()->forbid_breaks ();
}
+
if (evs_drul_[START])
{
if (beam_)
return;
}
+ set_melisma (true);
prev_start_ev_ = evs_drul_[START];
beam_ = new Spanner (get_property ("Beam"));
SCM smp = get_property ("measurePosition");
if (beam_)
{
- SCM m = get_property ("automaticMelismata");
- SCM b = get_property ("autoBeaming");
- if (to_boolean (m) && !to_boolean (b))
- {
- set_melisma (true);
- }
+ set_melisma (true);
+
subdivide_beams_ = to_boolean(get_property("subdivideBeams"));
beat_length_ = *unsmob_moment (get_property ("beatLength"));
}
beam_ = 0;
beam_info_ = 0;
typeset_beam();
+ set_melisma (false);
}
}
{
Moment now = now_mom();
- if (!valid_start_moment ())
+ if (!valid_start_point ())
return ;
Item *stem = dynamic_cast<Item*> (info.grob_);
/* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be "
"printed with flags instead of beams.",
/* creats*/ "Beam",
-/* accepts */ "beam-event new-beam-event abort-event",
+/* accepts */ "beam-event abort-event",
/* acks */ "stem-interface rest-interface",
/* reads */ "beamMelismaBusy beatLength subdivideBeams",
/* write */ "");
TRANSLATOR_DECLARATIONS(Grace_beam_engraver);
protected:
- virtual bool valid_start_moment();
- virtual bool valid_end_moment ();
+ virtual bool valid_start_point();
+ virtual bool valid_end_point ();
};
Grace_beam_engraver::Grace_beam_engraver()
}
bool
-Grace_beam_engraver::valid_start_moment()
+Grace_beam_engraver::valid_start_point()
{
Moment n = now_mom ();
bool
-Grace_beam_engraver::valid_end_moment ()
+Grace_beam_engraver::valid_end_point ()
{
- return beam_ && last_stem_added_at_.grace_part_ != Rational(0);
+ return beam_ && valid_start_point ();
}
" are at grace points in time. "
,
/* creats*/ "Beam",
-/* accepts */ "beam-event abort-event new-beam-event",
+/* accepts */ "beam-event abort-event",
/* acks */ "stem-interface rest-interface",
-/* reads */ "beamMelismaBusy beatLength subdivideBeams",
+/* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
/* write */ "");