X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=47300d7a82fcff90dffea4d7190b3c7b7f697a7c;hb=be9d398d705ecf2308e10864e37c6f1315c78ec9;hp=f7a8752e9f023505db4e3082702f518f7c69adac;hpb=e22333e86580918f2b5c5167fd4881758f4d43a7;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index f7a8752e9f..47300d7a82 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -65,8 +65,8 @@ Stem::head_positions (Grob*me) Drul_array e (extremal_heads (me)); - return Interval (Staff_symbol_referencer::position_f (e[DOWN]), - Staff_symbol_referencer::position_f (e[UP])); + return Interval (Staff_symbol_referencer::get_position (e[DOWN]), + Staff_symbol_referencer::get_position (e[UP])); } @@ -123,7 +123,9 @@ Stem::set_stemend (Grob*me, Real se) /* Note head that determines hshift for upstems - */ + + WARNING: triggers direction +*/ Grob* Stem::support_head (Grob*me) { @@ -152,7 +154,9 @@ Stem::head_count (Grob*me) /* The note head which forms one end of the stem. - */ + + WARNING: triggers direction +*/ Grob* Stem::first_head (Grob*me) { @@ -193,7 +197,7 @@ Stem::extremal_heads (Grob*me) Grob * n = unsmob_grob (ly_car (s)); - int p = int (Staff_symbol_referencer::position_f (n)); + int p = int (Staff_symbol_referencer::get_position (n)); Direction d = LEFT; do { @@ -221,7 +225,7 @@ Stem::note_head_positions (Grob *me) for (SCM s = me->get_grob_property ("note-heads"); gh_pair_p (s); s = ly_cdr (s)) { Grob * n = unsmob_grob (ly_car (s)); - int p = int (Staff_symbol_referencer::position_f (n)); + int p = int (Staff_symbol_referencer::get_position (n)); ps.push (p); } @@ -246,7 +250,8 @@ Stem::add_head (Grob*me, Grob *n) bool Stem::invisible_b (Grob*me) { - return ! (head_count (me) && Note_head::balltype_i (support_head (me)) >= 1); + return ! (head_count (me) + && gh_scm2int (me->get_grob_property ("duration-log")) >= 1); } Direction @@ -285,7 +290,7 @@ Stem::get_default_stem_end_position (Grob*me) SCM s; Array a; - Real length_f = 0.; + Real length_f = 3.5; SCM scm_len = me->get_grob_property ("length"); if (gh_number_p (scm_len)) { @@ -294,24 +299,20 @@ Stem::get_default_stem_end_position (Grob*me) else { s = me->get_grob_property ("lengths"); - for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) - a.push (gh_scm2double (ly_car (q))); - - // stem uses half-spaces - length_f = a[ ((duration_log (me) - 2) >? 0) get_grob_property ("stem-shorten"); - for (SCM q = s; gh_pair_p (q); q = ly_cdr (q)) - a.push (gh_scm2double (ly_car (q))); - - - // stem uses half-spaces - - // fixme: use scm_list_n_ref () iso. array[] - Real shorten_f = a[ ((duration_log (me) - 2) >? 0) get_grob_property ("stem-shorten"); + if (gh_pair_p (sshorten)) + { + shorten_f = 2* gh_scm2double (robust_list_ref ((duration_log (me) - 2) >? 0, sshorten)); + } /* On boundary: shorten only half */ if (abs (chord_start_y (me)) == 0.5) @@ -346,16 +347,16 @@ Stem::get_default_stem_end_position (Grob*me) good typesetting practice. */ - if (!beam_l (me) && dir == UP + if (!get_beam (me) && dir == UP && duration_log (me) > 2) { Grob * closest_to_flag = extremal_heads (me)[dir]; Grob * dots = closest_to_flag - ? Rhythmic_head::dots_l (closest_to_flag ) : 0; + ? Rhythmic_head::get_dots (closest_to_flag ) : 0; if (dots) { - Real dp = Staff_symbol_referencer::position_f (dots); + Real dp = Staff_symbol_referencer::get_position (dots); Real flagy = flag (me).extent (Y_AXIS)[-dir] * 2 / Staff_symbol_referencer::staff_space (me); @@ -418,7 +419,7 @@ Stem::position_noteheads (Grob*me) Real thick = 0.0; if (invisible) thick = gh_scm2double (me->get_grob_property ("thickness")) - * me->paper_l ()->get_var ("linethickness"); + * me->get_paper ()->get_var ("linethickness"); Grob *hed = support_head (me); @@ -430,10 +431,10 @@ Stem::position_noteheads (Grob*me) } bool parity= true; // todo: make me settable. - int lastpos = int (Staff_symbol_referencer::position_f (heads[0])); + int lastpos = int (Staff_symbol_referencer::get_position (heads[0])); for (int i=1; i < heads.size (); i ++) { - Real p = Staff_symbol_referencer::position_f (heads[i]); + Real p = Staff_symbol_referencer::get_position (heads[i]); int dy =abs (lastpos- (int)p); if (dy <= 1) @@ -542,7 +543,7 @@ Stem::flag (Grob*me) } bool adjust = to_boolean (me->get_grob_property ("adjust-if-on-staffline")); - if (String::compare_i (style, "mensural") == 0) + if (String::compare (style, "mensural") == 0) /* 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, @@ -578,7 +579,7 @@ Stem::flag (Grob*me) */ Grob *first = first_head(me); int sz = Staff_symbol_referencer::line_count (me)-1; - int p = (int)rint (Staff_symbol_referencer::position_f (first)); + int p = (int)rint (Staff_symbol_referencer::get_position (first)); staffline_offs = (((p ^ sz) & 0x1) == 0) ? "1" : "0"; } else @@ -591,12 +592,12 @@ Stem::flag (Grob*me) staffline_offs = ""; } char c = (get_direction (me) == UP) ? 'u' : 'd'; - String index_str - = String ("flags-") + style + to_str (c) + staffline_offs + to_str (duration_log (me)); + String index_string + = String ("flags-") + style + to_string (c) + staffline_offs + to_string (duration_log (me)); Molecule m - = Font_interface::get_default_font (me)->find_by_name (index_str); + = Font_interface::get_default_font (me)->find_by_name (index_string); if (!fstyle.empty_b ()) - m.add_molecule (Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + fstyle)); + m.add_molecule (Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_string (c) + fstyle)); return m; } @@ -648,14 +649,14 @@ Stem::brew_molecule (SCM smob) Grob * lh = last_head (me); if (!lh) return SCM_EOL; - y1 = Staff_symbol_referencer::position_f (lh); + y1 = Staff_symbol_referencer::get_position (lh); } else { Grob * lh = first_head (me); if (!lh) return SCM_EOL; - y1 = Staff_symbol_referencer::position_f (lh); + y1 = Staff_symbol_referencer::get_position (lh); } Real y2 = stem_end_position (me); @@ -682,14 +683,14 @@ Stem::brew_molecule (SCM smob) { Real stem_width = gh_scm2double (me->get_grob_property ("thickness")) // URG - * me->paper_l ()->get_var ("linethickness"); + * me->get_paper ()->get_var ("linethickness"); Molecule ss =Lookup::filledbox (Box (Interval (-stem_width/2, stem_width/2), Interval (stem_y[DOWN]*dy, stem_y[UP]*dy))); mol.add_molecule (ss); } - if (!beam_l (me) && abs (duration_log (me)) > 2) + if (!get_beam (me) && abs (duration_log (me)) > 2) { Molecule fl = flag (me); fl.translate_axis (stem_y[d]*dy, Y_AXIS); @@ -742,7 +743,7 @@ Stem::off_callback (SCM element_smob, SCM) { Real rule_thick = gh_scm2double (me->get_grob_property ("thickness")) - * me->paper_l ()->get_var ("linethickness"); + * me->get_paper ()->get_var ("linethickness"); r += - d * rule_thick * 0.5; @@ -754,13 +755,12 @@ Stem::off_callback (SCM element_smob, SCM) Grob* -Stem::beam_l (Grob*me) +Stem::get_beam (Grob*me) { SCM b= me->get_grob_property ("beam"); return unsmob_grob (b); } - // ugh still very long. Stem_info Stem::calc_stem_info (Grob*me) @@ -803,55 +803,35 @@ Stem::calc_stem_info (Grob*me) Real staff_space = Staff_symbol_referencer::staff_space (me); Real half_space = staff_space / 2; - Grob * beam = beam_l (me); - int beam_count = Beam::get_beam_count (beam); - Real beam_space_f = Beam::get_beam_space (beam); - + Grob * beam = get_beam (me); + int beam_count = Beam::get_direction_beam_count (beam, mydir); + Real beam_translation= Beam::get_beam_translation (beam); Real thick = gh_scm2double (beam->get_grob_property ("thickness")); - - Real ideal_y = chord_start_y (me); + Real note_start = chord_start_y (me); /* from here on, calculate as if dir == UP */ - ideal_y *= mydir; + note_start *= mydir; SCM grace_prop = me->get_grob_property ("grace"); bool grace_b = to_boolean (grace_prop); - - Array a; - SCM s; - - s = me->get_grob_property ("beamed-minimum-lengths"); - a.clear (); - for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) - a.push (gh_scm2double (ly_car (q))); - + SCM bml = robust_list_ref ( beam_count - 1, + me->get_grob_property ("beamed-minimum-lengths")); - Real minimum_length = a[beam_count get_grob_property ("beamed-lengths"); + Real minimum_length = gh_scm2double(bml)*staff_space; + SCM bl = robust_list_ref ( beam_count - 1, + me->get_grob_property ("beamed-lengths")); + Real stem_length = gh_scm2double(bl) * staff_space; - a.clear (); - for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) - a.push (gh_scm2double (ly_car (q))); - - Real stem_length = a[beam_count get_grob_property ("no-stem-extend")); - if (!grace_b && !no_extend_b) + bool knee_b = to_boolean (beam->get_grob_property ("knee")); + if (!grace_b && !no_extend_b && !knee_b) { /* highest beam of (UP) beam must never be lower than middle staffline lowest beam of (UP) beam must never be lower than second staffline */ - shortest_y = - shortest_y >? 0 - >? (- 2 * half_space - thick - + (beam_count > 0) * thick - + beam_space_f * (beam_count - 1)); + ideal_y = + ideal_y >? 0 + >? (- 2 * half_space - thick + beam_lengthen); } - ideal_y = ideal_y >? shortest_y; - - s = beam->get_grob_property ("shorten"); + // ideal_y = ideal_y >? shortest_y; + SCM s = beam->get_grob_property ("shorten"); if (gh_number_p (s)) ideal_y -= gh_scm2double (s); -#if 0 - Grob *common = me->common_refpoint (beam, Y_AXIS); - - /* - UGH -> THIS CAUSES ASYMETRY: the same beam can start/end on - different staffs. - - TODO: the beam calculation should probably also use - relative_coordinate() for the Y positions of all beams. - - - */ - Real interstaff_f = mydir * - (me->relative_coordinate (common, Y_AXIS) - - beam->relative_coordinate (common, Y_AXIS)); - - ideal_y += interstaff_f; - shortest_y += interstaff_f; -#endif ideal_y *= mydir; shortest_y *= mydir; @@ -920,7 +880,22 @@ Stem::calc_stem_info (Grob*me) return si; } + +// move to stem? +Slice +Stem::beam_multiplicity (Grob *stem) +{ + SCM beaming= stem->get_grob_property ("beaming"); + Slice l = int_list_to_slice (gh_car (beaming)); + Slice r = int_list_to_slice (gh_cdr (beaming)); + l.unite (r); + + return l; +} + + ADD_INTERFACE (Stem,"stem-interface", "A stem", "up-to-staff avoid-note-head adjust-if-on-staffline thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head note-heads direction length style no-stem-extend flag-style dir-forced"); +