/*
- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "side-position-interface.hh"
#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"
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.
{
Grob *me = unsmob_grob (smob);
System *sys = dynamic_cast<System*> (me->get_system ());
- Direction dir = Side_position_interface::get_direction (me);
+ Direction dir = get_grob_direction (me);
if (dir != DOWN)
dir = UP;
- Grob *top_staff = sys->get_extremal_staff (dir, me->extent (sys, X_AXIS));
+ 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;
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<Grob*> const& elts = ga->array ();
+ vector<Grob*> 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;
}
/* properties */
"direction "
- "direction-source "
"minimum-space "
"padding "
"quantize-position "
"side-axis "
- "side-relative-direction "
"side-support-elements "
"slur-padding "
"staff-padding "