X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=7ac3140141065c5a4b7fe359d8725d21a0cce230;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=320f0e4051100a66dfc8f62a067fa9616252523b;hpb=db86c490c23a25c32c0545f6f69d16538159f426;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 320f0e4051..7ac3140141 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,8 +17,6 @@ along with LilyPond. If not, see . */ -#include "dot-column.hh" - #include #include #include @@ -45,13 +43,13 @@ MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1); SCM Dot_column::calc_positioning_done (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); /* Trigger note collision resolution first, since that may kill off dots when merging. */ - if (Grob *collision = unsmob_grob (me->get_object ("note-collision"))) + if (Grob *collision = unsmob (me->get_object ("note-collision"))) (void) collision->get_property ("positioning-done"); me->set_property ("positioning-done", SCM_BOOL_T); @@ -59,7 +57,7 @@ Dot_column::calc_positioning_done (SCM smob) vector dots = extract_grob_array (me, "dots"); - vector main_heads; + vector parent_stems; Real ss = 0; Grob *commonx = me; @@ -68,12 +66,12 @@ Dot_column::calc_positioning_done (SCM smob) Grob *n = dots[i]->get_parent (Y_AXIS); commonx = n->common_refpoint (commonx, X_AXIS); - if (Grob *stem = unsmob_grob (n->get_object ("stem"))) + if (Grob *stem = unsmob (n->get_object ("stem"))) { commonx = stem->common_refpoint (commonx, X_AXIS); if (Stem::first_head (stem) == n) - main_heads.push_back (n); + parent_stems.push_back (stem); } } @@ -83,8 +81,8 @@ Dot_column::calc_positioning_done (SCM smob) extract_grob_set (me, "side-support-elements", support); Interval base_x; - for (vsize i = 0; i < main_heads.size (); i++) - base_x.unite (main_heads[i]->extent (commonx, X_AXIS)); + for (vsize i = 0; i < parent_stems.size (); i++) + base_x.unite (Stem::first_head (parent_stems[i])->extent (commonx, X_AXIS)); for (vsize i = 0; i < support.size (); i++) { @@ -97,34 +95,35 @@ Dot_column::calc_positioning_done (SCM smob) Rest collisions should wait after line breaking. */ Interval y; - if (Rest::has_interface (s)) + if (has_interface (s)) { base_x.unite (s->extent (commonx, X_AXIS)); continue; } - else if (Stem::has_interface (s)) + else if (has_interface (s)) { Real y1 = Stem::head_positions (s)[-get_grob_direction (s)]; Real y2 = y1 + get_grob_direction (s) * 7; y.add_point (y1); y.add_point (y2); + + stems.insert (s); } - else if (Note_head::has_interface (s)) - y = Interval (-1, 1); + else if (has_interface (s)) + y = Interval (-1.1, 1.1); else { programming_error ("unknown grob in dot col support"); continue; } - y *= 2 / ss; y += Staff_symbol_referencer::get_position (s); Box b (s->extent (commonx, X_AXIS), y); boxes.push_back (b); - if (Grob *stem = unsmob_grob (s->get_object ("stem"))) + if (Grob *stem = unsmob (s->get_object ("stem"))) stems.insert (stem); } @@ -143,7 +142,44 @@ Dot_column::calc_positioning_done (SCM smob) } } - vector_sort (dots, position_less); + /* + The use of pure_position_less and pure_get_rounded_position below + are due to the fact that this callback is called before line breaking + occurs. Because dots' actual Y posiitons may be linked to that of + beams (dots are attached to rests, which are shifted to avoid beams), + we instead must use their pure Y positions. + */ + vector_sort (dots, pure_position_less); + + SCM chord_dots_limit = me->get_property ("chord-dots-limit"); + if (scm_is_number (chord_dots_limit)) + { + // Sort dots by stem, then check for dots above the limit for each stem + vector > dots_each_stem (parent_stems.size ()); + for (vsize i = 0; i < dots.size (); i++) + if (Grob *stem = unsmob (dots[i]->get_parent (Y_AXIS) + -> get_object ("stem"))) + for (vsize j = 0; j < parent_stems.size (); j++) + if (stem == parent_stems[j]) + { + dots_each_stem[j].push_back (dots[i]); + break; + } + for (vsize j = 0; j < parent_stems.size (); j++) + { + Interval chord = Stem::head_positions (parent_stems[j]); + int total_room = ((int) chord.length () + 2 + + scm_to_int (chord_dots_limit)) / 2; + int total_dots = dots_each_stem[j].size (); + // remove excessive dots from the ends of the stem + for (int first_dot = 0; total_dots > total_room; total_dots--) + if (0 == (total_dots - total_room) % 2) + dots_each_stem[j][first_dot++]->suicide (); + else + dots_each_stem[j][first_dot + total_dots - 1]->suicide (); + } + } + for (vsize i = dots.size (); i--;) { if (!dots[i]->is_live ()) @@ -164,13 +200,13 @@ Dot_column::calc_positioning_done (SCM smob) Grob *note = dots[i]->get_parent (Y_AXIS); if (note) { - if (Note_head::has_interface (note)) + if (has_interface (note)) dp.dir_ = to_dir (dp.dot_->get_property ("direction")); dp.x_extent_ = note->extent (commonx, X_AXIS); } - int p = Staff_symbol_referencer::get_rounded_position (dp.dot_); + int p = Staff_symbol_referencer::pure_get_rounded_position (dp.dot_); /* icky, since this should go via a Staff_symbol_referencer offset callback but adding a dot overwrites Y-offset. */ @@ -179,7 +215,9 @@ Dot_column::calc_positioning_done (SCM smob) cfg.remove_collision (p); cfg[p] = dp; - if (Staff_symbol_referencer::on_line (dp.dot_, p)) + if (Staff_symbol_referencer::on_line (dp.dot_, p) + && !scm_is_eq (dp.dot_->get_property ("style"), + ly_symbol2scm ("kievan"))) cfg.remove_collision (p); } @@ -191,7 +229,7 @@ Dot_column::calc_positioning_done (SCM smob) /* Junkme? */ - Staff_symbol_referencer::set_position (i->second.dot_, i->first); + Staff_symbol_referencer::pure_set_position (i->second.dot_, i->first); } me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS), @@ -202,7 +240,7 @@ Dot_column::calc_positioning_done (SCM smob) void Dot_column::add_head (Grob *me, Grob *head) { - Grob *d = unsmob_grob (head->get_object ("dot")); + Grob *d = unsmob (head->get_object ("dot")); if (d) { Side_position_interface::add_support (me, head); @@ -214,7 +252,7 @@ Dot_column::add_head (Grob *me, Grob *head) // correct X-offset of the dots for horizontal collision avoidance. // The translation here is undone in calc_positioning_done, where we // do the X-offset properly. - if (Rest::has_interface (head)) + if (has_interface (head)) d->translate_axis (head->extent (head, X_AXIS).length (), X_AXIS); else d->set_property ("X-offset", Grob::x_parent_positioning_proc); @@ -227,8 +265,10 @@ ADD_INTERFACE (Dot_column, " dots so they do not clash with staff lines.", /* properties */ + "chord-dots-limit " "dots " "positioning-done " "direction " + "note-collision " );