DIRECTOR: Lingo: Added stubs for D3 Text-related syntax

1 files changed, 292 insertions, 270 deletions

diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 54cf786f77..6a2861c3dd 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -364,8 +364,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 65
-#define YY_END_OF_BUFFER 66
+#define YY_NUM_RULES 68
+#define YY_END_OF_BUFFER 69
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -373,33 +373,34 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[227] =
+static yyconst flex_int16_t yy_accept[236] =
     {   0,
-        0,    0,   66,   64,    3,   62,   62,   64,   64,   64,
-       61,   61,   61,   60,   61,   61,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,    2,    2,    3,   62,    0,    0,
-        0,    0,    0,   63,    4,   57,    1,   59,   60,   56,
-       54,   55,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   22,   12,   58,   58,   58,
-       58,   58,   58,   58,   33,   34,   58,   36,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   48,   58,   58,
-        2,    2,    0,    4,    1,   59,   58,    6,   58,   58,
-
-       58,   58,   58,   58,   16,   58,   58,   58,   58,    0,
-       58,   58,   58,   58,   58,   29,   58,   58,   32,   58,
-       58,   58,   39,   58,   41,   58,   58,   58,   58,   58,
-       58,   58,    0,   58,   58,    8,   58,   10,   11,   15,
-       18,   58,   58,   58,    0,   58,   58,   25,   26,   58,
-       58,   58,   31,   35,   37,   58,   58,   58,   58,   58,
-        0,   47,   52,   58,   50,   14,    5,   58,   58,   58,
-       19,   58,   21,   58,   58,   27,   58,   30,   58,   58,
-       42,   58,   58,   46,   46,   53,   58,    0,    7,   58,
-       58,   20,   58,   58,   28,   58,   40,   49,   43,    0,
-
-       46,   51,    0,   58,   17,   58,   58,   58,    0,   46,
-       13,    9,   23,   58,   38,    0,   46,   58,    0,    0,
-       24,   45,    0,    0,   44,    0
+        0,    0,   69,   67,    3,   65,   65,   67,   67,   67,
+       64,   64,   64,   63,   64,   64,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,    2,    2,    3,   65,    0,    0,
+        0,    0,    0,   66,    4,   60,    1,   62,   63,   59,
+       57,   58,   61,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   22,   12,   61,   61,   61,
+       61,   61,   61,   61,   61,   61,   35,   36,   61,   38,
+       61,   61,   61,   61,   61,   61,   61,   61,   61,   50,
+       61,   61,   61,    2,    2,    0,    4,    1,   62,   61,
+
+        6,   61,   61,   61,   61,   61,   61,   16,   61,   61,
+       61,   61,    0,   61,   61,   61,   61,   61,   61,   61,
+       31,   61,   61,   34,   61,   61,   61,   41,   61,   43,
+       61,   61,   61,   61,   61,   61,   61,   61,    0,   61,
+       61,    8,   61,   10,   11,   15,   18,   61,   61,   61,
+        0,   61,   61,   25,   26,   27,   28,   61,   61,   61,
+       33,   37,   39,   61,   61,   61,   61,   61,    0,   49,
+       54,   61,   52,   56,   14,    5,   61,   61,   61,   19,
+       61,   21,   61,   61,   29,   61,   32,   61,   61,   44,
+       61,   61,   48,   48,   55,   61,    0,    7,   61,   61,
+
+       20,   61,   61,   30,   61,   42,   51,   45,    0,   48,
+       53,    0,   61,   17,   61,   61,   61,    0,   48,   13,
+        9,   23,   61,   40,    0,   48,   61,    0,    0,   24,
+       47,    0,    0,   46,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -445,67 +446,69 @@ static yyconst flex_int32_t yy_meta[64] =
         5,    5,    5
     } ;
 
-static yyconst flex_int16_t yy_base[234] =
+static yyconst flex_int16_t yy_base[243] =
     {   0,
-        0,   62,  228,  553,   66,   70,   74,   78,  205,    0,
-      553,  161,  156,   54,   70,  135,   65,   67,   68,   60,
-       70,   86,   75,    0,   78,   76,   94,  111,  113,  118,
-      106,  128,  123,  131,  185,  189,  193,  553,  197,  158,
-      202,   83,  132,  553,    0,  553,    0,   95,  125,  553,
-      553,  553,    0,  127,  164,  163,  194,  184,  187,  180,
-      197,  193,  200,  203,  185,   90,    0,  192,  192,  209,
-      195,  215,  192,  197,    0,    0,  212,    0,  217,  220,
-      212,  226,  226,  226,  230,  247,  244,    0,  247,  232,
-      274,  295,  236,    0,    0,   76,  261,    0,  254,  255,
-
-      257,  274,  273,  275,    0,  268,  269,  277,  288,  307,
-      274,  293,  280,  284,  291,    0,  293,  287,    0,  295,
-      285,  293,    0,  298,    0,  303,  309,  303,  347,  308,
-      311,  321,  331,  318,  322,    0,  340,    0,    0,    0,
-        0,  333,  337,  347,  337,  348,  335,    0,    0,  339,
-      341,  351,    0,    0,    0,  348,  357,  358,  345,  346,
-      382,    0,    0,  363,  361,   98,    0,  373,  371,  368,
-        0,  375,  553,  377,  373,    0,  388,    0,  380,  377,
-        0,  392,  381,  170,  411,    0,  389,  421,    0,  391,
-      383,    0,  409,  408,    0,  396,    0,    0,    0,  442,
-
-      446,    0,  413,  403,    0,  420,  431,  423,  429,  452,
-      553,    0,    0,  424,    0,  218,  459,  430,  467,  471,
-        0,  479,  446,  483,  488,  553,  524,  526,  529,  532,
-      538,  543,  547
+        0,   62,  201,  569,   66,   70,   74,   78,  193,    0,
+      569,  184,  182,   54,   70,  158,   65,   67,   68,   60,
+       70,   86,   75,    0,  102,   85,  117,  106,  135,  118,
+       79,  149,  118,  161,  193,  213,  217,  569,  221,  225,
+      229,   79,  139,  569,    0,  569,    0,   98,   95,  569,
+      569,  569,    0,   97,  120,  136,  145,  121,  176,  119,
+      156,  156,  193,  213,  159,   90,    0,  205,  215,  212,
+      212,  224,  210,  233,  209,  214,    0,    0,  230,    0,
+      235,  233,  221,  226,  223,  223,  227,  245,  246,    0,
+      264,  239,  255,  296,  300,  257,    0,    0,   76,  265,
+
+        0,  263,  262,  261,  276,  278,  287,    0,  278,  281,
+      290,  291,  318,  288,  305,  297,  306,  299,  299,  312,
+        0,  313,  306,    0,  314,  304,  308,    0,  318,    0,
+      317,  323,  317,  352,  331,  335,  333,  346,  350,  342,
+      343,    0,  355,    0,    0,    0,    0,  348,  358,  366,
+      355,  370,  356,    0,    0,    0,    0,  360,  362,  372,
+        0,    0,    0,  369,  378,  378,  366,  368,  404,    0,
+        0,  385,  386,    0,   98,    0,  394,  392,  388,    0,
+      395,  569,  395,  392,    0,  408,    0,  400,  397,    0,
+      412,  401,  138,  431,    0,  412,  441,    0,  414,  409,
+
+        0,  420,  430,    0,  419,    0,    0,    0,  454,  465,
+        0,  430,  427,    0,  448,  451,  438,  452,  472,  569,
+        0,    0,  445,    0,  241,  480,  447,  486,  487,    0,
+      494,  466,  500,  506,  569,  540,  542,  545,  548,  554,
+      559,  563
     } ;
 
-static yyconst flex_int16_t yy_def[234] =
+static yyconst flex_int16_t yy_def[243] =
     {   0,
-      226,    1,  226,  226,  226,  226,  226,  226,  227,  228,
-      226,  226,  226,  226,  226,  226,  229,  229,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  226,  226,  226,  226,  226,  226,
-      226,  226,  227,  226,  230,  226,  231,  226,  226,  226,
-      226,  226,  229,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      226,  226,  226,  230,  231,  226,  229,  229,  229,  229,
-
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  226,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  226,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  226,  229,  229,  229,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  229,
-      232,  229,  229,  229,  229,  226,  229,  229,  229,  229,
-      229,  229,  226,  229,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  232,  232,  229,  229,  226,  229,  229,
-      229,  229,  229,  229,  229,  229,  229,  229,  229,  226,
-
-      232,  229,  226,  229,  229,  229,  229,  229,  226,  232,
-      226,  229,  229,  229,  229,  226,  232,  229,  233,  226,
-      229,  233,  226,  226,  233,    0,  226,  226,  226,  226,
-      226,  226,  226
+      235,    1,  235,  235,  235,  235,  235,  235,  236,  237,
+      235,  235,  235,  235,  235,  235,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  235,  235,  235,  235,  235,  235,
+      235,  235,  236,  235,  239,  235,  240,  235,  235,  235,
+      235,  235,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  235,  235,  235,  239,  240,  235,  238,
+
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  235,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  235,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      235,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  238,  238,  238,  238,  238,  238,  241,  238,
+      238,  238,  238,  238,  235,  238,  238,  238,  238,  238,
+      238,  235,  238,  238,  238,  238,  238,  238,  238,  238,
+      238,  238,  241,  241,  238,  238,  235,  238,  238,  238,
+
+      238,  238,  238,  238,  238,  238,  238,  238,  235,  241,
+      238,  235,  238,  238,  238,  238,  238,  235,  241,  235,
+      238,  238,  238,  238,  235,  241,  238,  242,  235,  238,
+      242,  235,  235,  242,    0,  235,  235,  235,  235,  235,
+      235,  235
     } ;
 
-static yyconst flex_int16_t yy_nxt[617] =
+static yyconst flex_int16_t yy_nxt[633] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
         4,   14,   15,   11,   16,   17,   18,   19,   20,   21,
@@ -515,69 +518,71 @@ static yyconst flex_int16_t yy_nxt[617] =
        27,   28,   29,   30,   24,   31,   32,   33,   24,   24,
        34,   24,   24,   35,   48,   49,   36,   37,   38,   38,
        39,   40,   41,   41,   40,   40,   41,   41,   40,   39,
-       38,   38,   39,   50,   51,   54,   56,   96,   59,   42,
-       57,  110,   55,   42,  110,   60,   58,   61,   67,  188,
+       38,   38,   39,   50,   51,   54,   56,   99,   59,   42,
+       57,  113,   55,   42,  113,   60,   58,   61,   84,  197,
 
-       65,   63,  188,   66,   69,   68,   96,   62,   93,   70,
+       65,   63,  197,   66,   96,   48,   49,   62,   70,   99,
        54,   56,   59,   71,   42,   57,   55,   64,   42,   60,
-       58,   61,   72,   67,   65,   82,   63,   66,   69,   68,
-       73,   62,   93,   75,   70,   48,   49,   44,   71,   74,
-       76,   64,   77,   79,   78,   87,   72,   83,   52,   80,
-       82,   88,   81,   89,   90,   73,   84,   85,   75,   40,
-       97,   86,   40,   74,   76,   47,   77,   79,   78,   46,
-       87,  200,   83,   80,  200,   88,   81,   42,   89,   90,
-       84,   85,   98,   99,   97,   86,   91,   38,   38,   92,
-       92,   38,   38,   92,   37,   38,   38,   39,   39,   38,
-
-       38,   39,   42,   40,   41,   41,   40,   98,   99,  100,
-       44,  101,  104,  109,  102,  105,  106,  107,  108,  219,
-      113,   42,  219,  103,  111,  112,  114,  226,  115,  118,
-      119,  120,  121,  116,  100,  101,  104,  109,  102,  122,
-      105,  106,  107,  108,  113,  123,   42,  103,  111,  112,
-      117,  114,  115,  118,  119,  124,  120,  121,  116,  125,
-      126,  127,  128,  129,  122,  132,  130,  226,  133,  123,
-      131,  226,  226,  226,  117,   91,   38,   38,   92,  124,
-      134,  226,  135,  125,  126,  127,  136,  128,  129,  132,
-      137,  130,  133,  138,  140,  131,   92,   38,   38,   92,
-
-      139,  141,  142,  143,  144,  134,  135,  146,  110,  149,
-      136,  110,  147,  151,  137,  150,  152,  157,  138,  140,
-      153,  148,  154,  155,  139,  141,  142,  143,  156,  144,
-      158,  146,  159,  149,  160,  163,  164,  147,  151,  150,
-      145,  152,  157,  165,  153,  148,  154,  155,  161,  167,
-      166,  161,  156,  168,  158,  169,  171,  159,  160,  163,
-      164,  170,  172,  174,  145,  173,  175,  176,  165,  177,
-      178,  179,  180,  167,  162,  166,  181,  168,  182,  183,
-      169,  171,  186,  161,  187,  170,  161,  172,  174,  173,
-      175,  176,  189,  177,  190,  178,  179,  180,  162,  191,
-
-      192,  181,  182,  183,  193,  194,  195,  186,  196,  187,
-      197,  198,  200,  199,  185,  200,  202,  189,  204,  190,
-      226,  205,  188,  191,  192,  188,  206,  207,  193,  194,
-      208,  195,  196,  211,  197,  212,  198,  199,  185,  213,
-      202,  201,  204,  200,  203,  205,  200,  200,  214,  216,
-      200,  206,  207,  200,  208,  215,  200,  218,  211,  212,
-      220,  226,  221,  220,  213,  201,  224,  226,  219,  203,
-      209,  219,  220,  214,  216,  220,  226,  210,  226,  215,
-      226,  218,  226,  226,  225,  217,  221,  225,  226,  225,
-      226,  224,  225,  226,  209,  226,  226,  226,  226,  223,
-
-      226,  210,  226,  226,  226,  226,  226,  226,  226,  217,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  223,   43,   43,  226,   43,   43,   43,
-       45,   45,   53,   53,   53,   94,   94,   94,   95,   95,
-      226,   95,   95,   95,  184,  226,  226,  184,  222,  226,
-      226,  222,    3,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226
+       58,   61,   67,   84,   65,   75,   63,   66,   96,   68,
+      100,   62,   72,   70,   76,   69,   73,   71,  101,  209,
+       89,   64,  209,   81,   44,   74,   90,   67,  104,   82,
+       75,  107,   83,   68,  100,   77,  102,   72,   76,   69,
+      103,   73,   78,  101,   79,   89,   80,   81,   85,   74,
+       90,   52,  104,   82,  108,  107,   83,   86,   87,  109,
+       77,  102,   88,   91,   92,  103,   78,  112,   79,   93,
+       80,   47,   46,   85,   94,   38,   38,   95,   44,  108,
+
+      235,   86,   87,  105,  109,  235,   88,  235,   91,   92,
+      110,  112,  106,   93,   95,   38,   38,   95,   37,   38,
+       38,   39,   39,   38,   38,   39,   40,  105,  111,   40,
+       40,   41,   41,   40,  116,  110,  106,  114,  115,  117,
+      118,  119,  228,  120,   42,  228,  123,  124,   42,  125,
+      126,  121,  127,  111,  128,  129,  130,  131,  132,  116,
+      133,  114,  115,  117,  118,  134,  119,  120,  122,   42,
+      123,  124,  137,   42,  125,  126,  121,  127,  128,  129,
+      130,  131,  132,  135,  140,  133,  138,  136,  235,  139,
+      134,  141,  122,  142,  143,  144,  137,   94,   38,   38,
+
+       95,   95,   38,   38,   95,  145,  146,  150,  135,  140,
+      138,  147,  136,  139,  148,  141,  149,  142,  143,  113,
+      144,  152,  113,  155,  153,  156,  235,  235,  157,  145,
+      158,  146,  150,  154,  159,  147,  160,  165,  148,  161,
+      149,  162,  163,  164,  166,  152,  167,  155,  168,  153,
+      156,  151,  157,  169,  158,  173,  169,  154,  171,  159,
+      172,  160,  165,  161,  174,  162,  163,  164,  166,  175,
+      178,  167,  168,  176,  177,  151,  179,  180,  235,  170,
+      173,  181,  171,  182,  172,  183,  235,  184,  185,  174,
+      186,  187,  188,  189,  175,  178,  190,  176,  177,  191,
+
+      179,  192,  180,  170,  195,  169,  181,  182,  169,  196,
+      183,  184,  185,  198,  186,  199,  187,  188,  189,  200,
+      201,  190,  202,  191,  203,  192,  204,  235,  205,  195,
+      206,  207,  209,  208,  196,  209,  194,  215,  198,  211,
+      199,  213,  197,  200,  201,  197,  202,  214,  203,  216,
+      220,  204,  205,  217,  206,  209,  207,  208,  209,  221,
+      194,  210,  215,  211,  212,  213,  209,  222,  223,  209,
+      224,  214,  225,  209,  216,  220,  209,  217,  227,  230,
+      235,  229,  218,  221,  229,  210,  233,  228,  229,  212,
+      228,  229,  222,  223,  224,  235,  219,  225,  235,  235,
+
+      235,  234,  227,  230,  234,  226,  218,  234,  235,  235,
+      234,  233,  235,  235,  235,  232,  235,  235,  235,  235,
+      219,  235,  235,  235,  235,  235,  235,  235,  235,  226,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  232,
+       43,   43,  235,   43,   43,   43,   45,   45,   53,   53,
+       53,   97,   97,   97,   98,   98,  235,   98,   98,   98,
+      193,  235,  235,  193,  231,  235,  235,  231,    3,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235
     } ;
 
-static yyconst flex_int16_t yy_chk[617] =
+static yyconst flex_int16_t yy_chk[633] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -587,66 +592,68 @@ static yyconst flex_int16_t yy_chk[617] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    2,   14,   14,    2,    5,    5,    5,
         5,    6,    6,    6,    6,    7,    7,    7,    7,    8,
-        8,    8,    8,   15,   15,   17,   18,   96,   20,    6,
-       19,   66,   17,    7,   66,   21,   19,   21,   25,  166,
-
-       23,   22,  166,   23,   26,   25,   48,   21,   42,   27,
-       17,   18,   20,   27,    6,   19,   17,   22,    7,   21,
-       19,   21,   27,   25,   23,   31,   22,   23,   26,   25,
-       28,   21,   42,   29,   27,   49,   49,   43,   27,   28,
-       29,   22,   29,   30,   29,   33,   27,   32,   16,   30,
-       31,   33,   30,   34,   34,   28,   32,   32,   29,   40,
-       54,   32,   40,   28,   29,   13,   29,   30,   29,   12,
-       33,  184,   32,   30,  184,   33,   30,   40,   34,   34,
-       32,   32,   55,   56,   54,   32,   35,   35,   35,   35,
-       36,   36,   36,   36,   37,   37,   37,   37,   39,   39,
-
-       39,   39,   40,   41,   41,   41,   41,   55,   56,   57,
-        9,   58,   60,   65,   59,   61,   62,   63,   64,  216,
-       69,   41,  216,   59,   68,   68,   70,    3,   71,   73,
-       74,   77,   79,   72,   57,   58,   60,   65,   59,   80,
-       61,   62,   63,   64,   69,   81,   41,   59,   68,   68,
-       72,   70,   71,   73,   74,   82,   77,   79,   72,   83,
-       84,   85,   86,   87,   80,   90,   89,    0,   93,   81,
-       89,    0,    0,    0,   72,   91,   91,   91,   91,   82,
-       97,    0,   99,   83,   84,   85,  100,   86,   87,   90,
-      101,   89,   93,  102,  104,   89,   92,   92,   92,   92,
-
-      103,  106,  107,  108,  109,   97,   99,  111,  110,  113,
-      100,  110,  112,  115,  101,  114,  117,  124,  102,  104,
-      118,  112,  120,  121,  103,  106,  107,  108,  122,  109,
-      126,  111,  127,  113,  128,  130,  131,  112,  115,  114,
-      110,  117,  124,  132,  118,  112,  120,  121,  129,  134,
-      133,  129,  122,  135,  126,  137,  143,  127,  128,  130,
-      131,  142,  144,  146,  110,  145,  147,  150,  132,  151,
-      152,  156,  157,  134,  129,  133,  158,  135,  159,  160,
-      137,  143,  164,  161,  165,  142,  161,  144,  146,  145,
-      147,  150,  168,  151,  169,  152,  156,  157,  129,  170,
-
-      172,  158,  159,  160,  174,  175,  177,  164,  179,  165,
-      180,  182,  185,  183,  161,  185,  187,  168,  190,  169,
-        0,  191,  188,  170,  172,  188,  193,  194,  174,  175,
-      196,  177,  179,  203,  180,  204,  182,  183,  161,  206,
-      187,  185,  190,  200,  188,  191,  200,  201,  207,  209,
-      201,  193,  194,  210,  196,  208,  210,  214,  203,  204,
-      217,    0,  218,  217,  206,  185,  223,    0,  219,  188,
-      200,  219,  220,  207,  209,  220,    0,  201,    0,  208,
-      222,  214,    0,  222,  224,  210,  218,  224,    0,  225,
-        0,  223,  225,    0,  200,    0,    0,    0,    0,  220,
-
-        0,  201,    0,    0,    0,    0,    0,    0,    0,  210,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  220,  227,  227,    0,  227,  227,  227,
-      228,  228,  229,  229,  229,  230,  230,  230,  231,  231,
-        0,  231,  231,  231,  232,    0,    0,  232,  233,    0,
-        0,  233,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-      226,  226,  226,  226,  226,  226
+        8,    8,    8,   15,   15,   17,   18,   99,   20,    6,
+       19,   66,   17,    7,   66,   21,   19,   21,   31,  175,
+
+       23,   22,  175,   23,   42,   49,   49,   21,   26,   48,
+       17,   18,   20,   26,    6,   19,   17,   22,    7,   21,
+       19,   21,   25,   31,   23,   28,   22,   23,   42,   25,
+       54,   21,   27,   26,   28,   25,   27,   26,   55,  193,
+       33,   22,  193,   30,   43,   27,   33,   25,   58,   30,
+       28,   60,   30,   25,   54,   29,   56,   27,   28,   25,
+       57,   27,   29,   55,   29,   33,   29,   30,   32,   27,
+       33,   16,   58,   30,   61,   60,   30,   32,   32,   62,
+       29,   56,   32,   34,   34,   57,   29,   65,   29,   34,
+       29,   13,   12,   32,   35,   35,   35,   35,    9,   61,
+
+        3,   32,   32,   59,   62,    0,   32,    0,   34,   34,
+       63,   65,   59,   34,   36,   36,   36,   36,   37,   37,
+       37,   37,   39,   39,   39,   39,   40,   59,   64,   40,
+       41,   41,   41,   41,   69,   63,   59,   68,   68,   70,
+       71,   72,  225,   73,   40,  225,   75,   76,   41,   79,
+       81,   74,   82,   64,   83,   84,   85,   86,   87,   69,
+       88,   68,   68,   70,   71,   89,   72,   73,   74,   40,
+       75,   76,   92,   41,   79,   81,   74,   82,   83,   84,
+       85,   86,   87,   91,  100,   88,   93,   91,    0,   96,
+       89,  102,   74,  103,  104,  105,   92,   94,   94,   94,
+
+       94,   95,   95,   95,   95,  106,  107,  112,   91,  100,
+       93,  109,   91,   96,  110,  102,  111,  103,  104,  113,
+      105,  114,  113,  116,  115,  117,    0,    0,  118,  106,
+      119,  107,  112,  115,  120,  109,  122,  129,  110,  123,
+      111,  125,  126,  127,  131,  114,  132,  116,  133,  115,
+      117,  113,  118,  134,  119,  137,  134,  115,  135,  120,
+      136,  122,  129,  123,  138,  125,  126,  127,  131,  139,
+      143,  132,  133,  140,  141,  113,  148,  149,    0,  134,
+      137,  150,  135,  151,  136,  152,    0,  153,  158,  138,
+      159,  160,  164,  165,  139,  143,  166,  140,  141,  167,
+
+      148,  168,  149,  134,  172,  169,  150,  151,  169,  173,
+      152,  153,  158,  177,  159,  178,  160,  164,  165,  179,
+      181,  166,  183,  167,  184,  168,  186,    0,  188,  172,
+      189,  191,  194,  192,  173,  194,  169,  202,  177,  196,
+      178,  199,  197,  179,  181,  197,  183,  200,  184,  203,
+      212,  186,  188,  205,  189,  209,  191,  192,  209,  213,
+      169,  194,  202,  196,  197,  199,  210,  215,  216,  210,
+      217,  200,  218,  219,  203,  212,  219,  205,  223,  227,
+        0,  226,  209,  213,  226,  194,  232,  228,  229,  197,
+      228,  229,  215,  216,  217,  231,  210,  218,  231,    0,
+
+        0,  233,  223,  227,  233,  219,  209,  234,    0,    0,
+      234,  232,    0,    0,    0,  229,    0,    0,    0,    0,
+      210,    0,    0,    0,    0,    0,    0,    0,    0,  219,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  229,
+      236,  236,    0,  236,  236,  236,  237,  237,  238,  238,
+      238,  239,  239,  239,  240,  240,    0,  240,  240,  240,
+      241,    0,    0,  241,  242,    0,    0,  242,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+      235,  235
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -720,7 +727,7 @@ static void countnl() {
 	g_lingo->_colnumber = strlen(p);
 }
 
-#line 724 "engines/director/lingo/lingo-lex.cpp"
+#line 731 "engines/director/lingo/lingo-lex.cpp"
 
 #define INITIAL 0
 
@@ -908,7 +915,7 @@ YY_DECL
 #line 69 "engines/director/lingo/lingo-lex.l"
 
 
-#line 912 "engines/director/lingo/lingo-lex.cpp"
+#line 919 "engines/director/lingo/lingo-lex.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -962,13 +969,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 227 )
+				if ( yy_current_state >= 236 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 553 );
+		while ( yy_base[yy_current_state] != 569 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1122,96 +1129,106 @@ YY_RULE_SETUP
 case 26:
 YY_RULE_SETUP
 #line 98 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLOOP; }
+{ count(); return tITEM; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 99 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMACRO; }
+{ count(); return tLINE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 100 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMETHOD; }
+{ count(); return tLOOP; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 101 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMOD; }
+{ count(); return tMACRO; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 102 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMOVIE; }
+{ count(); return tMETHOD; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 103 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEXT; }
+{ count(); return tMOD; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 104 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNOT; }
+{ count(); return tMOVIE; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 105 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOF; }
+{ count(); return tNEXT; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 106 "engines/director/lingo/lingo-lex.l"
-{ count(); return tON; }		// D3
+{ count(); return tNOT; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 107 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOPEN; }
+{ count(); return tOF; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 108 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOR; }
+{ count(); return tON; }		// D3
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 109 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPLAY; }
+{ count(); return tOPEN; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 110 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPREVIOUS; }
+{ count(); return tOR; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
 #line 111 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPUT; }
+{ count(); return tPLAY; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 112 "engines/director/lingo/lingo-lex.l"
-{ count(); return tREPEAT; }
+{ count(); return tPREVIOUS; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 113 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSET; }
+{ count(); return tPUT; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 114 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSOUND; }		// D3
+{ count(); return tREPEAT; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 115 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSTARTS; }
+{ count(); return tSET; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 116 "engines/director/lingo/lingo-lex.l"
+{ count(); return tSOUND; }		// D3
+	YY_BREAK
+case 45:
+YY_RULE_SETUP
+#line 117 "engines/director/lingo/lingo-lex.l"
+{ count(); return tSTARTS; }
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 118 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1221,9 +1238,9 @@ YY_RULE_SETUP
 		return THEENTITYWITHID;
 	}
 	YY_BREAK
-case 45:
+case 47:
 YY_RULE_SETUP
-#line 124 "engines/director/lingo/lingo-lex.l"
+#line 126 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1265,9 +1282,9 @@ YY_RULE_SETUP
 		warning("Unhandled the entity %s", ptr);
 	}
 	YY_BREAK
-case 46:
+case 48:
 YY_RULE_SETUP
-#line 164 "engines/director/lingo/lingo-lex.l"
+#line 166 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1288,64 +1305,69 @@ YY_RULE_SETUP
 		warning("Unhandled the entity %s", ptr);
 	}
 	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 183 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTHEN; }
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 184 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTO; }
-	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 185 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSPRITE; }
+{ count(); return tTHEN; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 186 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITH; }
+{ count(); return tTO; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 187 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITHIN; }
+{ count(); return tSPRITE; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 188 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHEN; }
+{ count(); return tWITH; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 189 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHILE; }
+{ count(); return tWITHIN; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 191 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEQ; }
+#line 190 "engines/director/lingo/lingo-lex.l"
+{ count(); return tWHEN; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 192 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGE; }
+#line 191 "engines/director/lingo/lingo-lex.l"
+{ count(); return tWHILE; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 193 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLE; }
+#line 192 "engines/director/lingo/lingo-lex.l"
+{ count(); return tWORD; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 194 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCONCAT; }
+{ count(); return tNEQ; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
+#line 195 "engines/director/lingo/lingo-lex.l"
+{ count(); return tGE; }
+	YY_BREAK
+case 59:
+YY_RULE_SETUP
 #line 196 "engines/director/lingo/lingo-lex.l"
+{ count(); return tLE; }
+	YY_BREAK
+case 60:
+YY_RULE_SETUP
+#line 197 "engines/director/lingo/lingo-lex.l"
+{ count(); return tCONCAT; }
+	YY_BREAK
+case 61:
+YY_RULE_SETUP
+#line 199 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 		yylval.s = new Common::String(yytext);
@@ -1376,43 +1398,43 @@ YY_RULE_SETUP
 		return ID;
 	}
 	YY_BREAK
-case 59:
+case 62:
 YY_RULE_SETUP
-#line 225 "engines/director/lingo/lingo-lex.l"
+#line 228 "engines/director/lingo/lingo-lex.l"
 { count(); yylval.f = atof(yytext); return FLOAT; }
 	YY_BREAK
-case 60:
+case 63:
 YY_RULE_SETUP
-#line 226 "engines/director/lingo/lingo-lex.l"
+#line 229 "engines/director/lingo/lingo-lex.l"
 { count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
 	YY_BREAK
-case 61:
+case 64:
 YY_RULE_SETUP
-#line 227 "engines/director/lingo/lingo-lex.l"
+#line 230 "engines/director/lingo/lingo-lex.l"
 { count(); return *yytext; }
 	YY_BREAK
-case 62:
-/* rule 62 can match eol */
+case 65:
+/* rule 65 can match eol */
 YY_RULE_SETUP
-#line 228 "engines/director/lingo/lingo-lex.l"
+#line 231 "engines/director/lingo/lingo-lex.l"
 { return '\n'; }
 	YY_BREAK
-case 63:
+case 66:
 YY_RULE_SETUP
-#line 229 "engines/director/lingo/lingo-lex.l"
+#line 232 "engines/director/lingo/lingo-lex.l"
 { count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
 	YY_BREAK
-case 64:
+case 67:
 YY_RULE_SETUP
-#line 230 "engines/director/lingo/lingo-lex.l"
+#line 233 "engines/director/lingo/lingo-lex.l"
 
 	YY_BREAK
-case 65:
+case 68:
 YY_RULE_SETUP
-#line 232 "engines/director/lingo/lingo-lex.l"
+#line 235 "engines/director/lingo/lingo-lex.l"
 ECHO;
 	YY_BREAK
-#line 1416 "engines/director/lingo/lingo-lex.cpp"
+#line 1438 "engines/director/lingo/lingo-lex.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1705,7 +1727,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 227 )
+			if ( yy_current_state >= 236 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1733,11 +1755,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 227 )
+		if ( yy_current_state >= 236 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 226);
+	yy_is_jam = (yy_current_state == 235);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2412,7 +2434,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 232 "engines/director/lingo/lingo-lex.l"
+#line 235 "engines/director/lingo/lingo-lex.l"