X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgregorian-ligature.hh;h=00894341632fd00ad4e3492599d92179be491a2c;hb=23bb09401ef1d8c5f5256b8f7a6c002365b1d88c;hp=80f123e2e20940f91710de594ef5dc0e58012f71;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/gregorian-ligature.hh b/lily/include/gregorian-ligature.hh
index 80f123e2e2..0089434163 100644
--- a/lily/include/gregorian-ligature.hh
+++ b/lily/include/gregorian-ligature.hh
@@ -1,22 +1,33 @@
 /*
-  gregorian-ligature.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2015 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2003--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/>.
 */
 
 #ifndef GREGORIAN_LIGATURE_HH
 #define GREGORIAN_LIGATURE_HH
 
 class Grob;
-class String;
+#include "std-string.hh"
+#include "grob-interface.hh"
 
 class Gregorian_ligature
 {
 public:
-  static bool has_interface (Grob *);
-  static String prefixes_to_str (Grob *);
+  static string prefixes_to_str (Grob *);
 };
 
 /*
@@ -48,14 +59,10 @@ public:
  * These definitions may be extended by more specific Gregorian
  * ligatures such as vaticana-ligature.hh.
  */
-#define PES_LOWER 0x0001 // this is a head before "\~" in an
-			 // ascending melody
-#define PES_UPPER 0x0002 // this is a head after "\~" in an
-			 // ascending melody
-#define FLEXA_LEFT 0x0004 // this is a head before "\~" in a
-// descending melody
-#define FLEXA_RIGHT 0x0008 // this is a head after "\~" in a
-// descending melody
+#define PES_LOWER 0x0001 // this is a head before "\~" in an ascending melody
+#define PES_UPPER 0x0002 // this is a head after "\~" in an ascending melody
+#define FLEXA_LEFT 0x0004 // this is a head before "\~" in a descending melody
+#define FLEXA_RIGHT 0x0008 // this is a head after "\~" in a descending melody
 #define AFTER_DEMINUTUM 0x0020 // previous head was a deminutum
 
 #endif /* GREGORIAN_LIGATURE_HH */