X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=e155a0611e628b64657a09bf6a0f54241f5d80e0;hb=711cf44d0ab28f3159230c84d63c0b19199408b0;hp=9cdaaa2568073c274aeaa903c57a15e23087e8e5;hpb=ebf33ab24c66b23917006ed8dcb4e91eb51ea739;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index 9cdaaa2568..e155a0611e 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2005 Han-Wen Nienhuys + (c) 1996--2006 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy @@ -14,26 +14,28 @@ */ #include "stem.hh" +#include "spanner.hh" #include // rint using namespace std; -#include "lookup.hh" +#include "beam.hh" #include "directional-element-interface.hh" +#include "dot-column.hh" +#include "font-interface.hh" +#include "international.hh" +#include "lookup.hh" +#include "misc.hh" #include "note-head.hh" -#include "warn.hh" #include "output-def.hh" -#include "rhythmic-head.hh" -#include "font-interface.hh" #include "paper-column.hh" -#include "misc.hh" -#include "beam.hh" -#include "rest.hh" #include "pointer-group-interface.hh" -#include "staff-symbol-referencer.hh" +#include "rest.hh" +#include "rhythmic-head.hh" #include "side-position-interface.hh" -#include "dot-column.hh" +#include "staff-symbol-referencer.hh" #include "stem-tremolo.hh" +#include "warn.hh" void Stem::set_beaming (Grob *me, int beam_count, Direction d) @@ -47,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); } @@ -60,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 @@ -146,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; @@ -154,7 +162,7 @@ Stem::extremal_heads (Grob *me) Drul_array exthead (0, 0); extract_grob_set (me, "note-heads", heads); - for (int i = heads.size (); i--;) + for (vsize i = heads.size (); i--;) { Grob *n = heads[i]; int p = Staff_symbol_referencer::get_rounded_position (n); @@ -173,28 +181,22 @@ 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. */ -Array +vector Stem::note_head_positions (Grob *me) { - Array ps; + vector ps; extract_grob_set (me, "note-heads", heads); - for (int i = heads.size (); i--;) + for (vsize i = heads.size (); i--;) { Grob *n = heads[i]; int p = Staff_symbol_referencer::get_rounded_position (n); - ps.push (p); + ps.push_back (p); } - ps.sort (integer_compare); + vector_sort (ps, less ()); return ps; } @@ -212,12 +214,46 @@ 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); + + 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) @@ -229,10 +265,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); - Array a; + vector a; /* WARNING: IN HALF SPACES */ Real length = robust_scm2double (me->get_property ("length"), 7); @@ -260,11 +301,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); @@ -283,7 +325,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) @@ -330,20 +372,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); } @@ -366,12 +411,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); @@ -382,15 +427,28 @@ 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 (int i = 0; i < heads.size (); i++) - heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir], - X_AXIS); + for (vsize i = 0; i < heads.size (); i++) + { + 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 (int i = 1; i < heads.size (); i++) + for (vsize i = 1; i < heads.size (); i++) { Real p = Staff_symbol_referencer::get_position (heads[i]); Real dy = fabs (lastpos- p); @@ -448,8 +506,6 @@ Stem::calc_positioning_done (SCM smob) return SCM_BOOL_T; } - - MAKE_SCHEME_CALLBACK(Stem, calc_direction, 1); SCM Stem::calc_direction (SCM smob) @@ -463,33 +519,37 @@ Stem::calc_direction (SCM smob) dir = get_grob_direction (me); } else - dir = get_default_dir (me); + { + SCM dd = me->get_property ("default-direction"); + dir = to_dir (dd); + if (!dir) + return me->get_property ("neutral-direction"); + } return scm_from_int (dir); } -/* A separate function, since this is used elsewhere too. */ -Direction -Stem::get_default_dir (Grob *me) +MAKE_SCHEME_CALLBACK(Stem, calc_default_direction, 1); +SCM +Stem::calc_default_direction (SCM smob) { + Grob *me = unsmob_grob (smob); + Direction dir = CENTER; int staff_center = 0; Interval hp = head_positions (me); if (!hp.is_empty ()) { - int udistance = (int) (UP *hp[UP] - staff_center); - int ddistance = (int) (DOWN *hp[DOWN] - staff_center); + int udistance = (int) (UP * hp[UP] - staff_center); + int ddistance = (int) (DOWN * hp[DOWN] - staff_center); - if (sign (ddistance - udistance)) - dir = Direction (sign (ddistance - udistance)); - else - dir = to_dir (me->get_property ("neutral-direction")); + dir = Direction (sign (ddistance - udistance)); } - return dir; + + return scm_from_int (dir); } - MAKE_SCHEME_CALLBACK (Stem, height, 1); SCM Stem::height (SCM smob) @@ -505,7 +565,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"); } /* @@ -545,7 +606,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"). */ - String flag_style; + string flag_style; SCM flag_style_scm = me->get_property ("flag-style"); if (scm_is_symbol (flag_style_scm)) @@ -556,8 +617,8 @@ Stem::flag (Grob *me) bool adjust = true; - String staffline_offs; - if (String::compare (flag_style, "mensural") == 0) + 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 flags are always vertically aligned with the staff lines, @@ -570,7 +631,7 @@ Stem::flag (Grob *me) { int p = (int) (rint (stem_end_position (me))); staffline_offs - = Staff_symbol_referencer::on_staffline (me, p) ? "0" : "1"; + = Staff_symbol_referencer::on_line (me, p) ? "0" : "1"; } else staffline_offs = "2"; @@ -579,7 +640,7 @@ Stem::flag (Grob *me) staffline_offs = ""; char dir = (get_grob_direction (me) == UP) ? 'u' : 'd'; - 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); @@ -589,10 +650,10 @@ Stem::flag (Grob *me) SCM stroke_style_scm = me->get_property ("stroke-style"); if (scm_is_string (stroke_style_scm)) { - String stroke_style = ly_scm2string (stroke_style_scm); - if (!stroke_style.is_empty ()) + string stroke_style = ly_scm2string (stroke_style_scm); + if (!stroke_style.empty ()) { - 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)); @@ -640,6 +701,8 @@ SCM Stem::print (SCM smob) { Grob *me = unsmob_grob (smob); + Grob *beam = get_beam (me); + Stencil mol; Direction d = get_grob_direction (me); @@ -653,7 +716,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; @@ -699,7 +761,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)); @@ -720,7 +782,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); @@ -767,7 +829,7 @@ Stem::offset_callback (SCM smob) extract_grob_set (me, "rests", rests); if (rests.size ()) { - Grob *rest = rests.top (); + Grob *rest = rests.back (); r = rest->extent (rest, X_AXIS).center (); } } @@ -793,7 +855,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) @@ -809,31 +870,45 @@ Stem::calc_stem_info (SCM smob) Real staff_space = Staff_symbol_referencer::staff_space (me); Grob *beam = get_beam (me); + + if (beam) + { + (void) beam->get_property ("beaming"); + } + Real beam_translation = Beam::get_beam_translation (beam); Real beam_thickness = Beam::get_thickness (beam); int beam_count = Beam::get_direction_beam_count (beam, my_dir); + Real length_fraction + = robust_scm2double (me->get_property ("length-fraction"), 1.0); /* Simple standard stem length */ SCM details = me->get_property ("details"); SCM lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-lengths"), details)); - 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; /* Condition: sane minimum free stem length (chord to beams) */ lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-minimum-free-lengths"), details)); - Real length_fraction - = robust_scm2double (me->get_property ("length-fraction"), 1.0); Real ideal_minimum_free = scm_to_double (robust_list_ref (beam_count - 1, lengths)) - * staff_space * length_fraction; + * 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 @@ -847,6 +922,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; @@ -893,20 +969,14 @@ Stem::calc_stem_info (SCM smob) Real minimum_free = scm_to_double (robust_list_ref (beam_count - 1, bemfl)) - * staff_space; + * 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; @@ -926,7 +996,7 @@ Stem::beam_multiplicity (Grob *stem) } /* 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. " @@ -953,6 +1023,7 @@ ADD_INTERFACE (Stem, "stem-interface", "avoid-note-head " "beam " "beaming " + "default-direction " "details " "direction " "duration-log " @@ -960,6 +1031,7 @@ ADD_INTERFACE (Stem, "stem-interface", "french-beaming " "length " "length-fraction " + "max-beam-connect " "neutral-direction " "no-stem-extend " "note-heads "