X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=b517b6ec9f69f323dfa97fdea5a52f1781187b92;hb=87bcfd325a61d9efb40f44fa7ac5a48e93d7b4af;hp=4189915f372fadb795c5e56861961e37735975ae;hpb=00e3e15364b9d3c94cda1bcab9f889bb95f6832d;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index 4189915f37..b517b6ec9f 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -239,19 +239,32 @@ Stem::pure_height (SCM smob, SCM start, SCM end) if (!is_normal_stem (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); + Real rad = Staff_symbol_referencer::staff_radius (me); - Interval hp = head_positions (me); - if (dir == UP) - iv = Interval (0, len); - else - iv = Interval (-len, 0); + if (!to_boolean (me->get_property ("cross-staff"))) + { + Real len = scm_to_double (calc_length (smob)) * ss / 2; + Direction dir = get_grob_direction (me); - if (!hp.is_empty ()) - iv.translate (hp[dir] * ss / 2); + Interval hp = head_positions (me); + if (dir == UP) + iv = Interval (0, len); + else + iv = Interval (-len, 0); + + if (!hp.is_empty ()) + iv.translate (hp[dir] * ss / 2); + + /* extend the stem (away from the head) to cover the staff */ + if (dir == UP) + iv[UP] = max (iv[UP], rad * ss); + else + iv[DOWN] = min (iv[DOWN], -rad * ss); + } + else + iv = Interval (-rad * ss, rad * ss); return ly_interval2scm (iv); } @@ -271,8 +284,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 */ @@ -283,45 +294,10 @@ Stem::calc_stem_end_position (SCM smob) Real stem_end = dir ? hp[dir] + dir * length : 0; /* TODO: change name to extend-stems to staff/center/'() */ - bool no_extend_b = to_boolean (me->get_property ("no-stem-extend")); - if (!no_extend_b && dir * stem_end < 0) + bool no_extend = to_boolean (me->get_property ("no-stem-extend")); + if (!no_extend && 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); } @@ -337,7 +313,7 @@ Stem::calc_length (SCM smob) Real ss = Staff_symbol_referencer::staff_space (me); Real length = 7; - SCM s = scm_cdr (scm_assq (ly_symbol2scm ("lengths"), details)); + SCM s = ly_assoc_get (ly_symbol2scm ("lengths"), details, SCM_EOL); if (scm_is_pair (s)) length = 2 * scm_to_double (robust_list_ref (durlog - 2, s)); @@ -348,7 +324,7 @@ Stem::calc_length (SCM smob) Interval hp = head_positions (me); if (dir && dir * hp[dir] >= 0) { - SCM sshorten = scm_cdr (scm_assq (ly_symbol2scm ("stem-shorten"), details)); + SCM sshorten = ly_assoc_get (ly_symbol2scm ("stem-shorten"), details, SCM_EOL); SCM scm_shorten = scm_is_pair (sshorten) ? robust_list_ref (max (duration_log (me) - 2, 0), sshorten) : SCM_EOL; Real shorten = 2* robust_scm2double (scm_shorten, 0); @@ -602,6 +578,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 @@ -723,6 +702,9 @@ Stem::print (SCM smob) if (!lh && stemlet && !beam) return SCM_EOL; + if (lh && robust_scm2int (lh->get_property ("duration-log"), 0) < 1) + return SCM_EOL; + if (is_invisible (me)) return SCM_EOL; @@ -886,7 +868,7 @@ Stem::calc_stem_info (SCM smob) /* Simple standard stem length */ SCM details = me->get_property ("details"); - SCM lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-lengths"), details)); + 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)) @@ -898,7 +880,7 @@ Stem::calc_stem_info (SCM smob) - 0.5 * beam_thickness; /* Condition: sane minimum free stem length (chord to beams) */ - lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-minimum-free-lengths"), details)); + 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)) @@ -956,9 +938,9 @@ Stem::calc_stem_info (SCM smob) Obviously not for grace beams. Also, not for knees. Seems to be a good thing. */ - bool no_extend_b = to_boolean (me->get_property ("no-stem-extend")); + bool no_extend = to_boolean (me->get_property ("no-stem-extend")); bool is_knee = to_boolean (beam->get_property ("knee")); - if (!no_extend_b && !is_knee) + if (!no_extend && !is_knee) { /* Highest beam of (UP) beam must never be lower than middle staffline */ @@ -970,8 +952,8 @@ Stem::calc_stem_info (SCM smob) ideal_y -= robust_scm2double (beam->get_property ("shorten"), 0); - SCM bemfl = scm_cdr (scm_assq (ly_symbol2scm ("beamed-extreme-minimum-free-lengths"), - details)); + SCM bemfl = ly_assoc_get (ly_symbol2scm ("beamed-extreme-minimum-free-lengths"), + details, SCM_EOL); Real minimum_free = scm_to_double (robust_list_ref (beam_count - 1, bemfl)) @@ -1001,29 +983,46 @@ 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. " - "In addition, it internally connects note heads, beams and" - "tremolos. " - "Rests and whole notes have invisible stems." - - "\n\nThe following properties may be set in the details list." + "The stem represents the graphical stem. In addition, it" + " internally connects note heads, beams, and tremolos. Rests" + " and whole notes have invisible stems.\n" + "\n" + "The following properties may be set in the @code{details}" + " list.\n" + "\n" "@table @code\n" - "@item beamed-lengths \n" - "list of stem lengths given beam multiplicity. \n" - "@item beamed-minimum-free-lengths \n" - "list of normal minimum free stem lengths (chord to beams) given beam multiplicity.\n" + "@item beamed-lengths\n" + "List of stem lengths given beam multiplicity.\n" + "@item beamed-minimum-free-lengths\n" + "List of normal minimum free stem lengths (chord to beams)" + " given beam multiplicity.\n" "@item beamed-extreme-minimum-free-lengths\n" - "list of extreme minimum free stem lengths (chord to beams) given beam multiplicity.\n" + "List of extreme minimum free stem lengths (chord to beams)" + " given beam multiplicity.\n" "@item lengths\n" - "Default stem lengths. The list gives a length for each flag-count.\n" + "Default stem lengths. The list gives a length for each" + " flag count.\n" "@item stem-shorten\n" - "How much a stem in a forced direction " - "should be shortened. The list gives an amount depending on the number " - "of flags/beams." - "@end table\n" - , + "How much a stem in a forced direction should be shortened." + " The list gives an amount depending on the number of flags" + " and beams.\n" + "@end table\n", /* properties */ "avoid-note-head "