X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=098ef17402e5cad7cba87197374826aee0c61181;hb=7979d8adaa8393daefd6585534221a93dd526758;hp=6d3b67d003e0623bb331d72cd8f8923b75146f3c;hpb=52102901e53611ad7bad111c2f9d414d2e593bc3;p=lilypond.git diff --git a/lily/text-item.cc b/lily/text-item.cc index 6d3b67d003..098ef17402 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -1,75 +1,277 @@ -/* +/* text-item.cc -- implement Text_item - source file of the LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - + source file of the GNU LilyPond music typesetter + + (c) 1998--2003 Han-Wen Nienhuys + Jan Nieuwenhuizen + */ +#include -#include "musical-request.hh" -#include "paper-def.hh" +#include "warn.hh" #include "text-item.hh" -#include "stem.hh" -#include "molecule.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" +#include "virtual-font-metric.hh" -Text_item::Text_item(Text_def *tdef_l, int d) - : Staff_side(this) +/* + + 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 + +*/ + +Molecule +Text_item::text2molecule (Grob *me, SCM text, SCM alist_chain) { - dir_i_ = d; - fat_b_ = false; - tdef_p_ = new Text_def(*tdef_l); - pos_i_ =0; + 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 (); } -Text_def* -Text_item::tdef_l() + +MAKE_SCHEME_CALLBACK(Text_item,text_to_molecule,3); +SCM +Text_item::text_to_molecule (SCM grob, SCM props, SCM markup) { - return tdef_p_; + Grob *me = unsmob_grob (grob); + + return Text_item::text2molecule (me, markup, props).smobbed_copy(); } -Text_item::~Text_item() + +Molecule +Text_item::string2molecule (Grob *me, SCM text, SCM alist_chain) { - delete tdef_p_; + 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; } -void -Text_item::set_default_index() +Molecule +Text_item::lookup_character (Grob *, Font_metric*fm, SCM char_name) { - pos_i_ = get_position_i(tdef_p_->create_atom().extent().y ); + return fm->find_by_name (ly_scm2string (char_name)); } -void -Text_item::do_pre_processing() + + +Molecule +Text_item::lookup_text (Grob *, Font_metric*fm, SCM text) { - if (!dir_i_) - dir_i_ = -1; - tdef_p_->pdef_l_ = paper(); + SCM list = scm_list_n (ly_symbol2scm ("text"), text, SCM_UNDEFINED); + + if (dynamic_cast (fm)) + { + /* + ARGH. + */ + programming_error ("Can't use virtual font for text."); + } + else + list = fontify_atom (fm, list); + + return Molecule (fm->text_dimension (ly_scm2string (text)), list); } -void -Text_item::do_post_processing() + +/* + TODO: + + DOCME. + + + MARKUP_TEXT must be compound (may not be simple string.) + + */ +Molecule +Text_item::markup_text2molecule (Grob *me, SCM markup_text, + SCM alist_chain) { - set_default_index(); + SCM f = me->get_paper ()->lookup_variable (ly_symbol2scm ("markup-to-properties")); + + SCM markup = ly_car (markup_text); + SCM text = ly_cdr (markup_text); + + /* ARGRGRRGRARGRA + */ + + SCM abbrev = me->get_paper ()->lookup_variable (ly_symbol2scm ("abbreviation-alist")); + SCM style = me->get_paper ()->lookup_variable (ly_symbol2scm ("style-alist")); + + SCM p = gh_cons (scm_call_3 (f, abbrev, style, 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) && 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))) + { + extent = Interval (gh_scm2double (ly_cadr (e)) * staff_space, + gh_scm2double (ly_cddr (e)) * staff_space); + extent_b = true; + } + + Offset o (kern[X_AXIS], raise - kern[Y_AXIS]); + + Molecule mol = Lookup::filledbox (Box (Interval (0,0), Interval (0,0))); + + SCM cp = ly_deep_copy (p); + if (raise) + { + SCM cr = ly_assoc_chain (ly_symbol2scm ("raise"), cp); + scm_set_cdr_x (cr, gh_int2scm (0)); + } + + while (gh_pair_p (text)) + { + 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); + } + + + /* 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); + + return mol; } - -Molecule* -Text_item::brew_molecule_p() const +MAKE_SCHEME_CALLBACK (Text_item, brew_molecule, 1); +SCM +Text_item::brew_molecule (SCM smob) { - Atom a(tdef_p_->create_atom()); + Grob *me = unsmob_grob (smob); + + SCM text = me->get_grob_property ("text"); - if ( fat_b_) - a.sym.dim.x = tdef_p_->width(); + SCM properties = Font_interface::font_alist_chain (me); + Molecule mol = Text_item::text2molecule (me, text, properties); - Molecule* mol_p = new Molecule(a); + 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), 0); + } + return mol.smobbed_copy (); +} - if(dir_i_<0 ) // should do something better anyway. - mol_p->translate(Offset(0, -mol_p->extent().y.left )); - mol_p->translate(Offset(0, pos_i_ * paper()->internote())); - - return mol_p; + + +ADD_INTERFACE (Text_item,"text-interface", + "A scheme markup text, see @ref{Markup functions}.", + "text baseline-skip word-space"); + + +/* + Ugh. Duplicated from Scheme. + */ +bool +new_markup_p (SCM x) +{ + return + gh_string_p (x) || + (gh_pair_p (x) + && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature"))); } -IMPLEMENT_STATIC_NAME(Text_item); +SCM +new_markup_brewer () +{ + static SCM proc ; + + if (!proc) + proc = scm_c_eval_string ("brew-new-markup-molecule"); + + return proc; +}