X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos.cc;h=5ef96c58683261633e54fd949fa8e98b87c34738;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=38dd09a6fc510131ce7079e5cee0c95380773064;hpb=765d8e8dfee2fcc86493d8e01463947762079dbf;p=lilypond.git

diff --git a/lily/custos.cc b/lily/custos.cc
index 38dd09a6fc..5ef96c5868 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,60 +3,57 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2008 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"
+#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);
+MAKE_SCHEME_CALLBACK (Custos, print, 1);
 SCM
 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);
-    }
+    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 + ".";
+  string font_char = "custodes." + style + ".";
   if (pos < neutral_pos)
     font_char += "u";
   else if (pos > neutral_pos)
@@ -69,13 +66,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);
@@ -88,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 "
+	       );