* The grand 2005-2006 replace.

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 55bad6226bcf734393e06ec85dd0dbf1b9264fe1..0b928b500ddab62e9183d422567b44b9e71df976 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2006 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 /* TODO:
@@ -14,7 +14,8 @@
 */
 
 #include <cstdio>
-#include <math.h> // rint
+#include <cmath> // rint
+using namespace std;
 
 #include "custos.hh"
 #include "direction.hh"
@@ -33,13 +34,9 @@ Custos::print (SCM smob)
   SCM scm_style = me->get_property ("style");
   String style;
   if (scm_is_symbol (scm_style))
-    {
-      style = ly_symbol2string (scm_style);
-    }
+    style = ly_symbol2string (scm_style);
   else
-    {
-      style = "mensural";
-    }
+    style = "mensural";
 
   /*
    * Shall we use a common custos font character regardless if on
@@ -68,13 +65,9 @@ Custos::print (SCM smob)
     font_char += "d";
 
   if (adjust)
-    {
-      font_char += (((pos ^ sz) & 0x1) == 0) ? "1" : "0";
-    }
+    font_char += (((pos ^ sz) & 0x1) == 0) ? "1" : "0";
   else
-    {
-      font_char += "2";
-    }
+    font_char += "2";
 
   Stencil stencil
     = Font_interface::get_default_font (me)->find_by_name (font_char);