source file of the GNU LilyPond music typesetter
- (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
keyplacement by Mats Bengtsson
*/
- lots of values trivially shared (key doesn't change very
often). Compute those once, and use that as cache for the rest.
+ TODO: can we do without c0pos? it's partly musical.
+
*/
int
alteration_pos (SCM what, int alter, int c0p)
String style;
if (gh_symbol_p (scm_style))
{
- style = ly_scm2string (scm_symbol_to_string (scm_style));
+ style = ly_symbol2string (scm_style);
}
else
{
Accidental_interface::get_fontcharname (style, alteration);
Molecule acc (fm->find_by_name ("accidentals-" + font_char));
- if (acc.empty_b())
+ if (acc.is_empty ())
{
me->warning (_f ("accidental `%s' not found", font_char));
}
SCM what = ly_caar (s);
int pos = alteration_pos (what, alteration, c0p);
acc.translate_axis (pos * inter, Y_AXIS);
- mol.add_at_edge (X_AXIS, LEFT, acc, 0);
+ mol.add_at_edge (X_AXIS, LEFT, acc, 0, 0);
}
}
Interval x (0, inter);
Interval y (0,0);
- mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)),0);
+ mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)), 0, 0);
Molecule natural;
if (gh_pair_p (old))
needed to prevent collisions.
*/
Real padding = 0.1 ;
- mol.add_at_edge (X_AXIS, LEFT, m, padding);
+ mol.add_at_edge (X_AXIS, LEFT, m, padding, 0);
}
}
}