Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / ligature-bracket-engraver.cc

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 9970886bed577b0ec2ecc0b8467f1e33a9354751..6e8dd9a22a9469cb878996252023b332b5d3e6a0 100644 (file)
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -1,31 +1,46 @@
-/*   
+/*
   ligature-bracket-engraver.cc -- implement Ligature_bracket_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2002 Juergen Reuter <reuter@ipd.uka.de>
-  
- */
+
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
+*/
+
 #include "ligature-engraver.hh"
 #include "note-column.hh"
 #include "tuplet-bracket.hh"
 #include "spanner.hh"
-#include "warn.hh"
+#include "stream-event.hh"
+#include "spanner.hh"
+#include "item.hh"
 
+#include "translator.icc"
+
+/*
+ * This engraver marks ligatures of any kind by just printing a
+ * horizontal square bracket on top of each ligature.  See class
+ * Ligature_engraver for more information on the interaction between
+ * this class and its superclass.
+ */
 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, Array<Grob_info>);
-
+  virtual void typeset_ligature (Spanner *ligature,
+                                vector<Grob_info> primitives);
+  DECLARE_ACKNOWLEDGER (rest);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (ligature);
 public:
-  TRANSLATOR_DECLARATIONS(Ligature_bracket_engraver);
-
-private:
-  void typeset_ligature_bracket ();
+  TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver);
 };
 
+IMPLEMENT_TRANSLATOR_LISTENER (Ligature_bracket_engraver, ligature);
+void
+Ligature_bracket_engraver::listen_ligature (Stream_event *ev)
+{
+  Ligature_engraver::listen_ligature (ev);
+}
 
 Ligature_bracket_engraver::Ligature_bracket_engraver ()
 {
@@ -34,33 +49,40 @@ Ligature_bracket_engraver::Ligature_bracket_engraver ()
 Spanner *
 Ligature_bracket_engraver::create_ligature_spanner ()
 {
-  return new Spanner (get_property ("LigatureBracket"));
+  return make_spanner ("LigatureBracket", SCM_EOL);
 }
 
 void
-Ligature_bracket_engraver::typeset_ligature (Spanner *ligature, Array<Grob_info>)
+Ligature_bracket_engraver::typeset_ligature (Spanner *, vector<Grob_info>)
 {
-  typeset_grob (ligature);
+  // no real ligature to typeset; the LigatureBracket just does it
 }
 
 void
-Ligature_bracket_engraver::acknowledge_grob (Grob_info info)
+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 ());
     }
 }
 
-ENTER_DESCRIPTION(Ligature_bracket_engraver,
-/* descr */       "Handles Ligature_events by engraving Ligature brackets.",
-/* creats*/       "TupletBracket",
-/* accepts */     "ligature-event abort-event",
-/* acks  */      "ligature-head-interface rest-interface note-column-interface",
-/* reads */       "",
-/* write */       "");
+void
+Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
+{
+  if (current_ligature ())
+    Ligature_engraver::acknowledge_rest (info);
+}
+
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
+ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
+ADD_TRANSLATOR (Ligature_bracket_engraver,
+               /* doc */ "Handles Ligature_events by engraving Ligature brackets.",
+               /* create */ "TupletBracket",
+               /* read */ "",
+               /* write */ "");