X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-bracket-engraver.cc;h=9e50962ddcb2473a0158068bb26f13e67ff81568;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=85cd473ecd21ee4e0ffbb5bdd7a281bd9c687700;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 85cd473ecd..9e50962ddc 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -1,89 +1,141 @@
 /*
-  ligature-bracket-engraver.cc -- implement Ligature_bracket_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ligature-engraver.hh"
+#include "international.hh"
+
+#include "engraver.hh"
 #include "note-column.hh"
 #include "tuplet-bracket.hh"
 #include "spanner.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
+class Ligature_bracket_engraver : public Engraver
 {
 protected:
-  virtual Spanner *create_ligature_spanner ();
-  virtual void typeset_ligature (Spanner *ligature,
-				 vector<Grob_info> primitives);
-  DECLARE_ACKNOWLEDGER (rest);
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_TRANSLATOR_LISTENER (ligature);
+  virtual void process_music ();
+  virtual void stop_translation_timestep ();
+  void acknowledge_rest (Grob_info);
+  void acknowledge_note_column (Grob_info);
+  void listen_ligature (Stream_event *);
 public:
   TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver);
+
+private:
+  Drul_array<Stream_event *> events_drul_;
+  Spanner *finished_ligature_;
+  Spanner *ligature_;
+  Stream_event *previous_start_event_;
 };
 
-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 ()
-{
+  Direction d = to_dir (ev->get_property ("span-direction"));
+  ASSIGN_EVENT_ONCE (events_drul_[d], ev);
 }
 
-Spanner *
-Ligature_bracket_engraver::create_ligature_spanner ()
+Ligature_bracket_engraver::Ligature_bracket_engraver (Context *c)
+  : Engraver (c)
 {
-  return make_spanner ("LigatureBracket", SCM_EOL);
+  ligature_ = 0;
+  finished_ligature_ = 0;
+  events_drul_[LEFT] = events_drul_[RIGHT] = 0;
+  previous_start_event_ = 0;
 }
 
 void
-Ligature_bracket_engraver::typeset_ligature (Spanner *, vector<Grob_info>)
+Ligature_bracket_engraver::process_music ()
 {
-  // no real ligature to typeset; the LigatureBracket just does it
+  if (events_drul_[STOP])
+    {
+      if (!ligature_)
+        {
+          events_drul_[STOP]->origin ()->warning (_ ("cannot find start of ligature"));
+          return;
+        }
+
+      finished_ligature_ = ligature_;
+      ligature_ = 0;
+      previous_start_event_ = 0;
+    }
+
+  if (events_drul_[START])
+    {
+      if (ligature_)
+        {
+          events_drul_[START]->origin ()->warning (_ ("already have a ligature"));
+          return;
+        }
+
+      previous_start_event_ = events_drul_[START];
+      ligature_ = make_spanner ("LigatureBracket", events_drul_[START]->self_scm ());
+    }
 }
 
 void
 Ligature_bracket_engraver::acknowledge_note_column (Grob_info info)
 {
-  if (current_ligature ())
+  if (ligature_)
     {
-      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 ());
+      Tuplet_bracket::add_column (ligature_,
+                                  info.item ());
+      add_bound_item (ligature_, info.item ());
     }
 }
 
 void
 Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
 {
-  if (current_ligature ())
-    Ligature_engraver::acknowledge_rest (info);
+  acknowledge_note_column (info);
+}
+
+void
+Ligature_bracket_engraver::stop_translation_timestep ()
+{
+  events_drul_[LEFT]
+    = events_drul_[RIGHT] = 0;
+  finished_ligature_ = 0;
 }
 
-ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
-ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
+
+void
+Ligature_bracket_engraver::boot ()
+{
+  ADD_LISTENER (Ligature_bracket_engraver, ligature);
+  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 */ "");
+                /* doc */
+                "Handle @code{Ligature_events} by engraving @code{Ligature}"
+                " brackets.",
+
+                /* create */
+                "LigatureBracket ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );