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

[lilypond.git] / lily / gregorian-ligature.cc

diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc
index 042457ea341565aebcbc908b48154d7bebee0e41..fa790b368ea61bf821b7a5637a6f97b33d96d788 100644 (file)
--- 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2003--2006 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->is_empty ())
+      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,8 +47,8 @@ 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",
+*/
+ADD_INTERFACE (Gregorian_ligature,
               "A gregorian ligature",
               "virga stropha inclinatum auctum descendens ascendens "
               "oriscus quilisma deminutum cavum linea pes-or-flexa "