#include "item.hh"
#include "stencil.hh"
#include "accidental-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "pitch.hh"
/*
if (to_boolean (a->get_property ("cautionary")))
{
SCM cstyle = a->get_property ("cautionary-style");
- parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+ parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
}
SCM accs = a->get_property ("accidentals");
SCM scm_style = a->get_property ("style");
- if (!gh_symbol_p (scm_style)
+ if (!ly_c_symbol_p (scm_style)
&& !parens
&& scm_ilength (accs) == 1)
{
- if (gh_scm2int (gh_car (accs)) == FLAT)
+ if (ly_scm2int (ly_car (accs)) == FLAT)
{
Box stem = b;
Box bulb = b;
if (caut)
{
SCM cstyle = me->get_property ("cautionary-style");
- parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses"));
- smaller = gh_equal_p (cstyle, ly_symbol2scm ("smaller"));
+ parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+ smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller"));
}
SCM scm_style = me->get_property ("style");
String style;
- if (gh_symbol_p (scm_style))
+ if (ly_c_symbol_p (scm_style))
{
style = ly_symbol2string (scm_style);
}
Font_metric *fm = 0;
if (smaller)
{
- SCM ac = Font_interface::font_alist_chain (me);
- ac = gh_cons (gh_cons (gh_cons
+ SCM ac = Font_interface::text_font_alist_chain (me);
+ ac = scm_cons (scm_cons (scm_cons
(ly_symbol2scm ("font-size"),
scm_int2num (-2)), SCM_EOL),
ac);
Stencil mol;
for (SCM s = me->get_property ("accidentals");
- gh_pair_p (s); s = gh_cdr (s))
+ ly_c_pair_p (s); s = ly_cdr (s))
{
- int alteration = gh_scm2int (gh_car (s));
+ int alteration = ly_scm2int (ly_car (s));
String font_char = get_fontcharname (style, alteration);
Stencil acc (fm->find_by_name ("accidentals-" + font_char));