* scm/output-ps.scm (define-fonts): fix scaling.

[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 90079037149abefda213a2cae995123264391598..fd327454526507662986671947bea4bcde502876 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,37 +12,37 @@
 
 #include "string.hh"
 #include "lily-proto.hh"
+#include "lily-guile.hh"
 #include "virtual-methods.hh"
-#include "dictionary.hh"
+#include "smobs.hh"
+#include "input.hh"
 
 /**
-  Definition of how to output mudela. 
+  Definition of how to output lilypond.
  */
-class Music_output_def  
+class Music_output_def   
 {
-  Scope *translator_p_dict_p_;
 public:
-  Scope *scope_p_;
+  Scheme_hash_table * translator_tab_;
+  Input input_origin_;
   
-  Array<String> filename_str_arr_;
+  SCM scope_;
 
-
-
-  
+  virtual void derived_mark ();
   Music_output_def (Music_output_def const&);
   Music_output_def ();
-  virtual ~Music_output_def ();
-
-  VIRTUAL_COPY_CONS(Music_output_def);
+  VIRTUAL_COPY_CONSTRUCTOR (Music_output_def, Music_output_def);
+
+  Context *get_group_translator (String type) const;
+  void assign_context_def (SCM transdef);
+  SCM find_context_def (SCM name) const;
+  String outname_string () ;
+  SCM get_scmvar (String id) const;
+  SCM lookup_variable (SCM sym) const;
+  void set_variable (SCM, SCM sym);
   
-  virtual void print () 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*);
-  Translator * find_translator_l (String) const;
-  virtual int get_next_default_count () const;
+  DECLARE_SMOBS (Music_output_def,);
 };
 
+DECLARE_UNSMOB(Music_output_def,music_output_def);
 #endif // Music_output_DEF_HH