message and silly fix

diff --git a/ChangeLog b/ChangeLog
index 10663780b0ee92c0943b098d75d307472a873daa..c555f04a3acb2ddf0c3832c64fcd7c81fc476075 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
        
 2002-08-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/parser.yy (assignment, Simple_music): Warning message fix.
+       Junk ARRAY_SIZE definition.
+
        * lily/score-engraver.cc: Uniformise error message.
 
        * lily/grob-property.cc (internal_set_grob_property,

diff --git a/lily/lexer.ll b/lily/lexer.ll
index d9b61340f6804daf1141d6f90bbe844371831abf..78b43638f2e5fb997be3b990025f45d7e4fccfb3 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -361,7 +361,7 @@ HYPHEN              --
                char c = s[s.length () - 1];
                if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
                        here_input ().warning (
-                               _ ("Brace found at end of lyric. Did you forget a space?"));
+                               _ ("Brace found at end of lyric.  Did you forget a space?"));
                yylval.scm = scm_makfrom0str (s.to_str0 ());
 
 

diff --git a/lily/parser.yy b/lily/parser.yy
index c314a96b171d04dc135f56bdb53b19002d91bebf..480edf162e545277b13738e32ee1b73ce4e75f5d 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -124,7 +124,6 @@ set_music_properties (Music *p, SCM a)
        ((My_lily_parser *) my_lily_parser)
 
 #define yyerror THIS->parser_error
-#define ARRAY_SIZE(a,s)   if (a.size () != s) THIS->parser_error (_f ("Expecting %d arguments", s))
 
 %}
 
@@ -432,7 +431,7 @@ assignment:
 
                if (! regular_identifier_b ($1))
                {
-                       ip.warning (_ ("Identifier should have  alphabetic characters only"));
+                       ip.warning (_ ("Identifier should have alphabetic characters only"));
                }
 
                THIS->lexer_->set_identifier ($1, $4);
@@ -798,10 +797,10 @@ Simple_music:
                {
                        THIS->parser_error (_ ("Second argument must be a symbol")); 
                }
-               /*hould check # args */
+               /* Should check # args */
                if (!gh_procedure_p (pred))
                {
-                       THIS->parser_error (_ ("First argument must be a procedure taking 1 argument"));
+                       THIS->parser_error (_ ("First argument must be a procedure taking one argument"));
                }
 
                Music *m = new Music (SCM_EOL);

diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc
index 582242400829734eec530bb8d3b328b8ae285f67..5e72942e291b18db81b67f26b703e7b8a21d528c 100644 (file)
--- a/lily/tfm-reader.cc
+++ b/lily/tfm-reader.cc
@@ -103,6 +103,8 @@ Tex_font_metric_reader::read_header ()
   /* We don't care about the extensible table.  */
 
   if (header_length < 2)
+    /* Not using ngettext's plural feature here, as this message is
+       more of a programming error.  */
     error (_f ("TFM header of `%s' has only %u word (s)",
               input_.name_string ().to_str0 (), header_length));
 

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 5b016b2d5ef4f303c18fb2531027c834fb30f947..f8ce3f462ff148e579083643e45a9ec4103c8445 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -327,7 +327,7 @@ latex_cmd = 'latex'
 tex_extension = '.tex'
 pdftex_p = 0
 
-help_summary = _ ("Generate .dvi with LaTeX for LilyPond")
+help_summary = _ ("Run LilyPond using LaTeX for titling")
 
 option_definitions = [
        ('', 'd', 'dependencies', _ ("write Makefile dependencies for every input file")),
@@ -338,9 +338,9 @@ option_definitions = [
        ('', 'm', 'no-paper', _ ("produce MIDI output only")),
        (_ ("FILE"), 'o', 'output', _ ("write ouput to FILE")),
        (_ ("FILE"), 'f', 'find-pfa', _ ("find pfa fonts used in FILE")),
-       # why capital P?
-       ('', '', 'preview', _("Make a picture of the first system.")),
-       (_ ('RES'), '', 'preview-resolution', _("Set the resolution of the preview to RES.")),
+       # FIXME: preview, picture; to indicate creation of a PNG?
+       ('', '', 'preview', _("make a picture of the first system.")),
+       (_ ('RES'), '', 'preview-resolution', _("set the resolution of the preview to RES.")),
        ('', 'P', 'postscript', _ ("generate PostScript output")),
        ('', 'p', 'pdf', _ ("generate PDF output")),    
        (_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")),