X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=4fe16e510b46ad871fd8e59a01e0b2f668889e2d;hb=7d870a2890deabfa746d2c17038a00fa9afb8897;hp=a3c4ca08a75a4594bb71c1f64200adac9cc56f72;hpb=4b8dc8caac9bae6dc9856be8e38ef7b5b42854cb;p=lilypond.git diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index a3c4ca08a7..4fe16e510b 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -1,19 +1,33 @@ /* - side-position-interface.cc -- implement Side_position_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 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 "side-position-interface.hh" #include // ceil. #include + using namespace std; +#include "axis-group-interface.hh" #include "directional-element-interface.hh" #include "grob.hh" +#include "grob-array.hh" #include "main.hh" #include "misc.hh" #include "note-head.hh" @@ -22,6 +36,7 @@ using namespace std; #include "staff-symbol.hh" #include "stem.hh" #include "string-convert.hh" +#include "system.hh" #include "warn.hh" void @@ -30,22 +45,6 @@ Side_position_interface::add_support (Grob *me, Grob *e) Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("side-support-elements"), e); } -Direction -Side_position_interface::get_direction (Grob *me) -{ - Direction relative_dir = Direction (1); - SCM reldir = me->get_property ("side-relative-direction"); - if (is_direction (reldir)) - relative_dir = to_dir (reldir); - - SCM other_elt = me->get_object ("direction-source"); - Grob *e = unsmob_grob (other_elt); - if (e) - return (Direction) (relative_dir * get_grob_direction (e)); - - return CENTER; -} - /* Put the element next to the support, optionally taking in account the extent of the support. @@ -95,13 +94,15 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten continue; if (e) - if (use_extents) - dim.unite (e->maybe_pure_extent (common, a, pure, start, end)); - else - { - Real x = e->maybe_pure_coordinate (common, a, pure, start, end); - dim.unite (Interval (x, x)); - } + { + if (use_extents) + dim.unite (e->maybe_pure_extent (common, a, pure, start, end)); + else + { + Real x = e->maybe_pure_coordinate (common, a, pure, start, end); + dim.unite (Interval (x, x)); + } + } } if (dim.is_empty ()) @@ -217,6 +218,10 @@ Side_position_interface::calc_cross_staff (SCM smob) Grob *me = unsmob_grob (smob); extract_grob_set (me, "side-support-elements", elts); + for (vsize i = 0; i < elts.size (); i++) + if (to_boolean (elts[i]->get_property ("cross-staff"))) + return SCM_BOOL_T; + Grob *common = common_refpoint_of_array (elts, me->get_parent (Y_AXIS), Y_AXIS); return scm_from_bool (common != me->get_parent (Y_AXIS)); } @@ -251,7 +256,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i /* In case of a ledger lines, quantize even if we're outside the staff. */ || (Note_head::has_interface (head) - && abs (Staff_symbol_referencer::get_position (head)) > position)) + && abs (Staff_symbol_referencer::get_position (head)) > abs (position))) { o += (rounded - position) * 0.5 * ss; if (Staff_symbol_referencer::on_line (me, int (rounded))) @@ -262,7 +267,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i { Interval iv = me->maybe_pure_extent (me, a, pure, start, end); - Real padding + Real padding = Staff_symbol_referencer::staff_space (me) * scm_to_double (me->get_property ("staff-padding")); @@ -289,31 +294,80 @@ Side_position_interface::set_axis (Grob *me, Axis a) a); } } + Axis Side_position_interface::get_axis (Grob *me) { if (scm_is_number (me->get_property ("side-axis"))) return Axis (scm_to_int (me->get_property ("side-axis"))); - me->programming_error ("side-axis not set."); + string msg = String_convert::form_string ("side-axis not set for grob %s.", + me->name ().c_str ()); + me->programming_error (msg); return NO_AXES; } +MAKE_SCHEME_CALLBACK (Side_position_interface, move_to_extremal_staff, 1); +SCM +Side_position_interface::move_to_extremal_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + System *sys = dynamic_cast (me->get_system ()); + Direction dir = get_grob_direction (me); + if (dir != DOWN) + dir = UP; + + Interval iv = me->extent (sys, X_AXIS); + iv.widen (1.0); + Grob *top_staff = sys->get_extremal_staff (dir, iv); + + if (!top_staff) + return SCM_BOOL_F; + + // Only move this grob if it is a direct child of the system. We + // are not interested in moving marks from other staves to the top + // staff; we only want to move marks from the system to the top + // staff. + if (sys != me->get_parent (Y_AXIS)) + return SCM_BOOL_F; + + me->set_parent (top_staff, Y_AXIS); + me->flush_extent_cache (Y_AXIS); + Axis_group_interface::add_element (top_staff, me); + + // Remove any cross-staff side-support dependencies + Grob_array *ga = unsmob_grob_array (me->get_object ("side-support-elements")); + if (ga) + { + vector const& elts = ga->array (); + vector new_elts; + for (vsize i = 0; i < elts.size (); ++i) + { + if (me->common_refpoint (elts[i], Y_AXIS) == top_staff) + new_elts.push_back (elts[i]); + } + ga->set_array (new_elts); + } + return SCM_BOOL_T; +} + + ADD_INTERFACE (Side_position_interface, - "Position a victim object (this one) next to other objects (the " - "support). The property @code{direction} signifies where to put the " - "victim object relative to the support (left or right, up or down?)\n\n " - "The routine also takes the size the staff into account if " - "@code{staff-padding} is set. If undefined, the staff symbol is ignored.", + "Position a victim object (this one) next to other objects" + " (the support). The property @code{direction} signifies where" + " to put the victim object relative to the support (left or" + " right, up or down?)\n" + "\n" + "The routine also takes the size of the staff into account if" + " @code{staff-padding} is set. If undefined, the staff symbol" + " is ignored.", /* properties */ "direction " - "direction-source " "minimum-space " "padding " "quantize-position " "side-axis " - "side-relative-direction " "side-support-elements " "slur-padding " "staff-padding "