Run grand replace for 2015.

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index 84f236864d4b07869eb6aa024c03424a155dab6d..3a1232d2a268034c7a2494257d42c102ea75d4e0 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -36,12 +36,11 @@ using namespace std;
 #include "paper-score.hh"
 #include "warn.hh"
 
-#include "ly-smobs.icc"
 
 Input *
 Score::origin () const
 {
-  return unsmob_input (input_location_);
+  return Input::unsmob (input_location_);
 }
 
 Score::Score ()
@@ -53,39 +52,28 @@ Score::Score ()
   error_found_ = false;
 
   smobify_self ();
-  input_location_ = make_input (Input ());
+  input_location_ = Input ().smobbed_copy ();
 }
 
 Score::~Score ()
 {
 }
 
-IMPLEMENT_SMOBS (Score);
-IMPLEMENT_DEFAULT_EQUAL_P (Score);
-IMPLEMENT_TYPE_P (Score, "ly:score?");
+const char Score::type_p_name_[] = "ly:score?";
 
 SCM
-Score::mark_smob (SCM s)
+Score::mark_smob ()
 {
-  Score *sc = (Score *) SCM_CELL_WORD_1 (s);
+  scm_gc_mark (header_);
+  for (vsize i = defs_.size (); i--;)
+    scm_gc_mark (defs_[i]->self_scm ());
 
-  scm_gc_mark (sc->header_);
-  for (vsize i = sc->defs_.size (); i--;)
-    scm_gc_mark (sc->defs_[i]->self_scm ());
-
-  scm_gc_mark (sc->input_location_);
-  return sc->music_;
-}
-
-int
-Score::print_smob (SCM, SCM p, scm_print_state *)
-{
-  scm_puts ("#<Score>", p);
-
-  return 1;
+  scm_gc_mark (input_location_);
+  return music_;
 }
 
 Score::Score (Score const &s)
+  : Smob<Score> ()
 {
   header_ = SCM_EOL;
   music_ = SCM_EOL;
@@ -93,9 +81,9 @@ Score::Score (Score const &s)
   error_found_ = s.error_found_;
 
   smobify_self ();
-  input_location_ = make_input (*s.origin ());
+  input_location_ = s.origin ()->smobbed_copy ();
 
-  Music *m = unsmob_music (s.music_);
+  Music *m = Music::unsmob (s.music_);
   if (m)
     {
       Music *mclone = m->clone ();
@@ -127,21 +115,19 @@ Score::book_rendering (Output_def *layoutbook,
   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)
         {
@@ -152,31 +138,29 @@ Score::book_rendering (Output_def *layoutbook,
         }
 
       /* TODO: fix or junk --no-layout.  */
-      SCM context = ly_run_translator (music_, def->self_scm ());
-      if (dynamic_cast<Global_context *> (unsmob_context (context)))
+      SCM context = ly_run_translator (music_, scaled);
+      if (dynamic_cast<Global_context *> (Context::unsmob (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
 Score::set_music (SCM music)
 {
-  if (unsmob_music (music_))
+  if (Music::is_smob (music_))
     {
-      unsmob_music (music)->origin ()->error (_ ("already have music in score"));
-      unsmob_music (music_)->origin ()->error (_ ("this is the previous music"));
+      Music::unsmob (music)->origin ()->error (_ ("already have music in score"));
+      Music::unsmob (music_)->origin ()->error (_ ("this is the previous music"));
     }
-  Music *m = unsmob_music (music);
+  Music *m = Music::unsmob (music);
   if (m && to_boolean (m->get_property ("error-found")))
     {
       m->origin ()->error (_ ("errors found, ignoring music expression"));