* The grand 2005-2006 replace.

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index d45974f9e23d8c04fa14da2d3c3959d252e25fb7..0b928b500ddab62e9183d422567b44b9e71df976 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,19 +3,19 @@
 
   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:
 
- - do not show if a clef change immediately follows in the next line
-
- - decide: do or do not print custos if the next line starts with a rest
+- do not show if a clef change immediately follows in the next line
 
+- decide: do or do not print custos if the next line starts with a rest
 */
 
 #include <cstdio>
-#include <math.h> // rint
+#include <cmath> // rint
+using namespace std;
 
 #include "custos.hh"
 #include "direction.hh"
@@ -34,27 +34,23 @@ 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
    * staffline or not, or shall we use individual font characters
    * for both cases?
    */
-  bool adjust = true; 
+  bool adjust = true;
 
   int neutral_pos = robust_scm2int (me->get_property ("neutral-position"), 0);
-  Direction neutral_direction =
-    to_dir (me->get_property ("neutral-direction"));
+  Direction neutral_direction
+    = to_dir (me->get_property ("neutral-direction"));
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
-  int sz = Staff_symbol_referencer::line_count (me)-1;
+  int sz = Staff_symbol_referencer::line_count (me) - 1;
 
   String font_char = "custodes." + style + ".";
   if (pos < neutral_pos)
@@ -69,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);
@@ -89,5 +81,5 @@ Custos::print (SCM smob)
 }
 
 ADD_INTERFACE (Custos, "custos-interface",
-  "A custos object.",
-  "style neutral-position neutral-direction");
+              "A custos object.",
+              "style neutral-position neutral-direction");