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

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 158663a979..5ebe256346 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  span-bar-engraver.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--2006 Han-Wen Nienhuys <hanwen@xs4all.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 "bar-line.hh"
@@ -22,35 +33,51 @@ dependencies to the spanbars.
 class Span_bar_engraver : public Engraver
 {
   Item *spanbar_;
-  Link_array<Item> bars_;
+  bool make_spanbar_;
+  vector<Item *> bars_;
 
 public:
   TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
   DECLARE_ACKNOWLEDGER (bar_line);
   void stop_translation_timestep ();
+  void process_acknowledged ();
 };
 
 Span_bar_engraver::Span_bar_engraver ()
 {
   spanbar_ = 0;
+  make_spanbar_ = false;
 }
 
 void
 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 && !Span_bar::has_interface (i.grob ()))
     {
       Item *it = dynamic_cast<Item *> (i.grob ());
       bars_.push_back (it);
 
       if (bars_.size () >= 2 && !spanbar_)
-	{
-	  spanbar_ = make_item ("SpanBar", SCM_EOL);
+        make_spanbar_ = true;
+    }
+}
+
+void
+Span_bar_engraver::process_acknowledged ()
+{
+  if (make_spanbar_)
+    {
+      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);
-	}
+      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;
     }
 }
 
@@ -59,13 +86,14 @@ Span_bar_engraver::stop_translation_timestep ()
 {
   if (spanbar_)
     {
+      vector_sort (bars_, Grob::vertical_less);
       for (vsize i = 0; i < bars_.size (); i++)
-	Span_bar::add_bar (spanbar_, bars_[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_->internal_set_property (vissym, vis);
+        spanbar_->set_property (vissym, vis);
 
       spanbar_ = 0;
     }
@@ -76,9 +104,16 @@ Span_bar_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
 ADD_TRANSLATOR (Span_bar_engraver,
-		/* doc */ "This engraver makes cross-staff barlines: It catches all normal "
-		"bar lines, and draws a single span-bar across them.",
-		/* create */ "SpanBar",
-		/* accept */ "",
-		/* read */ "",
-		/* write */ "");
+                /* doc */
+                "Make cross-staff bar lines: It catches all normal bar lines"
+                " and draws a single span bar across them.",
+
+                /* create */
+                "SpanBar ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );