source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+
+#include "note-column.hh"
+
#include <math.h> // ceil
#include "axis-group-interface.hh"
-#include "note-column.hh"
#include "stem.hh"
-#include "debug.hh"
-#include "paper-def.hh"
-#include "group-interface.hh"
+#include "warn.hh"
+#include "output-def.hh"
#include "staff-symbol-referencer.hh"
#include "rest.hh"
#include "note-head.hh"
+#include "accidental-placement.hh"
+
+/*
+ TODO: figure out if we can prune this class. This is just an
+ annoying layer between (rest)collision & (note-head + stem)
+*/
bool
-Note_column::rest_b (Grob*me)
+Note_column::has_rests (Grob *me)
{
- return unsmob_grob (me->get_grob_property ("rest"));
+ return unsmob_grob (me->get_property ("rest"));
}
int
-Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
+Note_column::shift_compare (Grob *const &p1, Grob *const &p2)
{
- SCM s1 = p1->get_grob_property ("horizontal-shift");
- SCM s2 = p2->get_grob_property ("horizontal-shift");
+ SCM s1 = p1->get_property ("horizontal-shift");
+ SCM s2 = p2->get_property ("horizontal-shift");
- int h1 = (gh_number_p (s1))? gh_scm2int (s1) :0;
- int h2 = (gh_number_p (s2)) ? gh_scm2int (s2):0;
+ 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;
}
-void
-Note_column::set_interface (Grob* me)
-{
- me->set_grob_property ("note-heads", SCM_EOL);
- me->set_interface (ly_symbol2scm ("note-column-interface"));
-
- Axis_group_interface::set_interface (me);
- Axis_group_interface::set_axes (me, X_AXIS, Y_AXIS);
-}
-
Item *
-Note_column::stem_l (Grob*me)
+Note_column::get_stem (Grob *me)
{
- SCM s = me->get_grob_property ("stem");
- return dynamic_cast<Item*> (unsmob_grob (s));
+ SCM s = me->get_property ("stem");
+ return unsmob_item (s);
}
-
+
Slice
Note_column::head_positions_interval (Grob *me)
{
- Slice iv;
+ Slice iv;
iv.set_empty ();
- SCM h = me->get_grob_property ("note-heads");
- for (; gh_pair_p (h); h = ly_cdr (h))
+ SCM h = me->get_property ("note-heads");
+ for (; scm_is_pair (h); h = scm_cdr (h))
{
- Grob *se = unsmob_grob (ly_car (h));
-
- int j = int (Staff_symbol_referencer::position_f (se));
- iv.unite (Slice (j,j));
+ Grob *se = unsmob_grob (scm_car (h));
+
+ int j = Staff_symbol_referencer::get_rounded_position (se);
+ iv.unite (Slice (j, j));
}
return iv;
}
Direction
-Note_column::dir (Grob* me)
+Note_column::dir (Grob *me)
{
- Grob *stem = unsmob_grob (me->get_grob_property ("stem"));
+ Grob *stem = unsmob_grob (me->get_property ("stem"));
if (stem && Stem::has_interface (stem))
return Stem::get_direction (stem);
- else if (gh_pair_p (me->get_grob_property ("note-heads")))
+ else if (scm_is_pair (me->get_property ("note-heads")))
return (Direction)sign (head_positions_interval (me).center ());
- programming_error ("Note column without heads and stem!");
+ programming_error ("note column without heads and stem");
return CENTER;
}
-
void
-Note_column::set_stem (Grob*me,Grob * stem_l)
+Note_column::set_stem (Grob *me, Grob *stem)
+{
+ me->set_property ("stem", stem->self_scm ());
+ me->add_dependency (stem);
+ Axis_group_interface::add_element (me, stem);
+}
+
+Grob *
+Note_column::get_rest (Grob *me)
{
- me->set_grob_property ("stem", stem_l->self_scm ());
- me->add_dependency (stem_l);
- Axis_group_interface::add_element (me, stem_l);
+ return unsmob_grob (me->get_property ("rest"));
}
void
-Note_column::add_head (Grob*me,Grob *h)
+Note_column::add_head (Grob *me, Grob *h)
{
+ bool both = false;
if (Rest::has_interface (h))
{
- me->set_grob_property ("rest", h->self_scm ());
+ if (scm_is_pair (me->get_property ("note-heads")))
+ both = true;
+ else
+ me->set_property ("rest", h->self_scm ());
}
else if (Note_head::has_interface (h))
{
- Pointer_group_interface::add_element (me, ly_symbol2scm ("note-heads"),h);
+ if (unsmob_grob (me->get_property ("rest")))
+ both = true;
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h);
}
- Axis_group_interface::add_element (me, h);
+
+ if (both)
+ me->warning (_ ("can't have note heads and rests together on a stem"));
+ else
+ Axis_group_interface::add_element (me, h);
}
/**
- translate the rest symbols vertically by amount DY_I.
- */
+ translate the rest symbols vertically by amount DY, but only if
+ they have no staff-position set.
+*/
void
-Note_column::translate_rests (Grob*me,int dy_i)
+Note_column::translate_rests (Grob *me, int dy)
{
- Grob * r = unsmob_grob (me->get_grob_property ("rest"));
- if (r)
+ Grob *r = unsmob_grob (me->get_property ("rest"));
+ if (r && !scm_is_number (r->get_property ("staff-position")))
{
- r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
+ r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS);
+ Grob *p = r->get_parent (Y_AXIS);
+ p->flush_extent_cache (Y_AXIS);
}
}
-
void
-Note_column::set_dotcol (Grob*me,Grob *d)
+Note_column::set_dotcol (Grob *me, Grob *d)
{
Axis_group_interface::add_element (me, d);
}
-
-
-
-Grob*
-Note_column::first_head (Grob*me)
+Grob *
+Note_column::first_head (Grob *me)
{
- Grob * st = stem_l (me);
- return st? Stem::first_head (st): 0;
+ Grob *st = get_stem (me);
+ return st ? Stem::first_head (st) : 0;
}
-bool
-Note_column::has_interface (Grob*me)
+/*
+ Return the first Accidentals grob that we find in a note-head.
+*/
+Grob *
+Note_column::accidentals (Grob *me)
{
- return me && me->has_interface (ly_symbol2scm ("note-column-interface"));
+ SCM heads = me->get_property ("note-heads");
+ Grob *acc = 0;
+ for (;scm_is_pair (heads); heads = scm_cdr (heads))
+ {
+ Grob *h = unsmob_grob (scm_car (heads));
+ acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0;
+ if (acc)
+ break;
+ }
+
+ if (!acc)
+ return 0;
+
+ if (Accidental_placement::has_interface (acc->get_parent (X_AXIS)))
+ return acc->get_parent (X_AXIS);
+
+ /* compatibility. */
+ return acc;
}
+
+ADD_INTERFACE (Note_column, "note-column-interface",
+ "Stem and noteheads combined",
+ "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
+
projects / lilypond.git / blobdiff