* lily/music-output-def.cc (Music_output_def): remove separate

[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 b01a7e8a3f6313f2e088f72cd8e025152ba13e1f..d95ee038bc745c6bf0feb3557b083b4f7e668aac 100644 (file)
--- a/lily/include/music-output-def.hh
+++ b/lily/include/music-output-def.hh
@@ -3,49 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#ifndef Music_output_DEF_HH
-#define Music_output_DEF_HH
+#ifndef MUSIC_OUTPUT_DEF_HH
+#define MUSIC_OUTPUT_DEF_HH
 
 #include "string.hh"
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 #include "virtual-methods.hh"
 #include "smobs.hh"
+#include "input.hh"
 
 /**
   Definition of how to output lilypond.
  */
-class Music_output_def  
+class Music_output_def   
 {
 public:
-  Scheme_hash_table * translator_tab_;
-
+  Input input_origin_;
   SCM scope_;
-  SCM scaled_fonts_;
-  SCM style_sheet_;
-  
-  VIRTUAL_COPY_CONS (Music_output_def);
+
+  void assign_context_def (SCM transdef);
+  SCM find_context_def (SCM name) const;
+
   Music_output_def (Music_output_def const&);
   Music_output_def ();
-  virtual int get_next_score_count () const;
+  VIRTUAL_COPY_CONSTRUCTOR (Music_output_def, Music_output_def);
 
-  Global_translator *get_global_translator ();
-  Translator_group *get_group_translator (String type) const;
-  void assign_translator (SCM transdef);
-  SCM find_translator (SCM name) const;
+  Context *get_group_translator (String type) const;
   String outname_string () ;
-  SCM get_scmvar (String id)const;
-  SCM lookup_variable  (SCM sym) const;
-  void set_variable  (SCM, SCM sym);
-  
+  SCM c_variable (String id) const;
+  SCM lookup_variable (SCM sym) const;
+  void set_variable (SCM, SCM sym);
   DECLARE_SMOBS (Music_output_def,);
-
-  
 };
 
-DECLARE_UNSMOB(Music_output_def,music_output_def);
-#endif // Music_output_DEF_HH
+DECLARE_UNSMOB (Music_output_def, music_output_def);
+
+#endif /* MUSIC_OUTPUT_DEF_HH */