X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=ebee8d6bf3f0c53413232cf6dfbc52e40d611c9a;hb=refs%2Fheads%2Fdebian;hp=c0536b6ce3ab69b95f545b860d45ba65a707ee8e;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index c0536b6ce3..ebee8d6bf3 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,18 +1,34 @@ /* - separation-item.cc -- implement Separation_item + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2012 Han-Wen Nienhuys - (c) 1998--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 "separation-item.hh" -#include "skyline.hh" +#include "accidental-placement.hh" +#include "axis-group-interface.hh" +#include "lookup.hh" +#include "note-column.hh" +#include "note-head.hh" #include "paper-column.hh" -#include "warn.hh" #include "pointer-group-interface.hh" -#include "accidental-placement.hh" +#include "skyline-pair.hh" +#include "stencil.hh" +#include "warn.hh" void Separation_item::add_item (Grob *s, Item *i) @@ -27,33 +43,33 @@ Separation_item::add_conditional_item (Grob *me, Grob *e) Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e); } -void -Separation_item::set_skyline_distance (Drul_array items, - Real padding) +Real +Separation_item::set_distance (Item *l, Item *r, Real padding) { - Drul_array lines (Skyline_pair::unsmob (items[LEFT]->get_property ("skylines")), - Skyline_pair::unsmob (items[RIGHT]->get_property ("skylines"))); - Skyline right = conditional_skyline (items[RIGHT], items[LEFT]); + Drul_array lines (Skyline_pair::unsmob (l->get_property ("horizontal-skylines")), + Skyline_pair::unsmob (r->get_property ("horizontal-skylines"))); + Skyline right = conditional_skyline (r, l); right.merge ((*lines[RIGHT])[LEFT]); - + Real dist = padding + (*lines[LEFT])[RIGHT].distance (right); if (dist > 0) { Rod rod; - rod.item_drul_ = items; + rod.item_drul_ = Drul_array (l, r); rod.distance_ = dist; rod.add_to_cols (); - } + } + + return max (dist, 0.0); } bool -Separation_item::set_distance (Drul_array items, - Real padding) +Separation_item::is_empty (Grob *me) { - set_skyline_distance (items, padding); - return true; + Skyline_pair *sky = Skyline_pair::unsmob (me->get_property ("horizontal-skylines")); + return (!sky || sky->is_empty ()); } /* @@ -64,24 +80,37 @@ Skyline Separation_item::conditional_skyline (Grob *me, Grob *left) { vector bs = boxes (me, left); - return Skyline (bs, 0.1, Y_AXIS, LEFT); + return Skyline (bs, Y_AXIS, LEFT); } - -MAKE_SCHEME_CALLBACK(Separation_item,calc_skylines,1); +MAKE_SCHEME_CALLBACK (Separation_item, calc_skylines, 1); SCM Separation_item::calc_skylines (SCM smob) { Item *me = unsmob_item (smob); vector bs = boxes (me, 0); - /* todo: the horizon_padding is somewhat arbitrary */ - return Skyline_pair (bs, 0.1, Y_AXIS).smobbed_copy (); + Skyline_pair sp (bs, Y_AXIS); + /* + TODO: We need to decide if padding is 'intrinsic' + to a skyline or if it is something that is only added on in + distance calculations. Here, we make it intrinsic, which copies + the behavior from the old code but no longer corresponds to how + vertical skylines are handled (where padding is not built into + the skyline). + */ + Real vp = robust_scm2double (me->get_property ("skyline-vertical-padding"), 0.0); + sp[LEFT] = sp[LEFT].padded (vp); + sp[RIGHT] = sp[RIGHT].padded (vp); + return sp.smobbed_copy (); } -/* if left is non-NULL, get the boxes corresponding to the - conditional-elements (conditioned on the grob LEFT). This - sounds more general than it is: conditional-elements are - always accidentals attached to a tied note. +/* + If left is non-NULL, get the boxes corresponding to the + conditional-elements (conditioned on the grob LEFT). + Conditional elements are, for now, arpeggios and accidental + placements. Based on the left grob, the accidentals will + be printed or not, so we filter using + Accidental_placement::get_relevant_accidentals. */ vector Separation_item::boxes (Grob *me, Grob *left) @@ -92,100 +121,96 @@ Separation_item::boxes (Grob *me, Grob *left) Paper_column *pc = item->get_column (); vector out; extract_grob_set (me, left ? "conditional-elements" : "elements", read_only_elts); - vector elts; + vector elts; if (left) - elts = Accidental_placement::get_break_reminder_accidentals (read_only_elts, left); + { + vector accidental_elts; + vector other_elts; // for now only arpeggios + for (vsize i = 0; i < read_only_elts.size (); i++) + { + if (Accidental_placement::has_interface (read_only_elts[i])) + accidental_elts.push_back (read_only_elts[i]); + else + other_elts.push_back (read_only_elts[i]); + } + elts = Accidental_placement::get_relevant_accidentals (accidental_elts, left); + elts.insert (elts.end (), other_elts.begin (), other_elts.end ()); + } else elts = read_only_elts; Grob *ycommon = common_refpoint_of_array (elts, me, Y_AXIS); - + for (vsize i = 0; i < elts.size (); i++) { Item *il = dynamic_cast (elts[i]); if (pc != il->get_column ()) - { - continue; - } + continue; + + /* ugh. We want to exclude groups of grobs (so that we insert each grob + individually into the skyline instead of adding a single box that + bounds all of them). However, we can't exclude an axis-group that + adds to its childrens' stencil. Currently, this is just TrillPitchGroup; + hence the check for note-head-interface. */ + if (Axis_group_interface::has_interface (il) + && !Note_head::has_interface (il)) + continue; Interval y (il->pure_height (ycommon, 0, very_large)); Interval x (il->extent (pc, X_AXIS)); - Interval extra = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"), - Interval (0, 0)); - x[LEFT] += extra[LEFT]; - x[RIGHT] += extra[RIGHT]; - if (to_boolean (elts[i]->get_property ("infinite-spacing-height"))) - y = Interval (-infinity_f, infinity_f); - - out.push_back (Box (x, y)); + Interval extra_width = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"), + Interval (-0.1, 0.1)); + Interval extra_height = robust_scm2interval (elts[i]->get_property ("extra-spacing-height"), + Interval (0.0, 0.0)); + + // The conventional empty extent is (+inf.0 . -inf.0) + // but (-inf.0 . +inf.0) is used as extra-spacing-height + // on items that must not overlap other note-columns. + // If these two uses of inf combine, leave the empty extent. + + if (!isinf (x[LEFT])) + x[LEFT] += extra_width[LEFT]; + if (!isinf (x[RIGHT])) + x[RIGHT] += extra_width[RIGHT]; + if (!isinf (y[DOWN])) + y[DOWN] += extra_height[DOWN]; + if (!isinf (y[UP])) + y[UP] += extra_height[UP]; + + if (!x.is_empty () && !y.is_empty ()) + out.push_back (Box (x, y)); } - return out; + return out; } -Interval -Separation_item::width (Grob *me) -{ - SCM sw = me->get_property ("X-extent"); - return ly_scm2interval (sw); -} - -Interval -Separation_item::relative_width (Grob *me, Grob *common) -{ - Interval iv = width (me); - - return dynamic_cast (me)->get_column ()->relative_coordinate (common, X_AXIS) + iv; -} - -/* - Try to find the break-aligned symbol in SEPARATION_ITEM that is - sticking out at direction D. The x size is put in LAST_EXT -*/ -Grob * -Separation_item::extremal_break_aligned_grob (Grob *me, - Direction d, - Interval *last_ext) +MAKE_SCHEME_CALLBACK (Separation_item, print, 1) +SCM +Separation_item::print (SCM smob) { - Grob *col = dynamic_cast (me)->get_column (); - last_ext->set_empty (); - Grob *last_grob = 0; + if (!debug_skylines) + return SCM_BOOL_F; - extract_grob_set (me, "elements", elts); - for (vsize i = elts.size (); i--;) + Grob *me = unsmob_grob (smob); + Stencil ret; + if (Skyline_pair *s = Skyline_pair::unsmob (me->get_property ("horizontal-skylines"))) { - Grob *break_item = elts[i]; - if (!scm_is_symbol (break_item->get_property ("break-align-symbol"))) - continue; - - if (!scm_is_pair (break_item->get_property ("space-alist"))) - continue; - - Interval ext = break_item->extent (col, X_AXIS); - - if (ext.is_empty ()) - continue; - - if (!last_grob - || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0)) - { - *last_ext = ext; - last_grob = break_item; - } + ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[LEFT].to_points (Y_AXIS)).in_color (255, 255, 0)); + ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[RIGHT].to_points (Y_AXIS)).in_color (0, 255, 255)); } - - return last_grob; + return ret.smobbed_copy (); } ADD_INTERFACE (Separation_item, - "Item that computes widths to generate spacing rods. " - "This is done in concert with @ref{separating-group-spanner-interface}.", - - "X-extent " - "conditional-elements " - "elements " - "padding " - "skylines " - ); + "Item that computes widths to generate spacing rods.", + + /* properties */ + "X-extent " + "conditional-elements " + "elements " + "padding " + "horizontal-skylines " + "skyline-vertical-padding " + );