resolve merge

[lilypond.git] / lily / global-context-scheme.cc

diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index d672178a54c3fda156dcc294ac348839596edcda..46bdae7b9097f9ec42f1703f5dcb1c98b22aea8b 100644 (file)
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -1,9 +1,20 @@
 /*
-  global-context-scheme.cc -- implement Global_context bindings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2009 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/>.
 */
 
 #include "cpu-timer.hh"
@@ -24,25 +35,25 @@ LY_DEFINE (ly_format_output, "ly:format-output",
           " in its final state.")
 {
   Global_context *g = dynamic_cast<Global_context *> (unsmob_context (context));
-  
-  LY_ASSERT_TYPE (unsmob_global_context, context, 1)
+
+  LY_ASSERT_TYPE (unsmob_global_context, context, 1);
 
   SCM output = g->get_output ();
   progress_indication ("\n");
 
   if (Music_output *od = unsmob_music_output (output))
     od->process ();
-  
+
   return output;
 }
 
 LY_DEFINE (ly_make_global_translator, "ly:make-global-translator",
-          1, 0, 0, (SCM global),
-          "Create a translator group and connect it to the global context"
-          " @var{global}.  The translator group is returned.")
+          1, 0, 0, (SCM global),
+          "Create a translator group and connect it to the global context"
+          " @var{global}.  The translator group is returned.")
 {
   Global_context *g = dynamic_cast<Global_context *> (unsmob_context (global));
-  LY_ASSERT_TYPE (unsmob_global_context, global, 1)
+  LY_ASSERT_TYPE (unsmob_global_context, global, 1);
 
   Translator_group *tg = new Translator_group ();
   tg->connect_to_context (g);
@@ -54,10 +65,10 @@ LY_DEFINE (ly_make_global_translator, "ly:make-global-translator",
 LY_DEFINE (ly_make_global_context, "ly:make-global-context",
           1, 0, 0, (SCM output_def),
           "Set up a global interpretation context, using the output"
-          " block @var{output_def}.  The context is returned.")
+          " block @var{output-def}.  The context is returned.")
 {
   LY_ASSERT_SMOB (Output_def, output_def, 1);
-  Output_def *odef = unsmob_output_def (output_def); 
+  Output_def *odef = unsmob_output_def (output_def);
 
   Global_context *glob = new Global_context (odef);