X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-bracket-engraver.cc;h=4e73a7df2fae309bf582dce71a077995925cc3a5;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=b483f660586b841715d7ae76d18d640d8fd7292b;hpb=811be522d0b79493159f47789e5621dc85493495;p=lilypond.git

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index b483f66058..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,6 +21,8 @@ class Ligature_bracket_engraver : public Ligature_engraver
 {
 protected:
   virtual Spanner *create_ligature_spanner ();
+  virtual void typeset_ligature (Spanner *ligature,
+				 vector<Grob_info> primitives);
   DECLARE_ACKNOWLEDGER (rest);
   DECLARE_ACKNOWLEDGER (note_column);
 public:
@@ -37,6 +39,12 @@ Ligature_bracket_engraver::create_ligature_spanner ()
   return make_spanner ("LigatureBracket", SCM_EOL);
 }
 
+void
+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)
 {
@@ -44,6 +52,10 @@ Ligature_bracket_engraver::acknowledge_note_column (Grob_info 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 ());
     }
 }
 
@@ -59,8 +71,8 @@ Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
 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",
-		/* reads */ "",
+		/* doc */ "Handles Ligature_events by engraving Ligature brackets.",
+		/* create */ "TupletBracket",
+		/* accept */ "ligature-event",
+		/* read */ "",
 		/* write */ "");