X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-output-def.hh;h=c19f9ce6feadd12b57a1f305cfcedb0d397db8b6;hb=bb36bac02a64770871780231ecc709cb18b20932;hp=29f4c11aaeaa225d7a1af7adb9bd3ff7ed342c64;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh
index 29f4c11aae..c19f9ce6fe 100644
--- a/lily/include/music-output-def.hh
+++ b/lily/include/music-output-def.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>
 */
 
 
@@ -13,32 +13,33 @@
 #include "string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
-#include "plist.hh"
 #include "dictionary.hh"
+#include "scm-hash.hh"
 
 /**
   Definition of how to output mudela. 
  */
 class Music_output_def  
 {
+  Scope *translator_p_dict_p_;
 public:
-  Dictionary<Translator*> translator_p_dict_;
+  Scope *scope_p_;
+  
   Array<String> filename_str_arr_;
-
-
+  Scheme_hash_table default_properties_;
   
   Music_output_def (Music_output_def const&);
   Music_output_def ();
   virtual ~Music_output_def ();
 
-  VIRTUAL_COPY_CONS(Music_output_def, Music_output_def);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS(Music_output_def);
+  
   virtual void print () const;
 
   Global_translator *get_global_translator_p ();
   Translator_group *get_group_translator_p (String type) const;
-  void assign_translator (String, Translator*);
-  String outfile_str_;
+  String get_default_output () const;
+  void assign_translator (Translator_group*);
   Translator * find_translator_l (String) const;
   virtual int get_next_default_count () const;
 };