resolve merge

[lilypond.git] / lily / include / gregorian-ligature.hh

diff --git a/lily/include/gregorian-ligature.hh b/lily/include/gregorian-ligature.hh
index e84ba674097abd84ead638216a1c782c2cd92747..cfe81bcf942c0e4031dcafe161f10ce296488e86 100644 (file)
--- a/lily/include/gregorian-ligature.hh
+++ b/lily/include/gregorian-ligature.hh
@@ -1,9 +1,20 @@
 /*
-  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--2011 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2003--2009 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
@@ -50,14 +61,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 */