#include "warn.hh"
#include "font-interface.hh"
#include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "text-item.hh"
#include "tuplet-bracket.hh"
#include "stem.hh"
SCM lp = me->get_property ("left-position");
SCM rp = me->get_property ("right-position");
- if (!is_number (rp) || !is_number (lp))
+ if (!ly_c_number_p (rp) || !ly_c_number_p (lp))
after_line_breaking (smob);
}
SCM number = me->get_property ("text");
- Paper_def *pap = me->get_paper ();
+ Output_def *pap = me->get_paper ();
Stencil num;
- if (ly_c_string_p (number) && number_visibility)
+ if (scm_is_string (number) && number_visibility)
{
SCM properties = Font_interface::text_font_alist_chain (me);
SCM snum = Text_item::interpret_markup (pap->self_scm (), properties, number);
Stencil m;
do {
m.add_stencil (Line_interface::line (me, straight_corners[d],
- gap_corners[d]));
+ gap_corners[d]));
m.add_stencil (Line_interface::line (me, straight_corners[d],
- flare_corners[d]));
+ flare_corners[d]));
} while (flip (&d) != LEFT);
return m;
if (b)
me->add_dependency (b);
}
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
}
MAKE_SCHEME_CALLBACK (Tuplet_bracket,after_line_breaking,1);
/*
duh. magic.
- */
+< */
offset = lp + dir * (0.5 + ly_scm2double (me->get_property ("padding")));
dy = rp- lp;
}
SCM lp = me->get_property ("left-position");
SCM rp = me->get_property ("right-position");
- if (is_number (lp) && !is_number (rp))
+ if (ly_c_number_p (lp) && !ly_c_number_p (rp))
{
rp = scm_make_real (ly_scm2double (lp) + dy);
}
- else if (is_number (rp) && !is_number (lp))
+ else if (ly_c_number_p (rp) && !ly_c_number_p (lp))
{
lp = scm_make_real (ly_scm2double (rp) - dy);
}
- else if (!is_number (rp) && !is_number (lp))
+ else if (!ly_c_number_p (rp) && !ly_c_number_p (lp))
{
lp = scm_make_real (offset);
rp = scm_make_real (offset +dy);