source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "note-column.hh"
-#include <math.h> // ceil
+#include <cmath> // ceil
+using namespace std;
+#include "accidental-placement.hh"
#include "axis-group-interface.hh"
-#include "stem.hh"
-#include "warn.hh"
-#include "output-def.hh"
-#include "staff-symbol-referencer.hh"
-#include "rest.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "item.hh"
#include "note-head.hh"
-#include "accidental-placement.hh"
+#include "output-def.hh"
#include "pointer-group-interface.hh"
+#include "rest.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "warn.hh"
/*
TODO: figure out if we can prune this class. This is just an
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 *
iv.set_empty ();
extract_grob_set (me, "note-heads", heads);
- for (int i = 0; i < heads.size(); i++)
+ for (vsize i = 0; i < heads.size (); i++)
{
Grob *se = heads[i];
{
Grob *stem = unsmob_grob (me->get_object ("stem"));
if (stem && Stem::has_interface (stem))
- return Stem::get_direction (stem);
+ return get_grob_direction (stem);
else
{
extract_grob_set (me, "note-heads", heads);
if (heads.size ())
return (Direction)sign (head_positions_interval (me).center ());
}
-
+
programming_error ("note column without heads and stem");
return CENTER;
}
Note_column::set_stem (Grob *me, Grob *stem)
{
me->set_object ("stem", stem->self_scm ());
- me->add_dependency (stem);
Axis_group_interface::add_element (me, stem);
}
{
extract_grob_set (me, "note-heads", heads);
Grob *acc = 0;
- for (int i = 0; i < heads.size(); i++)
+ for (vsize i = 0; i < heads.size (); i++)
{
Grob *h = heads[i];
acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
return acc;
}
-ADD_INTERFACE (Note_column, "note-column-interface",
+Grob *
+Note_column::arpeggio (Grob *me)
+{
+ return unsmob_grob (me->get_object ("arpeggio"));
+}
+
+ADD_INTERFACE (Note_column,
"Stem and noteheads combined",
- "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
+ /* properties */
+ "accidentals "
+ "arpeggio "
+ "force-hshift "
+ "horizontal-shift "
+ "note-heads "
+ "rest "
+ "rest-collision "
+ "stem "
+ );