source file of the GNU LilyPond music typesetter
- (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "dimensions.hh"
Real
output_scale (Output_def *od)
{
- return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale")));
+ return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale")));
}
SCM
SCM font_table = get_font_table (mod);
SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_EOL);
- SCM handle = scm_assoc (scm_make_real (lookup_mag), sizes);
+ SCM handle = scm_assoc (scm_from_double (lookup_mag), sizes);
if (scm_is_pair (handle))
return unsmob_metrics (scm_cdr (handle));
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);
+ sizes = scm_acons (scm_from_double (lookup_mag), val, sizes);
+ unsmob_metrics (val)->unprotect ();
scm_hashq_set_x (font_table, f->self_scm (), sizes);
return unsmob_metrics (val);
}
SCM size_key = scm_from_double (factor);
SCM handle = scm_assoc (size_key, sizes);
if (scm_is_pair (handle))
- {
- return unsmob_metrics (scm_cdr (handle));
- }
+ return unsmob_metrics (scm_cdr (handle));
PangoFontDescription *description
= pango_font_description_from_string (scm_i_string_chars (descr));
+
+ pango_font_description_set_size (description,
+ gint (factor *
+ pango_font_description_get_size (description)));
+
+
Font_metric *fm = all_fonts_global->find_pango_font (description,
- factor,
output_scale (layout));
+ pango_font_description_free (description);
+
sizes = scm_acons (size_key, fm->self_scm (), sizes);
scm_hash_set_x (table, descr, sizes);
{
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);
- return unsmob_output_def (new_pap);
+ o = unsmob_output_def (new_pap);
+ o->protect ();
+ return o;
}