Release: bump version.

[lilypond.git] / lily / paper-def.cc

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 5034376ed5f71581fbabd89a73e96f54e39fba76..aa3a296c1f4bca5f179af85b459ed41f70b825c0 100644 (file)
--- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2012 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
@@ -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);
 
@@ -115,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 ();