* lily/dots.cc (print): replace -

[lilypond.git] / lily / virtual-font-metric.cc

diff --git a/lily/virtual-font-metric.cc b/lily/virtual-font-metric.cc
index 6d21a715625a4a63cd05749245e4afca9b53533e..a2fd658558fc7913a325682b0e4d9e4895476ec9 100644 (file)
--- a/lily/virtual-font-metric.cc
+++ b/lily/virtual-font-metric.cc
@@ -7,15 +7,15 @@ source file of the GNU LilyPond music typesetter
 
  */
 
-#include "warn.hh"
 #include "virtual-font-metric.hh"
+
 #include "all-font-metrics.hh"
 #include "stencil.hh"
 #include "output-def.hh"
-
+#include "warn.hh"
 
 /*
-  passing DEF is ughish. Should move into paperdef?
+  passing DEF is ughish. Should move into layoutdef?
   */
 Virtual_font_metric::Virtual_font_metric (SCM font_list)
 {
@@ -71,9 +71,7 @@ Virtual_font_metric::find_by_name (String glyph) const
 {
   Stencil m;  
   for (SCM s = font_list_; m.is_empty () && scm_is_pair (s); s = scm_cdr (s))
-    {
-      m = unsmob_metrics (scm_car (s))->find_by_name (glyph);
-    }
+    m = unsmob_metrics (scm_car (s))->find_by_name (glyph);
 
   return m;
 }
@@ -127,7 +125,7 @@ Virtual_font_metric::name_to_index (String glyph) const
   int total = 0; 
   for (SCM s = font_list_; m.is_empty () && scm_is_pair (s); s = scm_cdr (s))
     {
-      Font_metric *m =unsmob_metrics (scm_car (s));
+      Font_metric *m = unsmob_metrics (scm_car (s));
       int k = m->name_to_index (glyph);
       if (k >= 0)
        return total + k;