-/*
- script-column.cc -- implement Script_column
-
+/*
+ script-column.cc -- implement Script_column
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1999--2008 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 "group-interface.hh"
+#include "grob.hh"
+#include "pointer-group-interface.hh"
+
+#include <map>
+
+typedef map<Grob*, vector <Grob*> > Grob_scripts_map;
void
-Script_column::add_staff_sided (Grob *me, Item *i)
+Script_column::add_side_positioned (Grob *me, Grob *script)
{
- SCM p = i->get_property ("script-priority");
- if (!ly_c_number_p (p))
+ SCM p = script->get_property ("script-priority");
+ if (!scm_is_number (p))
return;
- Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
-
- me->add_dependency (i);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), script);
}
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.")
+ 2, 0, 0, (SCM a, SCM b),
+ "Compare two grobs by script priority. For internal use.")
{
Grob *i1 = unsmob_grob (a);
Grob *i2 = unsmob_grob (b);
return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
}
+MAKE_SCHEME_CALLBACK (Script_column, row_before_line_breaking, 1);
+SCM
+Script_column::row_before_line_breaking (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+ vector<Grob*> horizontal_grobs;
+ 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 (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);
+ }
+ }
+
+ for (Grob_scripts_map::const_iterator i (head_scripts_map.begin ());
+ i != head_scripts_map.end ();
+ i++)
+ {
+ 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;
+}
+
+
MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1);
SCM
Script_column::before_line_breaking (SCM smob)
{
- Grob* me = unsmob_grob (smob);
- Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
- Link_array<Grob> staff_sided;
-
- for (SCM s = me->get_property ("scripts"); ly_c_pair_p (s); s = ly_cdr (s))
- {
- Grob *sc = unsmob_grob (ly_car (s));
+ Grob *me = unsmob_grob (smob);
+ vector<Grob*> staff_sided;
+ extract_grob_set (me, "scripts", scripts);
+ for (vsize i = 0; i < scripts.size (); i++)
+ {
+ Grob *sc = scripts[i];
/*
Don't want to consider scripts horizontally next to notes.
- */
- if (!sc->has_offset_callback (Side_position_interface::aligned_side_proc,
- X_AXIS))
- staff_sided.push (sc);
+ */
+ if (sc->get_property_data ("X-offset") !=
+ Side_position_interface::x_aligned_side_proc)
+ staff_sided.push_back (sc);
}
- for (int i = 0; i < staff_sided.size (); i++)
+ order_grobs (staff_sided);
+ return SCM_UNSPECIFIED;
+}
+
+void
+Script_column::order_grobs (vector<Grob*> grobs)
+{
+ Drul_array<SCM> scripts_drul (SCM_EOL, SCM_EOL);
+ for (vsize i = 0; i < grobs.size (); i++)
{
- Grob* g = staff_sided[i];
- Direction d = Side_position_interface::get_direction (g);
- if (!d)
- {
- programming_error ( "No direction for script?");
- d = DOWN;
- g->set_property ("direction", scm_int2num (d));
- }
-
- scripts[d] = scm_cons (g->self_scm (), scripts[d]);
+ Grob *g = grobs[i];
+ Direction d = get_grob_direction (g);
+
+ scripts_drul[d] = scm_cons (g->self_scm (), scripts_drul[d]);
}
Direction d = DOWN;
do
{
- SCM ss = scm_reverse_x (scripts[d], SCM_EOL);
+ SCM ss = scm_reverse_x (scripts_drul[d], SCM_EOL);
ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc);
-
- Grob * last = 0;
- for (SCM s = ss; ly_c_pair_p (s); s = ly_cdr (s))
+
+ Grob *last = 0;
+ for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s))
{
- Grob *g = unsmob_grob (ly_car (s));
+ 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);
-
- return SCM_UNSPECIFIED;
+ }
+ 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 */
+ ""
+ );
projects / lilypond.git / blobdiff