From: Werner Lemberg <wl@gnu.org>
Date: Sun, 21 Mar 2004 19:10:44 +0000 (+0000)
Subject: * lily/score.cc (ly_run_translator), lily/paper-def.cc
X-Git-Tag: release/2.1.34~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fd0f2e35815429224002d32adecd3f68d4e11516;p=lilypond.git

* lily/score.cc (ly_run_translator), lily/paper-def.cc
(Paper_def::get_paper_outputter), lily/input-file-results.cc
(Input_file_results::Input_file_results), lily/my-lily-parser.cc
(My_lily_parser::parse_file): Improve formatting progress indication
sent to stdout.
---

diff --git a/ChangeLog b/ChangeLog
index 48a27dedf3..a0c3cc5f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-21  Werner Lemberg  <wl@gnu.org>
+
+	* lily/score.cc (ly_run_translator), lily/paper-def.cc
+	(Paper_def::get_paper_outputter), lily/input-file-results.cc
+	(Input_file_results::Input_file_results), lily/my-lily-parser.cc
+	(My_lily_parser::parse_file): Improve formatting progress indication
+	sent to stdout.
+
 2004-03-21  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* scripts/lilypond-book.py (do_file): reinstate --filter support.
diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc
index 8c6cbab397..0da68c899d 100644
--- a/lily/input-file-results.cc
+++ b/lily/input-file-results.cc
@@ -139,7 +139,7 @@ Input_file_results::Input_file_results (String init, String in_file, String out_
   sources_.set_path (&global_path);
   
 
-  progress_indication (_f ("Now processing: `%s'", in_file.to_str0 ()));
+  progress_indication (_f ("Now processing `%s'", in_file.to_str0 ()));
   progress_indication ("\n");
 
   My_lily_parser parser (this);
diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index f000e678be..c87b1416ef 100644
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -43,6 +43,7 @@ My_lily_parser::parse_file (String init, String in_file, String out_file)
   lexer_->main_input_name_ = in_file;
 
   progress_indication (_ ("Parsing..."));
+  progress_indication ("\n");
 
   set_yydebug (0);
   lexer_->new_input (init, &input_file_->sources_);
@@ -50,8 +51,6 @@ My_lily_parser::parse_file (String init, String in_file, String out_file)
   /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
      OUT_FILE (unless IN_FILE redefines output file name).  */
   do_yyparse ();
-
-  progress_indication ("\n");
   
   if (!define_spots_.is_empty ())
     {
diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index fec208899a..83fb510504 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -72,6 +72,7 @@ Paper_def::get_paper_outputter (String outname)  const
 {
   progress_indication (_f ("paper output to `%s'...",
 			   outname == "-" ? String ("<stdout>") : outname));
+  progress_indication("\n");
 
   global_input_file->target_strings_.push (outname);
   Paper_outputter * po = new Paper_outputter (outname);
diff --git a/lily/score.cc b/lily/score.cc
index 71afe0f2aa..5e15b722e5 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -122,7 +122,7 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
       programming_error ("no toplevel translator");
       return SCM_BOOL_F;
     }
-  progress_indication (_ ("Interpreting music..."));
+  progress_indication (_ ("Interpreting music... "));
   
   SCM protected_iter = Music_iterator::get_static_get_iterator (music);
   Music_iterator * iter = unsmob_iterator (protected_iter);