don't return SCM_UNSPECIFIED in calc-positioning-done.

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

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index e6b3c9b534ed67737ce708abf47f70f419afad42..73ba7e1fed4db859a88c8f2da4a2ebe2ec4c34e6 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -42,7 +42,7 @@ Gregorian_ligature_engraver::listen_pes_or_flexa (Stream_event *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)
 {
@@ -209,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;
@@ -221,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;