From 86c0609e6736633ad03b92ba4516b659e218d4fa Mon Sep 17 00:00:00 2001
From: Julien Rioux <jrioux@physics.utoronto.ca>
Date: Wed, 14 Dec 2011 08:40:02 -0500
Subject: [PATCH] Output a newline by default at the end of progress messages.

---
 python/lilylib.py        | 14 ++++++++------
 scripts/convert-ly.py    |  9 +++++----
 scripts/lilypond-book.py | 11 -----------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/python/lilylib.py b/python/lilylib.py
index 0f33ed4a2c..26eb743a11 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -115,10 +115,12 @@ def is_verbose ():
 def stderr_write (s):
     encoded_write (sys.stderr, s)
 
-def print_logmessage (level, s, fullmessage = True):
+def print_logmessage (level, s, fullmessage = True, newline = True):
     if (is_loglevel (level)):
         if fullmessage:
             stderr_write (program_name + ": " + s + '\n')
+        elif newline:
+            stderr_write (s + '\n')
         else:
             stderr_write (s)
 
@@ -131,11 +133,11 @@ def warning (s):
 def basic_progress (s):
     print_logmessage ("BASIC", s);
 
-def progress (s, fullmessage = False):
-    print_logmessage ("PROGRESS", s, fullmessage);
+def progress (s, fullmessage = False, newline = True):
+    print_logmessage ("PROGRESS", s, fullmessage, newline);
 
-def debug_output (s, fullmessage = False):
-    print_logmessage ("DEBUG", s, fullmessage);
+def debug_output (s, fullmessage = False, newline = True):
+    print_logmessage ("DEBUG", s, fullmessage, newline);
 
 
 
@@ -179,7 +181,7 @@ def subprocess_system (cmd,
     error_log_file = ''
 
     if redirect_output:
-        progress (_ ("Processing %s.ly \n") % log_file)
+        progress (_ ("Processing %s.ly") % log_file)
     else:
         if be_verbose:
             show_progress = 1
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 9f983540d6..383f2fb855 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -181,16 +181,18 @@ tuple (LAST,STR), with the last successful conversion and the resulting
 string."""
     conv_list = get_conversions (from_version, to_version)
 
-    ly.progress (_ ("Applying conversion: "))
+    ly.progress (_ ("Applying conversion: "), newline = False)
 
     last_conversion = ()
     try:
         if not conv_list:
             last_conversion = to_version
         for x in conv_list:
-            ly.progress (tup_to_str (x[0]))
             if x != conv_list[-1]:
-                ly.progress (', ')
+                ly.progress (tup_to_str (x[0]), newline = False)
+                ly.progress (', ', newline = False)
+            else:
+                ly.progress (tup_to_str (x[0]))
             str = x[1] (str)
             last_conversion = x[0]
 
@@ -344,6 +346,5 @@ def main ():
                          "Valid version strings consist of three numbers, "
                          "separated by dots, e.g. `2.8.12'") % (f, v.version) )
 
-    ly.progress ('\n')
 
 main ()
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 78e9130b07..2ede9caf21 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -456,11 +456,9 @@ def do_process_cmd (chunks, input_name, options):
     progress (_ ("Writing snippets..."))
     for snippet in outdated:
         snippet.write_ly()
-    progress ('\n')
 
     if outdated:
         progress (_ ("Processing..."))
-        progress ('\n')
         process_snippets (options.process_cmd, outdated,
                           options.formatter, options.lily_output_dir)
 
@@ -474,8 +472,6 @@ def do_process_cmd (chunks, input_name, options):
                                            output_files,
                                            options.output_dir)
 
-    progress ('\n')
-
 
 ###
 # Format guessing data
@@ -496,7 +492,6 @@ def write_if_updated (file_name, lines):
         new_str = ''.join (lines)
         if oldstr == new_str:
             progress (_ ("%s is up to date.") % file_name)
-            progress ('\n')
 
             # this prevents make from always rerunning lilypond-book:
             # output file must be touched in order to be up to date
@@ -511,7 +506,6 @@ def write_if_updated (file_name, lines):
 
     progress (_ ("Writing `%s'...") % file_name)
     file (file_name, 'w').writelines (lines)
-    progress ('\n')
 
 
 def note_input_file (name, inputs=[]):
@@ -577,7 +571,6 @@ def do_file (input_filename, included=False):
     try:
         progress (_ ("Reading %s...") % input_fullname)
         source = in_handle.read ()
-        progress ('\n')
 
         if not included:
             global_options.formatter.init_default_snippet_options (source)
@@ -588,7 +581,6 @@ def do_file (input_filename, included=False):
 
         # Let the formatter modify the chunks before further processing
         chunks = global_options.formatter.process_chunks (chunks)
-        progress ('\n')
 
         if global_options.filter_cmd:
             write_if_updated (output_filename,
@@ -596,7 +588,6 @@ def do_file (input_filename, included=False):
         elif global_options.process_cmd:
             do_process_cmd (chunks, input_fullname, global_options)
             progress (_ ("Compiling %s...") % output_filename)
-            progress ('\n')
             write_if_updated (output_filename,
                      [s.replacement_text ()
                      for s in chunks])
@@ -605,7 +596,6 @@ def do_file (input_filename, included=False):
             os.chdir (original_dir)
             name = snippet.substring ('filename')
             progress (_ ("Processing include: %s") % name)
-            progress ('\n')
             return do_file (name, included=True)
 
         include_chunks = map (process_include,
@@ -617,7 +607,6 @@ def do_file (input_filename, included=False):
     except BookSnippet.CompileError:
         os.chdir (original_dir)
         progress (_ ("Removing `%s'") % output_filename)
-        progress ('\n')
         raise BookSnippet.CompileError
 
 def do_options ():
-- 
2.39.5