X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=3214fe4193db21e6cf1cee47b0a7dcd135fa106a;hb=a40e959dba858a468bede003e1f07438c6700fad;hp=0d83aefb77da09a97a9b0e38cdfc732464ba4a37;hpb=261c1a54f476e39ee854fc823d2f5859ff4e03f7;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index 0d83aefb77..3214fe4193 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -167,9 +167,15 @@ Beam::calc_direction (SCM smob) Grob *stem = first_normal_stem (me); /* - ugh: stems[0] case happens for chord tremolo. + This happens for chord tremolos. */ - dir = to_dir ((stem ? stem : stems[0])->get_property ("default-direction")); + if (!stem) + stem = stems[0]; + + if (is_direction (stem->get_property_data ("direction"))) + dir = to_dir (stem->get_property_data ("direction")); + else + dir = to_dir (stem->get_property ("default-direction")); } } @@ -336,7 +342,6 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); Slice ranks; - for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; @@ -366,7 +371,7 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) Beam_stem_segment seg; seg.stem_ = stem; seg.stem_x_ = stem_x; - seg.rank_ = 2 * i + (d+1)/2; + seg.rank_ = 2 * i + (d+1)/2; seg.width_ = stem_width; seg.stem_index_ = i; seg.dir_ = d; @@ -404,14 +409,15 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) Direction event_dir = LEFT; do { - bool on_bound = (event_dir == LEFT) ? j == 0 : + bool on_line_bound = (segs[j].dir_ == LEFT) ? segs[j].stem_index_ == 0 + : segs[j].stem_index_ == stems.size() - 1; + bool on_beam_bound = (event_dir == LEFT) ? j == 0 : j == segs.size () - 1; - bool inside_stem = (event_dir == LEFT) - ? segs[j].stem_index_ > 0 - : segs[j].stem_index_ + 1 < stems.size () ; + ? segs[j].stem_index_ > 0 + : segs[j].stem_index_ + 1 < stems.size () ; - bool event = on_bound + bool event = on_beam_bound || abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1 || (abs (vertical_count) >= segs[j].max_connect_ || abs (vertical_count) >= segs[j + event_dir].max_connect_); @@ -423,7 +429,7 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) current.horizontal_[event_dir] = segs[j].stem_x_; if (segs[j].dir_ == event_dir) { - if (on_bound + if (on_line_bound && me->get_bound (event_dir)->break_status_dir ()) { current.horizontal_[event_dir] @@ -446,7 +452,7 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common) = neighbor_stem->relative_coordinate (commonx, X_AXIS); notehead_width = min (notehead_width, - fabs (neighbor_stem_x - segs[j].stem_x_)/2); + fabs (neighbor_stem_x - segs[j].stem_x_)/2.5); } current.horizontal_[event_dir] += event_dir * notehead_width; } @@ -555,9 +561,15 @@ Beam::print (SCM grob) } #if (DEBUG_BEAM_SCORING) - SCM quant_score = me->get_property ("quant-score"); - SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring")); - if (to_boolean (debug) && scm_is_string (quant_score)) + SCM annotation = me->get_property ("annotation"); + if (!scm_is_string (annotation)) + { + SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring")); + if (to_boolean (debug)) + annotation = me->get_property ("quant-score"); + } + + if (scm_is_string (annotation)) { extract_grob_set (me, "stems", stems); @@ -572,10 +584,13 @@ Beam::print (SCM grob) Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP; Stencil score = *unsmob_stencil (Text_interface::interpret_markup - (me->layout ()->self_scm (), properties, quant_score)); + (me->layout ()->self_scm (), properties, annotation)); if (!score.is_empty ()) - the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0); + { + score.translate_axis (me->relative_coordinate(commonx, X_AXIS), X_AXIS); + the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0); + } } #endif @@ -848,6 +863,30 @@ Beam::calc_stem_shorten (SCM smob) } +Interval +Beam::no_visible_stem_positions (Grob *me, Interval default_value) +{ + extract_grob_set (me, "stems", stems); + if (stems.empty ()) + return default_value; + + Interval head_positions; + Slice multiplicity; + for (vsize i = 0; i < stems.size(); i++) + { + head_positions.unite (Stem::head_positions (stems[i])); + multiplicity.unite (Stem::beam_multiplicity (stems[i])); + } + + Direction dir = get_grob_direction (me); + Real y = head_positions[dir] + * 0.5 * Staff_symbol_referencer::staff_space (me) + + dir * get_beam_translation (me) * (multiplicity.length () + 1); + + y /= Staff_symbol_referencer::staff_space (me); + return Interval (y,y); +} + /* Compute a first approximation to the beam slope. @@ -863,7 +902,7 @@ Beam::calc_least_squares_positions (SCM smob, SCM posns) int count = normal_stem_count (me); Interval pos (0,0); if (count < 1) - return ly_interval2scm (pos); + return ly_interval2scm (no_visible_stem_positions (me, pos)); vector x_posns; extract_grob_set (me, "normal-stems", stems); @@ -1149,7 +1188,8 @@ Beam::calc_stem_y (Grob *me, Grob *stem, Grob **common, Slice beam_slice (french ? where_are_the_whole_beams (beaming) : Stem::beam_multiplicity (stem)); - + if (beam_slice.is_empty ()) + beam_slice = Slice (0,0); Interval beam_multiplicity(beam_slice[LEFT], beam_slice[RIGHT]); @@ -1229,7 +1269,7 @@ Beam::set_stem_lengths (SCM smob) for normal beams, but for tremolo beams it looks silly otherwise. */ if (gap - && !Stem::is_invisible (s)) + && !Stem::is_invisible (s)) stem_y += thick * 0.5 * get_grob_direction (s); /* @@ -1493,6 +1533,7 @@ ADD_INTERFACE (Beam, , /* properties */ + "annotation " "auto-knee-gap " "beamed-stem-shorten " "beaming "