X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=34ce9cc1a4ddc02e33c4eccdad13aa0732f83f88;hb=2583260566074fd263a84d515ef637267563d371;hp=14f1546d60f5c3e48fb47383c376e2aa9770b023;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 14f1546d60..34ce9cc1a4 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 <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 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
@@ -18,6 +18,7 @@
 */
 
 #include "dimensions.hh"
+#include "libc-extension.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 #include "pango-font.hh"
@@ -66,14 +67,14 @@ find_scaled_font (Output_def *mod, Font_metric *f, Real m)
   SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_EOL);
   SCM handle = scm_assoc (scm_from_double (lookup_mag), sizes);
   if (scm_is_pair (handle))
-    return unsmob_metrics (scm_cdr (handle));
+    return Font_metric::unsmob (scm_cdr (handle));
 
   SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag);
 
   sizes = scm_acons (scm_from_double (lookup_mag), val, sizes);
-  unsmob_metrics (val)->unprotect ();
+  Font_metric::unsmob (val)->unprotect ();
   scm_hashq_set_x (font_table, f->self_scm (), sizes);
-  return unsmob_metrics (val);
+  return Font_metric::unsmob (val);
 }
 
 Font_metric *
@@ -87,21 +88,20 @@ 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 Font_metric::unsmob (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)));
+  pango_font_description_set_size
+    (description,
+     gint (my_round (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);
 
@@ -117,7 +117,7 @@ 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_from_double (amount));
 
-  o = unsmob_output_def (new_pap);
+  o = Output_def::unsmob (new_pap);
   o->protect ();
   return o;
 }