Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index c3fcf3ae6ff37abaee159eaab4b481ad2e6d0509..99ec51880a3672e5741447a5ff66864544cc1f73 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -3,27 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score.hh"
 
 #include <cstdio>
 
+using namespace std;
+
 #include "book.hh"
 #include "cpu-timer.hh"
 #include "global-context.hh"
+#include "international.hh"
 #include "lily-parser.hh"
 #include "lilypond-key.hh"
 #include "main.hh"
 #include "music.hh"
+#include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "paper-score.hh"
 #include "warn.hh"
 
-
-#include "music.hh"
 #include "ly-smobs.icc"
 
 Score::Score ()
@@ -31,7 +33,6 @@ Score::Score ()
 {
   header_ = SCM_EOL;
   music_ = SCM_EOL;
-  texts_ = SCM_EOL;
   error_found_ = false;
   smobify_self ();
 }
@@ -50,8 +51,7 @@ Score::mark_smob (SCM s)
   Score *sc = (Score *) SCM_CELL_WORD_1 (s);
 
   scm_gc_mark (sc->header_);
-  scm_gc_mark (sc->texts_);
-  for (int i = sc->defs_.size (); i--;)
+  for (vsize i = sc->defs_.size (); i--;)
     scm_gc_mark (sc->defs_[i]->self_scm ());
   return sc->music_;
 }
@@ -69,31 +69,27 @@ Score::Score (Score const &s)
 {
   header_ = SCM_EOL;
   music_ = SCM_EOL;
-  texts_ = SCM_EOL;
   error_found_ = s.error_found_;
   smobify_self ();
 
   Music *m = unsmob_music (s.music_);
   if (m)
     {
-      Music *mclone =  m->clone ();
+      Music *mclone = m->clone ();
       music_ = mclone->unprotect ();
     }
   else
     music_ = SCM_EOL;
 
-  
-  for (int i = 0, n = s.defs_.size (); i < n; i++)
+  for (vsize i = 0, n = s.defs_.size (); i < n; i++)
     {
-      Output_def * copy = s.defs_[i]->clone ();
-      defs_.push (copy);
+      Output_def *copy = s.defs_[i]->clone ();
+      defs_.push_back (copy);
       copy->unprotect ();
     }
   header_ = ly_make_anonymous_module (false);
   if (ly_is_module (s.header_))
     ly_module_copy (header_, s.header_);
-
-  texts_ = s.texts_;
 }
 
 void
@@ -111,25 +107,25 @@ default_rendering (SCM music, SCM outdef,
   /* ugh.  */
   if (bpd->c_variable ("is-paper") == SCM_BOOL_T)
     {
-      Real scale = scm_to_double (bpd->c_variable ("outputscale"));
+      Real scale = scm_to_double (bpd->c_variable ("output-scale"));
 
       Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
       Output_def *bdef = scale_output_def (bpd, scale);
       def->parent_ = bdef;
 
       scaled_def = def->self_scm ();
-      scaled_bookdef = bdef->self_scm();
+      scaled_bookdef = bdef->self_scm ();
 
-      def->unprotect();
-      bdef->unprotect ();  
+      def->unprotect ();
+      bdef->unprotect ();
     }
 
   SCM context = ly_run_translator (music, scaled_def, key);
-
+  
   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))
+
+  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 ();
@@ -139,9 +135,7 @@ default_rendering (SCM music, SCM outdef,
       if (ly_is_module (header))
        paper_book->add_score (header);
 
-      SCM systems = pscore->get_paper_systems ();
-      paper_book->add_score (systems);
-
+      paper_book->add_score (pscore->self_scm ());
       paper_book->classic_output (outname);
       paper_book->unprotect ();
     }
@@ -152,7 +146,7 @@ default_rendering (SCM music, SCM outdef,
 }
 
 /*
-  Format score, return list of Music_output objects. 
+  Format score, return list of Music_output objects.
 
   LAYOUTBOOK should be scaled already.
 */
@@ -168,11 +162,11 @@ Score::book_rendering (Output_def *layoutbook,
   Real scale = 1.0;
 
   if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
-    scale = scm_to_double (layoutbook->c_variable ("outputscale"));
+    scale = scm_to_double (layoutbook->c_variable ("output-scale"));
 
   SCM outputs = SCM_EOL;
   SCM *tail = &outputs;
-  
+
   int outdef_count = defs_.size ();
 
   Object_key *key = new Lilypond_general_key (book_key, user_key_, 0);
@@ -196,9 +190,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);
@@ -237,3 +231,9 @@ Score::get_music () const
 {
   return music_;
 }
+
+void
+Score::add_output_def (Output_def *def)
+{
+  defs_.push_back (def);
+}