* lily/tie-column.cc (set_manual_tie_configuration): new function.

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index ee628b9b25f91863056b6726c67bb7d80ea98145..b47c6d099b60bc0399ae04d08418ee5692fc4a2a 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -9,23 +9,23 @@
 #include "score.hh"
 
 #include <cstdio>
+using namespace std;
 
 #include "book.hh"
 #include "cpu-timer.hh"
 #include "global-context.hh"
 #include "lily-parser.hh"
 #include "lilypond-key.hh"
-#include "ly-smobs.icc"
 #include "main.hh"
-#include "music-iterator.hh"
 #include "music.hh"
 #include "output-def.hh"
-#include "output-def.hh"
 #include "paper-book.hh"
 #include "paper-score.hh"
-#include "scm-hash.hh"
 #include "warn.hh"
 
+#include "music.hh"
+#include "ly-smobs.icc"
+
 Score::Score ()
   : Input ()
 {
@@ -74,14 +74,22 @@ Score::Score (Score const &s)
   smobify_self ();
 
   Music *m = unsmob_music (s.music_);
-  music_ = m ? m->clone ()->self_scm () : SCM_EOL;
-  scm_gc_unprotect_object (music_);
+  if (m)
+    {
+      Music *mclone = m->clone ();
+      music_ = mclone->unprotect ();
+    }
+  else
+    music_ = SCM_EOL;
 
   for (int i = 0, n = s.defs_.size (); i < n; i++)
-    defs_.push (s.defs_[i]->clone ());
-
+    {
+      Output_def *copy = s.defs_[i]->clone ();
+      defs_.push (copy);
+      copy->unprotect ();
+    }
   header_ = ly_make_anonymous_module (false);
-  if (ly_c_module_p (s.header_))
+  if (ly_is_module (s.header_))
     ly_module_copy (header_, s.header_);
 
   texts_ = s.texts_;
@@ -105,43 +113,45 @@ default_rendering (SCM music, SCM outdef,
       Real scale = scm_to_double (bpd->c_variable ("outputscale"));
 
       Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
-      scaled_def = def->self_scm ();
+      Output_def *bdef = scale_output_def (bpd, scale);
+      def->parent_ = bdef;
 
-      scaled_bookdef = scale_output_def (bpd, scale)->self_scm ();
-      unsmob_output_def (scaled_def)->parent_
-       = unsmob_output_def (scaled_bookdef);
+      scaled_def = def->self_scm ();
+      scaled_bookdef = bdef->self_scm ();
 
-      scm_gc_unprotect_object (scaled_bookdef);
-      scm_gc_unprotect_object (scaled_def);
+      def->unprotect ();
+      bdef->unprotect ();
     }
 
   SCM context = ly_run_translator (music, scaled_def, key);
-  Music_output *output = unsmob_music_output (ly_format_output (context));
-      
-  if (Paper_score *pscore = dynamic_cast<Paper_score*> (output))
+
+  SCM output_as_scm = ly_format_output (context);
+  Music_output *output = unsmob_music_output (output_as_scm);
+
+  if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
     {
       /* ugh, this is strange, Paper_book without a Book object. */
       Paper_book *paper_book = new Paper_book ();
       paper_book->header_ = header;
       paper_book->paper_ = unsmob_output_def (scaled_bookdef);
 
-      if (ly_c_module_p (header))
+      if (ly_is_module (header))
        paper_book->add_score (header);
 
       SCM systems = pscore->get_paper_systems ();
       paper_book->add_score (systems);
 
-      paper_book->classic_output (ly_scm2string (outname));
-      scm_gc_unprotect_object (paper_book->self_scm ());
+      paper_book->classic_output (outname);
+      paper_book->unprotect ();
     }
-  scm_gc_unprotect_object (output->self_scm ());
 
   scm_remember_upto_here_1 (scaled_def);
+  scm_remember_upto_here_1 (output_as_scm);
   scm_remember_upto_here_1 (scaled_bookdef);
 }
 
 /*
-  Format score, return list of Music_output objects. 
+  Format score, return list of Music_output objects.
 
   LAYOUTBOOK should be scaled already.
 */
@@ -161,12 +171,11 @@ Score::book_rendering (Output_def *layoutbook,
 
   SCM outputs = SCM_EOL;
   SCM *tail = &outputs;
-  
+
   int outdef_count = defs_.size ();
 
   Object_key *key = new Lilypond_general_key (book_key, user_key_, 0);
-  SCM scm_key = key->self_scm ();
-  scm_gc_unprotect_object (scm_key);
+  SCM scm_key = key->unprotect ();
 
   for (int i = 0; !i || i < outdef_count; i++)
     {
@@ -177,8 +186,8 @@ Score::book_rendering (Output_def *layoutbook,
        {
          def = scale_output_def (def, scale);
          def->parent_ = layoutbook;
-         scaled = def->self_scm ();
-         scm_gc_unprotect_object (scaled);
+
+         scaled = def->unprotect ();
        }
 
       /* TODO: fix or junk --no-layout.  */
@@ -186,9 +195,9 @@ Score::book_rendering (Output_def *layoutbook,
       if (dynamic_cast<Global_context *> (unsmob_context (context)))
        {
          SCM s = ly_format_output (context);
-         
+
          *tail = scm_cons (s, SCM_EOL);
-         tail = SCM_CDRLOC(*tail);
+         tail = SCM_CDRLOC (*tail);
        }
 
       scm_remember_upto_here_1 (scaled);
@@ -200,13 +209,8 @@ Score::book_rendering (Output_def *layoutbook,
 }
 
 void
-Score::set_music (SCM music, SCM parser)
+Score::set_music (SCM music)
 {
-  /* URG? */
-  SCM check_funcs = ly_lily_module_constant ("toplevel-music-functions");
-  for (; scm_is_pair (check_funcs); check_funcs = scm_cdr (check_funcs))
-    music = scm_call_2 (scm_car (check_funcs), music, parser);
-
   if (unsmob_music (music_))
     {
       unsmob_music (music)->origin ()->error (_ ("already have music in score"));
@@ -217,7 +221,8 @@ Score::set_music (SCM music, SCM parser)
     {
       m->origin ()->error (_ ("errors found, ignoring music expression"));
 
-      this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found"));
+      this->error_found_ = this->error_found_
+       || to_boolean (m->get_property ("error-found"));
     }
 
   if (this->error_found_)