X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=f45b66e068b14e2c229e8552530cf80692a7de65;hb=402045837e7134cdf90d1fcf31768c62227a4936;hp=802eeefc9bb1b6e54275d982741d9d5c970ee421;hpb=e166ef4d795f43bcdff1f04162d17c2d8c7a9302;p=lilypond.git diff --git a/lily/text-item.cc b/lily/text-item.cc index 802eeefc9b..f45b66e068 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -3,246 +3,85 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys + (c) 1998--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include -#include "debug.hh" +#include "warn.hh" +#include "grob.hh" #include "text-item.hh" -#include "paper-def.hh" #include "font-interface.hh" -#include "staff-symbol-referencer.hh" -#include "staff-symbol-referencer.hh" -#include "main.hh" -#include "all-font-metrics.hh" -#include "afm.hh" - - -/* - - TEXT: STRING - | (MARKUP? TEXT+) - ; - - HEAD: MARKUP-ITEM | (MARKUP-ITEM+) - - MARKUP-ITEM: PROPERTY | ABBREV | FONT-STYLE - PROPERTY: (key . value) - ABBREV: rows lines roman music bold italic named super sub text - -*/ +#include "virtual-font-metric.hh" +#include "paper-def.hh" -Molecule -Text_item::text2molecule (Grob *me, SCM text, SCM alist_chain) +MAKE_SCHEME_CALLBACK(Text_item,interpret_markup,3); +SCM +Text_item::interpret_markup (SCM paper, SCM props, SCM markup) { - if (gh_string_p (text)) - return string2molecule (me, text, alist_chain); - else if (gh_pair_p (text)) + if (gh_string_p (markup)) { - /* urg, why not just do this in markup_text2molecule ? */ - if (gh_string_p (ly_car (text))) - return markup_text2molecule (me, - gh_append2 (scm_list_n (SCM_EOL, - SCM_UNDEFINED), - text), - alist_chain); - /* - Allow (faulty) texts that are in an extra list: - #'(("foo")) - */ - else if (scm_ilength (text) <= 1) - return text2molecule (me, ly_car (text), alist_chain); + Paper_def *pap = unsmob_paper (paper); + Font_metric *fm = select_font (pap, props); + + SCM list = scm_list_n (ly_symbol2scm ("text"), markup, SCM_UNDEFINED); + + if (dynamic_cast (fm)) + { + /* + ARGH. + */ + programming_error ("Can't use virtual font for text."); + } else - return markup_text2molecule (me, text, alist_chain); - } - return Molecule (); -} - -Molecule -Text_item::string2molecule (Grob *me, SCM text, SCM alist_chain) -{ - SCM style = ly_assoc_chain (ly_symbol2scm ("font-style"), - alist_chain); - if (gh_pair_p (style) && gh_symbol_p (ly_cdr (style))) - alist_chain = Font_interface::add_style (me, ly_cdr (style), alist_chain); + list = fontify_atom (fm, list); - Font_metric *fm = Font_interface::get_font (me, alist_chain); - - SCM lookup = ly_assoc_chain (ly_symbol2scm ("lookup"), alist_chain); - - Molecule mol; - if (gh_pair_p (lookup) && ly_cdr (lookup) ==ly_symbol2scm ("name")) - mol = lookup_character (me, fm, text); + Box b = fm->text_dimension (ly_scm2string (markup)); + return Stencil (b, list).smobbed_copy(); + } + else if (gh_pair_p (markup)) + { + SCM func = gh_car (markup); + SCM args = gh_cdr (markup); + if (!markup_p (markup)) + programming_error ("Markup head has no markup signature."); + + return scm_apply_2 (func, paper, props, args); + } else - mol = lookup_text (me, fm, text); - - return mol; -} - -Molecule -Text_item::lookup_character (Grob *, Font_metric*fm, SCM char_name) -{ - return fm->find_by_name (ly_scm2string (char_name)); + { + return SCM_EOL; + } } - -Molecule -Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text) +MAKE_SCHEME_CALLBACK(Text_item,print,1); +SCM +Text_item::print (SCM grob) { - SCM list = scm_list_n (ly_symbol2scm ("text"), text, SCM_UNDEFINED); - list = fontify_atom (fm, list); + Grob * me = unsmob_grob (grob); - return Molecule (fm->text_dimension (ly_scm2string (text)), list); + SCM t = me->get_grob_property ("text"); + SCM chain = Font_interface::font_alist_chain (me); + return interpret_markup (me->get_paper ()->self_scm (), chain, t); } -/* - TODO: - - DOCME. - - MARKUP_TEXT must be compound (may not be simple string.) - +/* + Ugh. Duplicated from Scheme. */ -Molecule -Text_item::markup_text2molecule (Grob *me, SCM markup_text, - SCM alist_chain) +bool +Text_item::markup_p (SCM x) { - SCM sheet = me->paper_l ()->style_sheet_; - SCM f = ly_cdr (scm_assoc (ly_symbol2scm ("markup-to-properties"), sheet)); - - SCM markup = ly_car (markup_text); - SCM text = ly_cdr (markup_text); - - SCM p = gh_cons (gh_call2 (f, sheet, markup), alist_chain); - - Real staff_space = Staff_symbol_referencer::staff_space (me); - - /* - Line mode is default. - */ - Axis axis = X_AXIS; - - SCM a = ly_assoc_chain (ly_symbol2scm ("axis"), p); - if (gh_pair_p (a) && isaxis_b (ly_cdr (a))) - axis = (Axis)gh_scm2int (ly_cdr (a)); - - Real baseline_skip = 0; - SCM b = ly_assoc_chain (ly_symbol2scm ("baseline-skip"), p); - if (gh_pair_p (b) && gh_number_p (ly_cdr (b))) - baseline_skip = gh_scm2double (ly_cdr (b)) * staff_space; - - Real kern[2] = {0,0}; - - SCM k = ly_assoc_chain (ly_symbol2scm ("kern"), p); - if (gh_pair_p (k) && gh_number_p (ly_cdr (k))) - kern[axis] = gh_scm2double (ly_cdr (k)) * staff_space; - - Real raise = 0; - SCM r = ly_assoc_chain (ly_symbol2scm ("raise"), p); - if (gh_pair_p (r) && gh_number_p (ly_cdr (r))) - raise = gh_scm2double (ly_cdr (r)) * staff_space; - - Interval extent; - bool extent_b = false; - SCM e = ly_assoc_chain (ly_symbol2scm ("extent"), p); - if (gh_pair_p (e) && ly_number_pair_p (ly_cdr (e))) - { - extent = Interval (gh_scm2double (ly_cadr (e)) * staff_space, - gh_scm2double (ly_cddr (e)) * staff_space); - extent_b = true; - } - - Offset o (0, (axis == Y_AXIS ? - kern[axis] : 0)); - - Molecule mol; - while (gh_pair_p (text)) - { - - Molecule m = text2molecule (me, ly_car (text), p); - - /* - TODO: look at padding? - - Look ahead here for kern and raise. - - (cols "foo" ((raise . 1) "bar")) - (cols "foo" ((bold (raise . 1)) "bar")) - - When constructing the molecule for bar, all normal extra - properties found, such as bold, are used for the construction - of bar's molecule. But for kern or raise, it seems that we're - too late then, translating bar's molecule has no effect (or - maybe the effect of translating gets nullified when bar's - molecule is `added_to_edge' of the molecule for foo?) - - So, while constructing foo's molecule, we look ahead for the - raise of bar. The HEAD of the description of bar may be a - single property, or a list, so we must check that too. - */ - - SCM next_p = SCM_EOL; - if (gh_pair_p (ly_car (text))) - next_p = scm_list_n (gh_call2 (f, sheet, ly_caar (text)), SCM_UNDEFINED); - SCM next_k = ly_assoc_chain (ly_symbol2scm ("kern"), next_p); - Real next_kern = kern[axis]; - if (gh_pair_p (next_k) && gh_number_p (ly_cdr (next_k))) - next_kern = gh_scm2double (ly_cdr (next_k)) * staff_space; - - SCM next_r = ly_assoc_chain (ly_symbol2scm ("raise"), next_p); - Real next_raise = 0; - if (gh_pair_p (next_r) && gh_number_p (ly_cdr (next_r))) - next_raise = gh_scm2double (ly_cdr (next_r)) * staff_space; - - o[Y_AXIS] = next_raise; - - if (!m.empty_b ()) - { - m.translate (o); - if (mol.empty_b ()) - mol = m; - else - { - if (axis == Y_AXIS && baseline_skip) - next_kern += baseline_skip - m.extent (Y_AXIS)[UP]; - mol.add_at_edge (axis, axis == X_AXIS ? RIGHT : DOWN, m, next_kern); - } - } - text = ly_cdr (text); - } - - if (extent_b) - { - /* we're not setting extents for unknown reasons. */ - Box b = mol.extent_box (); - SCM expr = mol.get_expr (); - - b[axis] = extent; - mol = Molecule (b, expr); - } - return mol; + return + gh_string_p (x) || + (gh_pair_p (x) + && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature"))); } -MAKE_SCHEME_CALLBACK (Text_item, brew_molecule, 1); -SCM -Text_item::brew_molecule (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - SCM text = me->get_grob_property ("text"); +ADD_INTERFACE (Text_item,"text-interface", + "A scheme markup text, see @usermanref{Markup functions}.", + "text baseline-skip word-space"); + - SCM properties = Font_interface::font_alist_chain (me); - Molecule mol = Text_item::text2molecule (me, text, properties); - SCM space = me->get_grob_property ("word-space"); - if (gh_number_p (space)) - { - Molecule m; - m.set_empty (false); - mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space) - * Staff_symbol_referencer::staff_space (me)); - } - return mol.smobbed_copy (); -}