X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-bracket-engraver.cc;h=4e73a7df2fae309bf582dce71a077995925cc3a5;hb=ffb9d71ab52ad8d9a891f8070525d949789e5058;hp=175f8d12698cd97ec487bfb72e03b8df07b2cba4;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 175f8d1269..4e73a7df2f 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "ligature-engraver.hh"
@@ -21,7 +21,10 @@ class Ligature_bracket_engraver : public Ligature_engraver
 {
 protected:
   virtual Spanner *create_ligature_spanner ();
-  virtual void acknowledge_grob (Grob_info);
+  virtual void typeset_ligature (Spanner *ligature,
+				 vector<Grob_info> primitives);
+  DECLARE_ACKNOWLEDGER (rest);
+  DECLARE_ACKNOWLEDGER (note_column);
 public:
   TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver);
 };
@@ -37,25 +40,39 @@ Ligature_bracket_engraver::create_ligature_spanner ()
 }
 
 void
-Ligature_bracket_engraver::acknowledge_grob (Grob_info info)
+Ligature_bracket_engraver::typeset_ligature (Spanner *, vector<Grob_info>)
+{
+  // no real ligature to typeset; the LigatureBracket just does it
+}
+
+void
+Ligature_bracket_engraver::acknowledge_note_column (Grob_info info)
 {
   if (current_ligature ())
     {
-      if (Note_column::has_interface (info.grob ()))
-	{
-	  Tuplet_bracket::add_column (current_ligature (),
-				      dynamic_cast<Item *> (info.grob ()));
-	}
-      else Ligature_engraver::acknowledge_grob (info);
+      Tuplet_bracket::add_column (current_ligature (),
+				  dynamic_cast<Item *> (info.grob ()));
+
+      // avoid "junking empty ligature" message by acknowledging dummy
+      // note head
+      Ligature_engraver::acknowledge_note_head (Grob_info ());
     }
 }
 
+void
+Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
+{
+  if (current_ligature ())
+    Ligature_engraver::acknowledge_rest (info);
+}
+
 #include "translator.icc"
 
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
 ADD_TRANSLATOR (Ligature_bracket_engraver,
-		/* descr */ "Handles Ligature_events by engraving Ligature brackets.",
-		/* creats*/ "TupletBracket",
-		/* accepts */ "ligature-event",
-		/* acks  */ "rest-interface note-column-interface",
-		/* reads */ "",
+		/* doc */ "Handles Ligature_events by engraving Ligature brackets.",
+		/* create */ "TupletBracket",
+		/* accept */ "ligature-event",
+		/* read */ "",
 		/* write */ "");