source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
{
/* ugh, this has a side-effect that we need to ensure that
Stem #'beaming is correct */
- (void) me_grob->get_property ("quantized-positions");
+ (void) me_grob->get_property ("beaming");
Spanner *me = dynamic_cast<Spanner*> (me_grob);
bool inside_stem = (event_dir == LEFT)
? segs[j].stem_index_ > 0
- : segs[j].stem_index_ < stems.size () - 1;
+ : segs[j].stem_index_ + 1 < stems.size () ;
bool event = on_bound
|| abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1
(me->layout ()->self_scm (), properties, quant_score));
if (!score.is_empty ())
- the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0, 0);
+ the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
}
#endif
sets stem directions, a constant shift does not have an
influence.
*/
- head_extents += stem->relative_coordinate (common, Y_AXIS);
+ head_extents += stem->pure_relative_y_coordinate (common, 0, INT_MAX);
if (to_dir (stem->get_property_data ("direction")))
{
Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0;
Drul_array<Real> pos = ly_scm2interval (posns);
-
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
{
int count = beaming->beamlet_count (i, d);
if (i > 0
- && i < stems.size () -1
+ && i + 1 < stems.size ()
&& Stem::is_invisible (stem))
count = min (count, beaming->beamlet_count (i,-d));
rest -> stem -> beam -> interpolate_y_position ()
*/
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1, "");
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
return knee;
}
+bool
+Beam::is_cross_staff (Grob *me)
+{
+ extract_grob_set (me, "stems", stems);
+ Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me);
+ for (vsize i = 0; i < stems.size (); i++)
+ if (Staff_symbol_referencer::get_staff_symbol (stems[i]) != staff_symbol)
+ return true;
+ return false;
+}
+
+MAKE_SCHEME_CALLBACK (Beam, cross_staff, 1)
+SCM
+Beam::cross_staff (SCM smob)
+{
+ return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
+}
+
int
Beam::get_direction_beam_count (Grob *me, Direction d)
{