X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=aa3a296c1f4bca5f179af85b459ed41f70b825c0;hb=66b2a060d7402e0d9d42586207b71ca3eda752f1;hp=14f1546d60f5c3e48fb47383c376e2aa9770b023;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 14f1546d60..aa3a296c1f 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 @@ -93,15 +93,14 @@ find_pango_font (Output_def *layout, SCM descr, Real factor) = pango_font_description_from_string (scm_i_string_chars (descr)); pango_font_description_set_size (description, - gint (factor * - pango_font_description_get_size (description))); + gint (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);