/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
LY_ASSERT_TYPE (scm_is_string, markup, 3);
string str = ly_scm2string (markup);
- Output_def *layout = unsmob_output_def (layout_smob);
+ Output_def *layout = Output_def::unsmob (layout_smob);
Font_metric *fm = select_encoded_font (layout, props);
replace_special_characters (str, props);
{
if (scm_is_string (markup))
return interpret_string (layout_smob, props, markup);
- else if (scm_is_pair (markup))
+ else if (is_markup (markup))
{
SCM func = scm_car (markup);
SCM args = scm_cdr (markup);
- if (!is_markup (markup))
- programming_error ("markup head has no markup signature");
/* Use a hare/tortoise algorithm to detect whether we are in a cycle,
* i.e. whether we have already encountered the same markup in the
SCM
Text_interface::print (SCM grob)
{
- Grob *me = unsmob_grob (grob);
+ Grob *me = Grob::unsmob (grob);
SCM t = me->get_property ("text");
SCM chain = Font_interface::text_font_alist_chain (me);
bool
Text_interface::is_markup (SCM x)
{
- return (scm_is_string (x)
- || (scm_is_pair (x)
- && SCM_BOOL_F
- != scm_object_property (scm_car (x),
- ly_symbol2scm ("markup-signature"))));
+ return scm_is_string (x)
+ || (scm_is_pair (x)
+ && scm_is_true
+ (scm_object_property (scm_car (x),
+ ly_symbol2scm ("markup-signature")))
+ && scm_is_false
+ (scm_object_property (scm_car (x),
+ ly_symbol2scm ("markup-list-command"))));
}
bool
"text "
"word-space "
"text-direction "
+ "flag-style "
);