source file of the GNU LilyPond music typesetter
- (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO: This is way too hairy
Real pos;
if (!gh_number_p (p))
{
-
pos = get_default_stem_end_position (me);
me->set_grob_property ("stem-end-position", gh_double2scm (pos));
}
Direction d= get_direction (me);
if (d && d * head_positions (me)[get_direction (me)] >= se*d)
- warning (_ ("Weird stem size; check for narrow beams"));
+ me->warning (_ ("Weird stem size; check for narrow beams"));
me->set_grob_property ("stem-end-position", gh_double2scm (se));
}
if (Note_head::has_interface (n))
{
- Pointer_group_interface::add_element (me, ly_symbol2scm ("heads"), n);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("heads"), n);
}
else
{
return;
Link_array<Grob> heads =
- Pointer_group_interface__extract_elements (me, (Grob*)0, "heads");
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "heads");
heads.sort (compare_position);
Direction dir =get_direction (me);
{
if (parity)
{
- Real l = heads[i]->extent (heads[i], X_AXIS).length ();
+ Real l = Note_head::head_extent (heads[i], X_AXIS).length ();
+
heads[i]->translate_axis (l * get_direction (me), X_AXIS);
}
parity = !parity;
// suicide ();
}
- set_spacing_hints (me);
return SCM_UNSPECIFIED;
}
-
/*
ugh.
When in a beam with tuplet brackets, brew_mol is called early,
}
-/**
- set stem directions for hinting the optical spacing correction.
-
- Modifies DIR_LIST property of the Stem's Paper_column
-
- TODO: more advanced: supply height of noteheads as well, for more advanced spacing possibilities
- */
-void
-Stem::set_spacing_hints (Grob*me)
-{
- if (!invisible_b (me))
- {
- SCM scmdir = gh_int2scm (get_direction (me));
-
- Item* item = dynamic_cast<Item*> (me);
- Item * col = item->column_l ();
- SCM dirlist =col->get_grob_property ("dir-list");
- if (scm_c_memq (scmdir, dirlist) == SCM_BOOL_F)
- {
- dirlist = gh_cons (scmdir, dirlist);
- col->set_grob_property ("dir-list", dirlist);
- }
- }
-}
-
Molecule
Stem::flag (Grob*me)
{
{
style = "";
}
+ bool adjust = to_boolean (me->get_grob_property ("adjust-if-on-staffline"));
+
if (String::compare_i (style, "mensural") == 0)
/* Mensural notation: For notes on staff lines, use different
flags than for notes between staff lines. The idea is that
touches a staff line.
*/
{
- /* Urrgh! We have to detect wether this stem ends on a staff
- line or between two staff lines. But we can not call
- stem_end_position(me) or get_default_stem_end_position(me),
- since this encounters the flag and hence results in an
- infinite recursion. However, in pure mensural notation,
- there are no multiple note heads attached to a single stem,
- neither is there usually need for using the stem_shorten
- property (except for 32th and 64th notes, but that is not a
- problem since the stem length in this case is augmented by
- an integral multiple of staff_space). Hence, it should be
- sufficient to just take the first note head, assume it's
- the only one, look if it's on a staff line, and select the
- flag's shape accordingly. In the worst case, the shape
- looks slightly misplaced, but that will usually be the
- programmer's fault (e.g. when trying to attach multiple
- note heads to a single stem in mensural notation).
-
- */
- Grob *first = first_head(me);
- int sz = Staff_symbol_referencer::line_count (me)-1;
- int p = (int)rint (Staff_symbol_referencer::position_f (first));
- staffline_offs = (((p ^ sz) & 0x1) == 0) ? "1" : "0";
+ if (adjust)
+ {
+ /* Urrgh! We have to detect wether this stem ends on a staff
+ line or between two staff lines. But we can not call
+ stem_end_position(me) or get_default_stem_end_position(me),
+ since this encounters the flag and hence results in an
+ infinite recursion. However, in pure mensural notation,
+ there are no multiple note heads attached to a single stem,
+ neither is there usually need for using the stem_shorten
+ property (except for 32th and 64th notes, but that is not a
+ problem since the stem length in this case is augmented by
+ an integral multiple of staff_space). Hence, it should be
+ sufficient to just take the first note head, assume it's
+ the only one, look if it's on a staff line, and select the
+ flag's shape accordingly. In the worst case, the shape
+ looks slightly misplaced, but that will usually be the
+ programmer's fault (e.g. when trying to attach multiple
+ note heads to a single stem in mensural notation). */
+ Grob *first = first_head(me);
+ int sz = Staff_symbol_referencer::line_count (me)-1;
+ int p = (int)rint (Staff_symbol_referencer::position_f (first));
+ staffline_offs = (((p ^ sz) & 0x1) == 0) ? "1" : "0";
+ }
+ else
+ {
+ staffline_offs = "2";
+ }
}
else
{
- staffline_offs = "";
+ staffline_offs = "";
}
char c = (get_direction (me) == UP) ? 'u' : 'd';
String index_str
Real y1 = Staff_symbol_referencer::position_f (first_head (me));
Real y2 = stem_end_position (me);
- Interval stem_y (y1,y2);
- stem_y.unite (Interval (y2,y1));
+ Interval stem_y (y1 <? y2,y2 >? y1);
+
// dy?
- Real dy = Staff_symbol_referencer::staff_space (me)/2.0;
-
+ Real dy = Staff_symbol_referencer::staff_space (me) * 0.5;
+
if (Grob *hed = support_head (me))
{
- Interval head_height = hed->extent (hed,Y_AXIS);
+ /*
+ must not take ledgers into account.
+ */
+ Interval head_height = Note_head::head_extent (hed,Y_AXIS);
Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS);
y_attach = head_height.linear_combination (y_attach);
- stem_y[Direction (-d)] += d * 2*y_attach;
+ stem_y[Direction (-d)] += d * y_attach/dy;
}
if (!invisible_b (me))