#include "repeat-engraver.hh"
#include "bar.hh"
+#include "bar-engraver.hh"
#include "musical-request.hh"
#include "multi-measure-rest.hh"
#include "command-request.hh"
#include "time-description.hh"
#include "volta-spanner.hh"
#include "note-column.hh"
+#include "paper-def.hh"
ADD_THIS_TRANSLATOR (Repeat_engraver);
{
if (Repeated_music* r = dynamic_cast<Repeated_music *> (m))
{
- r->unfold_b_ = get_property ("unfoldRepeats").to_bool ();
+ r->unfold_b_ = get_property ("unfoldRepeats", 0).to_bool ();
if (r->unfold_b_)
return true;
- Moment stop_mom = now_moment () + r->repeat_p_->duration ()
- + r->alternative_p_->music_p_list_p_->top ()->duration ();
- Moment alt_mom = now_moment () + r->repeat_p_->duration ();
+ Music_sequence* alt = r->alternative_p_;
+ Moment stop_mom = now_mom () + r->repeat_p_->length_mom ();
+ for (PCursor<Music*> i (alt->music_p_list_p_->top ()); i.ok () && (i != alt->music_p_list_p_->bottom ()); i++)
+ {
+ stop_mom += i->length_mom ();
+ if (dynamic_cast<Simultaneous_music *> (alt))
+ break;
+ }
+ Moment alt_mom = now_mom () + r->repeat_p_->length_mom ();
/*
TODO:
figure out what we don't want.
return false;
repeated_music_arr_.push (r);
stop_mom_arr_.push (stop_mom);
- for (PCursor<Music*> i (r->alternative_p_->music_p_list_p_->top ()); i.ok (); i++)
+ for (PCursor<Music*> i (alt->music_p_list_p_->top ()); i.ok (); i++)
{
alternative_music_arr_.push (i.ptr ());
alternative_start_mom_arr_.push (alt_mom);
- alt_mom += i->duration ();
- alternative_stop_mom_arr_.push (alt_mom);
+ alternative_stop_mom_arr_.push (alt_mom + i->length_mom ());
+ if (!dynamic_cast<Simultaneous_music *> (alt))
+ alt_mom += i->length_mom ();
}
return true;
}
void
Repeat_engraver::acknowledge_element (Score_element_info i)
{
- Moment now = now_moment ();
+ Moment now = now_mom ();
if (Note_column *c = dynamic_cast<Note_column *> (i.elem_l_))
{
for (int i = 0; i < volta_p_arr_.size (); i++)
- if ((now >= alternative_start_mom_arr_[i]) && volta_p_arr_[i])
+ if (volta_p_arr_[i] && (now >= alternative_start_mom_arr_[i]))
volta_p_arr_[i]->add_column (c);
}
if (Bar *c = dynamic_cast<Bar*> (i.elem_l_))
{
for (int i = 0; i < volta_p_arr_.size (); i++)
- if ((now >= alternative_start_mom_arr_[i]) && volta_p_arr_[i])
+ if (volta_p_arr_[i] && (now >= alternative_start_mom_arr_[i]))
volta_p_arr_[i]->add_column (c);
}
}
void
Repeat_engraver::do_removal_processing ()
{
- for (int i = 0; i < bar_p_arr_.size (); i++)
- if (bar_p_arr_[i])
- typeset_element (bar_p_arr_[i]);
for (int i = 0; i < volta_p_arr_.size (); i++)
if (volta_p_arr_[i])
typeset_element (volta_p_arr_[i]);
void
Repeat_engraver::do_process_requests ()
{
- Moment now = now_moment ();
- for (int i = bar_p_arr_.size (); i < repeated_music_arr_.size (); i++)
+ Moment now = now_mom ();
+ Bar_engraver* bar_engraver_l = dynamic_cast <Bar_engraver*>
+ (daddy_grav_l ()->get_simple_translator ("Bar_engraver"));
+ for (int i = bar_b_arr_.size (); i < repeated_music_arr_.size (); i++)
{
- Bar* bar_p = new Bar;
- bar_p-> type_str_ = "|:";
- bar_p_arr_.push (bar_p);
- if (now > Moment (0))
- announce_element (Score_element_info (bar_p, repeated_music_arr_[i]));
+ if (bar_engraver_l && (now > Moment (0)))
+ bar_engraver_l->request_bar ("|:");
+ bar_b_arr_.push (true);
}
-#if 0 //urg, try pre-ceating and announcing
- for (int i = 0; i < bar_p_arr_.size (); i++)
+ for (int i = 0; i < bar_b_arr_.size (); i++)
{
- if (!bar_p_arr_[i] && (now >= stop_mom_arr_[i]))
+ if (!bar_b_arr_[i] && (now >= stop_mom_arr_[i]))
{
- Bar* bar_p = new Bar;
- bar_p-> type_str_ = ":|";
- bar_p_arr_[i] = bar_p;
- announce_element (Score_element_info (bar_p, repeated_music_arr_[i]));
+ if (bar_engraver_l)
+ bar_engraver_l->request_bar (":|");
}
}
-#endif
int bees = volta_p_arr_.size ();
for (int i = volta_p_arr_.size (); i < alternative_music_arr_.size (); i++)
{
Volta_spanner* v = new Volta_spanner;
+ Scalar prop = get_property ("voltaVisibility", 0);
+ v->visible_b_ = prop.to_bool ();
if (i == alternative_music_arr_.size () - 1)
v->last_b_ = true;
Text_def* t = new Text_def;
- t->text_str_ = to_str (i - bees + 1);
+ t->text_str_ = to_str (i - bees + 1) + ".";
v->number_p_.set_p (t);
volta_p_arr_.push (v);
announce_element (Score_element_info (v, alternative_music_arr_[i]));
void
Repeat_engraver::do_pre_move_processing ()
{
- Moment now = now_moment ();
- for (int i = bar_p_arr_.size (); i--; )
+ Moment now = now_mom ();
+ for (int i = bar_b_arr_.size (); i--; )
{
- if (bar_p_arr_[i])
- {
- if (now > Moment (0))
- typeset_element (bar_p_arr_[i]);
- else
- delete bar_p_arr_[i];
- bar_p_arr_[i] = 0;
+ if (bar_b_arr_[i])
+ bar_b_arr_[i] = false;
+ if (now >= stop_mom_arr_[i])
+ {
+ bar_b_arr_.del (i);
+ stop_mom_arr_.del (i);
+ repeated_music_arr_.del (i);
}
}
for (int i = volta_p_arr_.size (); i--; )
{
- if (now >= alternative_stop_mom_arr_[i])
+ if (volta_p_arr_[i] && (now >= alternative_stop_mom_arr_[i])
+ && (volta_p_arr_[i]->column_arr_.size () >= 1))
{
- if (volta_p_arr_[i])
- {
- typeset_element (volta_p_arr_[i]);
- volta_p_arr_[i] = 0;
- }
- }
+ typeset_element (volta_p_arr_[i]);
+ volta_p_arr_[i] = 0;
+ volta_p_arr_.del (i);
+ alternative_music_arr_[i] = 0;
+ alternative_music_arr_.del (i);
+ alternative_start_mom_arr_.del (i);
+ alternative_stop_mom_arr_.del (i);
+ }
}
}
void
Repeat_engraver::do_post_move_processing ()
{
- Moment now = now_moment ();
- for (int i = bar_p_arr_.size (); i--; )
+#if 0
+ Time_description const *time = get_staff_info().time_C_;
+ Moment now = now_mom ();
+ for (int i = volta_p_arr_.size (); i--; )
{
-#if 0 // urg, try with pre-created and annouced :|
- if (now >= stop_mom_arr_[i])
- {
- if (bar_p_arr_[i])
- {
- typeset_element (bar_p_arr_[i]);
- bar_p_arr_.del (i);
- stop_mom_arr_.del (i);
- repeated_music_arr_.del (i);
- }
- else
- {
- bar_p_arr_.del (i);
- }
- }
-#else
- if (now >= stop_mom_arr_[i])
- {
- Bar* bar_p = new Bar;
- bar_p-> type_str_ = ":|";
- typeset_element (bar_p);
- bar_p_arr_.del (i);
- stop_mom_arr_.del (i);
- repeated_music_arr_.del (i);
+ if ((now > alternative_stop_mom_arr_[i])
+ && !time->whole_in_measure_)
+ {
+ volta_p_arr_[i] = 0;
+ volta_p_arr_.del (i);
+ alternative_music_arr_[i] = 0;
+ alternative_music_arr_.del (i);
+ alternative_start_mom_arr_.del (i);
+ alternative_stop_mom_arr_.del (i);
}
-#endif
}
+#endif
}
projects / lilypond.git / blobdiff