X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-def.cc;h=4c6dc86ebeb8d645477920e9e4aa35c4b45cdd5a;hb=d62df6df677aeb8721715c5caf5b3e9e9053b411;hp=14f1546d60f5c3e48fb47383c376e2aa9770b023;hpb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 14f1546d60..4c6dc86ebe 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include "dimensions.hh" +#include "libc-extension.hh" #include "output-def.hh" #include "modified-font-metric.hh" #include "pango-font.hh" @@ -92,16 +93,15 @@ find_pango_font (Output_def *layout, SCM descr, Real factor) 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))); + pango_font_description_set_size + (description, + gint (my_round (factor * pango_font_description_get_size (description)))); - Font_metric *fm = all_fonts_global->find_pango_font (description, - output_scale (layout)); + output_scale (layout)); pango_font_description_free (description); - + sizes = scm_acons (size_key, fm->self_scm (), sizes); scm_hash_set_x (table, descr, sizes);