* input/regression/markup-note.ly: new file

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index c6e6b7a920f9b103d23aa0828fe8c87c1f016945..7fc5828206eef619feb4a24bec0ceeda232ee15c 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -1,10 +1,10 @@
 %{ // -*-Fundamental-*-
 /*
-  lexer.l -- implement the Flex lexer
+  lexer.ll -- implement the Flex lexer
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -26,7 +26,12 @@
 #include <ctype.h>
 #include <errno.h>
 
+/* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks
+   when building the actual lexer.  */
+#define LEXER_CC
+
 #include <iostream>
+using namespace std;
 
 #include "parse-scm.hh"
 #include "lily-guile.hh"
@@ -53,6 +58,8 @@ void strip_trailing_white (String&);
 void strip_leading_white (String&);
 String lyric_fudge (String s);
 
+SCM
+lookup_markup_command (String s);
 
 bool
 valid_version_b (String s);
@@ -78,6 +85,7 @@ SCM scan_fraction (String);
 SCM (* scm_parse_error_handler) (void *);
 
 
+
 %}
 
 %option c++
@@ -97,7 +105,7 @@ SCM (* scm_parse_error_handler) (void *);
 %x figures
 %x quote
 %x longcomment
-
+%x markup 
 
 A              [a-zA-Z]
 AA             {A}|_
@@ -121,6 +129,7 @@ HORIZONTALWHITE             [ \t]
 BLACK          [^ \n\t\f\r]
 RESTNAME       [rs]
 NOTECOMMAND    \\{A}+
+MARKUPCOMMAND  \\({A}|[-_])+
 LYRICS         ({AA}|{TEX})[^0-9 \t\n\f]*
 ESCAPED                [nt\\'"]
 EXTENDER       __
@@ -132,7 +141,7 @@ HYPHEN              --
        // windows-suck-suck-suck
 }
 
-<INITIAL,chords,incl,lyrics,notes,figures>{
+<INITIAL,chords,incl,markup,lyrics,notes,figures>{
   "%{" {
        yy_push_state (longcomment);
   }
@@ -251,7 +260,7 @@ HYPHEN              --
        exit (1);
 }
 
-<INITIAL,chords,lyrics,notes,figures># { //embedded scm
+<INITIAL,markup,chords,lyrics,notes,figures>#  { //embedded scm
        //char const* s = YYText () + 1;
        char const* s = here_str0 ();
        int n = 0;
@@ -261,6 +270,11 @@ HYPHEN             --
                return SCM_T;
        }
        SCM sval = ly_parse_scm (s, &n, here_input());
+       if (sval == SCM_UNDEFINED)
+               {
+               sval = SCM_UNSPECIFIED;
+               errorlevel_ = 1;
+               }
 
        for (int i=0; i < n; i++)
        {
@@ -277,7 +291,7 @@ HYPHEN              --
        yylval.scm = sval;
        return SCM_T;
 }
-<INITIAL,notes>{ 
+<INITIAL,notes,markup>{ 
        \<\<   {
                return CHORD_OPEN;
        }
@@ -296,6 +310,7 @@ HYPHEN              --
                return FIGURE_OPEN;
        }
 }
+
 <notes,figures>{
        {ALPHAWORD}     {
                return scan_bare_word (YYText ());
@@ -427,6 +442,62 @@ HYPHEN             --
        }
 }
 
+
+<markup>{
+       \" {
+               start_quote ();
+       }
+       {MARKUPCOMMAND} {
+               String str (YYText() + 1);
+               SCM s = lookup_markup_command (str);
+
+               if (gh_pair_p (s) && gh_symbol_p (gh_cdr (s)) ) {
+                       yylval.scm = gh_car(s);
+                       SCM tag = gh_cdr(s);
+                       if (tag == ly_symbol2scm("markup0"))
+                               return MARKUP_HEAD_MARKUP0;
+                       else if (tag == ly_symbol2scm ("markup0-markup1"))
+                               return MARKUP_HEAD_MARKUP0_MARKUP1;
+                       else if (tag == ly_symbol2scm ("markup-list0"))
+                               return MARKUP_HEAD_LIST0;
+                       else if (tag == ly_symbol2scm ("scheme0"))
+                               return MARKUP_HEAD_SCM0;
+                       else if (tag == ly_symbol2scm ("scheme0-scheme1"))
+                               return MARKUP_HEAD_SCM0_SCM1;
+                       else if (tag == ly_symbol2scm ("scheme0-markup1"))
+                               return MARKUP_HEAD_SCM0_MARKUP1;
+                       else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
+                               return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
+                       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"); 
+                               ly_display_scm (s);
+                               assert(false);
+                       }
+               } else
+                       return scan_escaped_word (str);
+       }
+       {LYRICS} {
+               String s (YYText ()); 
+
+               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?"));
+               yylval.scm = scm_makfrom0str (s.to_str0 ());
+
+
+               return STRING;
+       }
+       {WHITE} {
+
+       }
+       . {
+               return YYText ()[0];
+       }
+}
+
 <<EOF>> {
 
 
@@ -530,6 +601,12 @@ My_lily_lexer::push_lyric_state ()
        yy_push_state (lyrics);
 }
 
+void
+My_lily_lexer::push_markup_state ()
+{
+       yy_push_state (markup);
+}
+
 void
 My_lily_lexer::pop_state ()
 {
@@ -591,7 +668,7 @@ My_lily_lexer::scan_bare_word (String str)
                } else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
                {
                    yylval.scm = ly_cdr (pitch);
-                   return CHORDMODIFIER_PITCH;
+                   return CHORD_MODIFIER;
                }
        }
 
@@ -662,7 +739,7 @@ valid_version_b (String s)
   Lilypond_version ver (s);
   if (! ((ver >= oldest_version) && (ver <= current)))
        {       
-               non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.string (), oldest_version.string (), current.string ()));
+               non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.to_string (), oldest_version.to_string (), current.to_string ()));
                non_fatal_error (_ ("Consider updating the input with the convert-ly script")); 
                return false;
     }
@@ -670,6 +747,9 @@ valid_version_b (String s)
 }
        
 
+/*
+  substittute _ adn \,
+*/
 String
 lyric_fudge (String s)
 {
@@ -710,6 +790,8 @@ scan_fraction (String frac)
        return gh_cons (gh_int2scm (n), gh_int2scm (d));
 }
 
+// Breaks for flex 2.5.31
+#if 0
 /* avoid silly flex induced gcc warnings */
 static void yy_push_state (int) {;}
 static void yy_pop_state () {;}
@@ -726,3 +808,14 @@ avoid_silly_flex_induced_gcc_warnings ()
        yy_top_state ();
        avoid_silly_flex_induced_gcc_warnings ();
 }
+#endif
+
+SCM
+lookup_markup_command (String s)
+{
+       static SCM proc ;
+       if (!proc)
+               proc = scm_c_eval_string ("lookup-markup-command");
+
+       return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
+}