source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "lily-guile.hh"
#include "span-bar.hh"
#include "base-span-bar-engraver.hh"
-#include "vertical-align-spanner.hh"
+#include "axis-align-spanner.hh"
Base_span_bar_engraver::Base_span_bar_engraver()
{
spanbar_p_ =0;
- valign_l_ =0;
use_priority_b_ = true;
break_priority_i_ = 0;
}
void
Base_span_bar_engraver::acknowledge_element (Score_element_info i)
{
- int depth = i.origin_grav_l_arr_.size();
+ int depth = i.origin_trans_l_arr_.size();
if (depth > 1
&& dynamic_cast<Bar *> (i.elem_l_))
{
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
*/
{
spanbar_p_ = get_span_bar_p();
+ spanbar_p_->dim_cache_[Y_AXIS]->parent_l_ = bar_l_arr_[0]->dim_cache_[Y_AXIS];
+ String visnam = String(name()) + "_visibility";
+
+ spanbar_p_->set_elt_property (visibility_lambda_scm_sym,
+ gh_eval_str (visnam.ch_C()));
if (use_priority_b_)
{
- spanbar_p_->break_priority_i_ = break_priority_i_;
+ spanbar_p_->set_elt_property (break_priority_scm_sym,
+ gh_int2scm (break_priority_i_));
}
else
{
- spanbar_p_->dim_cache_[X_AXIS].parent_l_ = &bar_l_arr_[0]->dim_cache_[X_AXIS];
+ spanbar_p_->dim_cache_[X_AXIS]->parent_l_ = bar_l_arr_[0]->dim_cache_[X_AXIS];
}
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_);
- }
}
void
{
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;
}