patch::: 1.3.93.jcn2

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index c84c109ec4fcdddb264287e43db8d0a8266aba5d..05f865082db658324bd60d73f03092f1c9e58f58 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -10,21 +10,20 @@
 #ifndef TRANSLATOR_HH
 #define TRANSLATOR_HH
 
-#include <typeinfo>
 #include "global-ctor.hh"
 #include "string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "lily-guile.hh"
-#include "dictionary.hh"
 #include "parray.hh"
 #include "input.hh"
-
+#include "smobs.hh"
 
 /** Make some kind of #Element#s from Requests. Elements are made by
   hierarchically grouped #Translator#s
   */
 class Translator : public Input {
+  void init ();
 public:
   Music_output_def * output_def_l_;
   String type_str_;
@@ -35,11 +34,10 @@ public:
   VIRTUAL_COPY_CONS(Translator);
   Translator (Translator const &);
   Translator ();
-  virtual ~Translator ();
   
   Translator_group * daddy_trans_l_ ;
  
-  void print () const;
+
   
   /**
     try to fit the request in this engraver
@@ -62,12 +60,21 @@ public:
     */
   Music_output_def *output_def_l () const;
 
-  SCM get_property (String) const;
+  SCM get_property (const char *) const;
   SCM get_property (SCM symbol) const;
   
   virtual Moment now_mom () const;  
 
-protected:
+  /*
+    ugh: bubbled up from Translator_group. 
+   */
+  SCM simple_trans_list_;
+  SCM trans_group_list_;
+  SCM definition_;
+  
+  SCM properties_scm_;
+  DECLARE_SMOBS(Translator, dummy);
+public:
   /*
     UGH. Clean this up.
    */
@@ -80,7 +87,8 @@ protected:
     PROCESSED_REQS,
     ACKED_REQS,
     MOVE_DONE
-  } status;
+  } status_;                   // junkme
+protected:
 
   /*    
        @see{try_request}
@@ -88,7 +96,6 @@ protected:
        */
   virtual void do_add_processing ();
   virtual bool do_try_music (Music *req_l);
-  virtual void do_print () const;
   virtual void do_pre_move_processing();
   virtual void do_post_move_processing();
   virtual void do_process_music () ;
@@ -114,5 +121,5 @@ extern Dictionary<Translator*> *global_translator_dict_p;
 void add_translator (Translator*trans_p);
 
 Translator*get_translator_l (String s);
-
+Translator *unsmob_translator (SCM);
 #endif // TRANSLATOR_HH