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

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 5b6fc3df26e54339ad49ce59a92f77a9628b5b6e..3ed96f6a992ec4ec59f533cca3b5c1cacf1cb8bf 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2007 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 /* TODO:
@@ -33,7 +33,7 @@ Custos::print (SCM smob)
   Item *me = (Item *)unsmob_grob (smob);
 
   SCM scm_style = me->get_property ("style");
-  std::string style;
+  string style;
   if (scm_is_symbol (scm_style))
     style = ly_symbol2string (scm_style);
   else
@@ -53,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;
 
-  std::string font_char = "custodes." + style + ".";
+  string font_char = "custodes." + style + ".";
   if (pos < neutral_pos)
     font_char += "u";
   else if (pos > neutral_pos)
@@ -81,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 ");