}
Molecule
-internal_brew_molecule (Grob *me, bool ledger_take_space)
+internal_brew_molecule (Grob *me, bool ledger_take_space)
{
SCM style = me->get_grob_property ("style");
if (!gh_symbol_p (style))
SCM exp = scm_list_n (ly_symbol2scm ("find-notehead-symbol"), log,
ly_quote_scm (style),
SCM_UNDEFINED);
- SCM scm_pair = scm_primitive_eval (exp);
- SCM scm_font_char = ly_car (scm_pair);
- SCM scm_font_family = ly_cdr (scm_pair);
+ SCM scm_font_char = scm_primitive_eval (exp);
String font_char = "noteheads-" + ly_scm2string (scm_font_char);
- String font_family = ly_scm2string (scm_font_family);
-
- me->set_grob_property("font-family", ly_symbol2scm (font_family.to_str0 ()));
- Molecule out =
- Font_interface::get_default_font (me)->find_by_name (font_char);
- if (out.empty_b())
- {
- warning (_f("Symbol not found, ", font_char.to_str0()));
+
+ Font_metric * fm = Font_interface::get_default_font (me);
+ Molecule out = fm->find_by_name (font_char);
+ if (out.empty_b())
+ {
+ me->warning (_f ("note head `%s' not found", font_char.to_str0 ()));
}
-
+
int interspaces = Staff_symbol_referencer::line_count (me)-1;
int pos = (int)rint (Staff_symbol_referencer::get_position (me));
if (abs (pos) - interspaces > 1)
Interval
Note_head::head_extent (Grob *me, Axis a)
{
- return me->get_molecule()->extent (a);
+ Molecule * mol = me->get_molecule();
+ return mol ? mol ->extent (a) : Interval(0,0);
}
s[0] = (pit->notename_ + 2)%7 + 'a';
s[0] = toupper (s[0]);
- SCM charstr = ly_str02scm (s);
+ SCM charstr = scm_makfrom0str (s);
SCM at = scm_list_n (ly_symbol2scm ("ez-ball"),
charstr,
return gh_number_p (result) ? gh_scm2double (result) : 0.0;
}
-
int
Note_head::get_balltype (Grob*me)
{