/* TODO: should add nesting for Output_def here too. */
Font_metric *
-find_scaled_font (Output_def *mod, Font_metric *f, Real m,
- SCM font_encoding, SCM input_encoding)
+find_scaled_font (Output_def *mod, Font_metric *f, Real m)
{
if (mod->parent_)
- return find_scaled_font (mod->parent_, f, m, font_encoding, input_encoding);
+ return find_scaled_font (mod->parent_, f, m);
Real lookup_mag = m / output_scale (mod);
else
sizes = SCM_EOL;
- SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag,
- font_encoding,
- input_encoding);
-
+ SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag);
+
sizes = scm_acons (scm_make_real (lookup_mag), val, sizes);
scm_gc_unprotect_object (val);
scm_hashq_set_x (font_table, f->self_scm (), sizes);
Output_def *
scale_output_def (Output_def *o, Real amount)
{
- SCM proc = ly_scheme_function ("scale-layout");
+ SCM proc = ly_lily_module_constant ("scale-layout");
SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount));
scm_gc_protect_object (new_pap);
LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
1, 0, 0,
(SCM bp),
- "Return fonts scaled up BP")
+ "Return fonts from the @code{\\paper} block @var{bp}.")
{
Output_def *b = unsmob_output_def (bp);
SCM ell = SCM_EOL;
if (scm_hash_table_p (font_table) == SCM_BOOL_T)
{
- SCM func = ly_scheme_function ("hash-table->alist");
+ SCM func = ly_lily_module_constant ("hash-table->alist");
for (SCM s = scm_call_1 (func, font_table); scm_is_pair (s);
s = scm_cdr (s))