X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=dd247b4baa1997e2d74ea8783d13649631d91f38;hb=8eafccec8c45891d8e00366ca2f67f67a9c93cf9;hp=41f039f623469c47e0062fdd04c8389a91148137;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index 41f039f623..dd247b4baa 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 @@ -14,6 +14,7 @@ */ #include "stem.hh" +#include "spanner.hh" #include // rint using namespace std; @@ -48,8 +49,12 @@ Stem::set_beaming (Grob *me, int beam_count, Direction d) } SCM lst = index_get_cell (pair, d); - for (int i = 0; i < beam_count; i++) - lst = scm_cons (scm_from_int (i), lst); + if (beam_count) + for (int i = 0; i < beam_count; i++) + lst = scm_cons (scm_from_int (i), lst); + else + lst = SCM_BOOL_F; + index_set_cell (pair, d, lst); } @@ -61,7 +66,9 @@ Stem::get_beaming (Grob *me, Direction d) return 0; SCM lst = index_get_cell (pair, d); - return scm_ilength (lst); + + int len = scm_ilength (lst); + return max (len, 0); } Interval @@ -147,7 +154,7 @@ Stem::last_head (Grob *me) Drul_array Stem::extremal_heads (Grob *me) { - const int inf = 1000000; + const int inf = INT_MAX; Drul_array extpos; extpos[DOWN] = inf; extpos[UP] = -inf; @@ -174,17 +181,11 @@ Stem::extremal_heads (Grob *me) return exthead; } -static int -integer_compare (int const &a, int const &b) -{ - return a - b; -} - /* The positions, in ascending order. */ -std::vector +vector Stem::note_head_positions (Grob *me) { - std::vector ps; + vector ps; extract_grob_set (me, "note-heads", heads); for (vsize i = heads.size (); i--;) @@ -195,7 +196,7 @@ Stem::note_head_positions (Grob *me) ps.push_back (p); } - ps.sort (integer_compare); + vector_sort (ps, less ()); return ps; } @@ -213,12 +214,50 @@ 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); +} + + +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; - return !((head_count (me) - || stemlet_length > 0.0) - && scm_to_int (me->get_property ("duration-log")) >= 1); + 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 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); + + return ly_interval2scm (iv); } MAKE_SCHEME_CALLBACK (Stem, calc_stem_end_position, 1) @@ -230,10 +269,15 @@ Stem::calc_stem_end_position (SCM smob) if (!head_count (me)) return scm_from_double (0.0); + if (Grob *beam = get_beam (me)) + { + (void) beam->get_property ("quantized-positions"); + return me->get_property ("stem-end-position"); + } Real ss = Staff_symbol_referencer::staff_space (me); int durlog = duration_log (me); - std::vector a; + vector a; /* WARNING: IN HALF SPACES */ Real length = robust_scm2double (me->get_property ("length"), 7); @@ -261,11 +305,12 @@ Stem::calc_stem_end_position (SCM smob) if (dots) { Real dp = Staff_symbol_referencer::get_position (dots); - Real flagy = flag (me).extent (Y_AXIS)[-dir] * 2 / ss; + 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 (dir * (stem_end + flagy - dp) < 0.5) + + if (flag_yext.distance (dp) < 0.5) { Grob *par = dots->get_parent (X_AXIS); @@ -284,7 +329,7 @@ Stem::calc_stem_end_position (SCM smob) 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) @@ -331,20 +376,23 @@ Stem::calc_length (SCM smob) (Stem_tremolo::raw_stencil () looks at the beam.) --hwn */ Real minlen = 1.0 - + 2 * Stem_tremolo::raw_stencil (t_flag).extent (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 + approximation */ if (durlog >= 3) - { - Interval flag_ext = flag (me).extent (Y_AXIS); - if (!flag_ext.is_empty ()) - minlen += 2 * flag_ext.length () / ss; - - /* The clash is smaller for down stems (since the tremolo is - angled up.) */ - if (dir == DOWN) - minlen -= 1.0; - } + { + Real beam_trans = Stem_tremolo::get_beam_translation (t_flag); + /* the obvious choice is (durlog - 2) here, but we need a bit more space. */ + minlen += 2 * (durlog - 1.5) * beam_trans; + + /* up-stems need even a little more space to avoid collisions. This + needs to be in sync with the tremolo positioning code in + Stem_tremolo::print */ + if (dir == UP) + minlen += beam_trans; + } length = max (length, minlen + 1.0); } @@ -367,12 +415,12 @@ Stem::calc_positioning_done (SCM smob) return SCM_BOOL_T; extract_grob_set (me, "note-heads", ro_heads); - Link_array heads (ro_heads); - heads.sort (compare_position); + vector heads (ro_heads); + vector_sort (heads, position_less); Direction dir = get_grob_direction (me); if (dir < 0) - heads.reverse (); + reverse (heads); Real thick = thickness (me); @@ -383,12 +431,25 @@ Stem::calc_positioning_done (SCM smob) dir = UP; set_grob_direction (me, dir); } - + + bool is_harmonic_centered = false; + for (vsize i = 0; i < heads.size (); i++) + is_harmonic_centered = is_harmonic_centered + || heads[i]->get_property ("style") == ly_symbol2scm ("harmonic"); + is_harmonic_centered = is_harmonic_centered && is_invisible (me); + Real w = hed->extent (hed, X_AXIS)[dir]; for (vsize i = 0; i < heads.size (); i++) - heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir], - X_AXIS); + { + Real amount = w - heads[i]->extent (heads[i], X_AXIS)[dir]; + if (is_harmonic_centered) + amount = + hed->extent (hed, X_AXIS).linear_combination (CENTER) + - heads[i]->extent (heads[i], X_AXIS).linear_combination (CENTER); + + heads[i]->translate_axis (amount, X_AXIS); + } bool parity = true; Real lastpos = Real (Staff_symbol_referencer::get_position (heads[0])); for (vsize i = 1; i < heads.size (); i++) @@ -508,7 +569,8 @@ Stem::height (SCM smob) Grob *beam = get_beam (me); if (beam) { - beam->get_property ("positions"); + /* trigger set-stem-lengths. */ + beam->get_property ("quantized-positions"); } /* @@ -548,7 +610,7 @@ Stem::flag (Grob *me) TODO: maybe property stroke-style should take different values, e.g. "" (i.e. no stroke), "single" and "double" (currently, it's '() or "grace"). */ - std::string flag_style; + string flag_style; SCM flag_style_scm = me->get_property ("flag-style"); if (scm_is_symbol (flag_style_scm)) @@ -559,7 +621,7 @@ Stem::flag (Grob *me) bool adjust = true; - std::string staffline_offs; + string staffline_offs; if (flag_style == "mensural") /* Mensural notation: For notes on staff lines, use different flags than for notes between staff lines. The idea is that @@ -582,7 +644,7 @@ Stem::flag (Grob *me) staffline_offs = ""; char dir = (get_grob_direction (me) == UP) ? 'u' : 'd'; - std::string font_char = flag_style + string font_char = flag_style + to_string (dir) + staffline_offs + to_string (log); Font_metric *fm = Font_interface::get_default_font (me); Stencil flag = fm->find_by_name ("flags." + font_char); @@ -592,10 +654,10 @@ Stem::flag (Grob *me) SCM stroke_style_scm = me->get_property ("stroke-style"); if (scm_is_string (stroke_style_scm)) { - std::string stroke_style = ly_scm2string (stroke_style_scm); + string stroke_style = ly_scm2string (stroke_style_scm); if (!stroke_style.empty ()) { - std::string font_char = to_string (dir) + stroke_style; + string font_char = to_string (dir) + stroke_style; Stencil stroke = fm->find_by_name ("flags." + font_char); if (stroke.is_empty ()) me->warning (_f ("flag stroke `%s' not found", font_char)); @@ -643,6 +705,8 @@ SCM Stem::print (SCM smob) { Grob *me = unsmob_grob (smob); + Grob *beam = get_beam (me); + Stencil mol; Direction d = get_grob_direction (me); @@ -656,7 +720,6 @@ Stem::print (SCM smob) = to_boolean (me->get_property ("avoid-note-head")) ? last_head (me) : first_head (me); - Grob *beam = get_beam (me); if (!lh && !stemlet) return SCM_EOL; @@ -702,7 +765,7 @@ Stem::print (SCM smob) // URG Real stem_width = thickness (me); Real blot - = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); Box b = Box (Interval (-stem_width / 2, stem_width / 2), Interval (stem_y[DOWN] * half_space, stem_y[UP] * half_space)); @@ -723,7 +786,7 @@ Stem::get_translated_flag (Grob *me) { Direction d = get_grob_direction (me); Real blot - = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); Real stem_width = thickness (me); Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5; Real y2 = robust_scm2double (me->get_property ("stem-end-position"), 0.0); @@ -742,8 +805,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); @@ -756,7 +827,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) @@ -764,17 +835,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 * @@ -796,7 +861,6 @@ Stem::get_stem_info (Grob *me) return si; } -/* TODO: add extra space for tremolos! */ MAKE_SCHEME_CALLBACK(Stem, calc_stem_info, 1); SCM Stem::calc_stem_info (SCM smob) @@ -845,6 +909,13 @@ Stem::calc_stem_info (SCM smob) * staff_space * length_fraction; + 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 () + /* 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): @@ -857,6 +928,7 @@ Stem::calc_stem_info (SCM smob) Real ideal_minimum_length = ideal_minimum_free + height_of_my_beams + + height_of_my_trem /* stem only extends to center of beam */ - 0.5 * beam_thickness; @@ -906,18 +978,11 @@ Stem::calc_stem_info (SCM smob) * staff_space * length_fraction; - Real minimum_length = minimum_free + Real minimum_length = max (minimum_free, height_of_my_trem) + height_of_my_beams /* stem only extends to center of beam */ - 0.5 * beam_thickness; - if (Grob *tremolo = unsmob_grob (me->get_object ("tremolo-flag"))) - { - Interval y_ext = tremolo->extent (tremolo, Y_AXIS); - y_ext.widen (0.5); // FIXME. Should be tunable? - minimum_length = max (minimum_length, y_ext.length ()); - } - ideal_y *= my_dir; Real minimum_y = note_start + minimum_length; Real shortest_y = minimum_y * my_dir; @@ -936,8 +1001,22 @@ 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, cross_staff, 1) +SCM +Stem::cross_staff (SCM smob) +{ + return scm_from_bool (is_cross_staff (unsmob_grob (smob))); +} + /* FIXME: Too many properties */ -ADD_INTERFACE (Stem, "stem-interface", +ADD_INTERFACE (Stem, "The stem represent the graphical stem. " "In addition, it internally connects note heads, beams and" "tremolos. " @@ -972,6 +1051,7 @@ ADD_INTERFACE (Stem, "stem-interface", "french-beaming " "length " "length-fraction " + "max-beam-connect " "neutral-direction " "no-stem-extend " "note-heads "