release: 1.3.118

[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 b19f89ca32798b95b5c8d453a3af2db878625482..503a1c8105f57c15b5be3c53466f7b517ad04500 100644 (file)
--- a/lily/include/music-output-def.hh
+++ b/lily/include/music-output-def.hh
@@ -14,6 +14,7 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 #include "virtual-methods.hh"
+#include "smobs.hh"
 
 /**
   Definition of how to output lilypond.
@@ -23,21 +24,28 @@
 class Music_output_def  
 {
 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_;
+  
   VIRTUAL_COPY_CONS(Music_output_def);
   Music_output_def (Music_output_def const&);
   Music_output_def ();
-  virtual ~Music_output_def ();
   virtual int get_next_default_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 (SCM transdef);
   SCM find_translator_l (SCM name) const;
+  String base_output_str () ;
+  
+  DECLARE_SMOBS(Music_output_def,);
 };
 
+Music_output_def* unsmob_music_output_def (SCM);
 #endif // Music_output_DEF_HH