release: 1.0.1

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index 8f97c31d76d60b195798ed88bd02a497cfa2a158..e09cb71e72272c64e22bda906bcb17a95f283a37 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "score.hh"
@@ -54,10 +54,10 @@ Score::run_translator (Music_output_def *odef_l)
   Global_translator * trans_p = odef_l->get_global_translator_p();
   if (!trans_p)
     {
-      non_fatal_error ("No toplevel translator.");
+      non_fatal_error (_("no toplevel translator"));
       return ;
     }
-  *mlog << _("\nInterpreting music ...");
+  *mlog << '\n' << _("Interpreting music...") << flush;
   trans_p->last_mom_ = music_p_->time_int().max ();
 
   Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_,
@@ -67,7 +67,7 @@ Score::run_translator (Music_output_def *odef_l)
   if (! iter->ok())
     {
       delete iter;
-      warning (_("Need music in a score"));
+      warning (_("need music in a score"));
       errorlevel_i_ =1;
       return ;
     }
@@ -81,19 +81,21 @@ Score::run_translator (Music_output_def *odef_l)
       if (iter->ok())
        {
          w = iter->next_moment();
-         DOUT << "proccing: " << w <<"\n";
+         DOUT << "proccing: " << w << '\n';
          if (!monitor->silent_b ("walking"))
            iter->print();
        }
       
       trans_p->modify_next (w);
       trans_p->prepare (w);
+      
       if (!monitor->silent_b ("walking"))
        trans_p->print();
 
       iter->process_and_next (w);
       trans_p->process();
     }
+  
   delete iter;
   trans_p->finish();
 
@@ -101,13 +103,12 @@ Score::run_translator (Music_output_def *odef_l)
   if (errorlevel_i_)
     {
       // should we? hampers debugging.
-      warning (_("Errors found, /*not processing score*/"));
+      warning (_ ("errors found, /*not processing score*/"));
     }
 
   Music_output * output = trans_p->get_output_p();
   delete trans_p;
-  *mlog << _(" (time: ") << String(timer.read (), "%.2f") << _(" seconds)");
-
+  *mlog << endl << _f ("time: %.2f seconds",  timer.read ()) << flush;
 
   output->header_l_ = header_p_;
   output->origin_str_ =  location_str();
@@ -148,7 +149,7 @@ Score::print() const
 }
 
 void
-Score::add (Music_output_def *pap_p)
+Score::add_output (Music_output_def *pap_p)
 {
   def_p_arr_.push(pap_p);
 }