]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/gregorian-ligature-engraver.cc
Run grand-replace (issue 3765)
[lilypond.git] / lily / gregorian-ligature-engraver.cc
index 40710457400ee2126acad0c6d152f18ee6c4b1e0..9d070ad99782062d50794e45227a768896d70919 100644 (file)
@@ -1,19 +1,35 @@
 /*
-  gregorian-ligature-engraver.cc -- implement Gregorian_ligature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2014 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/>.
 */
 
 #include "gregorian-ligature-engraver.hh"
 
 #include "gregorian-ligature.hh"
-#include "warn.hh"
-#include "staff-symbol-referencer.hh"
-#include "spanner.hh"
+#include "international.hh"
 #include "paper-column.hh"
 #include "pitch.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+/* ASSIGN_EVENT_ONCE */
+#include "translator.icc"
 
 /*
  * This abstract class is the common superclass for all ligature
@@ -31,21 +47,15 @@ Gregorian_ligature_engraver::Gregorian_ligature_engraver ()
   pes_or_flexa_req_ = 0;
 }
 
-bool
-Gregorian_ligature_engraver::try_music (Music *m)
+void
+Gregorian_ligature_engraver::listen_pes_or_flexa (Stream_event *ev)
 {
-  if (m->is_mus_type ("pes-or-flexa-event"))
-    {
-      pes_or_flexa_req_ = m;
-      return true;
-    }
-  else
-    return Ligature_engraver::try_music (m);
+  ASSIGN_EVENT_ONCE (pes_or_flexa_req_, ev);
 }
 
-void fix_prefix (char *name, int mask,
-                int *current_set, int min_set, int max_set,
-                Grob *primitive)
+void fix_prefix (char const *name, int mask,
+                 int *current_set, int min_set, int max_set,
+                 Grob *primitive)
 {
   bool current = *current_set & mask;
   bool min = min_set & mask;
@@ -83,108 +93,108 @@ void fix_prefix_set (int *current_set, int min_set, int max_set, Grob *primitive
   fix_prefix ("pes_or_flexa", LINEA, current_set, min_set, max_set, primitive);
 }
 
-void check_and_fix_all_prefixes (Array<Grob_info> primitives)
+void check_and_fix_all_prefixes (vector<Grob_info> const &primitives)
 {
-  /* Check for illegal head modifier combinations */
-  for (int i = 0; i < primitives.size (); i++)
+  /* Check for invalid head modifier combinations */
+  for (vsize i = 0; i < primitives.size (); i++)
     {
       Grob *primitive = primitives[i].grob ();
 
       /* compute head prefix set by inspecting primitive grob properties */
       int prefix_set
-       = (VIRGA *to_boolean (primitive->get_property ("virga")))
-       | (STROPHA *to_boolean (primitive->get_property ("stropha")))
-       | (INCLINATUM *to_boolean (primitive->get_property ("inclinatum")))
-       | (AUCTUM *to_boolean (primitive->get_property ("auctum")))
-       | (DESCENDENS *to_boolean (primitive->get_property ("descendens")))
-       | (ASCENDENS *to_boolean (primitive->get_property ("ascendens")))
-       | (ORISCUS *to_boolean (primitive->get_property ("oriscus")))
-       | (QUILISMA *to_boolean (primitive->get_property ("quilisma")))
-       | (DEMINUTUM *to_boolean (primitive->get_property ("deminutum")))
-       | (CAVUM *to_boolean (primitive->get_property ("cavum")))
-       | (LINEA *to_boolean (primitive->get_property ("linea")))
-       | (PES_OR_FLEXA *to_boolean (primitive->get_property ("pes-or-flexa")));
+        = (VIRGA * to_boolean (primitive->get_property ("virga")))
+          | (STROPHA * to_boolean (primitive->get_property ("stropha")))
+          | (INCLINATUM * to_boolean (primitive->get_property ("inclinatum")))
+          | (AUCTUM * to_boolean (primitive->get_property ("auctum")))
+          | (DESCENDENS * to_boolean (primitive->get_property ("descendens")))
+          | (ASCENDENS * to_boolean (primitive->get_property ("ascendens")))
+          | (ORISCUS * to_boolean (primitive->get_property ("oriscus")))
+          | (QUILISMA * to_boolean (primitive->get_property ("quilisma")))
+          | (DEMINUTUM * to_boolean (primitive->get_property ("deminutum")))
+          | (CAVUM * to_boolean (primitive->get_property ("cavum")))
+          | (LINEA * to_boolean (primitive->get_property ("linea")))
+          | (PES_OR_FLEXA * to_boolean (primitive->get_property ("pes-or-flexa")));
 
       /* check: ascendens and descendens exclude each other; same with
-        auctum and deminutum */
+         auctum and deminutum */
       if (prefix_set & DESCENDENS)
-       {
-         fix_prefix_set (&prefix_set,
-                         prefix_set & ~ASCENDENS,
-                         prefix_set & ~ASCENDENS,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          prefix_set & ~ASCENDENS,
+                          prefix_set & ~ASCENDENS,
+                          primitive);
+        }
       if (prefix_set & AUCTUM)
-       {
-         fix_prefix_set (&prefix_set,
-                         prefix_set & ~DEMINUTUM,
-                         prefix_set & ~DEMINUTUM,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          prefix_set & ~DEMINUTUM,
+                          prefix_set & ~DEMINUTUM,
+                          primitive);
+        }
 
       /* check: virga, quilisma and oriscus cannot be combined with any
-        other prefix, but may be part of a pes or flexa */
+         other prefix, but may be part of a pes or flexa */
       if (prefix_set & VIRGA)
-       {
-         fix_prefix_set (&prefix_set,
-                         VIRGA,
-                         VIRGA | PES_OR_FLEXA,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          VIRGA,
+                          VIRGA | PES_OR_FLEXA,
+                          primitive);
+        }
       if (prefix_set & QUILISMA)
-       {
-         fix_prefix_set (&prefix_set,
-                         QUILISMA,
-                         QUILISMA | PES_OR_FLEXA,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          QUILISMA,
+                          QUILISMA | PES_OR_FLEXA,
+                          primitive);
+        }
       if (prefix_set & ORISCUS)
-       {
-         fix_prefix_set (&prefix_set,
-                         ORISCUS,
-                         ORISCUS | PES_OR_FLEXA,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          ORISCUS,
+                          ORISCUS | PES_OR_FLEXA,
+                          primitive);
+        }
 
       /* check: auctum is the only valid optional prefix for stropha */
       if (prefix_set & STROPHA)
-       {
-         fix_prefix_set (&prefix_set,
-                         STROPHA,
-                         STROPHA | AUCTUM,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          STROPHA,
+                          STROPHA | AUCTUM,
+                          primitive);
+        }
 
       /* check: inclinatum may be prefixed with auctum or deminutum only */
       if (prefix_set & INCLINATUM)
-       {
-         fix_prefix_set (&prefix_set,
-                         INCLINATUM,
-                         INCLINATUM | AUCTUM | DEMINUTUM,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          INCLINATUM,
+                          INCLINATUM | AUCTUM | DEMINUTUM,
+                          primitive);
+        }
       /* check: semivocalis (deminutum but not inclinatum) must occur in
-        combination with and only with pes or flexa */
+         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);
-       }
+        {
+          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 */
+         upon core punctum */
       if (prefix_set & (CAVUM | LINEA))
-       {
-         fix_prefix_set (&prefix_set,
-                         0,
-                         CAVUM | LINEA,
-                         primitive);
-       }
+        {
+          fix_prefix_set (&prefix_set,
+                          0,
+                          CAVUM | LINEA,
+                          primitive);
+        }
 
       /* all other combinations should be valid (unless I made a
-        mistake) */
+         mistake) */
 
       primitive->set_property ("prefix-set", scm_from_int (prefix_set));
     }
@@ -194,45 +204,43 @@ void check_and_fix_all_prefixes (Array<Grob_info> primitives)
  * Marks those heads that participate in a pes or flexa.
  */
 void
-provide_context_info (Array<Grob_info> primitives)
+provide_context_info (vector<Grob_info> const &primitives)
 {
   Grob *prev_primitive = 0;
   int prev_prefix_set = 0;
   int prev_context_info = 0;
   int prev_pitch = 0;
-  for (int i = 0; i < primitives.size (); i++)
+  for (vsize i = 0; i < primitives.size (); i++)
     {
       Grob *primitive = primitives[i].grob ();
-      Music *music_cause = primitives[i].music_cause ();
+      Stream_event *event_cause = primitives[i].event_cause ();
       int context_info = 0;
-      int pitch = unsmob_pitch (music_cause->get_property ("pitch"))->steps ();
+      int pitch = unsmob_pitch (event_cause->get_property ("pitch"))->steps ();
       int prefix_set = scm_to_int (primitive->get_property ("prefix-set"));
 
       if (prefix_set & PES_OR_FLEXA)
-       if (!i) // ligature may not start with 2nd head of pes or flexa
-         {
-           primitive->warning (_ ("can't apply `\\~' on first head of ligature"));
-         }
-       else if (pitch > prev_pitch) // pes
-         {
-           prev_context_info |= PES_LOWER;
-           context_info |= PES_UPPER;
-         }
-       else if (pitch < prev_pitch) // flexa
-         {
-           prev_context_info |= FLEXA_LEFT;
-           context_info |= FLEXA_RIGHT;
-         }
-       else // (pitch == prev_pitch)
-         {
-           primitive->warning (_ ("can't apply `\\~' on heads with identical pitch"));
-         }
+        {
+          if (!i) // ligature may not start with 2nd head of pes or flexa
+            primitive->warning (_ ("cannot apply `\\~' on first head of ligature"));
+          else if (pitch > prev_pitch) // pes
+            {
+              prev_context_info |= PES_LOWER;
+              context_info |= PES_UPPER;
+            }
+          else if (pitch < prev_pitch) // flexa
+            {
+              prev_context_info |= FLEXA_LEFT;
+              context_info |= FLEXA_RIGHT;
+            }
+          else // (pitch == prev_pitch)
+            primitive->warning (_ ("cannot apply `\\~' on heads with identical pitch"));
+        }
       if (prev_prefix_set & DEMINUTUM)
-       context_info |= AFTER_DEMINUTUM;
+        context_info |= AFTER_DEMINUTUM;
 
       if (prev_primitive)
-       prev_primitive->set_property ("context-info",
-                                     scm_from_int (prev_context_info));
+        prev_primitive->set_property ("context-info",
+                                      scm_from_int (prev_context_info));
       prev_primitive = primitive;
       prev_prefix_set = prefix_set;
       prev_context_info = context_info;
@@ -240,12 +248,12 @@ provide_context_info (Array<Grob_info> primitives)
     }
   if (prev_primitive)
     prev_primitive->set_property ("context-info",
-                                 scm_from_int (prev_context_info));
+                                  scm_from_int (prev_context_info));
 }
 
 void
 Gregorian_ligature_engraver::build_ligature (Spanner *ligature,
-                                            Array<Grob_info> primitives)
+                                             vector<Grob_info> const &primitives)
 {
   // apply style-independent checking and transformation
   check_and_fix_all_prefixes (primitives);