(c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
+#include <math.h>
#include "debug.hh"
#include "text-item.hh"
#include "paper-def.hh"
-#include "lookup.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: markup-symbol | (markup-symbol . parameter)
- sentence: text | sentence text
-
+ 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
+ */
- Properties:
+/*
+ TODO:
- * Font:
- ---* Type:
- ------* Series: medium, bold
- ------* Shape: upright, italic, slanted
- ------* Family: roman, music, orator, typewriter
+ rewrite routines and syntax to be like
- ---* Size:
- ------* size: ...,-2,-1,0,1,2,... (style-sheet -> cmrXX, fetaXX)
- ------* points: 11,13,16,20,23,26 (for feta)
- ------* magnification: UNSIGNED
+ TEXT: STRING
+ | (head-expression* TEXT*)
+ ;
- * Typesetting:
- ---* kern: INT (staff-space)
- ---* align: horizontal/vertical / lines / rows
+ 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,
+
+ '(
+ (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 properties)
+Text_item::text2molecule (Grob *me, SCM text, SCM alist_chain)
{
if (gh_string_p (text))
- return string2molecule (me, text, properties);
+ 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), properties);
+ return string2molecule (me, gh_car (text), alist_chain);
else
- return markup_sentence2molecule (me, text, properties);
+ return markup_sentence2molecule (me, text, alist_chain);
}
return Molecule ();
}
-
-static
-SCM
-get_elt_property (Score_element *me, char const *name)
-{
- SCM s = me->get_elt_property (name);
- if (s == SCM_EOL)
- error (_f ("No `%s' defined for %s", name, me->name ()));
- return s;
-}
-
+
Molecule
-Text_item::string2molecule (Score_element *me, SCM text, SCM properties)
+Text_item::string2molecule (Grob *me, SCM text, SCM alist_chain)
{
- SCM style = scm_assoc (ly_symbol2scm ("font-style"), properties);
- SCM paper = me->get_elt_property ("style-sheet");
- if (paper == SCM_EOL)
- paper = scm_string_to_symbol (me->paper_l ()->get_scmvar ("style_sheet"));
+ 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);
- SCM font_name;
- if (gh_pair_p (style))
- {
- SCM f = get_elt_property (me, "style-to-font-name");
- font_name = gh_call2 (f, paper, gh_cdr (style));
- }
- else
- {
- SCM f = get_elt_property (me, "properties-to-font-name");
- font_name = gh_call2 (f, paper, properties);
- }
-
- // should move fallback to scm
- if (!gh_string_p (font_name))
- font_name = ly_str02scm ("cmr10");
+ Font_metric *fm = Font_interface::get_font (me, alist_chain);
+
+ SCM lookup = ly_assoc_chain (ly_symbol2scm ("lookup"), alist_chain);
- 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);
+ if (gh_pair_p (lookup) && gh_cdr (lookup) ==ly_symbol2scm ("name"))
+ mol = lookup_character (me, fm, text);
else
- mol = lookup_text (me, font_name, text);
+ mol = lookup_text (me, fm, text);
return mol;
}
-/*
- caching / use some form of Lookup without 'paper'?
-*/
Molecule
-Text_item::lookup_character (Score_element *me, SCM font_name, SCM char_name)
+Text_item::lookup_character (Grob *, Font_metric*fm, SCM char_name)
{
- 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"));
- }
-
- AFM_CharMetricInfo const *metric =
- afm->find_char_metric (ly_scm2string (char_name), true);
-
- if (!metric)
- {
- Molecule m;
- m.set_empty (false);
- return m;
- }
-
- SCM list = gh_list (ly_symbol2scm ("char"),
- gh_int2scm (metric->code),
- SCM_UNDEFINED);
-
- list = fontify_atom (afm, list);
- return Molecule (afm_bbox_to_box (metric->charBBox), list);
+ return fm->find_by_name (ly_scm2string (char_name));
}
+
Molecule
-Text_item::lookup_text (Score_element *me, SCM font_name, SCM text)
+Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text)
{
- SCM magnification = me->get_elt_property ("font-magnification");
+#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))
- metric = all_fonts_global_p->find_scaled (ly_scm2string (font_name),
- gh_scm2int (magnification));
- else
- metric = all_fonts_global_p->find_font (ly_scm2string (font_name));
-
+ {
+
+ Real realmag = pow (1.2, gh_scm2int (magnification));
+ metric = all_fonts_global_p->find_scaled (ly_scm2string (font_name), realmag);
+
+ assert (false);
+ }
+
+#endif
+
SCM list = gh_list (ly_symbol2scm ("text"), text, SCM_UNDEFINED);
- list = fontify_atom (metric, list);
+ list = fontify_atom (fm, list);
- return Molecule (metric->text_dimension (ly_scm2string (text)), list);
+ return Molecule (fm->text_dimension (ly_scm2string (text)), list);
}
Molecule
-Text_item::markup_sentence2molecule (Score_element *me, SCM markup_sentence,
- SCM properties)
+Text_item::markup_sentence2molecule (Grob *me, SCM markup_sentence,
+ SCM alist_chain)
{
+ /*
+ FIXME
+
+ huh?
+ */
+ // return Molecule ();
+
+ SCM sheet = me->paper_l ()->style_sheet_;
+ SCM f = gh_cdr (scm_assoc (ly_symbol2scm ("markup-to-properties"), sheet));
+
SCM markup = gh_car (markup_sentence);
SCM sentence = gh_cdr (markup_sentence);
- SCM f = get_elt_property (me, "markup-to-properties");
- SCM p = gh_append2 (gh_call1 (f, markup), properties);
+
+ SCM p = gh_cons (gh_call2 (f, sheet, markup), alist_chain);
Axis align = X_AXIS;
- SCM a = scm_assoc (ly_symbol2scm ("align"), p);
+ 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 = scm_assoc (ly_symbol2scm ("kern"), p);
+ 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 = scm_assoc (ly_symbol2scm ("raise"), p);
+ 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;
SCM
Text_item::brew_molecule (SCM smob)
{
- Score_element *me = unsmob_element (smob);
+ Grob *me = unsmob_grob (smob);
- SCM text = me->get_elt_property ("text");
-
- SCM properties = gh_append2 (me->immutable_property_alist_,
- me->mutable_property_alist_);
+ SCM text = me->get_grob_property ("text");
+ SCM properties = Font_interface::font_alist_chain (me);
Molecule mol = Text_item::text2molecule (me, text, properties);
- SCM space = me->get_elt_property ("word-space");
+ SCM space = me->get_grob_property ("word-space");
if (gh_number_p (space))
{
Molecule m;
mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space)
* Staff_symbol_referencer::staff_space (me));
}
- return mol.create_scheme ();
+ return mol.smobbed_copy ();
}
projects / lilypond.git / blobdiff