X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-select.cc;h=e5093768156a437eb7227b3a2a198218c48be52c;hb=ce40a498e9f6977a5d65af8fbe5d904c3b29ec37;hp=5d032f252bcaecbd5ea890d5485e470968e45855;hpb=afa98722d22b2cc4c98254ff05c9ee164cf98bae;p=lilypond.git diff --git a/lily/pango-select.cc b/lily/pango-select.cc index 5d032f252b..e509376815 100644 --- a/lily/pango-select.cc +++ b/lily/pango-select.cc @@ -1,9 +1,20 @@ /* - pango-select.cc -- implement lily font selection for Pango_fonts. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2010 Han-Wen Nienhuys - (c) 2004--2006 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 + 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 . */ #include "dimensions.hh" @@ -58,7 +69,8 @@ select_pango_font (Output_def *layout, SCM chain) char *str = pango_font_description_to_string (pfd); SCM scm_str = scm_from_locale_string (str); g_free (str); - + pango_font_description_free (pfd); + return find_pango_font (layout, scm_str, 1.0); }