release: 1.5.29

[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 c19f9ce6feadd12b57a1f305cfcedb0d397db8b6..e585202a6e65eeedb35eb35ccaa800d8c28a0320 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,36 +12,39 @@
 
 #include "string.hh"
 #include "lily-proto.hh"
+#include "lily-guile.hh"
 #include "virtual-methods.hh"
-#include "dictionary.hh"
-#include "scm-hash.hh"
+#include "smobs.hh"
 
 /**
-  Definition of how to output mudela. 
+  Definition of how to output lilypond.
+
+  TODO: smobify, remove Music_output_def_identifier.
  */
 class Music_output_def  
 {
-  Scope *translator_p_dict_p_;
 public:
+  Scheme_hash_table * translator_tab_;
+  Scheme_hash_table * variable_tab_;  
+  Scope *translator_p_dict_p_;
   Scope *scope_p_;
+
+  SCM scaled_fonts_;
+  SCM style_sheet_;
   
-  Array<String> filename_str_arr_;
-  Scheme_hash_table default_properties_;
-  
+  VIRTUAL_COPY_CONS (Music_output_def);
   Music_output_def (Music_output_def const&);
   Music_output_def ();
-  virtual ~Music_output_def ();
-
-  VIRTUAL_COPY_CONS(Music_output_def);
-  
-  virtual void print () const;
+  virtual int get_next_score_count () const;
 
   Global_translator *get_global_translator_p ();
   Translator_group *get_group_translator_p (String type) const;
-  String get_default_output () const;
-  void assign_translator (Translator_group*);
-  Translator * find_translator_l (String) const;
-  virtual int get_next_default_count () const;
+  void assign_translator (SCM transdef);
+  SCM find_translator_l (SCM name) const;
+  String outname_str () ;
+  
+  DECLARE_SMOBS (Music_output_def,);
 };
 
+DECLARE_UNSMOB(Music_output_def,music_output_def);
 #endif // Music_output_DEF_HH