* lily/percent-repeat-engraver.cc, lily/parser.yy,

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

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 7d0ea7c6e22c25ab7ac209dfc7594ac37b520f5b..6e040e75bb6946683445a73a20f00623ee0e6273 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -3,10 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2006 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,9 +111,7 @@ 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))