X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature-engraver.cc;h=fc2235bd6435ea8d03337c4e5c74e8401c9d92f5;hb=730e35bfe91fc8b151fbd54c6daddaf930664327;hp=82c84ffc4c634403265c7c965264d9d3bf22bd75;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 82c84ffc4c..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--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "gregorian-ligature-engraver.hh"
@@ -14,8 +14,12 @@
 #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
  * engravers for Gregorian chant notation.  It cares for the musical
@@ -32,19 +36,13 @@ 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,
+void fix_prefix (char const *name, int mask,
 		 int *current_set, int min_set, int max_set,
 		 Grob *primitive)
 {
@@ -84,9 +82,9 @@ 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 (std::vector<Grob_info> primitives)
+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 ();
@@ -195,7 +193,7 @@ void check_and_fix_all_prefixes (std::vector<Grob_info> primitives)
  * Marks those heads that participate in a pes or flexa.
  */
 void
-provide_context_info (std::vector<Grob_info> primitives)
+provide_context_info (vector<Grob_info> primitives)
 {
   Grob *prev_primitive = 0;
   int prev_prefix_set = 0;
@@ -204,26 +202,28 @@ provide_context_info (std::vector<Grob_info> primitives)
   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;
 
@@ -242,7 +242,7 @@ provide_context_info (std::vector<Grob_info> primitives)
 
 void
 Gregorian_ligature_engraver::build_ligature (Spanner *ligature,
-					     std::vector<Grob_info> primitives)
+					     vector<Grob_info> primitives)
 {
   // apply style-independent checking and transformation
   check_and_fix_all_prefixes (primitives);