#include "virtual-font-metric.hh"
#include "paper-def.hh"
-MAKE_SCHEME_CALLBACK(Text_item,interpret_markup,3);
+MAKE_SCHEME_CALLBACK (Text_item, interpret_markup, 3)
SCM
Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
{
if (gh_string_p (markup))
{
+ String str = ly_scm2string (markup);
+
Paper_def *pap = unsmob_paper (paper);
Font_metric *fm = select_font (pap, props);
-
- SCM list = scm_list_n (ly_symbol2scm ("text"), markup, SCM_UNDEFINED);
+ SCM lst = scm_list_n (ly_symbol2scm ("text"), markup, SCM_UNDEFINED);
if (dynamic_cast<Virtual_font_metric*> (fm))
- {
- /*
- ARGH.
- */
- programming_error ("Can't use virtual font for text.");
- }
+ /* ARGH. */
+ programming_error ("Can't use virtual font for text.");
else
- list = fontify_atom (fm, list);
+ lst = fontify_atom (fm, lst);
- Box b = fm->text_dimension (ly_scm2string (markup));
- return Stencil (b, list).smobbed_copy();
+ Box b = fm->text_dimension (str);
+ return Stencil (b, lst).smobbed_copy ();
}
else if (gh_pair_p (markup))
{
return scm_apply_2 (func, paper, props, args);
}
- else
- {
- return SCM_EOL;
- }
+ return SCM_EOL;
}
-MAKE_SCHEME_CALLBACK(Text_item,print,1);
+MAKE_SCHEME_CALLBACK (Text_item,print,1);
SCM
Text_item::print (SCM grob)
{
Grob * me = unsmob_grob (grob);
- SCM t = me->get_grob_property ("text");
- SCM chain = Font_interface::font_alist_chain (me);
+ SCM t = me->get_property ("text");
+ SCM chain = Font_interface::text_font_alist_chain (me);
return interpret_markup (me->get_paper ()->self_scm (), chain, t);
}
}
ADD_INTERFACE (Text_item,"text-interface",
- "A scheme markup text, see @usermanref{Markup functions}.",
+ "A scheme markup text, see @usermanref{Text-markup}.",
"text baseline-skip word-space");