X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature.cc;h=0bfdde3efaec88fc3e5a5cab61fb5785c33d9a8f;hb=61f4e2136fd454fda734f7ebc0f2847848f4e9ca;hp=43cc3c596711d2f18faf6eed9dde0e40cd63c57a;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc
index 43cc3c5967..0bfdde3efa 100644
--- a/lily/gregorian-ligature.cc
+++ b/lily/gregorian-ligature.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "gregorian-ligature.hh"
 
 #include "grob.hh"
 
-void check_prefix (std::string name, int mask, int prefix_set, std::string *str)
+void check_prefix (string name, int mask, int prefix_set, string *str)
 {
   if (prefix_set & mask)
     {
@@ -20,10 +20,10 @@ void check_prefix (std::string name, int mask, int prefix_set, std::string *str)
     }
 }
 
-std::string
+string
 Gregorian_ligature::prefixes_to_str (Grob *primitive)
 {
-  std::string str;
+  string str;
   int prefix_set
     = scm_to_int (primitive->get_property ("prefix-set"));
   check_prefix ("virga", VIRGA, prefix_set, &str);
@@ -48,7 +48,7 @@ Gregorian_ligature::prefixes_to_str (Grob *primitive)
   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 "