* lily/slur-performer.cc (Slur_performer): add inits

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index a7475e452e2c4b7bba4ba0e2a56c0160f63275c4..1bec02a6faca455f9210c3b195279be23cd72f52 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -24,7 +24,7 @@ Rest::after_line_breaking (SCM smob)
   int bt = gh_scm2int (me->get_property ("duration-log"));
   int lc = Staff_symbol_referencer::line_count (me);
   Real ss = Staff_symbol_referencer::staff_space (me);
-  if(lc % 2)
+  if (lc % 2)
     {
       if (bt == 0 && lc > 1)
        {
@@ -128,19 +128,15 @@ Rest::brew_internal_stencil (SCM smob)
   String style; 
   SCM style_scm = me->get_property ("style");
   if (gh_symbol_p (style_scm))
-    {
-      style = ly_scm2string (scm_symbol_to_string (style_scm));
-    }
+    style = ly_scm2string (scm_symbol_to_string (style_scm));
 
   Font_metric *fm = Font_interface::get_default_font (me);
   String font_char = glyph_name (me, balltype, style);
   Stencil out = fm->find_by_name (font_char);
   if (out.is_empty ())
-    {
-      me->warning (_f ("rest `%s' not found, ", font_char.to_str0 ()));
-    }
+    me->warning (_f ("rest `%s' not found", font_char.to_str0 ()));
 
-  return out.smobbed_copy();
+  return out.smobbed_copy ();
 }
 
 SCM 
@@ -170,7 +166,7 @@ Rest::polyphonic_offset_callback (SCM smob, SCM)
 
   Direction d = get_grob_direction (me);
   Real off = 2* d ;
-  if(off)
+  if (off)
     off *= Staff_symbol_referencer::staff_space (me);
   return gh_double2scm (off);
 }