X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=55ef59e32e40f656388f06b27f7cdf42a6a03b06;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=ff7bdd65dc4466eb55b1578243f383d85f505cab;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index ff7bdd65dc..55ef59e32e 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,88 +1,117 @@
 /*
-  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--1998 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 "span-bar.hh"
-#include "span-bar-engraver.hh"
-#include "vertical-align-spanner.hh"
+#include "item.hh"
+#include "engraver.hh"
+#include "pointer-group-interface.hh"
+#include "lily-imports.hh"
 
-Span_bar_engraver::Span_bar_engraver()
-{
-  spanbar_p_ =0;
-  valign_l_ =0;
-}
+#include "translator.icc"
+
+/**
 
-Span_bar*
-Span_bar_engraver::get_span_bar_p() const
+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_;
+  bool make_spanbar_;
+  vector<Item *> bars_;
+
+public:
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
+protected:
+  void acknowledge_bar_line (Grob_info);
+  void stop_translation_timestep ();
+  void process_acknowledged ();
+};
+
+Span_bar_engraver::Span_bar_engraver (Context *c)
+  : Engraver (c)
 {
-  return new Span_bar;
+  spanbar_ = 0;
+  make_spanbar_ = false;
 }
 
-
 void
-Span_bar_engraver::do_creation_processing ()
+Span_bar_engraver::acknowledge_bar_line (Grob_info i)
 {
+  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::do_removal_processing ()
+Span_bar_engraver::process_acknowledged ()
 {
-}    
+  if (make_spanbar_)
+    {
+      spanbar_ = make_item ("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::acknowledge_element (Score_element_info i)
+Span_bar_engraver::stop_translation_timestep ()
 {
-  int depth = i.origin_grav_l_arr_.size();
-  if (depth > 1
-      && dynamic_cast<Bar *> (i.elem_l_)) 
+  if (spanbar_)
     {
-      bar_l_arr_.push (dynamic_cast<Bar *> (i.elem_l_));
-	
-      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
-	/*
-	  hmm, i do want a bracket with one staff some times, but not always
-	  if (bar_l_arr_.size() >= 1 && !spanbar_p_)
-
-	  --jcn
-	*/
-
-	/*
-
-	  use a property?  get_property ("singleStaffBracket") ?
-
-	  --hwn
-	 */
-	{
-	  spanbar_p_ = get_span_bar_p();
-	  announce_element (Score_element_info (spanbar_p_,0));
-	  spanbar_p_-> type_str_ = bar_l_arr_[0]->type_str_;
-	}
-    }
-  else if  (dynamic_cast<Vertical_align_spanner *> (i.elem_l_) 
-	    && i.origin_grav_l_arr_.size() <= 2) 
-    {
-      valign_l_ = dynamic_cast<Vertical_align_spanner *> (i.elem_l_);
+      SCM vis = bars_[0]->get_property ("break-visibility");
+      if (ly_is_equal (spanbar_->get_property ("break-visibility"), vis))
+        spanbar_->set_property ("break-visibility", vis);
+      Lily::span_bar_notify_grobs_of_my_existence (spanbar_->self_scm ());
+      spanbar_ = 0;
     }
+  bars_.resize (0);
 }
 
 void
-Span_bar_engraver::do_pre_move_processing()
+Span_bar_engraver::boot ()
 {
-  if (spanbar_p_) 
-    {
-      for (int i=0; i < bar_l_arr_.size() ; i++)
-	spanbar_p_->add_bar (bar_l_arr_[i]);
-      spanbar_p_->set_align (valign_l_);
-      typeset_element (spanbar_p_);
-      spanbar_p_ =0;
-    }
-  bar_l_arr_.set_size (0);
+  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 */
+                "",
 
-ADD_THIS_TRANSLATOR(Span_bar_engraver);
+                /* write */
+                ""
+               );