patch::: 1.3.85.jcn5

[lilypond.git] / lily / include / global-translator.hh

diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh
index 7028dbc92fafaf8bb2428eb8775ad3cf9a3f81b2..ebcb6b34e9f582066137192beec99e64cf267aa7 100644 (file)
--- a/lily/include/global-translator.hh
+++ b/lily/include/global-translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,31 +11,35 @@
 #define GLOBAL_TRANSLATOR_HH
 
 #include "translator-group.hh"
-#include "rational.hh"
+#include "moment.hh"
 #include "pqueue.hh"
 
+
 class Global_translator : public virtual Translator_group{
   PQueue<Moment> extra_mom_pq_;
 public:
   VIRTUAL_COPY_CONS(Translator);
-  Moment last_mom_;
+  Moment final_mom_;
+  Moment prev_mom_;
   Moment now_mom_;
   Global_translator();
 
   int moments_left_i() const;
   void modify_next (Moment&);
   void add_moment_to_process (Moment);
-
+  void run_iterator_on_me (Music_iterator*);
+  
   virtual Music_output *get_output_p ();     
   virtual void prepare (Moment);
-  virtual void process() {}
-  virtual void finish() {}
-  virtual void start() {}
+  virtual void process();
+  virtual void finish();
+  virtual void start();
+
+  virtual Moment now_mom () const;
 
   
 protected:
-  virtual Moment now_mom () const;
-  virtual Global_translator *global_l() { return this; }
+
 };