X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=f45939ad4636d7409109787756cd8738478ddcf5;hb=d199c2786d16e1fc00bd17fd9b1a54a8312e2079;hp=6b7a1917a7b515dbf018ee1a0cc6f477ab544097;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 6b7a1917a7..f45939ad46 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--2011 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
@@ -76,15 +87,19 @@ find_pango_font (Output_def *layout, SCM descr, Real factor)
   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);
   scm_hash_set_x (table, descr, sizes);
@@ -99,7 +114,7 @@ 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 new_pap = scm_call_2 (proc, o->self_scm (), scm_from_double (amount));
 
   o = unsmob_output_def (new_pap);
   o->protect ();