patch::: 1.3.33.jcn3

[lilypond.git] / lily / include / auto-beam-engraver.hh

diff --git a/lily/include/auto-beam-engraver.hh b/lily/include/auto-beam-engraver.hh
index 18b5ffceb042cb38dbe899319d7a77cd5c236e49..b5aec56fb1fed328fcdd67369de6cc9a980e5e85 100644 (file)
--- a/lily/include/auto-beam-engraver.hh
+++ b/lily/include/auto-beam-engraver.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -19,16 +19,17 @@ public:
   VIRTUAL_COPY_CONS (Translator);
 
 protected:
+  virtual bool do_try_music (Music*);
   virtual void do_pre_move_processing ();
   virtual void do_post_move_processing ();
   virtual void do_removal_processing ();
   virtual void acknowledge_element (Score_element_info);
-  virtual void do_process_requests ();
+  virtual void do_process_music ();
   virtual void process_acknowledged ();
-
+  virtual void do_creation_processing ();
 private:
   void begin_beam ();
-  void consider_end_and_begin ();
+  void consider_end_and_begin (Moment test_mom);
   Beam* create_beam_p ();
   void end_beam ();
   void junk_beam ();
@@ -38,12 +39,18 @@ private:
   Moment shortest_mom_;
   Beam *finished_beam_p_;
   Array<Stem*>* stem_l_arr_p_;
+  
   Moment last_add_mom_;
   Moment extend_mom_;
+
+
+  Moment beam_start_moment_;
+  Moment beam_start_location_;
   
+  Timing_translator * timer_l_;
   // We act as if beam were created, and start a grouping anyway.
-  Rhythmic_grouping*grouping_p_;
-  Rhythmic_grouping*finished_grouping_p_;
+  Beaming_info_list*grouping_p_;  
+  Beaming_info_list*finished_grouping_p_;
 };
 
 #endif /* AUTO_BEAM_ENGRAVER_HH */