X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;fp=lily%2Fside-position-interface.cc;h=9e8c71f6e6f05d0402533417062f0543a0e5eb30;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=ed3af0577a8a0e726adfb86f079a58d513a06dda;hpb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;p=lilypond.git diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index ed3af0577a..9e8c71f6e6 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -1,9 +1,20 @@ /* - 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--2009 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" @@ -13,8 +24,10 @@ 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" @@ -23,6 +36,7 @@ using namespace std; #include "staff-symbol.hh" #include "stem.hh" #include "string-convert.hh" +#include "system.hh" #include "warn.hh" void @@ -31,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. @@ -64,7 +62,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten Grob *common = common_refpoint_of_array (support, me->get_parent (a), a); Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me); - bool include_staff = + bool include_staff = staff_symbol && a == Y_AXIS && scm_is_number (me->get_property ("staff-padding")) @@ -94,7 +92,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten && Stem::has_interface (e) && dir == - get_grob_direction (e)) continue; - + if (e) { if (use_extents) @@ -138,8 +136,8 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten if (current_offset) total_off = dir * max (dir * total_off, dir * (*current_offset)); - - + + /* FIXME: 1000 should relate to paper size. */ if (fabs (total_off) > 1000) { @@ -151,6 +149,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten if (strict_infinity_checking) scm_misc_error (__FUNCTION__, "Improbable offset.", SCM_EOL); } + return scm_from_double (total_off); } @@ -159,15 +158,15 @@ MAKE_SCHEME_CALLBACK (Side_position_interface, y_aligned_on_support_refpoints, 1 SCM Side_position_interface::y_aligned_on_support_refpoints (SCM smob) { - return general_side_position (unsmob_grob (smob), Y_AXIS, false, false, false, 0, 0, 0); + return general_side_position (unsmob_grob (smob), Y_AXIS, false, false, false, 0, 0, 0); } MAKE_SCHEME_CALLBACK (Side_position_interface, pure_y_aligned_on_support_refpoints, 3); SCM Side_position_interface::pure_y_aligned_on_support_refpoints (SCM smob, SCM start, SCM end) { - return general_side_position (unsmob_grob (smob), Y_AXIS, false, false, - true, scm_to_int (start), scm_to_int (end), 0); + return general_side_position (unsmob_grob (smob), Y_AXIS, false, false, + true, scm_to_int (start), scm_to_int (end), 0); } @@ -182,9 +181,9 @@ axis_aligned_side_helper (SCM smob, Axis a, bool pure, int start, int end, SCM c if (scm_is_number (current_off_scm)) { r = scm_to_double (current_off_scm); - current_off_ptr = &r; + current_off_ptr = &r; } - + return Side_position_interface::aligned_side (unsmob_grob (smob), a, pure, start, end, current_off_ptr); } @@ -257,7 +256,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i if (fabs (position) <= 2 * Staff_symbol_referencer::staff_radius (me) + 1 /* 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)) > abs (position))) { o += (rounded - position) * 0.5 * ss; @@ -268,16 +267,20 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i else if (scm_is_number (me->get_property ("staff-padding")) && dir) { Interval iv = me->maybe_pure_extent (me, a, pure, start, end); - - Real padding + + Real staff_padding = Staff_symbol_referencer::staff_space (me) * scm_to_double (me->get_property ("staff-padding")); - Grob *common = me->common_refpoint (staff, Y_AXIS); - - Interval staff_size = staff->maybe_pure_extent (common, Y_AXIS, pure, start, end); - Real diff = dir*staff_size[dir] + padding - dir * (o + iv[-dir]); - o += dir * max (diff, 0.0); + Grob *parent = me->get_parent (Y_AXIS); + Grob *common = me->common_refpoint (staff, Y_AXIS); + Real parent_position = parent->maybe_pure_coordinate (common, Y_AXIS, pure, start, end); + Real staff_position = staff->maybe_pure_coordinate (common, Y_AXIS, pure, start, end); + Interval staff_extent = staff->maybe_pure_extent (staff, a, pure, start, end); + Real diff = (dir * staff_extent[dir] + staff_padding + - dir * (o + iv[-dir]) + + dir * (staff_position - parent_position)); + o += dir * max (diff, 0.0); } } return scm_from_double (o); @@ -302,13 +305,58 @@ 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"))); - + 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" @@ -321,12 +369,10 @@ ADD_INTERFACE (Side_position_interface, /* properties */ "direction " - "direction-source " "minimum-space " "padding " "quantize-position " "side-axis " - "side-relative-direction " "side-support-elements " "slur-padding " "staff-padding "