X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=c26d5509c643d500ec510ec2f256aafce8f632e2;hb=a0f4b682135cf77e168a7201adbb4d083a1972d4;hp=db87a8d152c7fc6e6365df5382ab9fa8ee4ff03d;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git diff --git a/lily/text-item.cc b/lily/text-item.cc index db87a8d152..c26d5509c6 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -1,61 +1,233 @@ -/* +/* text-item.cc -- implement Text_item source file of the GNU LilyPond music typesetter + + (c) 1998--2000 Han-Wen Nienhuys + Jan Nieuwenhuizen + */ +#include - (c) 1997 Han-Wen Nienhuys -*/ +#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" -#include "musical-request.hh" -#include "paper-def.hh" -#include "text-item.hh" -#include "stem.hh" -#include "molecule.hh" -#include "lookup.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 + */ + +/* + TODO: + + rewrite routines and syntax to be like + + TEXT: STRING + | (head-expression* TEXT*) + ; + + 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, -Text_item::Text_item (General_script_def*tdef_l, int d) + '( + (tag1 . argcount1) + (tag2 . argcount2) + + ... etc + + ) + + or even entries like + + (tag . (argcount function-to-handle-the-tag )) + + */ + +Molecule +Text_item::text2molecule (Score_element *me, SCM text, SCM alist_chain) { - dir_i_ = d; - fat_b_ = false; - tdef_p_ = tdef_l->clone(); + if (gh_string_p (text)) + return string2molecule (me, text, alist_chain); + else if (gh_list_p (text)) + { + 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); + } + return Molecule (); } -Text_item::~Text_item() +SCM +ly_assoc_chain (SCM key, SCM achain) { - delete tdef_p_; + if (gh_pair_p (achain)) + { + SCM handle = scm_assoc (key, gh_car (achain)); + if (gh_pair_p (handle)) + return handle; + else + return ly_assoc_chain (key, gh_cdr (achain)); + } + else + return SCM_BOOL_F; } - -void -Text_item::do_pre_processing() + +Molecule +Text_item::string2molecule (Score_element *me, SCM text, SCM alist_chain) { - if (!dir_i_) - dir_i_ = -1; + SCM style = ly_assoc_chain (ly_symbol2scm ("font-style"), + alist_chain); + if (gh_pair_p (style)) + style = gh_cdr (style); + + SCM sheet = me->paper_l ()->style_sheet_; + + if (gh_symbol_p (style)) + { + SCM style_alist = gh_cdr (scm_assoc (ly_symbol2scm ("style-alist"), sheet)); + SCM entry = scm_assoc (style, style_alist); + entry = gh_pair_p (entry) ? gh_cdr (entry) : SCM_EOL; + alist_chain = gh_cons (entry, alist_chain); + } + + SCM fonts = gh_cdr (scm_assoc (ly_symbol2scm ("fonts"), sheet)); + SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"), sheet)); + SCM font_name = gh_call2 (proc, fonts, alist_chain); + +#if 0 + SCM lookup = scm_assoc (ly_symbol2scm ("lookup"), properties); + + Molecule mol; + if (gh_pair_p (lookup) && ly_symbol2string (gh_cdr (lookup)) == "name") + mol = lookup_character (me, font_name, text); + else +#endif + Molecule mol = lookup_text (me, font_name, text); + + return mol; } -Interval -Text_item::symbol_height()const +Molecule +Text_item::lookup_character (Score_element *, SCM font_name, SCM char_name) { - return tdef_p_->get_atom (paper(), dir_i_).sym_.dim.y (); + Adobe_font_metric *afm = all_fonts_global_p->find_afm (ly_scm2string (font_name)); + + if (!afm) + { + warning (_f ("can't find font: `%s'", ly_scm2string (font_name))); + warning (_f ("(search path: `%s')", global_path.str ().ch_C())); + error (_ ("Aborting")); + } + Font_metric * fm = afm; + + return fm->find_by_name (ly_scm2string (char_name)); } + + +Molecule +Text_item::lookup_text (Score_element *me, SCM font_name, SCM text) +{ + SCM magnification = me->get_elt_property ("font-magnification"); + Font_metric* metric = 0; + if (gh_number_p (magnification)) + { +#if 0 + Real realmag = pow (1.2, gh_scm2int (magnification)); + metric = all_fonts_global_p->find_scaled (ly_scm2string (font_name), realmag); +#endif + assert (false); + } + else + metric = me->paper_l ()->find_font (font_name, 1.0); -Molecule* -Text_item::brew_molecule_p() const + SCM list = gh_list (ly_symbol2scm ("text"), text, SCM_UNDEFINED); + list = fontify_atom (metric, list); + + return Molecule (metric->text_dimension (ly_scm2string (text)), list); +} + +Molecule +Text_item::markup_sentence2molecule (Score_element *me, SCM markup_sentence, + SCM alist_chain) { - Atom a (tdef_p_->get_atom (paper(), dir_i_)); + /* + FIXME + */ + return Molecule (); + + SCM sheet = me->paper_l ()->style_sheet_; + SCM f = gh_cdr (scm_assoc (ly_symbol2scm ("markup-abbrev-to-properties-alist"), sheet)); + + SCM markup = gh_car (markup_sentence); + SCM sentence = gh_cdr (markup_sentence); + + SCM p = gh_cons (gh_call1 (f, markup), alist_chain); -/* - if ( fat_b_) - a.sym.dim.x = tdef_p_->width (paper()); - */ - Molecule* mol_p = new Molecule (a); + Axis align = X_AXIS; + SCM a = scm_assoc (ly_symbol2scm ("align"), p); + if (gh_pair_p (a) && gh_number_p (gh_cdr (a))) + align = (Axis)gh_scm2int (gh_cdr (a)); - if (dir_i_<0) // should do something better anyway. - mol_p->translate (-mol_p->extent().y ().left , Y_AXIS); - mol_p->translate (pos_i_ * paper()->internote_f (), Y_AXIS); - - return mol_p; + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real kern = 0; + SCM k = scm_assoc (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 = scm_assoc (ly_symbol2scm ("raise"), p); + if (gh_pair_p (r) && gh_number_p (gh_cdr (r))) + raise = gh_scm2double (gh_cdr (r)) * staff_space; + + Offset o (align == X_AXIS ? kern : 0, + (align == Y_AXIS ? - kern : 0) + raise); + + Molecule mol; + while (gh_pair_p (sentence)) + { + Molecule m = text2molecule (me, gh_car (sentence), p); + if (!m.empty_b ()) + { + m.translate (o); + mol.add_at_edge (align, align == X_AXIS ? RIGHT : DOWN, m, 0); + } + sentence = gh_cdr (sentence); + } + return mol; } +MAKE_SCHEME_CALLBACK (Text_item, brew_molecule, 1); +SCM +Text_item::brew_molecule (SCM smob) +{ + Score_element *me = unsmob_element (smob); + + SCM text = me->get_elt_property ("text"); + + SCM properties = gh_list (me->immutable_property_alist_, + me->mutable_property_alist_, SCM_UNDEFINED); + + Molecule mol = Text_item::text2molecule (me, text, properties); + + SCM space = me->get_elt_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.create_scheme (); +} -IMPLEMENT_IS_TYPE_B1(Text_item,Item);