* lily/skyline.cc (merge_skyline): new function

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 97784a82a980136b90e27b5bc44c2cc6e97fb407..81b95bbdf76500f7f5f44b2e2f2c070dc9e35d65 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -37,11 +37,8 @@ class Translator
   void init ();
 public:
   Music_output_def * output_def_;
-  String type_string_;
   
-  bool is_alias_b (String) const;
-    
-
+  bool is_alias_b (SCM) const;
   Translator (Translator const &);
 
   
@@ -62,21 +59,13 @@ public:
   SCM simple_trans_list_;
   SCM trans_group_list_;
   SCM definition_;
-  
   SCM properties_scm_;
   DECLARE_SMOBS (Translator, dummy);
 
+
 public:
+  Global_translator * top_translator () const;
   TRANSLATOR_DECLARATIONS(Translator);
-    /**
-    try to fit the request in this engraver
-
-    @return
-    false: not noted,  not taken.
-
-    true: request swallowed. Don't try to put the request elsewhere.
-
-    */
   virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
@@ -95,7 +84,6 @@ static void  _ ## T ## _adder () {\
       T *t = new T;\
       T::static_description_ = t->static_translator_description ();\
       scm_permanent_object (T::static_description_);\
-      t->type_string_ = classname (t);\
       add_translator (t);\
 }\
 SCM T::translator_description() const\
@@ -107,7 +95,7 @@ ADD_GLOBAL_CTOR (_ ## T ## _adder);
 
 
 
-#define ENTER_DESCRIPTION(classname,desc,grobs,acked,read,write)                                               \
+#define ENTER_DESCRIPTION(classname,desc,grobs,accepted,acked,read,write)                                              \
 ADD_THIS_TRANSLATOR (classname);\
 SCM                                                                                            \
 classname::static_translator_description () const \
@@ -124,6 +112,8 @@ classname::static_translator_description () const \
                                                                                                \
   static_properties= scm_acons (ly_symbol2scm ("interfaces-acked"),                            \
                              parse_symbol_list (acked), static_properties);                    \
+  static_properties= scm_acons (ly_symbol2scm ("events-accepted"),                             \
+                             parse_symbol_list (accepted), static_properties);                 \
                                                                                                \
   static_properties= scm_acons (ly_symbol2scm ("properties-read"),                             \
                              parse_symbol_list (read), static_properties);                     \
@@ -136,7 +126,6 @@ classname::static_translator_description () const \
 
 
 
-extern Dictionary<Translator*> *global_translator_dict;
 void add_translator (Translator*trans);
 
 Translator*get_translator (String s);