Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 6a99e3946e71ab0ed0655ab1cc7f69e3de04d266..73ba7e1fed4db859a88c8f2da4a2ebe2ec4c34e6 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -17,6 +17,9 @@
 #include "stream-event.hh"
 #include "warn.hh"
 
+/* ASSIGN_EVENT_ONCE */
+#include "translator.icc"
+
 /*
  * This abstract class is the common superclass for all ligature
  * engravers for Gregorian chant notation.  It cares for the musical
@@ -36,10 +39,10 @@ Gregorian_ligature_engraver::Gregorian_ligature_engraver ()
 void
 Gregorian_ligature_engraver::listen_pes_or_flexa (Stream_event *ev)
 {
-  pes_or_flexa_req_ = ev;
+  ASSIGN_EVENT_ONCE (pes_or_flexa_req_, ev);
 }
 
-void fix_prefix (char *name, int mask,
+void fix_prefix (char const *name, int mask,
                 int *current_set, int min_set, int max_set,
                 Grob *primitive)
 {
@@ -206,7 +209,7 @@ provide_context_info (vector<Grob_info> primitives)
 
       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"));
+         primitive->warning (_ ("cannot apply `\\~' on first head of ligature"));
        else if (pitch > prev_pitch) // pes
          {
            prev_context_info |= PES_LOWER;
@@ -218,7 +221,7 @@ provide_context_info (vector<Grob_info> primitives)
            context_info |= FLEXA_RIGHT;
          }
        else // (pitch == prev_pitch)
-         primitive->warning (_ ("can't apply `\\~' on heads with identical pitch"));
+         primitive->warning (_ ("cannot apply `\\~' on heads with identical pitch"));
       if (prev_prefix_set & DEMINUTUM)
        context_info |= AFTER_DEMINUTUM;