Run grand-replace (issue 3765)

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index fb537a3db299c83d0860b7f85991d7a006662555..1f26b8473b46de1d25165dd2812a96e39182a418 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 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
@@ -44,7 +44,6 @@ Score::origin () const
   return unsmob_input (input_location_);
 }
 
-
 Score::Score ()
 {
   header_ = SCM_EOL;
@@ -79,7 +78,7 @@ Score::mark_smob (SCM s)
 }
 
 int
-Score::print_smob (SCM, SCM p, scm_print_state*)
+Score::print_smob (SCM, SCM p, scm_print_state *)
 {
   scm_puts ("#<Score>", p);
 
@@ -94,7 +93,7 @@ Score::Score (Score const &s)
   error_found_ = s.error_found_;
 
   smobify_self ();
-  input_location_ = make_input (*s.origin ()); 
+  input_location_ = make_input (*s.origin ());
 
   Music *m = unsmob_music (s.music_);
   if (m)
@@ -111,12 +110,11 @@ Score::Score (Score const &s)
       defs_.push_back (copy);
       copy->unprotect ();
     }
-  header_ = ly_make_anonymous_module (false);
+  header_ = ly_make_module (false);
   if (ly_is_module (s.header_))
     ly_module_copy (header_, s.header_);
 }
 
-
 /*
   Format score, return list of Music_output objects.
 
@@ -124,50 +122,46 @@ Score::Score (Score const &s)
 */
 SCM
 Score::book_rendering (Output_def *layoutbook,
-                      Output_def *default_def)
+                       Output_def *default_def)
 {
   if (error_found_)
     return SCM_EOL;
 
-  SCM scaled_bookdef = SCM_EOL;
   Real scale = 1.0;
 
   if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
     scale = scm_to_double (layoutbook->c_variable ("output-scale"));
 
   SCM outputs = SCM_EOL;
-  SCM *tail = &outputs;
 
   int outdef_count = defs_.size ();
 
   for (int i = 0; !i || i < outdef_count; i++)
     {
       Output_def *def = outdef_count ? defs_[i] : default_def;
-      SCM scaled = SCM_EOL;
+      SCM scaled = def->self_scm ();
 
       if (def->c_variable ("is-layout") == SCM_BOOL_T)
-       {
-         def = scale_output_def (def, scale);
-         def->parent_ = layoutbook;
+        {
+          def = scale_output_def (def, scale);
+          def->parent_ = layoutbook;
 
-         scaled = def->unprotect ();
-       }
+          scaled = def->unprotect ();
+        }
 
       /* TODO: fix or junk --no-layout.  */
-      SCM context = ly_run_translator (music_, def->self_scm ());
+      SCM context = ly_run_translator (music_, scaled);
       if (dynamic_cast<Global_context *> (unsmob_context (context)))
-       {
-         SCM s = ly_format_output (context);
+        {
+          SCM s = ly_format_output (context);
 
-         *tail = scm_cons (s, SCM_EOL);
-         tail = SCM_CDRLOC (*tail);
-       }
+          outputs = scm_cons (s, outputs);
+        }
 
       scm_remember_upto_here_1 (scaled);
     }
 
-  scm_remember_upto_here_1 (scaled_bookdef);
-  return outputs;
+  return scm_reverse_x (outputs, SCM_EOL);
 }
 
 void
@@ -184,7 +178,7 @@ Score::set_music (SCM music)
       m->origin ()->error (_ ("errors found, ignoring music expression"));
 
       this->error_found_ = this->error_found_
-       || to_boolean (m->get_property ("error-found"));
+                           || to_boolean (m->get_property ("error-found"));
     }
 
   if (this->error_found_)