release: 0.1.41

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index 135ebf9821ec3590f69f810f35afd3653997c89e..97203dec9cd7a1fc7aeddca23d83e58bcdfea161 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -17,10 +17,12 @@
 #include "global-translator.hh"
 #include "header.hh"
 #include "cpu-timer.hh"
+#include "main.hh"
+#include "paper-def.hh"
 
-extern String default_out_fn;
 
 Score::Score()
+    : Input()
 {
   header_p_ = 0;
   music_p_ = 0;
@@ -75,11 +77,14 @@ Score::run_translator (Music_output_def *odef_l)
        {
          w = iter->next_moment();
          DOUT << "proccing: " << w <<"\n";
-         iter->print();
+         if (!monitor->silent_b ("walking"))
+           iter->print();
        }
+      
       trans_p->modify_next (w);
       trans_p->prepare (w);
-      trans_p->print();
+      if (!monitor->silent_b ("walking"))
+       trans_p->print();
 
       iter->process_and_next (w);
       trans_p->process();
@@ -100,7 +105,6 @@ Score::run_translator (Music_output_def *odef_l)
 
 
   output->header_l_ = header_p_;
-  output->default_out_str_ = default_out_fn;
   output->origin_str_ =  location_str();
 
   *mlog << endl;
@@ -116,12 +120,16 @@ Score::process()
 
   print();
   for (int i=0; i < def_p_arr_.size (); i++)
-    run_translator (def_p_arr_[i]);
+    {
+      if (no_paper_global_b 
+         && def_p_arr_[i]->is_type_b (Paper_def::static_name ()))
+       continue;
+      run_translator (def_p_arr_[i]);
+    }
 }
 
 
 
-
 void
 Score::print() const
 {