X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=17d7effd7c947c6eb4178242e0bb0c465a08857a;hb=7cd8c1d1e389edc26c26b7eba8358578329f5881;hp=e549fa11c496ebacd725c56819535864865668fb;hpb=f8bb7cb87aebcf0ced2388dc266daa72d0e3abff;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index e549fa11c4..17d7effd7c 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -1,9 +1,20 @@ /* - dot-column.cc -- implement Dot_column + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2007 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "dot-column.hh" @@ -15,20 +26,20 @@ using namespace std; -#include "dots.hh" +#include "axis-group-interface.hh" +#include "directional-element-interface.hh" #include "dot-column.hh" +#include "dot-configuration.hh" +#include "dot-formatting-problem.hh" +#include "dots.hh" +#include "grob.hh" +#include "note-head.hh" +#include "pointer-group-interface.hh" +#include "rest.hh" #include "rhythmic-head.hh" -#include "staff-symbol-referencer.hh" -#include "directional-element-interface.hh" #include "side-position-interface.hh" -#include "axis-group-interface.hh" +#include "staff-symbol-referencer.hh" #include "stem.hh" -#include "grob.hh" -#include "pointer-group-interface.hh" -#include "dot-configuration.hh" -#include "note-head.hh" -#include "skyline.hh" -#include "dot-formatting-problem.hh" MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1); SCM @@ -36,6 +47,13 @@ Dot_column::calc_positioning_done (SCM smob) { Grob *me = unsmob_grob (smob); + /* + Trigger note collision resolution first, since that may kill off + dots when merging. + */ + if (Grob *collision = unsmob_grob (me->get_object ("note-collision"))) + (void) collision->get_property ("positioning-done"); + me->set_property ("positioning-done", SCM_BOOL_T); vector dots @@ -45,24 +63,19 @@ Dot_column::calc_positioning_done (SCM smob) Real ss = 0; Grob *commonx = me; - { /* - Trigger note collision resolution first, since that may kill off - dots when merging. - */ - for (vsize i = 0; i < dots.size (); i++) - { - Grob *n = dots[i]->get_parent (Y_AXIS); - commonx = n->common_refpoint (commonx, X_AXIS); - - if (Grob *stem = unsmob_grob (n->get_object("stem"))) - { - commonx = stem->common_refpoint (commonx, X_AXIS); - - if (Stem::first_head (stem) == n) - main_heads.push_back (n); - } - } - } + for (vsize i = 0; i < dots.size (); i++) + { + Grob *n = dots[i]->get_parent (Y_AXIS); + commonx = n->common_refpoint (commonx, X_AXIS); + + if (Grob *stem = unsmob_grob (n->get_object("stem"))) + { + commonx = stem->common_refpoint (commonx, X_AXIS); + + if (Stem::first_head (stem) == n) + main_heads.push_back (n); + } + } vector boxes; set stems; @@ -75,22 +88,47 @@ Dot_column::calc_positioning_done (SCM smob) for (vsize i = 0; i < support.size (); i++) { + Grob *s = support[i]; if (!ss) - ss = Staff_symbol_referencer::staff_space (support[i]); - - Interval y (support[i]->extent (support[i], Y_AXIS)); + ss = Staff_symbol_referencer::staff_space (s); + + /* can't inspect Y extent of rest. + + Rest collisions should wait after line breaking. + */ + Interval y; + if (Rest::has_interface (s)) + { + base_x.unite (s->extent (commonx, X_AXIS)); + continue; + } + else if (Stem::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); + } + else if (Note_head::has_interface (s)) + y = Interval (-1, 1); + else + { + programming_error ("unknown grob in dot col support"); + continue; + } y *= 2 / ss; - y += Staff_symbol_referencer::get_position (support[i]); - - Box b (support[i]->extent (commonx, X_AXIS), y); + y += Staff_symbol_referencer::get_position (s); + + Box b (s->extent (commonx, X_AXIS), y); boxes.push_back (b); - if (Grob *s = unsmob_grob (support[i]->get_object ("stem"))) - stems.insert (s); + if (Grob *stem = unsmob_grob (s->get_object ("stem"))) + stems.insert (stem); } - for (set::const_iterator i(stems.begin()); + for (set::const_iterator i (stems.begin()); i != stems.end (); i++) { Grob *stem = (*i); @@ -100,7 +138,7 @@ Dot_column::calc_positioning_done (SCM smob) Interval y = flag.extent (Y_AXIS) * (2 / ss) + Stem::stem_end_position (stem); - + Interval x = stem->relative_coordinate (commonx, X_AXIS) + flag.extent (X_AXIS); @@ -110,8 +148,13 @@ Dot_column::calc_positioning_done (SCM smob) vector_sort (dots, position_less); for (vsize i = dots.size (); i--;) - if (!dots[i]->is_live ()) - dots.erase (dots.begin () + i); + { + if (!dots[i]->is_live ()) + dots.erase (dots.begin () + i); + else + // Undo any fake translations that were done in add_head. + dots[i]->translate_axis (-dots[i]->relative_coordinate (me, X_AXIS), X_AXIS); + } Dot_formatting_problem problem (boxes, base_x); @@ -126,11 +169,7 @@ Dot_column::calc_positioning_done (SCM smob) { Grob *stem = unsmob_grob (note->get_object ("stem")); if (stem) - { - dp.extremal_head_ = Stem::first_head (stem) == note; - - - } + dp.extremal_head_ = Stem::first_head (stem) == note; dp.x_extent_ = note->extent (commonx, X_AXIS); } @@ -160,7 +199,6 @@ Dot_column::calc_positioning_done (SCM smob) */ Staff_symbol_referencer::set_position (i->second.dot_, i->first); } - me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS), X_AXIS); @@ -168,24 +206,31 @@ Dot_column::calc_positioning_done (SCM smob) } void -Dot_column::add_head (Grob *me, Grob *rh) +Dot_column::add_head (Grob *me, Grob *head) { - Grob *d = unsmob_grob (rh->get_object ("dot")); + Grob *d = unsmob_grob (head->get_object ("dot")); if (d) { - Side_position_interface::add_support (me, rh); + Side_position_interface::add_support (me, head); Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d); d->set_property ("Y-offset", Grob::x_parent_positioning_proc); - d->set_property ("X-offset", Grob::x_parent_positioning_proc); + // Dot formatting requests the Y-offset, which for rests may + // trigger post-linebreak callbacks. On the other hand, we need the + // 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)) + d->translate_axis (head->extent (head, X_AXIS).length (), X_AXIS); + else + d->set_property ("X-offset", Grob::x_parent_positioning_proc); Axis_group_interface::add_element (me, d); } } ADD_INTERFACE (Dot_column, - - "Groups dot objects so they form a column, and position dots so they do not " - "clash with staff lines. ", + "Group dot objects so they form a column, and position" + " dots so they do not clash with staff lines.", /* properties */ "dots "