X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature.cc;h=6fbbd0927b0eb3fa90b968675974802077d79c4d;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=042457ea341565aebcbc908b48154d7bebee0e41;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc
index 042457ea34..6fbbd0927b 100644
--- a/lily/gregorian-ligature.cc
+++ b/lily/gregorian-ligature.cc
@@ -1,30 +1,42 @@
-/*   
-  gregorian-ligature.cc -- implement Gregorian_ligature
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2003--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  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.
 
-  source file of the GNU LilyPond music typesetter
+  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.
 
-  (c) 2003--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
-#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 (const string &name, int mask, int prefix_set, string *str)
 {
   if (prefix_set & mask)
     {
-      if (!str->is_empty ())
-	*str += ", ";
+      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 +58,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 "
+              );