release: 0.0.73pre

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 0dc7047f181799d8f1cf80926f05f04bb9c34cdb..65219628f030476b1af73056874ba6c7dff782b4 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -1,5 +1,5 @@
 /*
-  acceptor.hh -- declare Translator
+  translator.hh -- declare Translator
 
   source file of the GNU LilyPond music typesetter
 
@@ -7,12 +7,11 @@
 */
 
 
-#ifndef ACCEPTOR_HH
-#define ACCEPTOR_HH
+#ifndef TRANSLATOR_HH
+#define TRANSLATOR_HH
 
 #include "string.hh"
 #include "lily-proto.hh"
-#include "interpreter.hh"
 #include "virtual-methods.hh"
 
 class Translator {
@@ -21,10 +20,12 @@ public:
     
     int iterator_count_;
     
-    virtual Interpreter * interpreter_l() { return 0; }
+    virtual Global_translator *global_l() { return 0; }
 
     /// Score_register = 0, Staff_registers = 1, etc)
     virtual int depth_i()const=0;
+    virtual bool is_bottom_engraver_b() const { return false; }
+    virtual bool try_request(Request*);
     virtual Translator *find_get_translator_l(String name, String id)=0;
     virtual Translator *ancestor_l(int l=1)=0;
     virtual ~Translator(){}
@@ -33,8 +34,4 @@ public:
     virtual Translator *get_default_interpreter()=0;
 };
 
-class Interpreter : public virtual Translator {
-public:
-    virtual bool interpret_request_b(Request*) { return false;}
-};
-#endif // ACCEPTOR_HH
+#endif // TRANSLATOR_HH