Merge branch 'issue4032'

[lilypond.git] / lily / output-def.cc

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 0e29b23fb1933b2fa41bf24fdf79a69cc0c03f26..9c93dc68810907af158dc120a448637afa0c4f4c 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -1,9 +1,20 @@
 /*
-  music-output-def.cc -- implement Output_def
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--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 "output-def.hh"
@@ -31,7 +42,7 @@ Output_def::Output_def ()
 
   smobify_self ();
 
-  scope_ = ly_make_anonymous_module (false);
+  scope_ = ly_make_module (false);
 }
 
 Output_def::Output_def (Output_def const &s)
@@ -41,7 +52,7 @@ Output_def::Output_def (Output_def const &s)
   smobify_self ();
 
   input_origin_ = s.input_origin_;
-  scope_ = ly_make_anonymous_module (false);
+  scope_ = ly_make_module (false);
   if (ly_is_module (s.scope_))
     ly_module_copy (scope_, s.scope_);
 }
@@ -69,7 +80,7 @@ Output_def::mark_smob (SCM m)
 void
 assign_context_def (Output_def * m, SCM transdef)
 {
-  Context_def *tp = unsmob_context_def (transdef);
+  Context_def *tp = Context_def::unsmob (transdef);
   assert (tp);
 
   if (tp)
@@ -83,14 +94,14 @@ assign_context_def (Output_def * m, SCM transdef)
 SCM
 find_context_def (Output_def const *m, SCM name)
 {
-  Context_def *cd = unsmob_context_def (m->lookup_variable (name));
+  Context_def *cd = Context_def::unsmob (m->lookup_variable (name));
   return cd ? cd->self_scm () : SCM_EOL;
 }
 
 int
 Output_def::print_smob (SCM s, SCM p, scm_print_state *)
 {
-  Output_def * def = unsmob_output_def (s);
+  Output_def * def = Output_def::unsmob (s);
   scm_puts ("#< ", p);
   scm_puts (def->class_name (), p);
   scm_puts (">", p);
@@ -118,7 +129,7 @@ Output_def::lookup_variable (SCM sym) const
 }
 
 SCM
-Output_def::c_variable (string s) const
+Output_def::c_variable (const string &s) const
 {
   return lookup_variable (ly_symbol2scm (s.c_str ()));
 }