Uniformize, internalize.

[lilypond.git] / lily / include / global-context.hh

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index f48f94313805301c779c6d7338a17769d8543e26..181ee87703f19c42ab0d5af3f530553bba6081a7 100644 (file)
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -16,11 +16,11 @@
 class Global_context : public virtual Context
 {
   PQueue<Moment> extra_mom_pq_;
-  Music_output_def*  output_def_;
+  Output_def*  output_def_;
   
-  friend class Music_output_def;
+  friend class Output_def;
 public:
-  Global_context (Music_output_def*, Moment final);
+  Global_context (Output_def*, Moment final, Object_key *key);
   int get_moments_left () const;
   Moment sneaky_insert_extra_moment (Moment);
   void add_moment_to_process (Moment);
@@ -34,8 +34,10 @@ public:
   virtual void prepare (Moment);
   virtual void one_time_step ();
   virtual void finish ();
-  virtual Music_output_def* get_output_def () const; 
+  virtual Output_def* get_output_def () const; 
   virtual Moment now_mom () const;
+  virtual Context *get_default_interpreter ();
+
 
   Moment previous_moment () const;
 protected:
@@ -44,6 +46,6 @@ protected:
   Moment now_mom_;
 };
 
-
+SCM ly_format_output (SCM, SCM);
 
 #endif // GLOBAL_CONTEXT_HH