source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "note-column.hh"
#include "axis-group-interface.hh"
#include "directional-element-interface.hh"
#include "international.hh"
+#include "item.hh"
#include "note-head.hh"
#include "output-def.hh"
#include "pointer-group-interface.hh"
return unsmob_grob (me->get_object ("rest"));
}
-int
-Note_column::shift_compare (Grob *const &p1, Grob *const &p2)
+bool
+Note_column::shift_less (Grob *const &p1, Grob *const &p2)
{
SCM s1 = p1->get_property ("horizontal-shift");
SCM s2 = p2->get_property ("horizontal-shift");
int h1 = (scm_is_number (s1)) ? scm_to_int (s1) : 0;
int h2 = (scm_is_number (s2)) ? scm_to_int (s2) : 0;
- return h1 - h2;
+ return h1 < h2;
}
Item *
}
if (both)
- me->warning (_ ("can't have note heads and rests together on a stem"));
+ me->warning (_ ("cannot have note heads and rests together on a stem"));
else
Axis_group_interface::add_element (me, h);
}
}
}
-void
-Note_column::set_dotcol (Grob *me, Grob *d)
-{
- Axis_group_interface::add_element (me, d);
-}
-
Grob *
Note_column::first_head (Grob *me)
{
return acc;
}
+Grob *
+Note_column::dot_column (Grob *me)
+{
+ extract_grob_set (me, "note-heads", heads);
+ for (vsize i = 0; i < heads.size (); i++)
+ {
+ Grob *dots = unsmob_grob (heads[i]->get_object ("dot"));
+ if (dots)
+ return dots->get_parent (X_AXIS);
+ }
+
+ return 0;
+}
+
Grob *
Note_column::arpeggio (Grob *me)
{
return unsmob_grob (me->get_object ("arpeggio"));
}
-ADD_INTERFACE (Note_column, "note-column-interface",
- "Stem and noteheads combined",
- "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
+/* If a note-column contains a cross-staff stem then
+ nc->extent (Y_AXIS, refp) will not consider the extent of the stem.
+ If you want the extent of the stem to be included (and you are safe
+ from any cross-staff issues) then call this function instead. */
+Interval
+Note_column::cross_staff_extent (Grob *me, Grob *refp)
+{
+ Interval iv = me->extent (refp, Y_AXIS);
+ if (Grob *s = get_stem (me))
+ iv.unite (s->extent (refp, Y_AXIS));
+
+ return iv;
+}
+
+ADD_INTERFACE (Note_column,
+ "Stem and noteheads combined.",
+
+ /* properties */
+ "arpeggio "
+ "force-hshift "
+ "horizontal-shift "
+ "ignore-collision "
+ "note-heads "
+ "rest "
+ "rest-collision "
+ "stem "
+ );