X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=5034376ed5f71581fbabd89a73e96f54e39fba76;hb=725ff5c600041c5ce8ea41880bc11575b836c5fb;hp=eb338d2f7e9a8bd832424a024e4ce4601ed779c2;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index eb338d2f7e..5034376ed5 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -1,9 +1,20 @@
 /*
-  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--2010 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"
@@ -15,7 +26,7 @@
 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
@@ -80,10 +91,17 @@ 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)));
+
+  
   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);