-/*
- paper-def.cc -- implement Paper_def
+/*
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "dimensions.hh"
#include "pango-font.hh"
#include "all-font-metrics.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
{
if (mod->parent_)
return find_scaled_font (mod->parent_, f, m);
-
+
Real lookup_mag = m / output_scale (mod);
-
+
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);
}
-Font_metric*
-find_pango_font (Output_def *layout, SCM descr, Real factor)
+Font_metric *
+find_pango_font (Output_def *layout, SCM descr, Real factor)
{
if (layout->parent_)
return find_pango_font (layout->parent_, descr, factor);
-
+
SCM table = get_pango_font_table (layout);
- SCM sizes = scm_hash_ref (table, descr, SCM_EOL);
+ SCM sizes = scm_hash_ref (table, descr, SCM_EOL);
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));
+ output_scale (layout));
+
+ pango_font_description_free (description);
- sizes = scm_acons (size_key, fm->self_scm(), sizes);
+ sizes = scm_acons (size_key, fm->self_scm (), sizes);
scm_hash_set_x (table, descr, sizes);
return fm;
/* TODO: this is a nasty interface. During formatting,
the Output_def should be scaled to the output_scale_
specified in the toplevel Output_def. */
-Output_def *
+Output_def *
scale_output_def (Output_def *o, Real amount)
{
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);
+ SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_from_double (amount));
- return unsmob_output_def (new_pap);
+ o = unsmob_output_def (new_pap);
+ o->protect ();
+ return o;
}