X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature-engraver.cc;h=fc2235bd6435ea8d03337c4e5c74e8401c9d92f5;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=3f08b7131cf91ee6309c0dded54bb8cdc22b4048;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 3f08b7131c..fc2235bd64 100644
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2007 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "gregorian-ligature-engraver.hh"
@@ -84,7 +84,7 @@ void fix_prefix_set (int *current_set, int min_set, int max_set, Grob *primitive
 
 void check_and_fix_all_prefixes (vector<Grob_info> primitives)
 {
-  /* Check for illegal head modifier combinations */
+  /* Check for invalid head modifier combinations */
   for (vsize i = 0; i < primitives.size (); i++)
     {
       Grob *primitive = primitives[i].grob ();
@@ -208,20 +208,22 @@ provide_context_info (vector<Grob_info> primitives)
       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 (_ ("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 (!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;