X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature-engraver.cc;h=bb43513e939f0315bf04c79da308d8cf22607e8f;hb=b6a3535923f893b4c593203c3421361ae02eba7c;hp=4958274a2e14af17eb986ed1956095b5b3a37181;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 4958274a2e..bb43513e93 100644
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -186,7 +186,7 @@ void check_and_fix_all_prefixes (Array<Grob_info> primitives)
       /* all other combinations should be valid (unless I made a
 	 mistake) */
 
-      primitive->set_property ("prefix-set", scm_int2num (prefix_set));
+      primitive->set_property ("prefix-set", scm_from_int (prefix_set));
     }
 }
 
@@ -210,9 +210,7 @@ provide_context_info (Array<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 (_ ("can't apply `\\~' on first head of ligature"));
 	else if (pitch > prev_pitch) // pes
 	  {
 	    prev_context_info |= PES_LOWER;
@@ -224,17 +222,13 @@ provide_context_info (Array<Grob_info> primitives)
 	    context_info |= FLEXA_RIGHT;
 	  }
 	else // (pitch == prev_pitch)
-	  {
-	    primitive->warning (_ ("can't apply `\\~' on heads with identical pitch"));
-	  }
+	  primitive->warning (_ ("can't 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_int2num (prev_context_info));
+				      scm_from_int (prev_context_info));
       prev_primitive = primitive;
       prev_prefix_set = prefix_set;
       prev_context_info = context_info;
@@ -242,15 +236,7 @@ provide_context_info (Array<Grob_info> primitives)
     }
   if (prev_primitive)
     prev_primitive->set_property ("context-info",
-				  scm_int2num (prev_context_info));
-}
-
-void
-Gregorian_ligature_engraver::transform_heads (Spanner *, Array<Grob_info>)
-{
-  programming_error ("Gregorian_ligature_engraver::transform_heads (): "
-		     "this is an abstract method that should not be called, "
-		     "but overridden by a subclass");
+				  scm_from_int (prev_context_info));
 }
 
 void
@@ -273,13 +259,5 @@ Gregorian_ligature_engraver::stop_translation_timestep ()
   pes_or_flexa_req_ = 0;
 }
 
-#include "translator.icc"
-
-ADD_ACKNOWLEDGER(Gregorian_ligature_engraver, rest);
-ADD_ACKNOWLEDGER(Gregorian_ligature_engraver, note_head);
-ADD_TRANSLATOR (Gregorian_ligature_engraver,
-		/* descr */ "This is an abstract class.  Subclasses such as Vaticana_ligature_engraver handle ligatures by glueing special ligature heads together.",
-		/* creats*/ "",
-		/* accepts */ "ligature-event",
-		/* reads */ "",
-		/* write */ "");
+// no ADD_ACKNOWLEDGER / ADD_ACKNOWLEDGER / ADD_TRANSLATOR macro calls
+// since this class is abstract