X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmensural-ligature.hh;h=0881d6b6a8e639e5712e4e1e8c18075f0cc300f9;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=c3b5031f403c09b86b2777433e2f99307f2c2232;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/include/mensural-ligature.hh b/lily/include/mensural-ligature.hh index c3b5031f40..0881d6b6a8 100644 --- a/lily/include/mensural-ligature.hh +++ b/lily/include/mensural-ligature.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2011 Juergen Reuter , + Copyright (C) 2002--2014 Juergen Reuter , Pal Benko LilyPond is free software: you can redistribute it and/or modify @@ -24,7 +24,6 @@ #include "lily-proto.hh" #include "grob-interface.hh" - /* * These are all possible mensural ligature primitives. */ @@ -34,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 */