Release: bump Welcome versions.

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index dd8f97ac30256207a905716d4112a5b4371f317a..0f6efc6b75ca457b821c2c718e379531d2c02aab 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--2015 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,10 +18,12 @@
 */
 
 #include "dimensions.hh"
+#include "libc-extension.hh"
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 #include "pango-font.hh"
 #include "all-font-metrics.hh"
+#include "lily-imports.hh"
 
 Real
 output_scale (Output_def *od)
@@ -33,7 +35,7 @@ SCM
 get_font_table (Output_def *def)
 {
   SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts"));
-  if (scm_hash_table_p (font_table) != SCM_BOOL_T)
+  if (!to_boolean (scm_hash_table_p (font_table)))
     {
       font_table = scm_c_make_hash_table (11);
       def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table);
@@ -45,7 +47,7 @@ SCM
 get_pango_font_table (Output_def *def)
 {
   SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts"));
-  if (scm_hash_table_p (font_table) != SCM_BOOL_T)
+  if (!to_boolean (scm_hash_table_p (font_table)))
     {
       font_table = scm_c_make_hash_table (11);
       def->set_variable (ly_symbol2scm ("pango-fonts"), font_table);
@@ -66,14 +68,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 unsmob<Font_metric> (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 ();
+  unsmob<Font_metric> (val)->unprotect ();
   scm_hashq_set_x (font_table, f->self_scm (), sizes);
-  return unsmob_metrics (val);
+  return unsmob<Font_metric> (val);
 }
 
 Font_metric *
@@ -87,21 +89,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 unsmob<Font_metric> (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);
 
@@ -114,10 +115,9 @@ find_pango_font (Output_def *layout, SCM descr, Real factor)
 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_from_double (amount));
+  SCM new_pap = Lily::scale_layout (o->self_scm (), scm_from_double (amount));
 
-  o = unsmob_output_def (new_pap);
+  o = unsmob<Output_def> (new_pap);
   o->protect ();
   return o;
 }