X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos.cc;h=00da1d53d1bfee2288287e082d2c5523a641121b;hb=9564d2844d109d0730cf850bbeb7768bb4d721d1;hp=ae32e8562b671052ce440a2502b5d1829f63d0bd;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/custos.cc b/lily/custos.cc
index ae32e8562b..00da1d53d1 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -1,9 +1,20 @@
 /*
-  custos.cc -- implement Custos
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2012 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2000--2005 Juergen Reuter <reuter@ipd.uka.de>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* TODO:
@@ -19,11 +30,12 @@ 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
@@ -32,7 +44,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
@@ -52,7 +64,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)
@@ -80,6 +92,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 "
+              );