(old-relative-not-used-message)

(version-not-seen-message): Add input-file-name-location to message.

diff --git a/ChangeLog b/ChangeLog
index e5b6cb72ee7320f7fce51df89380758a9b5f7549..641f2848ffc0634496f510e28851ddc83ddcc4cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/lily-library.scm (old-relative-not-used-message)
+       (version-not-seen-message): Add input-file-name-location to message.
+
        * lily/parser.yy (lilypond): Add token aliases.
 
        * Documentation/user/music-glossary.tely (accidental): Fixes.  Do

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index c63f6c531c2239468a90a48c906237f401f53da5..cef4ed683615c88fa8c617b5e96e3acbf8669afb 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -168,8 +168,6 @@ Lily_parser::here_str0 () const
 void
 Lily_parser::parser_error (String s)
 {
-  /* FIXME: cannot otherwise internationalize this bison warning.  */
-  (void) _i ("syntax error, unexpected ");
   lexer_->here_input ().error (_ (s.to_str0 ()));
   error_level_ = 1;
 }

diff --git a/ly/init.ly b/ly/init.ly
index 04fa98748391acb1a11c0388fc4a9cc94f6c2718..cf7245980cd0dbbe247eb5545bc002f3f875b427 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -27,13 +27,11 @@
 #(if (and (ly:get-option 'old-relative)
       (defined? 'input-file-name)
       (not (ly:get-option 'old-relative-used)))
-  (ly:warning (string-append
-           "\n"
-           input-file-name ": old relative compatibility was not used."
-       )))%% there is a problem at the end of the input file
+  (old-relative-not-used-message input-file-name))%% there is a problem at the end of the input file
 
-#(if (not version-seen?)
-  (version-not-seen-message))
+#(if (and (not version-seen?)
+      (defined? 'input-file-name))
+  (version-not-seen-message input-file-name))
 
 #(if (pair? toplevel-scores)
   (ly:parser-print-book parser

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 77938bd9b4901f601f7b3d03fa8cb8bc3dbe63a0..2d25a3991f5fb6ea7a8757bdb7ddd07eea778099 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -339,8 +339,16 @@ possibly turned off."
     (debugf "design:~S\n" designsize)
     scaling))
 
-(define-public (version-not-seen-message)
-  (ly:warning
+(define-public (version-not-seen-message input-file-name)
+  (ly:message
+   (string-append
+    input-file-name ": 0: " (_ "warning: ")
    (format #f
-          (_ "No \\version statement found.  Add~afor future compatibility.")
-          (format #f "\n\n\\version ~s\n\n" (lilypond-version)))))
+          (_ "no \\version statement found,  add~afor future compatibility")
+          (format #f "\n\n\\version ~s\n\n" (lilypond-version))))))
+
+(define-public (old-relative-not-used-message input-file-name)
+  (ly:message
+   (string-append
+    input-file-name ": 0: " (_ "warning: ")
+    (_ "old relative compatibility not used"))))

diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make
index fe84a76fb6dfa4c3393efb95885ba81fe90b1c40..bdad9633e612c3b865b9e758d40b208cd90e7a44 100644 (file)
--- a/stepmake/stepmake/po-targets.make
+++ b/stepmake/stepmake/po-targets.make
@@ -23,8 +23,7 @@ ifneq ($(strip $(ALL_PO_SOURCES)),)
        @echo $(ALL_PO_SOURCES)
        xgettext --default-domain=$(package) --join \
         --output-dir=$(po-dir)/$(outdir) --add-comments \
-        --keyword=_ --keyword=_f --keyword=_i \
-        --keyword=yyerror \
+        --keyword=_ --keyword=_f --keyword=_i
         $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES)
 endif
 endif