* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index f89f7fa5af599abf250aa1a4a458ff1ea2751ef8..d0a2dc50f01a2285bde30c5b603e14357f2cf00d 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -28,10 +28,13 @@
 
 /* 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 "music-function.hh"
 #include "source-file.hh"
 #include "parse-scm.hh"
@@ -161,7 +164,7 @@ HYPHEN              --
   }
 }
 
-<INITIAL,notes>\\encoding{WHITE}* {
+<INITIAL,lyrics,figures,notes>\\encoding{WHITE}* {
        yy_push_state (encoding);
 }
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
@@ -183,19 +186,22 @@ HYPHEN            --
        yy_pop_state ();
        if (!is_valid_version (s))
                return INVALID;
+
+       SCM top_scope = scm_car (scm_last_pair (scopes_));
+       scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T);
+
 }
 <renameinput>\"[^"]*\"     {
-       String s (YYText ()+1);
+       String s (YYText () + 1);
        s = s.left_string (s.index_last ('\"'));
 
        yy_pop_state();
        this->here_input().source_file_->name_ = s;
-       progress_indication ("\n");
-       progress_indication (_f ("input renamed to: `%s'", s.to_str0 ()));
+       progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ()));
        progress_indication ("\n");
        scm_module_define (scm_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
-                    scm_makfrom0str (s.to_str0()));
+                    scm_makfrom0str (s.to_str0 ()));
 
 }
 <encoding>.    {
@@ -241,16 +247,14 @@ HYPHEN            --
 <INITIAL,chords,lyrics,figures,notes>\\include           {
        yy_push_state (incl);
 }
-<incl>\"[^"]*\";?   { /* got the include file name */
-/* FIXME: semicolon? */
+<incl>\"[^"]*\"   { /* got the include file name */
        String s (YYText ()+1);
        s = s.left_string (s.index_last ('"'));
 
        new_input (s, sources_);
        yy_pop_state ();
 }
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
-/* FIXME: semicolon? */
+<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
        String s = YYText () + 1;
        strip_trailing_white (s);
        if (s.length () && (s[s.length () - 1] == ';'))
@@ -294,7 +298,7 @@ HYPHEN              --
                error_level_ = 1;
        }
 
-       for (int i=0; i < n; i++)
+       for (int i = 0; i < n; i++)
        {
                yyinput ();
        }
@@ -354,7 +358,6 @@ HYPHEN              --
                yylval.i = String_convert::dec2int (String (YYText () +1));
                return E_UNSIGNED;
        }
-
        \" {
                start_quote ();
        }
@@ -486,12 +489,6 @@ HYPHEN             --
        \" {
                start_quote ();
        }
-       \< {
-               return '<';
-       }
-       \> {
-               return '>';
-       }
        \\score {
                return SCORE;
        }
@@ -571,7 +568,7 @@ HYPHEN              --
 }
 {REAL}         {
        Real r;
-       int cnv=sscanf (YYText (), "%lf", &r);
+       int cnv = sscanf (YYText (), "%lf", &r);
        assert (cnv == 1);
 
        yylval.scm = scm_make_real (r);
@@ -599,7 +596,7 @@ HYPHEN              --
 }
 
 <INITIAL,lyrics,notes,figures>\\. {
-    char c= YYText ()[1];
+    char c = YYText ()[1];
 
     switch (c) {
     case '>':
@@ -779,7 +776,7 @@ Lily_lexer::is_figure_state () const
 void
 strip_leading_white (String&s)
 {
-       int i=0;
+       int i = 0;
        for (;  i < s.length (); i++) 
                if (!isspace (s[i]))
                        break;
@@ -790,7 +787,7 @@ strip_leading_white (String&s)
 void
 strip_trailing_white (String&s)
 {
-       int i=s.length ();      
+       int i = s.length ();    
        while (i--) 
                if (!isspace (s[i]))
                        break;
@@ -801,7 +798,7 @@ strip_trailing_white (String&s)
 
 
 /* 2.1.2x something -> \property -> \set. */ 
-Lilypond_version oldest_version ("2.2.0");
+Lilypond_version oldest_version ("2.3.22");
 
 
 bool
@@ -825,7 +822,7 @@ is_valid_version (String s)
 String
 lyric_fudge (String s)
 {
-  char  * chars  =s.get_copy_str0 ();
+  char  * chars  = s.get_copy_str0 ();
 
   for (char * p = chars; *p ; p++)
     {
@@ -836,8 +833,8 @@ lyric_fudge (String s)
   s = String (chars);
   delete[] chars;
 
-  int i =0;    
-  if ((i=s.index ("\\,")) != -1)   // change "\," to TeX's "\c "
+  int i = 0;   
+  if ((i = s.index ("\\,")) != -1)   // change "\," to TeX's "\c "
     {
       * (s.get_str0 () + i + 1) = 'c';
       s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2);
@@ -885,7 +882,7 @@ avoid_silly_flex_induced_gcc_warnings ()
 SCM
 lookup_markup_command (String s)
 {
-       SCM proc = ly_scheme_function ("lookup-markup-command");
+       SCM proc = ly_lily_module_constant ("lookup-markup-command");
        return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
 }
 
@@ -893,7 +890,7 @@ lookup_markup_command (String s)
 int
 music_function_type (SCM func)
 {
-       SCM type= scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
+       SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
        if (type == ly_symbol2scm ("scm"))
        {
                return MUSIC_FUNCTION_SCM;
@@ -922,6 +919,26 @@ music_function_type (SCM func)
        {
                return MUSIC_FUNCTION_SCM_SCM_MUSIC;
        }
+       else if (type == ly_symbol2scm ("markup"))
+       {
+               return MUSIC_FUNCTION_MARKUP;
+       }
+       else if (type == ly_symbol2scm ("markup-music"))
+       {
+               return MUSIC_FUNCTION_MARKUP_MUSIC;
+       }
+       else if (type == ly_symbol2scm ("markup-markup"))
+       {
+               return MUSIC_FUNCTION_MARKUP_MARKUP;
+       }
+       else if (type == ly_symbol2scm ("markup-music-music"))
+       {
+               return MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC;
+       }
+       else if (type == ly_symbol2scm ("markup-markup-music"))
+       {
+               return MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC;
+       }
        else if (type == ly_symbol2scm ("noarg"))
        {
                return MUSIC_FUNCTION;