/*
- span-bar-grav.cc -- implement Span_bar_engraver
+ span-bar-engraver.cc -- implement Span_bar_engraver
source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "bar-line.hh"
#include "span-bar.hh"
#include "engraver.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_;
+ vector<Item*> bars_;
public:
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 ();
};
Span_bar_engraver::Span_bar_engraver ()
}
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 && Bar_line::has_interface (i.grob ()))
{
- 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_)
+ if (bars_.size () >= 2 && !spanbar_)
{
spanbar_ = make_item ("SpanBar", SCM_EOL);
spanbar_->set_parent (bars_[0], X_AXIS);
-
}
}
}
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]);
+ 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_c_equal_p (spanbar_->internal_get_property (vissym), vis))
- spanbar_->internal_set_property (vissym, vis);
+ 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;
}
- bars_.set_size (0);
+ bars_.resize (0);
}
+#include "translator.icc"
+ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
ADD_TRANSLATOR (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 */ "");
+ /* doc */
+ "Make cross-staff bar lines: It catches all normal bar lines"
+ " and draws a single span bar across them.",
+
+ /* create */
+ "SpanBar ",
+
+ /* read */
+ "",
+
+ /* write */
+ ""
+ );