* lily/SConscript: Remove ttftools.

[lilypond.git] / lily / font-select.cc

diff --git a/lily/font-select.cc b/lily/font-select.cc
index c4d85f864ac34ca158bc1dfc62d2dbbcfd4e5222..571433052d4317e3a169ab10fba1bd06a4446256 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -6,7 +6,6 @@
   (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <math.h>
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"
@@ -77,9 +76,7 @@ get_font_by_design_size (Output_def *layout, Real requested,
 #endif
     }
   else
-    {
-      fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i)));
-    }
+    fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i)));
 
   return find_scaled_font (layout, fm, requested / size);
 }
@@ -114,16 +111,14 @@ select_encoded_font (Output_def *layout, SCM chain)
 #if HAVE_PANGO_FT2
   if (scm_is_string (name)
       && is_pango_format_global)
-    {
-      return select_pango_font (layout, chain);
-    }
+    return select_pango_font (layout, chain);
   else
 #endif
     if (scm_is_string (name))
       {
-       Real rmag =
-         robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-magnification"), chain, SCM_BOOL_F),
-                            1.0);
+       Real rmag
+         = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-magnification"), chain, SCM_BOOL_F),
+                              1.0);
        Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
 
        return find_scaled_font (layout, fm, rmag);
@@ -135,7 +130,7 @@ select_encoded_font (Output_def *layout, SCM chain)
 
        Real req = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
                                      0.0);
-       
+
        return get_font_by_mag_step (layout, req, vec,
                                     scm_to_double (base_size));
       }