X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=78aecd437f7c4de14a8eec1a80223320f2ad3fe4;hb=6c00542bf11cd4759b2e39537aeb3d9a533a3519;hp=6e70076a55ce955313b5bc36e8aa2c2f37bfea4c;hpb=487ee28c2a58e7bd5cb9e85c7676057c0b32f385;p=lilypond.git diff --git a/lily/text-item.cc b/lily/text-item.cc index 6e70076a55..78aecd437f 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -1,227 +1,109 @@ /* - text-item.cc -- implement Text_item + text-item.cc -- implement Text_interface source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ -#include - -#include "warn.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" -#include "lookup.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 - + (c) 1998--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -Molecule -Text_item::text2molecule (Grob *me, SCM text, SCM alist_chain) -{ - if (gh_string_p (text)) - return string2molecule (me, text, alist_chain); - else if (gh_pair_p (text)) - { - /* 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); - 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); - - 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); - 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)); -} - - -Molecule -Text_item::lookup_text (Grob *, Font_metric*fm, SCM text) -{ - SCM list = scm_list_n (ly_symbol2scm ("text"), text, SCM_UNDEFINED); - list = fontify_atom (fm, list); - - return Molecule (fm->text_dimension (ly_scm2string (text)), list); -} - +#include "text-item.hh" -/* - TODO: +#include - DOCME. +#include "main.hh" +#include "config.hh" +#include "pango-font.hh" +#include "warn.hh" +#include "grob.hh" +#include "font-interface.hh" +#include "output-def.hh" +#include "modified-font-metric.hh" - MARKUP_TEXT must be compound (may not be simple string.) - - */ -Molecule -Text_item::markup_text2molecule (Grob *me, SCM markup_text, - SCM alist_chain) +MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3) +SCM +Text_interface::interpret_string (SCM layout_smob, + SCM props, + SCM markup) { - SCM sheet = me->get_paper ()->style_sheet_; - SCM f = ly_cdr (scm_assoc (ly_symbol2scm ("markup-to-properties"), sheet)); + Output_def *layout = unsmob_output_def (layout_smob); - 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); + SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1, + __FUNCTION__, "Layout definition"); + SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3, + __FUNCTION__, "string"); - /* - Line mode is default. - */ - Axis axis = X_AXIS; + String str = ly_scm2string (markup); - SCM a = ly_assoc_chain (ly_symbol2scm ("axis"), p); - if (gh_pair_p (a) && ly_axis_p (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))) +#if HAVE_PANGO_FT2 + if (output_backend_global != "tex" + && output_backend_global != "texstr") { - extent = Interval (gh_scm2double (ly_cadr (e)) * staff_space, - gh_scm2double (ly_cddr (e)) * staff_space); - extent_b = true; + Font_metric *fm = select_pango_font (layout, props); + return fm->text_stencil (str).smobbed_copy (); } - - Offset o (kern[X_AXIS], raise - kern[Y_AXIS]); +#endif - Molecule mol = Lookup::filledbox (Box (Interval (0,0), Interval (0,0))); + Font_metric *fm = select_encoded_font (layout, props); + return fm->text_stencil (str).smobbed_copy(); +} - SCM cp = ly_deep_copy (p); - if (raise) +MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3) +SCM +Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup) +{ + if (scm_is_string (markup)) + return interpret_string (layout_smob, props, markup); + else if (scm_is_pair (markup)) { - SCM cr = ly_assoc_chain (ly_symbol2scm ("raise"), cp); - scm_set_cdr_x (cr, gh_int2scm (0)); + SCM func = scm_car (markup); + SCM args = scm_cdr (markup); + if (!markup_p (markup)) + programming_error ("Markup head has no markup signature."); + + return scm_apply_2 (func, layout_smob, props, args); } - - while (gh_pair_p (text)) + else { - Molecule m = text2molecule (me, ly_car (text), cp); - - if (!m.empty_b ()) - { - m.translate_axis (mol.extent (axis)[axis == X_AXIS ? RIGHT : DOWN] - - (axis == Y_AXIS ? baseline_skip : 0), - axis); - mol.add_molecule (m); - } - text = ly_cdr (text); + programming_error ("Is not a markup: "); + scm_display (markup, scm_current_error_port()); + assert (false); + Box b; + b[X_AXIS].set_empty(); + b[Y_AXIS].set_empty(); + + Stencil s(b, SCM_EOL); + return s.smobbed_copy(); } - - - /* Set extend to markup evented value. */ - if (extent_b) - { - Box b = mol.extent_box (); - SCM expr = mol.get_expr (); +} - b[axis] = extent; - mol = Molecule (b, expr); - } - - mol.translate (o); +MAKE_SCHEME_CALLBACK (Text_interface,print,1); +SCM +Text_interface::print (SCM grob) +{ + Grob *me = unsmob_grob (grob); - return mol; + 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); } -MAKE_SCHEME_CALLBACK (Text_item, brew_molecule, 1); -SCM -Text_item::brew_molecule (SCM smob) +/* Ugh. Duplicated from Scheme. */ +bool +Text_interface::markup_p (SCM x) { - Grob *me = unsmob_grob (smob); - - SCM text = me->get_grob_property ("text"); + return (scm_is_string (x) + || (scm_is_pair (x) + && SCM_BOOL_F + != scm_object_property (scm_car (x), + ly_symbol2scm ("markup-signature")))); +} - SCM properties = Font_interface::font_alist_chain (me); - Molecule mol = Text_item::text2molecule (me, text, properties); +ADD_INTERFACE (Text_interface,"text-interface", + "A scheme markup text, see @usermanref{Text-markup}.", + "text baseline-skip word-space"); - 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 (); -} -ADD_INTERFACE (Text_item,"text-interface", - "A scheme markup text", - "text align baseline-skip lookup raise kern word-space magnify");