* flower/string.cc (substitute): Take two strings or two

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 2372e6827859f7d12e1f4b8a550b210a418f0224..bca7f0a936b6f1db2a0fc3419de7bf77d38d6797 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -190,7 +190,7 @@ HYPHEN              --
 
        yy_pop_state();
        this->here_input().source_file_->name_ = s;
-       progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ()));
+       message (_f ("Renaming input to: `%s'", s.to_str0 ()));
        progress_indication ("\n");
        scm_module_define (scm_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
@@ -198,11 +198,11 @@ HYPHEN            --
 
 }
 <version>.     {
-       LexerError (_ ("No quoted string found after \\version").to_str0 ());
+       LexerError (_ ("quoted string expected after \\version").to_str0 ());
        yy_pop_state ();
 }
 <renameinput>.         {
-       LexerError (_ ("No quoted string found after \\renameinput").to_str0 ());
+       LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
        yy_pop_state ();
 }
 <longcomment>{
@@ -263,7 +263,7 @@ HYPHEN              --
          }
 }
 <incl>\"[^"]*   { // backup rule
-       error (_ ("Missing end quote"));
+       error (_ ("end quote missing"));
        exit (1);
 }
 <chords,notes,figures>{RESTNAME}       {
@@ -507,7 +507,7 @@ HYPHEN              --
                        else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
                                return MARKUP_HEAD_SCM0_SCM1_SCM2;
                        else {
-                               programming_error ("No parser tag defined for this signature. Abort"); 
+                               programming_error ("no parser tag defined for this signature"); 
                                ly_display_scm (s);
                                assert(false);
                        }
@@ -589,9 +589,9 @@ HYPHEN              --
 
     switch (c) {
     case '>':
-       return E_BIGGER;
+       return E_ANGLE_CLOSE;
     case '<':
-       return E_SMALLER;
+       return E_ANGLE_OPEN;
     case '!':
        return E_EXCLAMATION;
     case '(':
@@ -599,9 +599,9 @@ HYPHEN              --
     case ')':
        return E_CLOSE;
     case '[':
-       return E_LEFTSQUARE;
+       return E_BRACKET_OPEN;
     case ']':
-       return E_RIGHTSQUARE;
+       return E_BRACKET_CLOSE;
     case '~':
        return E_TILDE;
     case '\\':
@@ -936,7 +936,7 @@ music_function_type (SCM func)
        else
                {
                /* TODO: print location */
-               error ("Can not find signature for music function.");
+               error (_ ("can't find signature for music function"));
                }
 
        return MUSIC_FUNCTION_SCM;