source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
SCM props,
SCM markup)
{
- Output_def *layout = unsmob_output_def (layout_smob);
-
- SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
- __FUNCTION__, "Layout definition");
- SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
- __FUNCTION__, "string");
-
- String str = ly_scm2string (markup);
+ LY_ASSERT_SMOB (Output_def, layout_smob, 1);
+ LY_ASSERT_TYPE (scm_is_string, markup, 3);
+ string str = ly_scm2string (markup);
+ Output_def *layout = unsmob_output_def (layout_smob);
Font_metric *fm = select_encoded_font (layout, props);
- return fm->text_stencil (str).smobbed_copy ();
+ return fm->word_stencil (str).smobbed_copy ();
}
-MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Text_interface, interpret_markup, 3, 0,
+ "Convert a text markup into a stencil."
+" Takes three arguments, @var{layout}, @var{props}, and @var{markup}.\n"
+"\n"
+"@var{layout} is a @code{\\layout} block; it may be obtained from a grob with"
+" @code{ly:grob-layout}. @var{props} is a alist chain, ie. a list of alists."
+" This is typically obtained with"
+" @code{(ly:grob-alist-chain (ly:layout-lookup layout 'text-font-defaults))}."
+" @var{markup} is the markup text to be processed.");
SCM
Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
{
}
else
{
- programming_error ("not a markup: ");
+ programming_error ("Object is not a markup. ");
+ scm_puts ("This object should be a markup: ", scm_current_error_port ());
scm_display (markup, scm_current_error_port ());
+ scm_puts ("\n", scm_current_error_port ());
Box b;
b[X_AXIS].set_empty ();
SCM t = me->get_property ("text");
SCM chain = Font_interface::text_font_alist_chain (me);
- return interpret_markup (me->get_layout ()->self_scm (), chain, t);
+ return interpret_markup (me->layout ()->self_scm (), chain, t);
}
/* Ugh. Duplicated from Scheme. */
ly_symbol2scm ("markup-signature"))));
}
-ADD_INTERFACE (Text_interface, "text-interface",
- "A scheme markup text, see @usermanref{Text markup}.",
+bool
+Text_interface::is_markup_list (SCM x)
+{
+ SCM music_list_p = ly_lily_module_constant ("markup-list?");
+ return scm_is_true (scm_call_1 (music_list_p, x));
+}
+
+
+ADD_INTERFACE (Text_interface,
+ "A scheme markup text, see @ruser{Text markup} and "
+ "@ruser{New markup command definition}. "
+ "\n\n"
+ "There are two important commands: ly:text-interface::print, which is a "
+ "grob callback, and ly:text-interface::interpret-markup ",
+
+ /* props */
"baseline-skip "
"text "
"word-space "