/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO: This is way too hairy
if (!to_boolean (me->get_property ("cross-staff")))
{
- Real len = scm_to_double (calc_length (smob)) * ss / 2;
+ Real len_in_halfspaces;
+ SCM user_set_len_scm = me->get_property_data ("length");
+ if (scm_is_number (user_set_len_scm))
+ len_in_halfspaces = scm_to_double (user_set_len_scm);
+ else
+ len_in_halfspaces = scm_to_double (calc_length (smob));
+ Real len = len_in_halfspaces * ss / 2;
Direction dir = get_grob_direction (me);
Interval hp = head_positions (me);
SCM lengths = ly_assoc_get (ly_symbol2scm ("beamed-lengths"), details, SCM_EOL);
Real ideal_length
- = scm_to_double (robust_list_ref (beam_count - 1, lengths))
- * staff_space
- * length_fraction
-
- /* stem only extends to center of beam
- */
- - 0.5 * beam_thickness;
+ = (scm_is_pair (lengths)
+ ? (scm_to_double (robust_list_ref (beam_count - 1, lengths))
+ * staff_space
+ * length_fraction
+ /*
+ stem only extends to center of beam
+ */
+ - 0.5 * beam_thickness)
+ : 0.0);
/* Condition: sane minimum free stem length (chord to beams) */
- lengths = ly_assoc_get (ly_symbol2scm ("beamed-minimum-free-lengths"), details, SCM_EOL);
+ lengths = ly_assoc_get (ly_symbol2scm ("beamed-minimum-free-lengths"),
+ details, SCM_EOL);
Real ideal_minimum_free
- = scm_to_double (robust_list_ref (beam_count - 1, lengths))
- * staff_space
- * length_fraction;
+ = (scm_is_pair (lengths)
+ ? (scm_to_double (robust_list_ref (beam_count - 1, lengths))
+ * staff_space
+ * length_fraction)
+ : 0.0);
Real height_of_my_trem = 0.0;
Grob *trem = unsmob_grob (me->get_object ("tremolo-flag"));
It seems that also for ideal minimum length, we must use
the maximum beam count (for this direction):
- \score{ \notes\relative c''{ [a8 a32] }}
+ \score { \relative c'' { a8[ a32] } }
must be horizontal. */
Real height_of_my_beams = beam_thickness
details, SCM_EOL);
Real minimum_free
- = scm_to_double (robust_list_ref (beam_count - 1, bemfl))
- * staff_space
- * length_fraction;
+ = (scm_is_pair (bemfl)
+ ? (scm_to_double (robust_list_ref (beam_count - 1, bemfl))
+ * staff_space
+ * length_fraction)
+ : 0.0);
Real minimum_length = max (minimum_free, height_of_my_trem)
+ height_of_my_beams