Make a warning message more polite, and clarify failed octave check.

diff --git a/ChangeLog b/ChangeLog
index 694195e31e91b014ba6ce5730430815f980adf5a..b93ac82719206d73f629923a1c4b3ccc55003f13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-30  Graham Percival  <gpermus@gmail.com>
+
+       * scm/lily-library.scm: make "no version" warning message more polite.
+
+       * lily/music.cc: add double quotes to failed octave check.
+
 2006-03-30  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/pango-font.cc (pango_item_string_stencil): more robustness.

diff --git a/lily/music.cc b/lily/music.cc
index 715df36c36a7f3c4dfc9028bb1fdbd5c3e6b2eb3..191f42a1b725d82e00a3ba84470749f18efe2730 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -137,7 +137,7 @@ Music::generic_to_relative_octave (Pitch last)
          Pitch expected_pit (scm_to_int (check),
                              new_pit.get_notename (),
                              new_pit.get_alteration ());
-         origin ()->warning (_f ("octave check failed; expected %s, found: %s",
+         origin ()->warning (_f ("octave check failed; expected \"%s\", found: %s",
                                  expected_pit.to_string (),
                                  new_pit.to_string ()));
          new_pit = expected_pit;

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 2e7fde27636932dcb0448afa89d824fbe8cb02d2..8d12c350d796505eb9d9927bd7e6dcc7fbad1f4d 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -488,7 +488,7 @@ possibly turned off."
    (string-append
     input-file-name ": 0: " (_ "warning: ")
    (format #f
-          (_ "no \\version statement found,  add~afor future compatibility")
+          (_ "no \\version statement found, please add~afor future compatibility")
           (format #f "\n\n\\version ~s\n\n" (lilypond-version))))))
 
 (define-public (old-relative-not-used-message input-file-name)