X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-engraver.cc;h=cd975b71e98c8f72244ee7e380b44b9210f03ee3;hb=f1b93c0d52ef9229f8b58acc2ec8207ed50f5bee;hp=115eecb66287bbc2f9c5cd30eba191c22e6456c9;hpb=2fa83cb202267f58cdfd8ad1496851f3d0816ddd;p=lilypond.git

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 115eecb662..cd975b71e9 100644
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -89,15 +89,6 @@ Ligature_engraver::try_music (Music *m)
   return false;
 }
 
-Spanner *
-Ligature_engraver::create_ligature_spanner ()
-{
-  programming_error ("Ligature_engraver::create_ligature_spanner (): "
-		     "this is an abstract method that should not be called, "
-		     "but overridden by a subclass");
-  return 0;
-}
-
 /*
  * This method should do something that comes close to the following
  * .ly snippet:
@@ -156,13 +147,9 @@ Ligature_engraver::process_music ()
 	}
 
       if (!last_bound_)
-	{
-	  events_drul_[STOP]->origin ()->warning (_ ("no right bound"));
-	}
+	events_drul_[STOP]->origin ()->warning (_ ("no right bound"));
       else
-	{
-	  ligature_->set_bound (RIGHT, last_bound_);
-	}
+	ligature_->set_bound (RIGHT, last_bound_);
 
       prev_start_event_ = 0;
       finished_primitives_ = primitives_;
@@ -192,19 +179,13 @@ Ligature_engraver::process_music ()
       brew_ligature_primitive_proc
 	= ligature_->get_property ("ligature-primitive-callback");
       if (brew_ligature_primitive_proc == SCM_EOL)
-	{
-	  programming_error ("Ligature_engraver: ligature-primitive-callback undefined");
-	}
+	programming_error ("Ligature_engraver: ligature-primitive-callback undefined");
 
       Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
       if (!bound)
-	{
-	  events_drul_[START]->origin ()->warning (_ ("no left bound"));
-	}
+	events_drul_[START]->origin ()->warning (_ ("no left bound"));
       else
-	{
-	  ligature_->set_bound (LEFT, bound);
-	}
+	ligature_->set_bound (LEFT, bound);
 
       ligature_start_mom_ = now_mom ();
 
@@ -214,14 +195,6 @@ Ligature_engraver::process_music ()
     }
 }
 
-void
-Ligature_engraver::typeset_ligature (Spanner *, Array<Grob_info>)
-{
-  programming_error ("Ligature_engraver::typeset_ligature (): "
-		     "this is an abstract method that should not be called, "
-		     "but overridden by a subclass");
-}
-
 void
 Ligature_engraver::stop_translation_timestep ()
 {
@@ -272,8 +245,11 @@ Ligature_engraver::acknowledge_note_head (Grob_info info)
   if (ligature_)
     {
       primitives_.push (info);
-      info.grob ()->set_property ("print-function",
-				  brew_ligature_primitive_proc);
+      if (info.grob ())
+	{
+	  info.grob ()->set_property ("print-function",
+				      brew_ligature_primitive_proc);
+	}
     }
 }
 
@@ -289,12 +265,5 @@ Ligature_engraver::acknowledge_rest (Grob_info info)
     }
 }
 
-
-ADD_ACKNOWLEDGER(Ligature_engraver, rest);
-ADD_ACKNOWLEDGER(Ligature_engraver, note_head);
-ADD_TRANSLATOR (Ligature_engraver,
-		/* descr */ "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.",
-		/* creats */ "",
-		/* accepts */ "ligature-event",
-		/* reads */ "",
-		/* write */ "");
+// no ADD_ACKNOWLEDGER / ADD_ACKNOWLEDGER / ADD_TRANSLATOR macro calls
+// since this class is abstract