X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=802eeefc9bb1b6e54275d982741d9d5c970ee421;hb=e166ef4d795f43bcdff1f04162d17c2d8c7a9302;hp=b6252548673cafea2353d7422e8d9625db60e54a;hpb=8a4b84458c8fc5e8e1e2288a92da01cd5eda1b2f;p=lilypond.git diff --git a/lily/text-item.cc b/lily/text-item.cc index b625254867..802eeefc9b 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -1,85 +1,248 @@ -/* +/* text-item.cc -- implement Text_item source file of the GNU LilyPond music typesetter + + (c) 1998--2002 Han-Wen Nienhuys + Jan Nieuwenhuizen + */ +#include - (c) 1997--1998 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" -#include "debug.hh" +/* + + TEXT: STRING + | (MARKUP? TEXT+) + ; + + HEAD: MARKUP-ITEM | (MARKUP-ITEM+) -Text_item::Text_item (General_script_def* tdef_l, Direction d) + 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) +{ + 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) { - dir_ = d; - fat_b_ = false; - tdef_p_ = tdef_l->clone (); + 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; } -Text_item::~Text_item () +Molecule +Text_item::lookup_character (Grob *, Font_metric*fm, SCM char_name) { - delete tdef_p_; + return fm->find_by_name (ly_scm2string (char_name)); } -void -Text_item::do_pre_processing () + +Molecule +Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text) { - if (!dir_) - dir_ = DOWN; + 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); } -Real -Text_item::get_position_f () const +/* + 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) { - // uhuh, tdef/gdef? - if (Text_def *tdl = dynamic_cast(tdef_p_)) + 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))) { - if (tdl->style_str_ != "finger") // HUHH? - return Staff_side::get_position_f (); + extent = Interval (gh_scm2double (ly_cadr (e)) * staff_space, + gh_scm2double (ly_cddr (e)) * staff_space); + extent_b = true; } - if (!dir_) + Offset o (0, (axis == Y_AXIS ? - kern[axis] : 0)); + + Molecule mol; + while (gh_pair_p (text)) { - warning (_ ("Text_item::get_position_f(): " - "somebody forgot to set my vertical direction, returning -20")); - return -20; + + 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); } - - Interval v = support_extent (); - // add no extra: fingers should be just above note, no? - return v[dir_]; + + 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; } -Interval -Text_item::symbol_height () const +MAKE_SCHEME_CALLBACK (Text_item, brew_molecule, 1); +SCM +Text_item::brew_molecule (SCM smob) { - return tdef_p_->get_atom (paper (), dir_).dim_.y (); -} + Grob *me = unsmob_grob (smob); -Molecule* -Text_item::brew_molecule_p () const -{ - Atom a (tdef_p_->get_atom (paper (), dir_)); - + SCM text = me->get_grob_property ("text"); - if (fat_b_) - a.dim_[X_AXIS] = tdef_p_->width (paper ()); - Molecule* mol_p = new Molecule (a); + SCM properties = Font_interface::font_alist_chain (me); + Molecule mol = Text_item::text2molecule (me, text, properties); - if (dir_<0) // should do something better anyway. - mol_p->translate_axis (mol_p->extent ().y ().left , Y_AXIS); - mol_p->translate_axis (coordinate_offset_f_, Y_AXIS); - // fine for one lyric, urg for lyric chord - mol_p->translate_axis (a.dim_.y ().length (), Y_AXIS); - - return mol_p; + 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 (); } - -