X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=5ebe256346c6cbc4ad98a20a533c765a7a48282b;hb=20670d51f8d97fd390210dd239b3b2427f071e7c;hp=a228a1b2980011069a2d17a9fae3cd657a5c1650;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index a228a1b298..5ebe256346 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,91 +1,119 @@
 /*
-  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--2011 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 "lily-guile.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "item.hh"
 #include "span-bar.hh"
 #include "engraver.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
 {
-  Item * spanbar_p_;
-  Link_array<Item> 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();
-
+  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;
 }
 
+void
+Span_bar_engraver::acknowledge_bar_line (Grob_info i)
+{
+  int depth = i.origin_contexts (this).size ();
+  if (depth && !Span_bar::has_interface (i.grob ()))
+    {
+      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
-      && Bar::has_interface (i.elem_l_))
+  if (make_spanbar_)
     {
-      Item * it = dynamic_cast<Item*>(i.elem_l_);
-      bar_l_arr_.push (it);
-
-      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
-	{
-	  spanbar_p_ = new Item (get_property ("basicSpanBarProperties"));
-	  Span_bar::set_interface (spanbar_p_);
-	  spanbar_p_->set_elt_property ("glyph", bar_l_arr_[0]->get_elt_property ("glyph"));
-	  spanbar_p_->set_elt_property ("visibility-lambda",
-					bar_l_arr_[0]->get_elt_property ("visibility-lambda"));	  
-					
-	  spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
-	  spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
-
-	  announce_element (spanbar_p_,0);
-	}
+      Grob *vag = Grob::get_root_vertical_alignment (bars_[0]);
+      if (vag)
+        vector_sort (bars_, Grob::vertical_less);
+      spanbar_ = make_item ("SpanBar", SCM_EOL);
+
+      spanbar_->set_parent (bars_[0], X_AXIS);
+      for (vsize i = 0; i < bars_.size (); i++)
+        Span_bar::add_bar (spanbar_, 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++)
-	Span_bar::add_bar( spanbar_p_,bar_l_arr_[i]);
-      typeset_element (spanbar_p_);
-      spanbar_p_ =0;
+      vector_sort (bars_, Grob::vertical_less);
+      for (vsize 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_property (vissym);
+      if (ly_is_equal (spanbar_->internal_get_property (vissym), vis))
+        spanbar_->set_property (vissym, vis);
+
+      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 */
+                ""
+               );