2003 -> 2004

[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 7d5872de6dd36e5dbbaa9a1325e91c4d30c7ecb2..340b47f40ed17209323e79789956688b086bae8e 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -18,33 +18,32 @@
 
 /**
   Definition of how to output lilypond.
-
-  TODO: smobify, remove Music_output_def_identifier.
  */
 class Music_output_def  
 {
 public:
   Scheme_hash_table * translator_tab_;
-  Scheme_hash_table * variable_tab_;  
-  Scope *translator_p_dict_p_;
-  Scope *scope_p_;
 
+  SCM scope_;
   SCM scaled_fonts_;
-  SCM style_sheet_;
   
-  VIRTUAL_COPY_CONS(Music_output_def);
+  VIRTUAL_COPY_CONS (Music_output_def);
   Music_output_def (Music_output_def const&);
   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;
+  Global_translator *get_global_translator ();
+  Translator_group *get_group_translator (String type) const;
   void assign_translator (SCM transdef);
-  SCM find_translator_l (SCM name) const;
-  String outname_str () ;
+  SCM find_translator (SCM name) const;
+  String outname_string () ;
+  SCM get_scmvar (String id)const;
+  SCM lookup_variable  (SCM sym) const;
+  void set_variable  (SCM, SCM sym);
+  
+  DECLARE_SMOBS (Music_output_def,);
+
   
-  DECLARE_SMOBS(Music_output_def,);
 };
 
-Music_output_def* unsmob_music_output_def (SCM);
+DECLARE_UNSMOB(Music_output_def,music_output_def);
 #endif // Music_output_DEF_HH