X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos.cc;h=79a69144dd811bf76914625e2f822d771d830edf;hb=84dfa31321b6f0c3224ed8c586b64ec97e88402f;hp=515e04f761f76b285b7ce8de638dfc3cc6b81889;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/custos.cc b/lily/custos.cc
index 515e04f761..79a69144dd 100644
--- 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--2007 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,13 @@ Custos::print (SCM smob)
   return stencil.smobbed_copy ();
 }
 
-ADD_INTERFACE (Custos, "custos-interface",
-	       "A custos object.",
-	       "style neutral-position neutral-direction");
+ADD_INTERFACE (Custos,
+	       "A custos object.  @code{style} can have four valid values:"
+	       " @code{mensural}, @code{vaticana}, @code{medicaea}, and"
+	       " @code{hufnagel}.  @code{mensural} is the default style.",
+
+	       /* properties */
+	       "style "
+	       "neutral-position "
+	       "neutral-direction "
+	       );