release: 0.1.39

[lilypond.git] / lily / scores.cc

diff --git a/lily/scores.cc b/lily/scores.cc
index 90fbcf17a703d2916cd8a16f7113d9f83460f349..a5081a25b3e17ee5db4558a330e453b4a7bb9f94 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -15,42 +15,48 @@
 #include "parray.hh"
 
 static Link_array<Score> global_score_array;
-String default_out_fn = "lelie";
+String default_outname_suffix_global = "";
+String default_outname_base_global =  "lelie";
+int default_count_global;
+
 
 void
 do_scores()
 {
-  for (int i=0; i < global_score_array.size(); i++) 
+  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_->lily_id_str_ = "Lily was here, " + 
-         get_version_number_str();
-      if (is_p->errorlevel_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. ");
+         is_p->warning (_("Score contains errors. Will not process it. "));
          exit_status_i_ |= 1;
        }
-      else 
+      else
        {
          is_p->process();
        }
-      delete is_p;
-      is_p =0;
-
     }
-  global_score_array.clear();
 }
 
 void
-add_score (Score * s)
+clear_scores ()
 {
-  global_score_array.push (s);
+  for (int i=0; i < global_score_array.size(); i++)
+    {
+      delete global_score_array[i];
+    }
+  global_score_array.clear();
 }
 
 void
-set_default_output (String s)
+add_score (Score * s)
 {
-  default_out_fn = s;
+  global_score_array.push (s);
 }