X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=b313b1abeee830878b13aa6a9263563e86afa9a4;hb=b9f170d5efc8d7ff0d3b13fcd98b6252a7fcb7d3;hp=fb537a3db299c83d0860b7f85991d7a006662555;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/score.cc b/lily/score.cc
index fb537a3db2..b313b1abee 100644
--- 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
@@ -36,15 +36,13 @@ 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 ()
 {
   header_ = SCM_EOL;
@@ -54,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 *sc = (Score *) SCM_CELL_WORD_1 (s);
-
-  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*)
+Score::mark_smob ()
 {
-  scm_puts ("#<Score>", p);
+  scm_gc_mark (header_);
+  for (vsize i = defs_.size (); i--;)
+    scm_gc_mark (defs_[i]->self_scm ());
 
-  return 1;
+  scm_gc_mark (input_location_);
+  return music_;
 }
 
 Score::Score (Score const &s)
+  : Smob<Score> ()
 {
   header_ = SCM_EOL;
   music_ = SCM_EOL;
@@ -94,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 ();
@@ -111,12 +98,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,67 +110,63 @@ 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 ());
-      if (dynamic_cast<Global_context *> (unsmob_context (context)))
-	{
-	  SCM s = ly_format_output (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"));
 
       this->error_found_ = this->error_found_
-	|| to_boolean (m->get_property ("error-found"));
+                           || to_boolean (m->get_property ("error-found"));
     }
 
   if (this->error_found_)