X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=7203d7b8e049d0b0b4a5eb286e57ce652a14250b;hb=98ba77f9a972c75e431f29a47df18676c3d65621;hp=ef256e5b7a1aa8892bd1b68332657a48cedb5b38;hpb=17d66c0ec6d2f99624e902dbbe71497a4424c445;p=lilypond.git diff --git a/lily/text-item.cc b/lily/text-item.cc index ef256e5b7a..7203d7b8e0 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -1,208 +1,121 @@ /* - text-item.cc -- implement Text_item + text-item.cc -- implement Text_interface source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ -#include + (c) 1998--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen +*/ -#include "debug.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 SENTENCE) - MARKUP: PROPERTY | ABBREV - SENTENCE: TEXT | SENTENCE TEXT - PROPERTY: (key . value) - ABBREV: rows lines roman music bold italic named super sub text, or any font-style - */ - -/* - FIXME: - - rewrite routines and syntax to be like - TEXT: STRING - | (head-expression* TEXT*) - ; +#include - head-expression is a list, containing a tag and a variable number of - arguments. If necessary, the number of arguments can be stored in a alist, +#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" +#include "ly-module.hh" - '( - (tag1 . argcount1) - (tag2 . argcount2) - ... etc - - ) +MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 4) +SCM +Text_interface::interpret_string (SCM layout_smob, + SCM props, SCM input_encoding, 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"); - or even entries like + String str = ly_scm2string (markup); - (tag . (argcount function-to-handle-the-tag )) +#if HAVE_PANGO_FT2 + if (output_format_global != "tex") + { + Font_metric *fm = select_pango_font (layout, props); + return fm->text_stencil (str).smobbed_copy (); + } +#endif - */ + SCM_ASSERT_TYPE (input_encoding == SCM_EOL || scm_is_symbol (input_encoding), + input_encoding, SCM_ARG2, __FUNCTION__, "symbol"); -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_list_p (text)) + if (!scm_is_symbol (input_encoding)) { - if (!gh_pair_p (gh_car (text)) && gh_string_p (gh_car (text))) - return string2molecule (me, gh_car (text), alist_chain); - else - return markup_sentence2molecule (me, text, alist_chain); + SCM enc = layout->lookup_variable (ly_symbol2scm ("inputencoding")); + if (scm_is_string (enc)) + input_encoding = scm_string_to_symbol (enc); + else if (scm_is_symbol (enc)) + input_encoding = enc; } - 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 (gh_cdr (style))) - alist_chain = Font_interface::add_style (me, gh_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) && gh_cdr (lookup) ==ly_symbol2scm ("name")) - mol = lookup_character (me, fm, text); - else - mol = lookup_text (me, fm, text); - - return mol; -} + Font_metric *fm = select_encoded_font (layout, props, input_encoding); -Molecule -Text_item::lookup_character (Grob *, Font_metric*fm, SCM char_name) -{ - return fm->find_by_name (ly_scm2string (char_name)); + return fm->text_stencil (str).smobbed_copy(); } - -Molecule -Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text) +MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3) +SCM +Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup) { -#if 0 - /* - Fixme; should be done differently, move to font-interface? - */ - - SCM magnification = me->get_grob_property ("font-magnification"); - - Font_metric* metric = 0; - if (gh_number_p (magnification)) + if (scm_is_string (markup)) + return interpret_string (layout_smob, props, SCM_EOL, markup); + else if (scm_is_pair (markup)) { - - Real realmag = pow (1.2, gh_scm2int (magnification)); - metric = all_fonts_global_p->find_scaled (ly_scm2string (font_name), realmag); - + 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); + } + else + { + 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(); } - -#endif - - SCM list = gh_list (ly_symbol2scm ("text"), text, SCM_UNDEFINED); - list = fontify_atom (fm, list); - - return Molecule (fm->text_dimension (ly_scm2string (text)), list); } -Molecule -Text_item::markup_sentence2molecule (Grob *me, SCM markup_sentence, - SCM alist_chain) +MAKE_SCHEME_CALLBACK (Text_interface,print,1); +SCM +Text_interface::print (SCM grob) { - SCM sheet = me->paper_l ()->style_sheet_; - SCM f = gh_cdr (scm_assoc (ly_symbol2scm ("markup-to-properties"), sheet)); + Grob *me = unsmob_grob (grob); - SCM markup = gh_car (markup_sentence); - SCM sentence = gh_cdr (markup_sentence); - - SCM p = gh_cons (gh_call2 (f, sheet, markup), alist_chain); - - Axis align = X_AXIS; - SCM a = ly_assoc_chain (ly_symbol2scm ("align"), p); - if (gh_pair_p (a) && gh_number_p (gh_cdr (a))) - align = (Axis)gh_scm2int (gh_cdr (a)); - - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real kern = 0; - SCM k = ly_assoc_chain (ly_symbol2scm ("kern"), p); - if (gh_pair_p (k) && gh_number_p (gh_cdr (k))) - kern = gh_scm2double (gh_cdr (k)) * staff_space; - - Real raise = 0; - SCM r = ly_assoc_chain (ly_symbol2scm ("raise"), p); - if (gh_pair_p (r) && gh_number_p (gh_cdr (r))) - raise = gh_scm2double (gh_cdr (r)) * staff_space; - -#if 0 - Offset o (align == X_AXIS ? kern : 0, - (align == Y_AXIS ? - kern : 0) + raise); -#else - Offset o (0, (align == Y_AXIS ? - kern : 0) + raise); -#endif - - Molecule mol; - while (gh_pair_p (sentence)) - { - /* Ugh: this (kerning) only works if 'kern' is the first modifier of a - markup. I guess the only solution is to rewrite markup definition, - see above. */ - Molecule m = text2molecule (me, gh_car (sentence), p); - Real m_kern = 0; - SCM m_p = SCM_EOL; - if (gh_pair_p (gh_car (sentence))) - m_p = gh_cons (gh_call2 (f, sheet, gh_caar (sentence)), alist_chain); - SCM m_k = ly_assoc_chain (ly_symbol2scm ("kern"), m_p); - if (gh_pair_p (m_k) && gh_number_p (gh_cdr (m_k))) - m_kern = gh_scm2double (gh_cdr (m_k)) * staff_space; - - if (!m.empty_b ()) - { - m.translate (o); - mol.add_at_edge (align, align == X_AXIS ? RIGHT : DOWN, m, m_kern); - } - sentence = gh_cdr (sentence); - } - 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")))); +} + +ADD_INTERFACE (Text_interface,"text-interface", + "A scheme markup text, see @usermanref{Text-markup}.", + "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 (); -}