release: 0.1.31

[lilypond.git] / lily / scores.cc

diff --git a/lily/scores.cc b/lily/scores.cc
index be558b29c153fcf12e145259acba072f7a7a600d..a13e1195bebfc22e9112de595965b5e26825a0e0 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -10,46 +10,48 @@
 #include "score.hh"
 #include "string.hh"
 #include "paper-def.hh"
+#include "header.hh"
 #include "debug.hh"
+#include "parray.hh"
 
-static Array<Score*> score_array_global;
+static Link_array<Score> global_score_array;
 String default_out_fn = "lelie";
 
 void
 do_scores()
 {
-    for (int i=0; i < score_array_global.size(); i++) {
-       Score *&is_p = score_array_global[i];
-       
-       if (only_midi) {
-           delete is_p->paper_p_;
-           is_p->paper_p_ = 0;
+  for (int i=0; i < global_score_array.size(); i++)
+    {
+      Score *&is_p = global_score_array[i];
+      if (!is_p->header_p_)
+       is_p->header_p_ = new Header;
+      
+      is_p->header_p_->lily_id_str_ = "Lily was here, " +
+       get_version_number_str();
+      if (is_p->errorlevel_i_)
+       {
+         is_p->warning (_("Score contains errors. Will not process it. "));
+         exit_status_i_ |= 1;
        }
-       
-       if (is_p->errorlevel_i_) {
-           is_p->warning("Score contains errors. Will not process it. ");
-         
-       } else { 
-       
-           is_p->print ();
-           is_p->process();
+      else
+       {
+         is_p->process();
        }
-       delete is_p;
-       is_p =0;
+      delete is_p;
+      is_p =0;
 
     }
-    score_array_global.set_size(0);
+  global_score_array.clear();
 }
 
 void
-add_score(Score * s)
+add_score (Score * s)
 {
-    score_array_global.push(s);
+  global_score_array.push (s);
 }
 
 void
-set_default_output(String s)
+set_default_output (String s)
 {
-    default_out_fn = s;
+  default_out_fn = s;
 }
-