X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=79823a10923942f0212c7e8c62b50cac4a369883;hb=f05cfd7757b31723fe6af2f5c0e2fdbaebea3b85;hp=304c382a81b0e2f7353ce8b00927450e5b9dbee4;hpb=38d60c0c4e8c29beccd4acfd07aadf1cdea74097;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index 304c382a81..79823a1092 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy @@ -36,7 +36,7 @@ Stem::set_beaming (Grob*me ,int i, Direction d) if (!gh_pair_p (pair)) { - pair = gh_cons (gh_int2scm (0),gh_int2scm (0)); + pair = gh_cons (gh_int2scm (-1),gh_int2scm (-1)); me-> set_grob_property ("beaming", pair); } index_set_cell (pair, d, gh_int2scm (i)); @@ -49,7 +49,7 @@ Stem::beam_count (Grob*me,Direction d) if (gh_pair_p (p)) return gh_scm2int (index_cell (p,d)); else - return 0; + return -1; } Interval @@ -113,7 +113,7 @@ Stem::set_stemend (Grob*me, Real se) Direction d= get_direction (me); if (d && d * head_positions (me)[get_direction (me)] >= se*d) - warning (_ ("Weird stem size; check for narrow beams")); + me->warning (_ ("Weird stem size; check for narrow beams")); me->set_grob_property ("stem-end-position", gh_double2scm (se)); } @@ -229,10 +229,6 @@ Stem::add_head (Grob*me, Grob *n) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("heads"), n); } - else - { - n->set_grob_property ("rest", n->self_scm ()); - } } bool @@ -296,6 +292,10 @@ Stem::get_default_stem_end_position (Grob*me) // fixme: use scm_list_n_ref () iso. array[] Real shorten_f = a[ ((flag_i (me) - 2) >? 0) get_grob_property ("no-stem-extend")); - if (!grace_b && !no_extend_b && dir * st < 0) // junkme? - st = 0.0; + if (!grace_b && !no_extend_b && dir * st < 0) // junkme? + st = 0.0; return st; } @@ -407,7 +405,8 @@ Stem::position_noteheads (Grob*me) { if (parity) { - Real l = heads[i]->extent (heads[i], X_AXIS).length (); + Real l = Note_head::head_extent (heads[i], X_AXIS).length (); + heads[i]->translate_axis (l * get_direction (me), X_AXIS); } parity = !parity; @@ -480,6 +479,8 @@ Stem::flag (Grob*me) { style = ""; } + bool adjust = to_boolean (me->get_grob_property ("adjust-if-on-staffline")); + if (String::compare_i (style, "mensural") == 0) /* Mensural notation: For notes on staff lines, use different flags than for notes between staff lines. The idea is that @@ -489,32 +490,37 @@ Stem::flag (Grob*me) touches a staff line. */ { - /* Urrgh! We have to detect wether this stem ends on a staff - line or between two staff lines. But we can not call - stem_end_position(me) or get_default_stem_end_position(me), - since this encounters the flag and hence results in an - infinite recursion. However, in pure mensural notation, - there are no multiple note heads attached to a single stem, - neither is there usually need for using the stem_shorten - property (except for 32th and 64th notes, but that is not a - problem since the stem length in this case is augmented by - an integral multiple of staff_space). Hence, it should be - sufficient to just take the first note head, assume it's - the only one, look if it's on a staff line, and select the - flag's shape accordingly. In the worst case, the shape - looks slightly misplaced, but that will usually be the - programmer's fault (e.g. when trying to attach multiple - note heads to a single stem in mensural notation). - - */ - Grob *first = first_head(me); - int sz = Staff_symbol_referencer::line_count (me)-1; - int p = (int)rint (Staff_symbol_referencer::position_f (first)); - staffline_offs = (((p ^ sz) & 0x1) == 0) ? "1" : "0"; + if (adjust) + { + /* Urrgh! We have to detect wether this stem ends on a staff + line or between two staff lines. But we can not call + stem_end_position(me) or get_default_stem_end_position(me), + since this encounters the flag and hence results in an + infinite recursion. However, in pure mensural notation, + there are no multiple note heads attached to a single stem, + neither is there usually need for using the stem_shorten + property (except for 32th and 64th notes, but that is not a + problem since the stem length in this case is augmented by + an integral multiple of staff_space). Hence, it should be + sufficient to just take the first note head, assume it's + the only one, look if it's on a staff line, and select the + flag's shape accordingly. In the worst case, the shape + looks slightly misplaced, but that will usually be the + programmer's fault (e.g. when trying to attach multiple + note heads to a single stem in mensural notation). */ + Grob *first = first_head(me); + int sz = Staff_symbol_referencer::line_count (me)-1; + int p = (int)rint (Staff_symbol_referencer::position_f (first)); + staffline_offs = (((p ^ sz) & 0x1) == 0) ? "1" : "0"; + } + else + { + staffline_offs = "2"; + } } else { - staffline_offs = ""; + staffline_offs = ""; } char c = (get_direction (me) == UP) ? 'u' : 'd'; String index_str @@ -563,7 +569,7 @@ Stem::brew_molecule (SCM smob) // dy? Real dy = Staff_symbol_referencer::staff_space (me) * 0.5; - + if (Grob *hed = support_head (me)) { /* @@ -573,7 +579,7 @@ Stem::brew_molecule (SCM smob) Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS); y_attach = head_height.linear_combination (y_attach); - stem_y[Direction (-d)] += d * 2*y_attach; + stem_y[Direction (-d)] += d * y_attach/dy; } if (!invisible_b (me)) @@ -650,6 +656,19 @@ Stem::beam_l (Grob*me) Stem_info Stem::calc_stem_info (Grob*me) { + SCM scm_info = me->get_grob_property ("stem-info"); + + if (gh_pair_p (scm_info )) + { + Stem_info si ; + + si.ideal_y = gh_scm2double (gh_car (scm_info)); + si.max_y = gh_scm2double (gh_cadr (scm_info)); + si.min_y = gh_scm2double (gh_caddr (scm_info)); + + return si; + } + Grob * beam = beam_l (me); Direction beam_dir = Directional_element_interface::get (beam); @@ -662,19 +681,16 @@ Stem::calc_stem_info (Grob*me) Real staff_space = Staff_symbol_referencer::staff_space (me); Real half_space = staff_space / 2; + int multiplicity = Beam::get_multiplicity (beam); - - - SCM space_proc = beam->get_grob_property ("space-function"); - SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity)); - Real interbeam_f = gh_scm2double (space) * staff_space; + Real interbeam_f = Beam::get_interbeam (beam); Real thick = gh_scm2double (beam->get_grob_property ("thickness")); Stem_info info; - info.idealy_f_ = chord_start_f (me); + info.ideal_y = chord_start_f (me); // for simplicity, we calculate as if dir == UP - info.idealy_f_ *= beam_dir; + info.ideal_y *= beam_dir; SCM grace_prop = me->get_grob_property ("grace"); bool grace_b = to_boolean (grace_prop); @@ -702,13 +718,13 @@ Stem::calc_stem_info (Grob*me) { if (multiplicity) { - info.idealy_f_ += thick + (multiplicity - 1) * interbeam_f; + info.ideal_y += thick + (multiplicity - 1) * interbeam_f; } - info.miny_f_ = info.idealy_f_; - info.maxy_f_ = INT_MAX; + info.min_y = info.ideal_y; + info.max_y = 1000; // INT_MAX; - info.idealy_f_ += stem_length; - info.miny_f_ += minimum_length; + info.ideal_y += stem_length; + info.min_y += minimum_length; /* lowest beam of (UP) beam must never be lower than second staffline @@ -727,8 +743,8 @@ Stem::calc_stem_info (Grob*me) staffline lowest beam of (UP) beam must never be lower than second staffline */ - info.miny_f_ = - info.miny_f_ >? 0 + info.min_y = + info.min_y >? 0 >? (- 2 * half_space - thick + (multiplicity > 0) * thick + interbeam_f * (multiplicity - 1)); @@ -737,29 +753,35 @@ Stem::calc_stem_info (Grob*me) else /* knee */ { - info.idealy_f_ -= thick; - info.maxy_f_ = info.idealy_f_; - info.miny_f_ = -INT_MAX; + info.ideal_y -= thick; + info.max_y = info.ideal_y; + info.min_y = - 1000 ; // INT_MAX; - info.idealy_f_ -= stem_length; - info.maxy_f_ -= minimum_length; + info.ideal_y -= stem_length; + info.max_y -= minimum_length; } - info.idealy_f_ = (info.maxy_f_ ? info.miny_f_; + info.ideal_y = (info.max_y ? info.min_y; s = beam->get_grob_property ("shorten"); if (gh_number_p (s)) - info.idealy_f_ -= gh_scm2double (s); + info.ideal_y -= gh_scm2double (s); - Grob *common = me->common_refpoint (beam, Y_AXIS); + Grob *common = me->common_refpoint (beam, Y_AXIS); Real interstaff_f = beam_dir * - (me->relative_coordinate (common, Y_AXIS) + (me->relative_coordinate (common, Y_AXIS) - beam->relative_coordinate (common, Y_AXIS)); - - info.idealy_f_ += interstaff_f; - info.miny_f_ += interstaff_f; - info.maxy_f_ += interstaff_f ; - + + info.ideal_y += interstaff_f; + info.min_y += interstaff_f; + info.max_y += interstaff_f ; + + me->set_grob_property ("stem-info", + scm_list_n (gh_double2scm (info.ideal_y), + gh_double2scm (info.max_y), + gh_double2scm (info.min_y), + SCM_UNDEFINED)); + return info; } @@ -769,8 +791,7 @@ Stem::has_interface (Grob*m) return m && m->has_interface (ly_symbol2scm ("stem-interface")); } -void -Stem::set_interface (Grob*me) -{ - me->set_interface (ly_symbol2scm ("stem-interface")); -} +ADD_INTERFACE (Stem,"stem-interface", + "A stem", + "thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head heads direction length style no-stem-extend flag-style dir-forced"); +