release: 1.3.33

[lilypond.git] / lily / include / repeat-engraver.hh

diff --git a/lily/include/repeat-engraver.hh b/lily/include/repeat-engraver.hh
index cef330a7187953b1a8b1acdf70d295bb6500123b..bd8bbd9237abdc3cbbccaaa0a90c0d99aa327e63 100644 (file)
--- a/lily/include/repeat-engraver.hh
+++ b/lily/include/repeat-engraver.hh
@@ -3,13 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef REPEAT_ENGRAVER_HH
 #define REPEAT_ENGRAVER_HH
 
 #include "engraver.hh"
+#include "cons.hh"
+
+struct Bar_create_event
+{
+  Moment when_;
+  bool bar_b_;
+  bool last_b_;
+  String type_;
+  Bar_create_event();
+  Bar_create_event (Moment w, String s);
+  Bar_create_event (Moment w, int i, int j);
+};
+
+int compare (Bar_create_event const & c1, Bar_create_event const &c2)
+{
+  return (c1.when_ - c2.when_).sign();
+}
 
 /**
   Generate repeat-bars |: :| for repeated-music
@@ -17,26 +34,28 @@
 class Repeat_engraver : public Engraver 
 {
 public:
-  Repeat_engraver ();
   VIRTUAL_COPY_CONS(Translator);
-  
+  Repeat_engraver ();
 protected:
   virtual void acknowledge_element (Score_element_info i);
   virtual void do_removal_processing ();
   virtual bool do_try_music (Music *req_l);
-  virtual void do_process_requests();
+  virtual void do_process_music();
   virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
+  virtual void do_post_move_processing ();
+  void queue_events ();
 
 private:
-  Link_array<Repeated_music> repeated_music_arr_;
-  Link_array<Music> alternative_music_arr_;
-  //  Link_array<Bar> bar_p_arr_;
-  Array<bool> bar_b_arr_;
-  Link_array<Volta_spanner> volta_p_arr_;
-  Array<Moment> stop_mom_arr_;
-  Array<Moment> alternative_start_mom_arr_;
-  Array<Moment> alternative_stop_mom_arr_;
+  Repeated_music *repeated_music_l_;
+  bool done_this_one_b_;
+
+  /*
+    Royal_brackla_create_queue is only two Whiskies away. :-)
+   */
+  Cons<Bar_create_event> *create_barmoments_queue_;
+
+  Volta_spanner * volta_span_p_;
+  Volta_spanner* end_volta_span_p_;
 };
 
 #endif // REPEAT_ENGRAVER_HH