X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=732c206f3c0dc0a404f34916a68f95c9df6eec52;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f8e7b445b1deec9074ce73f218d921f693488cd6;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index f8e7b445b1..732c206f3c 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,98 +1,110 @@
 /*
-  span-bar-grav.cc -- implement Span_bar_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  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 "lily-guile.hh"
-#include "bar-line.hh"
 #include "item.hh"
-#include "span-bar.hh"
 #include "engraver.hh"
+#include "pointer-group-interface.hh"
 
+/**
 
-/** 
-
-  Make bars that span multiple "staves". Catch bars, and span a
-  Span_bar over them if we find more than 2 bars.  Vertical alignment
-  of staves changes the appearance of spanbars.  It is up to the
-  aligner (Vertical_align_engraver, in this case, to add extra
-  dependencies to the spanbars.
-
-  */
+Make bars that span multiple "staves". Catch bars, and span a
+Span_bar over them if we find more than 2 bars.  Vertical alignment
+of staves changes the appearance of spanbars.  It is up to the
+aligner (Vertical_align_engraver, in this case, to add extra
+dependencies to the spanbars.
+*/
 class Span_bar_engraver : public Engraver
 {
-  Item * spanbar_;
-  Link_array<Item> bars_;
+  Item *spanbar_;
+  bool make_spanbar_;
+  vector<Item *> bars_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Span_bar_engraver);
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-
+  DECLARE_ACKNOWLEDGER (bar_line);
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 };
 
-
 Span_bar_engraver::Span_bar_engraver ()
 {
-  spanbar_ =0;
+  spanbar_ = 0;
+  make_spanbar_ = false;
 }
 
-
-
 void
-Span_bar_engraver::acknowledge_grob (Grob_info i)
+Span_bar_engraver::acknowledge_bar_line (Grob_info i)
 {
   int depth = i.origin_contexts (this).size ();
-  if (depth && Bar_line::has_interface (i.grob_))
+  if (depth && !i.grob ()->internal_has_interface (ly_symbol2scm ("span-bar-interface")))
     {
-      Item * it = dynamic_cast<Item*> (i.grob_);
-      bars_.push (it);
+      Item *it = dynamic_cast<Item *> (i.grob ());
+      bars_.push_back (it);
 
-      if (bars_.size () >= 2 && !spanbar_) 
-	{
-	  spanbar_ = make_item ("SpanBar");
+      if (bars_.size () >= 2 && !spanbar_)
+        make_spanbar_ = true;
+    }
+}
 
-	  spanbar_->set_parent (bars_[0], X_AXIS);
+void
+Span_bar_engraver::process_acknowledged ()
+{
+  if (make_spanbar_)
+    {
+      spanbar_ = make_item ("SpanBar", SCM_EOL);
 
-	  announce_grob (spanbar_, SCM_EOL);
-	}
+      spanbar_->set_parent (bars_[0], X_AXIS);
+      for (vsize i = 0; i < bars_.size (); i++)
+        Pointer_group_interface::add_grob (spanbar_, ly_symbol2scm ("elements"), bars_[i]);
+      make_spanbar_ = false;
     }
 }
+
 void
 Span_bar_engraver::stop_translation_timestep ()
 {
-  if (spanbar_) 
+  if (spanbar_)
     {
-      for (int i=0; i < bars_.size () ; i++)
-	Span_bar::add_bar (spanbar_,bars_[i]);
-
-      SCM vissym =ly_symbol2scm ("break-visibility");
-      SCM vis = bars_[0]->internal_get_grob_property (vissym);	  
-      if (scm_equal_p (spanbar_->internal_get_grob_property (vissym), vis) != SCM_BOOL_T)
-	spanbar_->internal_set_grob_property (vissym, vis);
-
-      typeset_grob (spanbar_);
-      spanbar_ =0;
+      SCM vis = bars_[0]->get_property ("break-visibility");
+      if (ly_is_equal (spanbar_->get_property ("break-visibility"), vis))
+        spanbar_->set_property ("break-visibility", vis);
+      scm_call_1 (ly_lily_module_constant ("span-bar::notify-grobs-of-my-existence"), spanbar_->self_scm ());
+      spanbar_ = 0;
     }
-  bars_.set_size (0);
+  bars_.resize (0);
 }
 
+#include "translator.icc"
 
+ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
+ADD_TRANSLATOR (Span_bar_engraver,
+                /* doc */
+                "Make cross-staff bar lines: It catches all normal bar lines"
+                " and draws a single span bar across them.",
 
+                /* create */
+                "SpanBar ",
 
+                /* read */
+                "",
 
-
-
-ENTER_DESCRIPTION(Span_bar_engraver,
-/* descr */       "This engraver makes cross-staff barlines: It catches all normal "
-"bar lines, and draws a single span-bar across them.",
-/* creats*/       "SpanBar",
-/* accepts */     "",
-/* acks  */      "bar-line-interface",
-/* reads */       "",
-/* write */       "");
+                /* write */
+                ""
+               );