source file of the GNU LilyPond music typesetter
- (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "warn.hh"
+/*
+ TODO revise font handling.
+
+
+* relative sizes should relate to staff-space, eg. font-staff-space
+= 1.2 ^ relative-size
+
+* If a relative size is given, lily should magnify the closest
+design size font to match that. (ie. fonts should have variable
+scaling)
+
+(this requires that fonts are stored as (filename , designsize))
+
+
+
+ */
+
SCM
Font_interface::font_alist_chain (Grob *me)
{
- SCM defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
+ SCM defaults = ly_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
me->paper_l ()->style_sheet_));
- SCM ch = gh_list (me->mutable_property_alist_,
+ SCM ch = scm_list_n (me->mutable_property_alist_,
me->immutable_property_alist_,
defaults,
SCM_UNDEFINED);
SCM ss = me->paper_l ()->style_sheet_;
- SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"),
+ SCM proc = ly_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"),
ss));
- SCM fonts = gh_cdr (scm_assoc (ly_symbol2scm ("fonts"), ss));
+ SCM fonts = ly_cdr (scm_assoc (ly_symbol2scm ("fonts"), ss));
assert (gh_procedure_p (proc));
SCM font_name = gh_call2 (proc, fonts, chain);
SCM sheet = me->paper_l ()->style_sheet_;
- SCM style_alist = gh_cdr (scm_assoc (ly_symbol2scm ("style-alist"), sheet));
+ SCM style_alist = ly_cdr (scm_assoc (ly_symbol2scm ("style-alist"), sheet));
SCM entry = scm_assoc (style, style_alist);
if (gh_pair_p (entry))
{
- chain = gh_cons (gh_cdr (entry), chain);
+ chain = gh_cons (ly_cdr (entry), chain);
}
return chain;
}
*/
-static SCM name_sym, shape_sym, family_sym, series_sym, rel_sz_sym, pt_sz_sym, wild_sym;
+static SCM name_sym, shape_sym, family_sym, series_sym, rel_sz_sym, design_sz_sym, wild_sym;
static void
family_sym = scm_permanent_object (ly_symbol2scm ("font-family"));
series_sym = scm_permanent_object (ly_symbol2scm ("font-series"));
rel_sz_sym = scm_permanent_object (ly_symbol2scm ("font-relative-size"));
- pt_sz_sym = scm_permanent_object (ly_symbol2scm ("font-point-size"));
+ design_sz_sym = scm_permanent_object (ly_symbol2scm ("font-design-size"));
wild_sym = scm_permanent_object (ly_symbol2scm ("*"));
- scm_make_gsubr ("ly-get-default-font", 1 , 0, 0, (Scheme_function_unknown) ly_font_interface_get_default_font);
+ scm_c_define_gsubr ("ly-get-default-font", 1 , 0, 0,
+ (Scheme_function_unknown) ly_font_interface_get_default_font);
}
SCM series = SCM_BOOL_F;
- SCM point_sz = ly_assoc_chain (pt_sz_sym, alist_chain);
+ SCM point_sz = ly_assoc_chain (design_sz_sym, alist_chain);
SCM rel_sz = SCM_BOOL_F;
if (!gh_pair_p (name))
series = ly_assoc_chain (series_sym, alist_chain);
if (gh_pair_p (shape))
- shape = gh_cdr (shape);
+ shape = ly_cdr (shape);
if (gh_pair_p (family))
- family = gh_cdr (family);
+ family = ly_cdr (family);
if (gh_pair_p (series))
- series = gh_cdr (series);
+ series = ly_cdr (series);
}
else
- name = gh_cdr (name);
+ name = ly_cdr (name);
if (gh_pair_p (point_sz))
- point_sz = gh_cdr (point_sz);
+ point_sz = ly_cdr (point_sz);
else
{
rel_sz = ly_assoc_chain (rel_sz_sym, alist_chain);
if (gh_pair_p (rel_sz))
- rel_sz = gh_cdr (rel_sz);
+ rel_sz = ly_cdr (rel_sz);
}
- for (SCM s = fonts ; gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = fonts ; gh_pair_p (s); s = ly_cdr (s))
{
- SCM qlist = gh_caar (s);
+ SCM qlist = ly_caar (s);
if (name != SCM_BOOL_F)
{
}
else
{
- if (!wild_compare (gh_car (qlist), rel_sz))
+ if (!wild_compare (ly_car (qlist), rel_sz))
continue;
}
- SCM qname = gh_cdar (s);
+ SCM qname = ly_cdar (s);
return qname;
}
warning (_ ("couldn't find any font satisfying "));
- scm_write (gh_list (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ());
+ scm_write (scm_list_n (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ());
scm_flush (scm_current_error_port ());
return ly_str02scm ("cmr10");