X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=9ef07652e33bff3df8fc314e793fbed3a4e51c11;hb=8c0213576d4f811c826a828c38fe418ab50b66ce;hp=77185b3bdc9bc07e2c8539a4c97953a01b90a618;hpb=fe0e309fd2ff64aad884873c004d3740da51c272;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index 77185b3bdc..9ef07652e3 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2006 Han-Wen Nienhuys + (c) 1996--2007 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy @@ -214,28 +214,40 @@ Stem::add_head (Grob *me, Grob *n) bool Stem::is_invisible (Grob *me) { - Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"), - 0.0); + return !is_normal_stem (me) + && (robust_scm2double (me->get_property ("stemlet-length"), + 0.0) == 0.0); +} + - return !((head_count (me) - || stemlet_length > 0.0) - && scm_to_int (me->get_property ("duration-log")) >= 1); +bool +Stem::is_normal_stem (Grob *me) +{ + return head_count (me) && scm_to_int (me->get_property ("duration-log")) >= 1; } + MAKE_SCHEME_CALLBACK (Stem, pure_height, 3) SCM Stem::pure_height (SCM smob, SCM start, SCM end) { (void) start; (void) end; - - + Grob *me = unsmob_grob (smob); + Interval iv; + + if (!is_normal_stem (me)) + return ly_interval2scm (iv); + + /* if we are part of a cross-staff beam, return empty */ + if (get_beam (me) && Beam::is_cross_staff (get_beam (me))) + return ly_interval2scm (iv); + Real ss = Staff_symbol_referencer::staff_space (me); Real len = scm_to_double (calc_length (smob)) * ss / 2; Direction dir = get_grob_direction (me); - Interval iv; Interval hp = head_positions (me); if (dir == UP) iv = Interval (0, len); @@ -263,8 +275,6 @@ Stem::calc_stem_end_position (SCM smob) return me->get_property ("stem-end-position"); } - Real ss = Staff_symbol_referencer::staff_space (me); - int durlog = duration_log (me); vector a; /* WARNING: IN HALF SPACES */ @@ -279,45 +289,10 @@ Stem::calc_stem_end_position (SCM smob) if (!no_extend_b && dir * stem_end < 0) stem_end = 0.0; - - /* Make a little room if we have a upflag and there is a dot. - previous approach was to lengthen the stem. This is not - good typesetting practice. */ - if (!get_beam (me) && dir == UP - && durlog > 2) - { - Grob *closest_to_flag = extremal_heads (me)[dir]; - Grob *dots = closest_to_flag - ? Rhythmic_head::get_dots (closest_to_flag) : 0; - - if (dots) - { - Real dp = Staff_symbol_referencer::get_position (dots); - Interval flag_yext = flag (me).extent (Y_AXIS) * (2 / ss) + stem_end; - - /* Very gory: add myself to the X-support of the parent, - which should be a dot-column. */ - - if (flag_yext.distance (dp) < 0.5) - { - Grob *par = dots->get_parent (X_AXIS); - - if (Dot_column::has_interface (par)) - { - Side_position_interface::add_support (par, me); - - /* TODO: apply some better logic here. The flag is - curved inwards, so this will typically be too - much. */ - } - } - } - } - return scm_from_double (stem_end); } - +/* Length is in half-spaces (or: positions) here. */ MAKE_SCHEME_CALLBACK (Stem, calc_length, 1) SCM Stem::calc_length (SCM smob) @@ -364,8 +339,7 @@ Stem::calc_length (SCM smob) (Stem_tremolo::raw_stencil () looks at the beam.) --hwn */ Real minlen = 1.0 - + 2 * t_flag->extent (t_flag, Y_AXIS).length () - / ss; + + 2 * Stem_tremolo::vertical_length (t_flag) / ss; /* We don't want to add the whole extent of the flag because the trem and the flag can overlap partly. beam_translation gives a good @@ -395,7 +369,7 @@ Stem::duration_log (Grob *me) return (scm_is_number (s)) ? scm_to_int (s) : 2; } -MAKE_SCHEME_CALLBACK(Stem, calc_positioning_done, 1); +MAKE_SCHEME_CALLBACK (Stem, calc_positioning_done, 1); SCM Stem::calc_positioning_done (SCM smob) { @@ -403,6 +377,8 @@ Stem::calc_positioning_done (SCM smob) if (!head_count (me)) return SCM_BOOL_T; + me->set_property ("positioning-done", SCM_BOOL_T); + extract_grob_set (me, "note-heads", ro_heads); vector heads (ro_heads); vector_sort (heads, position_less); @@ -499,7 +475,7 @@ Stem::calc_positioning_done (SCM smob) return SCM_BOOL_T; } -MAKE_SCHEME_CALLBACK(Stem, calc_direction, 1); +MAKE_SCHEME_CALLBACK (Stem, calc_direction, 1); SCM Stem::calc_direction (SCM smob) { @@ -522,7 +498,7 @@ Stem::calc_direction (SCM smob) return scm_from_int (dir); } -MAKE_SCHEME_CALLBACK(Stem, calc_default_direction, 1); +MAKE_SCHEME_CALLBACK (Stem, calc_default_direction, 1); SCM Stem::calc_default_direction (SCM smob) { @@ -548,13 +524,11 @@ SCM Stem::height (SCM smob) { Grob *me = unsmob_grob (smob); - + if (!is_normal_stem (me)) + return ly_interval2scm (Interval ()); + Direction dir = get_grob_direction (me); - /* Trigger callback. - - UGH. Should be automatic - */ Grob *beam = get_beam (me); if (beam) { @@ -563,11 +537,11 @@ Stem::height (SCM smob) } /* - Can't get_stencil(), since that would cache stencils too early. + Can't get_stencil (), since that would cache stencils too early. This causes problems with beams. */ Stencil *stencil = unsmob_stencil (print (smob)); - Interval iv = stencil ? stencil->extent (Y_AXIS) : Interval(); + Interval iv = stencil ? stencil->extent (Y_AXIS) : Interval (); if (beam) { if (dir == CENTER) @@ -595,6 +569,9 @@ Stem::flag (Grob *me) || unsmob_grob (me->get_object ("beam"))) return Stencil (); + if (!is_normal_stem (me)) + return Stencil (); + /* TODO: maybe property stroke-style should take different values, e.g. "" (i.e. no stroke), "single" and "double" (currently, it's @@ -794,8 +771,16 @@ SCM Stem::offset_callback (SCM smob) { Grob *me = unsmob_grob (smob); - Real r = 0.0; + extract_grob_set (me, "rests", rests); + if (rests.size ()) + { + Grob *rest = rests.back (); + Real r = rest->extent (rest, X_AXIS).center (); + return scm_from_double (r); + } + + if (Grob *f = first_head (me)) { Interval head_wid = f->extent (f, X_AXIS); @@ -808,7 +793,7 @@ Stem::offset_callback (SCM smob) Direction d = get_grob_direction (me); Real real_attach = head_wid.linear_combination (d * attach); - r = real_attach; + Real r = real_attach; /* If not centered: correct for stem thickness. */ if (attach) @@ -816,17 +801,11 @@ Stem::offset_callback (SCM smob) Real rule_thick = thickness (me); r += -d * rule_thick * 0.5; } + return scm_from_double (r); } - else - { - extract_grob_set (me, "rests", rests); - if (rests.size ()) - { - Grob *rest = rests.back (); - r = rest->extent (rest, X_AXIS).center (); - } - } - return scm_from_double (r); + + programming_error ("Weird stem."); + return scm_from_double (0.0); } Spanner * @@ -848,7 +827,7 @@ Stem::get_stem_info (Grob *me) return si; } -MAKE_SCHEME_CALLBACK(Stem, calc_stem_info, 1); +MAKE_SCHEME_CALLBACK (Stem, calc_stem_info, 1); SCM Stem::calc_stem_info (SCM smob) { @@ -899,10 +878,14 @@ Stem::calc_stem_info (SCM smob) Real height_of_my_trem = 0.0; Grob *trem = unsmob_grob (me->get_object ("tremolo-flag")); if (trem) - height_of_my_trem = trem->extent (trem, Y_AXIS).length () + { + height_of_my_trem + = Stem_tremolo::vertical_length (trem) /* hack a bit of space around the trem. */ + beam_translation; + } + /* UGH It seems that also for ideal minimum length, we must use the maximum beam count (for this direction): @@ -988,6 +971,20 @@ Stem::beam_multiplicity (Grob *stem) return le; } +bool +Stem::is_cross_staff (Grob *stem) +{ + Grob *beam = unsmob_grob (stem->get_object ("beam")); + return beam && Beam::is_cross_staff (beam); +} + +MAKE_SCHEME_CALLBACK (Stem, calc_cross_staff, 1) +SCM +Stem::calc_cross_staff (SCM smob) +{ + return scm_from_bool (is_cross_staff (unsmob_grob (smob))); +} + /* FIXME: Too many properties */ ADD_INTERFACE (Stem, "The stem represent the graphical stem. "