* input/test/time-signature-double.ly: use markups for double time

[lilypond.git] / lily / gregorian-ligature-engraver.cc

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 482b60ba718b0b47c54d55dabd6c676d3de8d3e6..b1c1a826baf0ec230f51d050dabba46e3d1fb57c 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -76,8 +76,7 @@ void fix_prefix_set (int *current_set, int min_set, int max_set, Grob *primitive
   fix_prefix ("ascendens", ASCENDENS, current_set, min_set, max_set, primitive);
   fix_prefix ("oriscus", ORISCUS, current_set, min_set, max_set, primitive);
   fix_prefix ("quilisma", QUILISMA, current_set, min_set, max_set, primitive);
-  fix_prefix ("deminutus", DEMINUTUM, current_set, min_set, max_set, primitive);
-  fix_prefix ("semivocalis", SEMIVOCALIS, current_set, min_set, max_set, primitive);
+  fix_prefix ("deminutum", DEMINUTUM, current_set, min_set, max_set, primitive);
   fix_prefix ("cavum", CAVUM, current_set, min_set, max_set, primitive);
   fix_prefix ("linea", LINEA, current_set, min_set, max_set, primitive);
   fix_prefix ("pes_or_flexa", LINEA, current_set, min_set, max_set, primitive);
@@ -101,13 +100,12 @@ void check_and_fix_all_prefixes (Array<Grob_info> primitives)
       (ORISCUS * to_boolean (primitive->get_grob_property ("oriscus"))) |
       (QUILISMA * to_boolean (primitive->get_grob_property ("quilisma"))) |
       (DEMINUTUM * to_boolean (primitive->get_grob_property ("deminutum"))) |
-      (SEMIVOCALIS * to_boolean (primitive->get_grob_property ("semivocalis"))) |
       (CAVUM * to_boolean (primitive->get_grob_property ("cavum"))) |
       (LINEA * to_boolean (primitive->get_grob_property ("linea"))) |
       (PES_OR_FLEXA * to_boolean (primitive->get_grob_property ("pes-or-flexa")));
 
     /* check: ascendens and descendens exclude each other; same with
-       auctum and diminutum */
+       auctum and deminutum */
     if (prefix_set & DESCENDENS)
       {
        fix_prefix_set (&prefix_set,
@@ -156,17 +154,8 @@ void check_and_fix_all_prefixes (Array<Grob_info> primitives)
                        primitive);
       }
 
-    /* check: semivocalis must occur in combination with and only with
-       pes or flexa */
-    if (prefix_set & SEMIVOCALIS)
-      {
-       fix_prefix_set (&prefix_set,
-                       SEMIVOCALIS | PES_OR_FLEXA,
-                       SEMIVOCALIS | PES_OR_FLEXA,
-                       primitive);
-      }
 
-    /* check: inclinatum may be prefixed with auctum or diminutum only */
+    /* check: inclinatum may be prefixed with auctum or deminutum only */
     if (prefix_set & INCLINATUM)
       {
        fix_prefix_set (&prefix_set,
@@ -174,6 +163,15 @@ void check_and_fix_all_prefixes (Array<Grob_info> primitives)
                        INCLINATUM | AUCTUM | DEMINUTUM,
                        primitive);
       }
+    /* check: semivocalis (deminutum but not inclinatum) must occur in
+       combination with and only with pes or flexa */
+    else if (prefix_set & DEMINUTUM)
+      {
+       fix_prefix_set (&prefix_set,
+                       DEMINUTUM | PES_OR_FLEXA,
+                       DEMINUTUM | PES_OR_FLEXA,
+                       primitive);
+      }
 
     /* check: cavum and linea (either or both) may be applied only
        upon core punctum */
@@ -225,9 +223,9 @@ provide_context_info (Array<Grob_info> primitives)
          primitive->warning ("may not apply `\\~' on heads with "
                              "identical pitch; ignoring `\\~'");
        }
-    if (prev_prefix_set & VIRGA)
+    if (prev_prefix_set & DEMINUTUM)
       {
-       context_info |= AFTER_VIRGA;
+       context_info |= AFTER_DEMINUTUM;
       }
 
     if (prev_primitive)
@@ -275,6 +273,6 @@ ENTER_DESCRIPTION (Gregorian_ligature_engraver,
 /* descr */       "This is an abstract class.  Subclasses such as Vaticana_ligature_engraver handle ligatures by glueing special ligature heads together.",
 /* creats*/       "",
 /* accepts */     "ligature-event abort-event",
-/* acks  */      "ligature-head-interface note-head-interface rest-interface",
+/* acks  */      "note-head-interface rest-interface",
 /* reads */       "",
 /* write */       "");