X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature.cc;h=c9b849eed9e0aabc39683bbf4e46ee2c1de4c130;hb=b3c66f0bfee5faae56a500b70214ba4d88c52a5f;hp=8e6f7194c7aa9bf097b6bf5d30df3f161c331928;hpb=34c92c0b21a76b8ebe54ceb7d6ca78f70e280c10;p=lilypond.git

diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc
index 8e6f7194c7..c9b849eed9 100644
--- a/lily/gregorian-ligature.cc
+++ b/lily/gregorian-ligature.cc
@@ -1,30 +1,31 @@
-/*   
+/*
   gregorian-ligature.cc -- implement Gregorian_ligature
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2003--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include "grob.hh"
+
 #include "gregorian-ligature.hh"
-#include "string.hh"
 
-void check_prefix (String name, int mask, int prefix_set, String *str)
+#include "grob.hh"
+
+void check_prefix (string name, int mask, int prefix_set, string *str)
 {
   if (prefix_set & mask)
     {
-      if (!str->empty_b ())
+      if (!str->empty ())
 	*str += ", ";
       *str += name;
     }
 }
 
-String
+string
 Gregorian_ligature::prefixes_to_str (Grob *primitive)
 {
-  String str;
-  int prefix_set =
-    gh_scm2int (primitive->get_grob_property ("prefix-set"));
+  string str;
+  int prefix_set
+    = scm_to_int (primitive->get_property ("prefix-set"));
   check_prefix ("virga", VIRGA, prefix_set, &str);
   check_prefix ("stropha", STROPHA, prefix_set, &str);
   check_prefix ("inclinatum", INCLINATUM, prefix_set, &str);
@@ -46,9 +47,23 @@ Gregorian_ligature::prefixes_to_str (Grob *primitive)
   by code of GregorianLigatureEngraver that is virtually invoked by a
   subclass like VaticanaLigatureEngraver.  The property is lateron
   read by the associated item class, such as VaticanaLigature.--jr
- */
-ADD_INTERFACE (Gregorian_ligature, "gregorian-ligature-interface",
-	       "A gregorian ligature",
-	       "virga stropha inclinatum auctum descendens ascendens "
-	       "oriscus quilisma deminutum cavum linea pes-or-flexa "
-	       "context-info prefix-set");
+*/
+ADD_INTERFACE (Gregorian_ligature,
+	       "A gregorian ligature.",
+
+	       /* properties */
+	       "virga "
+	       "stropha "
+	       "inclinatum "
+	       "auctum "
+	       "descendens "
+	       "ascendens "
+	       "oriscus "
+	       "quilisma "
+	       "deminutum "
+	       "cavum "
+	       "linea "
+	       "pes-or-flexa "
+	       "context-info "
+	       "prefix-set "
+	       );