Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 515e04f761f76b285b7ce8de638dfc3cc6b81889..7a3c09bbfa16d826b9dc274296659c3075adec09 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,15 +14,17 @@
 */
 
 #include <cstdio>
-#include <math.h> // rint
+#include <cmath> // rint
+using namespace std;
 
 #include "custos.hh"
 #include "direction.hh"
+#include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
+#include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
-#include "note-head.hh"
-#include "item.hh"
-#include "font-interface.hh"
 
 MAKE_SCHEME_CALLBACK (Custos, print, 1);
 SCM
@@ -31,7 +33,7 @@ Custos::print (SCM smob)
   Item *me = (Item *)unsmob_grob (smob);
 
   SCM scm_style = me->get_property ("style");
-  String style;
+  string style;
   if (scm_is_symbol (scm_style))
     style = ly_symbol2string (scm_style);
   else
@@ -51,7 +53,7 @@ Custos::print (SCM smob)
   int pos = Staff_symbol_referencer::get_rounded_position (me);
   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)
@@ -79,6 +81,8 @@ Custos::print (SCM smob)
   return stencil.smobbed_copy ();
 }
 
-ADD_INTERFACE (Custos, "custos-interface",
+ADD_INTERFACE (Custos,
               "A custos object.",
-              "style neutral-position neutral-direction");
+              "style "
+              "neutral-position "
+              "neutral-direction ");