* lily/lily-parser.cc (LY_DEFINE): Remove "Now " from message.

* lily/main.cc (main): Invoke identify.

* scm/lily.scm (postscript->pdf): Remove progress newline.
Write progress to stderr.

* lily/paper-book.cc (output): Remove progress newline.

* scm/framework-tex.scm (convert-to-dvi, convert-to-ps): Call
gettext on user messages, and remove whitespace.

* lily/paper-outputter.cc (get_paper_outputter): Add progress newline.

* lily/main.cc (usage): Typo.

diff --git a/ChangeLog b/ChangeLog
index de6e5ffd7a44f432ffbd9abbe54d03255bbe0d13..42be61ba095b645e0e48a7748bb3473fbf6ed4b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2004-11-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/lily-parser.cc (LY_DEFINE): Remove "Now " from message.
+
+       * lily/main.cc (main): Invoke identify.
+
+       * scm/lily.scm (postscript->pdf): Remove progress newline.
+       Write progress to stderr.
+
+       * lily/paper-book.cc (output): Remove progress newline.
+
+       * scm/framework-tex.scm (convert-to-dvi, convert-to-ps): Call
+       gettext on user messages, and remove whitespace.
+
+       * lily/paper-outputter.cc (get_paper_outputter): Add progress newline.
+
        * scripts/lilypond-latex.py (program_name): Bugfix: use only basename of
        argv[0] (Thomas Scharkowski).
 

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index e487ca24160500cb5cc439d8e5c2d09f7f543193..5285d6baa87fc7e4e2b7c3323b6e657889ffbbb1 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -236,15 +236,17 @@ lilypond test.ly
 You will see something resembling
 
 @example
-lilypond (GNU LilyPond) 2.2.0
-Running lilypond...
-Now processing `/home/fred/ly/test.ly'
+lilypond test.ly
+GNU LilyPond 2.5.0
+Processing `test.ly'
 Parsing...
-Interpreting music...[1]
-@emph{... more interesting stuff ... }
-DVI output to `test.dvi'...
-PDF output to `test.pdf'...
-PS output to `test.ps'...
+Interpreting music... [1]
+Preprocessing graphical objects... 
+Calculating line breaks... [2]
+Layout output to `test.tex'...
+Converting to `test.dvi'...
+Converting to `test.ps'...
+Converting to `test.pdf'...
 @end example
 
 @cindex DVI file

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 355791e7191c0865ab5560d88d3f37b9ec4ad887..253cae0467955b2d1a2be2525e46d570af7f8e50 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -281,7 +281,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
       Sources sources;
       sources.set_path (&global_path);
   
-      progress_indication (_f ("Now processing `%s'", file_name.to_str0 ()));
+      progress_indication (_f ("Processing `%s'", file_name.to_str0 ()));
       progress_indication ("\n");
 
       Lily_parser *parser = new Lily_parser (&sources);

diff --git a/lily/main.cc b/lily/main.cc
index edd9ba013e4e2036482d37a4bed83bf85dcdcdbe..30f2c6c13b3c1525298707970a39c8697db18834 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -175,13 +175,13 @@ static void
 identify (FILE *out)
 {
   fputs (gnu_lilypond_version_string ().to_str0 (), out);
+  fputs ("\n", out);
 }
  
 static void
 notice ()
 {
   identify (stdout);
-  printf ("\n");
   printf (_f (NOTICE, PROGRAM_NAME).to_str0 ());
   printf ("\n");
   copyright ();
@@ -309,7 +309,6 @@ main_with_guile (void *, int, char **)
 
   ly_c_init_guile ();
   call_constructors ();
-  progress_indication ("\n");
 
   determine_output_options ();  
   all_fonts_global = new All_font_metrics (global_path.to_string ());
@@ -454,6 +453,7 @@ parse_argv (int argc, char **argv)
 
   if (help_b)
     {
+      identify (stdout);
       usage ();
       if (verbose_global_b)
        dir_info (stdout);
@@ -464,9 +464,10 @@ parse_argv (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  setup_localisation ();  
+  setup_localisation ();
   setup_paths ();
   parse_argv (argc, argv);
+  identify (stderr);
   initialize_kpathsea (argv[0]);
 
   scm_boot_guile (argc, argv, main_with_guile, 0);

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index f7ead445a93b2483ad6afe0ffc2b45ec8f26c0f1..08367608b38d7db94fe53e12506d873a200504ee 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -127,10 +127,10 @@ Paper_book::post_processing (SCM module,
     {make_ps, "convert-to-ps"},
     {make_pdf, "convert-to-pdf"},
     {make_png, "convert-to-png"},
-    {0,0}
+    {0, 0},
   };
 
-  for (int i= 0; settings[i].func_name_; i++)
+  for (int i = 0; settings[i].func_name_; i++)
     {
       if (settings[i].do_it_)
        {
@@ -139,7 +139,7 @@ Paper_book::post_processing (SCM module,
            {
              func = scm_variable_ref (func);
              if (ly_c_procedure_p (func))
-               scm_call_2 (func, self_scm(), file_name);
+               scm_call_2 (func, self_scm (), file_name);
            }
        }
     }
@@ -207,9 +207,8 @@ Paper_book::output (String outname)
 
          post_processing (mod, scm_makfrom0str (file_name.to_str0 ()));
        }
-      
-      progress_indication ("\n");
     }
+  progress_indication ("\n");
 }
 
 void

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 43c6e842b9af1ac7986b80e8e93aa30bc5dae67f..0a28aa242eceb5cbb1afca6ba81c8d463006999c 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -115,6 +115,7 @@ get_paper_outputter (String outname, String f)
 {
   progress_indication (_f ("Layout output to `%s'...",
                           outname == "-" ? String ("<stdout>") : outname));
+  progress_indication ("\n");
   return new Paper_outputter (outname, f);
 }
 

diff --git a/lily/performance.cc b/lily/performance.cc
index 379e024793d9f112d0b20e84c1acf9ab5f024113..65e091bf69b9644e3a5fb2fe022a722b7b924318 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -47,9 +47,9 @@ Performance::output (Midi_stream& midi_stream)
   midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
   output_header_track (midi_stream);
   progress_indication ("\n");
-  progress_indication (_ ("Track ... "));
+  progress_indication (_ ("Track...") + " ");
   int channel = 0;
-  for (int i =0; i < audio_staffs_.size (); i++)
+  for (int i = 0; i < audio_staffs_.size (); i++)
     {
       Audio_staff *s = audio_staffs_[i];
       if (verbose_global_b)

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 20a04f5a1611eeed6f8d83feb639b74a6cf86b2a..a7ecaae9967ea72784f7f82981b1f7998e24ae4b 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -288,17 +288,16 @@
 
                             (if (ly:get-option 'verbose)
                                 " "
-                                " 2>&1 1>& /dev/null ")
-                            )))
+                                " 2>&1 1>& /dev/null "))))
 
     (if (ly:get-option 'verbose)
        (begin 
          (newline (current-error-port))
-
-         (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
+         (format (current-error-port) (_ "Invoking ~S") cmd)
          (newline (current-error-port)))
-       (display (format #f "Converting to `~a.ps'...\n" base) (current-error-port))
-       )
+       (begin
+         (format (current-error-port) (_ "Converting to `~a.ps'...") base)
+         (newline (current-error-port))))
     (system cmd)))
 
 (define-public (convert-to-dvi book name)
@@ -313,16 +312,16 @@
               "latex \\\\nonstopmode \\\\input " name
               (if (ly:get-option 'verbose)
                   " "
-                  " 2>&1 1>& /dev/null ")
-
-              )))
+                  " 2>&1 1>& /dev/null "))))
     (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
     (if (ly:get-option 'verbose)
        (begin 
          (newline (current-error-port))
-         (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
+         (format (current-error-port) (_ "Invoking ~S") cmd)
          (newline (current-error-port)))
-       (format (current-error-port) "Converting to `~a.dvi'...\n" base))
+       (begin
+         (format (current-error-port) (_ "Converting to `~a.dvi'...") base)
+         (newline (current-error-port))))
 
     ;; fixme: set in environment?
     (if (ly:get-option 'safe)

diff --git a/scm/lily.scm b/scm/lily.scm
index 01de0a300a5a149a9bb259fb5aef6dd7a3299f18..82bbfaa384fe4c009b14d9322f1a4f4552abcb96 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -563,29 +563,19 @@ possibly turned off."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
 
 (define-public (ly:system command)
-  (let*
-      ((status 0))
-    
+  (let* ((status 0))
     (if (ly:get-option 'verbose)
-       (display (format (_ "Invoking `~a'...\n") command) (current-error-port)))
-    
+       (format  (current-error-port) (_ "Invoking `~a'...\n") command))
     (set! status (system command))
-
-
     (if (> status 0)
-       (display (format (_ "Error invoking `~a'. Return value ~a")
-                        command status)))
-    ))
+       (format (current-error-port) (_ "Error invoking `~a'. Return value ~a")
+                        command status))))
 
 (define-public (postscript->pdf papersizename name)
   (let* ((cmd (string-append "ps2pdf -sPAPERSIZE=" papersizename " " name))
         (output-name
          (regexp-substitute/global #f "\\.ps" name 'pre ".pdf" 'post)))
-
-    (newline (current-error-port))
-    (display (format (_ "Converting to `~a'...") output-name)
-            (current-error-port))
-
+    (format (current-error-port) (_ "Converting to `~a'...") output-name)
     (ly:system cmd)))
 
 (define-public (postscript->png resolution name)