new file

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 8ea02b4b1cd69352b2291f407d18949e90fce6e0..55bad6226bcf734393e06ec85dd0dbf1b9264fe1 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,22 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2005 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 "custos.hh"
-
 #include <cstdio>
-#include <cmath> // rint
+#include <math.h> // rint
 
+#include "custos.hh"
 #include "direction.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
@@ -26,7 +24,7 @@
 #include "item.hh"
 #include "font-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Custos,print,1);
+MAKE_SCHEME_CALLBACK (Custos, print, 1);
 SCM
 Custos::print (SCM smob)
 {
@@ -48,16 +46,16 @@ Custos::print (SCM smob)
    * 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 + "-";
+  String font_char = "custodes." + style + ".";
   if (pos < neutral_pos)
     font_char += "u";
   else if (pos > neutral_pos)
@@ -90,5 +88,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");