More newlines and hierarchical indentation in log messages.

(cherry picked from commit 089eeb5026ea52c23b7903fb0c06585b1d5e62c2)

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 9721f8e8093af98b239f1e99c148c03fd7081950..344d3a3e7548023c9b7a16b52f187f9fc61674d6 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -80,7 +80,7 @@ All_font_metrics::find_pango_font (PangoFontDescription const *description,
   if (!pango_dict_->try_retrieve (key, &val))
     {
       if (be_verbose_global)
-       progress_indication ("[" + string (pango_fn));
+       progress_indication ("\n[" + string (pango_fn));
 
       Pango_font *pf = new Pango_font (pango_ft2_fontmap_,
                                       description,
@@ -119,7 +119,7 @@ All_font_metrics::find_otf (string name)
        return 0;
 
       if (be_verbose_global)
-       progress_indication ("[" + file_name);
+       progress_indication ("\n[" + file_name);
 
       val = Open_type_font::make_otf (file_name);
 

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 7d506373f32788674bf3c3fd8bc4f02720cdf33e..2eb5df5cb3deaea4a8f29e110d2bff9b67d59e4b 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -71,7 +71,12 @@ Includable_lexer::new_input (string name, Sources *sources)
     state_stack_.push_back (yy_current_buffer);
 
   if (be_verbose_global)
-    progress_indication (string ("[") + file->name_string ());
+    {
+      string spaces = "";
+      for (size_t i = 0; i < state_stack_.size (); i++)
+       spaces += " ";
+      progress_indication (string ("\n") + spaces + string ("[") + file->name_string ());
+    }
 
   include_stack_.push_back (file);
 
@@ -94,7 +99,12 @@ Includable_lexer::new_input (string name, string data, Sources *sources)
     state_stack_.push_back (yy_current_buffer);
 
   if (be_verbose_global)
-    progress_indication (string ("[") + name);
+    {
+      string spaces = "";
+      for (size_t i = 0; i < state_stack_.size (); i++)
+       spaces += " ";
+      progress_indication (string ("\n") + spaces + string ("[") + name);
+    }
   include_stack_.push_back (file);
 
   yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 3753a77795f236312f3827da724352451c0da389..d81eec8982bbfce592599489a475985f97b6d981 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -89,7 +89,7 @@ gulp_file_to_string (string fn, bool must_exist, int size)
   string result (&chars[0], chars.size ());
 
   if (be_verbose_global)
-    progress_indication ("]");
+    progress_indication ("]\n");
 
   return result;
 }

diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc
index 6713c1b08f70bd235022e1114e46350c8a3d8004..730442ef05bf781b130ed7d6b0397f5c16a2ef8f 100644 (file)
--- a/lily/pfb-scheme.cc
+++ b/lily/pfb-scheme.cc
@@ -15,7 +15,7 @@ LY_DEFINE (ly_pfb_2_pfa, "ly:pfb->pfa",
   string file_name = ly_scm2string (pfb_file_name);
 
   if (be_verbose_global)
-    progress_indication ("[" + file_name);
+    progress_indication ("\n[" + file_name);
   
   vector<char> pfb_string = gulp_file (file_name, 0);
   char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ());
@@ -38,7 +38,7 @@ LY_DEFINE (ly_otf_2_cff, "ly:otf->cff",
 
   string file_name = ly_scm2string (otf_file_name);
   if (be_verbose_global)
-    progress_indication ("[" + file_name);
+    progress_indication ("\n[" + file_name);
 
   FT_Face face = open_ft_face (file_name, 0 /* index */);
   string table = get_otf_table (face, "CFF ");

diff --git a/lily/system.cc b/lily/system.cc
index 9054988dabf75304d4445de9e2094586cd041706..6f363970ff75af4d78a6baecc347970830d9bb12 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -175,7 +175,7 @@ System::do_break_substitution_and_fixup_refpoints ()
     }
 
   if (be_verbose_global)
-    message (_f ("Element count %d.", count + element_count ()));
+    message (_f ("Element count %d", count + element_count ()) + "\n");
 }
 
 SCM

diff --git a/lily/ttf.cc b/lily/ttf.cc
index 62c6d4695e1cba7e5af289a116a05f9fc0d2e54a..d8e2b56f4549340bf9ef44f192a2d0759b9a6d4c 100644 (file)
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -504,7 +504,7 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name",
 
   string file_name = ly_scm2string (ttf_file_name);
   if (be_verbose_global)
-    progress_indication ("[" + file_name);
+    progress_indication ("\n[" + file_name);
 
   FT_Face face;
 
@@ -556,7 +556,7 @@ LY_DEFINE (ly_ttf_2_pfa, "ly:ttf->pfa",
 
   string file_name = ly_scm2string (ttf_file_name);
   if (be_verbose_global)
-    progress_indication ("[" + file_name);
+    progress_indication ("\n[" + file_name);
 
   Memory_out_stream stream;
 

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index a229f8f6d002cccda6e947062fe781a22249b8de..301868cb84d66baf54838e71738b45ec19a3ddbf 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -77,20 +77,20 @@
                    ".pdf"))
         (is-eps (string-match "\\.eps$" name))
         (paper-size-string (if is-eps
-                               " -dEPSCrop "
-                               (ly:format "-dDEVICEWIDTHPOINTS=~$ \
--dDEVICEHEIGHTPOINTS=~$ "
-                                       paper-width paper-height )))
+                               "-dEPSCrop"
+                               (ly:format "-dDEVICEWIDTHPOINTS=~$\
+ -dDEVICEHEIGHTPOINTS=~$"
+                                       paper-width paper-height)))
 
         (cmd (simple-format #f
                      "~a\
  ~a\
  ~a\
  ~a\
- -dCompatibilityLevel=1.4 \
+ -dCompatibilityLevel=1.4\
  -dNOPAUSE\
  -dBATCH\
- -r1200 \
+ -r1200\
  -sDEVICE=pdfwrite\
  -sOutputFile=~S\
  -c .setpdfwrite\
@@ -100,9 +100,8 @@
                      (if (ly:get-option 'verbose) "" "-q")
                      (if (or (ly:get-option 'gs-load-fonts)
                              (ly:get-option 'gs-load-lily-fonts))
-                             
-                         " -dNOSAFER "
-                         " -dSAFER ")
+                         "-dNOSAFER"
+                         "-dSAFER")
                      paper-size-string
                      pdf-name
                      name)))

diff --git a/scm/lily.scm b/scm/lily.scm
index c39b243648613d4a0f475f8e40aca3a0b8dfa17c..360e694053fafaf1b6a59b0110d6e6182f305b21 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -242,7 +242,7 @@ second.  Dump results to `FILE.stacks' and
        (ly:error (_ "cannot find: ~A") x))
     (primitive-load file-name)
     (if (ly:get-option 'verbose)
-       (ly:progress "]"))))
+       (ly:progress "]\n"))))
 
 (define-public DOS
   (let ((platform (string-tokenize
@@ -750,6 +750,6 @@ PIDs or the number of the process."
         ;; FIXME: soft-code, localize
         (welcome-ly (string-append ly "Welcome_to_LilyPond.ly"))
         (cmd (get-editor-command welcome-ly 0 0 0)))
-    (ly:message (_ "Invoking `~a'...") cmd)
+    (ly:message (_ "Invoking `~a'...\n") cmd)
     (system cmd)
     (exit 1)))