X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=1aa0b728c0657618f6839be6818691cee898848a;hb=bdf74886dc9bcaf01c55677bf2086f4b76a7ef8c;hp=c2e1d912b036b83c90d4cee6588d2e9aadd4be86;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index c2e1d912b0..1aa0b728c0 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -1,56 +1,243 @@ /* - 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--2012 Han-Wen Nienhuys - (c) 1997--1999 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 "dots.hh" #include "dot-column.hh" + +#include +#include +#include +#include + +using namespace std; + +#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 "side-position-interface.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" -void -Dot_column::add_dots (Dots *d) +MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1); +SCM +Dot_column::calc_positioning_done (SCM smob) { - dot_l_arr_.push (d); - add_dependency (d); - add_element (d); -} + Grob *me = unsmob_grob (smob); -void -Dot_column::add_head (Rhythmic_head *r) -{ - if (!r->dots_l_) - return ; - - head_l_arr_.push (r); - add_dependency (r); - add_dots (r->dots_l_); -} + /* + 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"); -void -Dot_column::do_substitute_element_pointer (Score_element*o,Score_element*n) -{ - Item *oi =dynamic_cast (o); - - if (oi && dynamic_cast (oi)) - head_l_arr_.substitute (dynamic_cast (oi), - dynamic_cast(n)); - else if (oi && dynamic_cast (oi)) - dot_l_arr_.substitute (dynamic_cast (oi), - dynamic_cast (n)); + me->set_property ("positioning-done", SCM_BOOL_T); + + vector dots + = extract_grob_array (me, "dots"); + + vector main_heads; + Real ss = 0; + + Grob *commonx = me; + 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; + + 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 < support.size (); i++) + { + Grob *s = support[i]; + if (!ss) + 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); + + stems.insert (s); + } + else if (Note_head::has_interface (s)) + y = Interval (-1.1, 1.1); + else + { + programming_error ("unknown grob in dot col support"); + continue; + } + + 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"))) + stems.insert (stem); + } + + for (set::const_iterator i (stems.begin ()); + i != stems.end (); i++) + { + Grob *stem = (*i); + Grob *flag = Stem::flag (stem); + if (flag) + { + Grob *commony = stem->common_refpoint (flag, Y_AXIS); + Interval y = flag->extent (commony, Y_AXIS) * (2 / ss); + Interval x = flag->extent (commonx, X_AXIS); + + boxes.push_back (Box (x, y)); + } + } + + /* + 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); + for (vsize i = dots.size (); 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); + + Dot_configuration cfg (problem); + for (vsize i = 0; i < dots.size (); i++) + { + Dot_position dp; + dp.dot_ = dots[i]; + + Grob *note = dots[i]->get_parent (Y_AXIS); + if (note) + { + if (Note_head::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::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. */ + p += (int) robust_scm2double (dp.dot_->get_property ("staff-position"), 0.0); + dp.pos_ = p; + + cfg.remove_collision (p); + cfg[p] = dp; + if (Staff_symbol_referencer::on_line (dp.dot_, p)) + cfg.remove_collision (p); + } + + problem.register_configuration (cfg); + + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + { + /* + Junkme? + */ + Staff_symbol_referencer::pure_set_position (i->second.dot_, i->first); + } + + me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS), + X_AXIS); + return SCM_BOOL_T; } void -Dot_column::do_pre_processing () +Dot_column::add_head (Grob *me, Grob *head) { - Interval w; - for (int i=0; i < head_l_arr_.size (); i++) - w.unite (head_l_arr_[i]->extent (X_AXIS)); - - if (!w.empty_b ()) - translate_axis (w[RIGHT] - extent(X_AXIS) [LEFT],X_AXIS); + Grob *d = unsmob_grob (head->get_object ("dot")); + if (d) + { + 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); + // 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, + "Group dot objects so they form a column, and position" + " dots so they do not clash with staff lines.", + + /* properties */ + "dots " + "positioning-done " + "direction " + "note-collision " + );