patch::: 1.1.23.jcn4: %-|

[lilypond.git] / lily / repeat-engraver.cc

diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc
index 3558b8d05ae8d1db908875a3e102a53961c53b58..472b849b0dc65a79c3a81e2c662e644b779ebbd9 100644 (file)
--- a/lily/repeat-engraver.cc
+++ b/lily/repeat-engraver.cc
@@ -16,7 +16,7 @@
 #include "repeated-music.hh"
 #include "time-description.hh"
 #include "volta-spanner.hh"
-//#include "note-column.hh"
+#include "note-column.hh"
 
 ADD_THIS_TRANSLATOR (Repeat_engraver);
 
@@ -29,8 +29,18 @@ Repeat_engraver::do_try_music (Music* m)
 {
   if (Repeated_music* r = dynamic_cast<Repeated_music *> (m))
     {
-      Moment stop_mom = now_moment () + r->repeat_p_->duration () 
-        + r->alternative_p_->music_p_list_p_->top ()->duration ();
+      r->unfold_b_ = get_property ("unfoldRepeats", 0).to_bool ();
+      if (r->unfold_b_)
+        return true;
+ 
+      Music_sequence* alt = r->alternative_p_;
+      Moment stop_mom = now_moment () + r->repeat_p_->duration ();
+      for (PCursor<Music*> i (alt->music_p_list_p_->top ()); i.ok () && (i != alt->music_p_list_p_->bottom ()); i++)
+       {
+         stop_mom += i->duration ();
+         if (dynamic_cast<Simultaneous_music *> (alt))
+           break;
+       }
       Moment alt_mom = now_moment () + r->repeat_p_->duration ();
       /*
         TODO: 
@@ -47,12 +57,13 @@ Repeat_engraver::do_try_music (Music* m)
          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->duration ());
+         if (!dynamic_cast<Simultaneous_music *> (alt))
+           alt_mom += i->duration ();
        }
       return true;
     }
@@ -63,11 +74,16 @@ void
 Repeat_engraver::acknowledge_element (Score_element_info i)
 {
   Moment now = now_moment ();
-//  if (Note_column *c = dynamic_cast<Note_column *> (i.elem_l_))
+  if (Note_column *c = dynamic_cast<Note_column *> (i.elem_l_))
+    {
+      for (int i = 0; i < volta_p_arr_.size (); 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);
     }
 }
@@ -86,15 +102,15 @@ Repeat_engraver::do_removal_processing ()
 void
 Repeat_engraver::do_process_requests ()
 {  
+  Moment now = now_moment ();
   for (int i = bar_p_arr_.size (); i < repeated_music_arr_.size (); i++)
     {
       Bar* bar_p = new Bar;
       bar_p-> type_str_ = "|:";
       bar_p_arr_.push (bar_p);
-      announce_element (Score_element_info (bar_p, repeated_music_arr_[i])); 
+      if (now > Moment (0))
+       announce_element (Score_element_info (bar_p, repeated_music_arr_[i])); 
     }
-#if 0 //urg, try pre-ceating and announcing 
-  Moment now = now_moment ();
   for (int i = 0; i < bar_p_arr_.size (); i++)
     {
       if (!bar_p_arr_[i] && (now >= stop_mom_arr_[i]))
@@ -105,7 +121,6 @@ Repeat_engraver::do_process_requests ()
          announce_element (Score_element_info (bar_p, repeated_music_arr_[i]));
        }
     }
-#endif
   int bees = volta_p_arr_.size ();
   for (int i = volta_p_arr_.size (); i < alternative_music_arr_.size (); i++)
     {
@@ -123,60 +138,63 @@ Repeat_engraver::do_process_requests ()
 void 
 Repeat_engraver::do_pre_move_processing ()
 {
+  Moment now = now_moment ();
   for (int i = bar_p_arr_.size (); i--; )
     {
       if (bar_p_arr_[i])
         {
-         typeset_element (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 (now >= stop_mom_arr_[i])
+       {
+         bar_p_arr_.del (i);
+         stop_mom_arr_.del (i);
+         repeated_music_arr_.del (i);
+       }
     }
-  Moment now = now_moment ();
+  Time_description const *time = get_staff_info().time_C_;
   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] && (now > alternative_stop_mom_arr_[i])
+                 // && !time->whole_in_measure_
+                 // && (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 ()
 {
+#if 0
+  Time_description const *time = get_staff_info().time_C_;
   Moment now = now_moment ();
-  for (int i = bar_p_arr_.size (); i--; )
+  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
 }