X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=09c846f8968c1c9897d040e1740555da145a70b0;hb=refs%2Fheads%2Fdon%2Ffix_configure_ac;hp=f2659b09230e6ad55c1202e5e994e141c27c44f5;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index f2659b0923..09c846f896 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,88 +1,111 @@
 /*
-  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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 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 "dimension-cache.hh"
-#include "lily-guile.hh"
-#include "span-bar.hh"
+#include "item.hh"
 #include "engraver.hh"
+#include "pointer-group-interface.hh"
 
-/** 
+/**
 
-  Make bars that span multiple "staffs". Catch bars, and span a
-  Span_bar over them if we find more than 2 bars.  Vertical alignment
-  of staffs 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
 {
-  Span_bar * spanbar_p_;
-  Link_array<Bar> bar_l_arr_;
+  Item *spanbar_;
+  bool make_spanbar_;
+  vector<Item *> bars_;
 
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Span_bar_engraver();
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing();
-  virtual Span_bar* get_span_bar_p(SCM) const;
+  DECLARE_ACKNOWLEDGER (bar_line);
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 };
 
-
-Span_bar_engraver::Span_bar_engraver()
+Span_bar_engraver::Span_bar_engraver ()
 {
-  spanbar_p_ =0;
+  spanbar_ = 0;
+  make_spanbar_ = false;
 }
 
-Span_bar*
-Span_bar_engraver::get_span_bar_p(SCM s) const
+void
+Span_bar_engraver::acknowledge_bar_line (Grob_info i)
 {
-  Span_bar * sp= new Span_bar (s);
-  return sp;
-}
+  int depth = i.origin_contexts (this).size ();
+  if (depth && !i.grob ()->internal_has_interface (ly_symbol2scm ("span-bar-interface")))
+    {
+      Item *it = dynamic_cast<Item *> (i.grob ());
+      bars_.push_back (it);
 
+      if (bars_.size () >= 2 && !spanbar_)
+        make_spanbar_ = true;
+    }
+}
 
 void
-Span_bar_engraver::acknowledge_element (Score_element_info i)
+Span_bar_engraver::process_acknowledged ()
 {
-  int depth = i.origin_trans_l_arr (this).size();
-  if (depth > 1
-      && dynamic_cast<Bar *> (i.elem_l_)) 
+  if (make_spanbar_)
     {
-      bar_l_arr_.push (dynamic_cast<Bar *> (i.elem_l_));
+      spanbar_ = make_item ("SpanBar", SCM_EOL);
 
-      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
-	{
-	  spanbar_p_ = get_span_bar_p( bar_l_arr_[0]->property_alist_);
-	  spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
-	  spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
-
-	  announce_element (Score_element_info (spanbar_p_,0));
-	}
+      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::do_pre_move_processing()
+Span_bar_engraver::stop_translation_timestep ()
 {
-  if (spanbar_p_) 
+  if (spanbar_)
     {
-      for (int i=0; i < bar_l_arr_.size() ; i++)
-	spanbar_p_->add_bar (bar_l_arr_[i]);
-      typeset_element (spanbar_p_);
-      spanbar_p_ =0;
+      SCM vissym = ly_symbol2scm ("break-visibility");
+      SCM vis = bars_[0]->internal_get_property (vissym);
+      if (ly_is_equal (spanbar_->internal_get_property (vissym), vis))
+        spanbar_->set_property (vissym, vis);
+      scm_call_1 (ly_lily_module_constant ("span-bar::notify-grobs-of-my-existence"), spanbar_->self_scm ());
+      spanbar_ = 0;
     }
-  bar_l_arr_.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.",
 
-ADD_THIS_TRANSLATOR(Span_bar_engraver);
-
+                /* create */
+                "SpanBar ",
 
+                /* read */
+                "",
 
+                /* write */
+                ""
+               );