X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fglobal-context.hh;h=75b52c95ae01f9fd943e46ed65add4fd4615be99;hb=cee6cea4ed55eb4fa1f9d83c997ebc19744a6e1a;hp=2fcbfca2982cc7ff770d9a862dd36fe43efa122a;hpb=c5a3f0c024f4cb629811cff9eb04abff36e94138;p=lilypond.git

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index 2fcbfca298..75b52c95ae 100644
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -1,9 +1,20 @@
 /*
-  global-context.hh -- declare Global_context
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef GLOBAL_CONTEXT_HH
@@ -12,12 +23,12 @@
 #include "context.hh"
 #include "pqueue.hh"
 
-class Global_context : public virtual Context
+class Global_context : public Context
 {
   PQueue<Moment> extra_mom_pq_;
   Output_def *output_def_;
 
-  DECLARE_CLASSNAME(Global_context);
+  DECLARE_CLASSNAME (Global_context);
 
   friend class Output_def;
 public:
@@ -31,11 +42,11 @@ public:
   void apply_finalizations ();
   void add_finalization (SCM);
 
-  DECLARE_LISTENER (prepare);
+  void prepare (SCM);
   virtual SCM get_output ();
   virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
-  virtual Context *get_default_interpreter ();
+  virtual Context *get_default_interpreter (const string &context_id = "");
 
   Moment previous_moment () const;
 protected:
@@ -44,6 +55,5 @@ protected:
 };
 
 SCM ly_format_output (SCM);
-Global_context *unsmob_global_context (SCM x);
 
 #endif // GLOBAL_CONTEXT_HH