Run grand replace for 2015.

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

diff --git a/lily/include/mensural-ligature.hh b/lily/include/mensural-ligature.hh
index 2ef7f511b9f5564a7fe12ff41cddc429e16e48b6..97b8e2e21682a5eecd7863e28537a987d91609dd 100644 (file)
--- a/lily/include/mensural-ligature.hh
+++ b/lily/include/mensural-ligature.hh
@@ -1,10 +1,21 @@
 /*
-  mensural-ligature.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>,
+  Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
+
+  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 MENSURAL_LIGATURE_HH
@@ -13,7 +24,6 @@
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 
-
 /*
  * These are all possible mensural ligature primitives.
  */
@@ -23,17 +33,19 @@
 #define MLP_BREVIS 0x04 // mensural brevis head
 #define MLP_LONGA 0x08 // mensural brevis head with right cauda
 #define MLP_MAXIMA 0x10 // mensural maxima head without stem
-#define MLP_FLEXA 0x20 // mensural flexa-like shape
+#define MLP_FLEXA_BEGIN 0x20 // start of obliqua
+#define MLP_FLEXA_END 0x40 // end of obliqua
 
 #define MLP_STEM (MLP_UP | MLP_DOWN)
 #define MLP_SINGLE_HEAD (MLP_BREVIS | MLP_LONGA | MLP_MAXIMA)
+#define MLP_FLEXA (MLP_FLEXA_BEGIN | MLP_FLEXA_END)
 #define MLP_ANY (MLP_FLEXA | MLP_SINGLE_HEAD)
 
 struct Mensural_ligature
 {
   DECLARE_SCHEME_CALLBACK (brew_ligature_primitive, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 };
 
 #endif /* MENSURAL_LIGATURE_HH */