source file of the GNU LilyPond music typesetter
- (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "script-column.hh"
+#include "accidental-placement.hh"
+#include "arpeggio.hh"
#include "directional-element-interface.hh"
#include "side-position-interface.hh"
#include "warn.hh"
+#include "grob.hh"
#include "pointer-group-interface.hh"
#include <map>
LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less",
2, 0, 0, (SCM a, SCM b),
- "Compare two grobs by script priority. For internal use.")
+ "Compare two grobs by script priority. For internal use.")
{
Grob *i1 = unsmob_grob (a);
Grob *i2 = unsmob_grob (b);
extract_grob_set (me, "scripts", scripts);
Grob_scripts_map head_scripts_map;
+ vector<Grob *> affect_all_grobs;
for (vsize i = 0; i < scripts.size (); i++)
{
Grob *sc = scripts[i];
/*
Don't want to consider scripts horizontally next to notes.
*/
- if (sc->get_property_data (ly_symbol2scm ("Y-offset")) !=
- Side_position_interface::x_aligned_side_proc)
+ if (Accidental_placement::has_interface (sc)
+ || Arpeggio::has_interface (sc))
+ {
+ affect_all_grobs.push_back (sc);
+ }
+ else if (sc->get_property_data ("Y-offset") !=
+ Side_position_interface::x_aligned_side_proc)
{
head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc);
}
i != head_scripts_map.end ();
i++)
{
- order_grobs ((*i).second);
+ vector<Grob*> grobs = (*i).second;
+
+ // this isn't right in all cases, but in general a safe assumption.
+ concat (grobs, affect_all_grobs);
+ order_grobs (grobs);
}
return SCM_UNSPECIFIED;
for (vsize i = 0; i < scripts.size (); i++)
{
Grob *sc = scripts[i];
-
/*
Don't want to consider scripts horizontally next to notes.
*/
- if (sc->get_property_data (ly_symbol2scm ("X-offset")) !=
+ if (sc->get_property_data ("X-offset") !=
Side_position_interface::x_aligned_side_proc)
staff_sided.push_back (sc);
}
-
+
order_grobs (staff_sided);
return SCM_UNSPECIFIED;
-
}
void
{
Grob *g = unsmob_grob (scm_car (s));
if (last)
- Side_position_interface::add_support (g, last);
+ {
+ SCM outside_staff = last->get_property ("outside-staff-priority");
+ if (scm_is_number (outside_staff))
+ {
+ /* we allow the outside-staff-priority ordering to override the
+ script-priority ordering */
+ if (!scm_is_number (g->get_property ("outside-staff-priority")))
+ g->set_property ("outside-staff-priority",
+ scm_from_double (scm_to_double (outside_staff) + 0.1));
+ }
+ else
+ Side_position_interface::add_support (g, last);
+ }
last = g;
}
while (flip (&d) != DOWN);
}
-ADD_INTERFACE (Script_column, "script-column-interface",
- "An interface that sorts scripts "
- "according to their @code{script-priority}",
+ADD_INTERFACE (Script_column,
+ "An interface that sorts scripts according to their"
+ " @code{script-priority}.",
- "");
+ /* properties */
+ ""
+ );