patch::: 1.1.17.mb1: Re: LilyPond Xmas release

[lilypond.git] / lily / include / music-output-def.hh

diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh
index 26dacffa31f17ae9a81400246664e90fca46cebd..bc83ff39aaeec7687d9c1fc9142701ec4f3d7294 100644 (file)
--- 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -21,22 +21,29 @@
  */
 class Music_output_def  
 {
+  Scope *translator_p_dict_p_;
 public:
-  Dictionary<Translator*> translator_p_dict_;
+  Scope *scope_p_;
+  
+  Array<String> filename_str_arr_;
+
+
+
   
   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*);
   Translator * find_translator_l (String) const;
+  virtual int get_next_default_count () const;
 };
 
 #endif // Music_output_DEF_HH