Make deferral default in Shogi promotions

Because '+' is intercepted by the parser as check indicator, Shogi moves
are pre-processed to change a trailing '+' into an internally used
alternative '^'. The testing if a promotion character is OK is now done
in LegalityTest() and Disambiguate(), which return ImpossibleMove when
the character does not correspond to any piece, and IllegalMove when in
Shogi anything other than '^' or '=' is used. (Except for the ICS
notations.) On output, in CoordsToComputerAlgebraic() and
CoordsToAlgebraic(), the '^' is translated back to '+'.

diff --git a/backend.c b/backend.c
index 16fdc62..5c7ebad 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -4377,7 +4377,7 @@ ParseBoard12(string)
            strcat(parseList[moveNum - 1], " ");
            strcat(parseList[moveNum - 1], elapsed_time);
            /* currentMoveString is set as a side-effect of ParseOneMove */
-           if(gameInfo.variant == VariantShogi && currentMoveString[4]) currentMoveString[4] = '+';
+           if(gameInfo.variant == VariantShogi && currentMoveString[4]) currentMoveString[4] = '^';
            safeStrCpy(moveList[moveNum - 1], currentMoveString, sizeof(moveList[moveNum - 1])/sizeof(moveList[moveNum - 1][0]));
            strcat(moveList[moveNum - 1], "\n");
 
@@ -4804,7 +4804,7 @@ CoordsToComputerAlgebraic(rf, ff, rt, ft, promoChar, move)
                     AAA + ff, ONE + rf, AAA + ft, ONE + rt);
        } else {
            sprintf(move, "%c%c%c%c%c\n",
-                    AAA + ff, ONE + rf, AAA + ft, ONE + rt, promoChar);
+                    AAA + ff, ONE + rf, AAA + ft, ONE + rt, promoChar == '^' ? '+' : promoChar);
        }
     }
 }
@@ -4884,10 +4884,16 @@ ParseOneMove(move, moveNum, moveType, fromX, fromY, toX, toY, promoChar)
      int *fromX, *fromY, *toX, *toY;
      char *promoChar;
 {
+    char moveCopy[20], *p = moveCopy;
+    strncpy(moveCopy, move, 20); // make a copy of move to preprocess it
+    if(gameInfo.variant == VariantShogi) {
+        while(*p && *p != ' ') p++;
+        if(p[-1] == '+') p[-1] = '^'; // in Shogi '+' is promotion, distinguish from check
+    }
     if (appData.debugMode) {
-        fprintf(debugFP, "move to parse: %s\n", move);
+        fprintf(debugFP, "move to parse: %s\n", moveCopy);
     }
-    *moveType = yylexstr(moveNum, move, yy_textstr, sizeof yy_textstr);
+    *moveType = yylexstr(moveNum, moveCopy, yy_textstr, sizeof yy_textstr);
 
     switch (*moveType) {
       case WhitePromotion:
@@ -5694,14 +5700,14 @@ HasPromotionChoice(int fromX, int fromY, int toX, int toY, char *promoChoice)
            if(toY == 0 && piece == BlackPawn ||
               toY == 0 && piece == BlackQueen ||
               toY <= 1 && piece == BlackKnight) {
-               *promoChoice = '+';
+               *promoChoice = '^';
                return FALSE;
            }
        } else {
            if(toY == BOARD_HEIGHT-1 && piece == WhitePawn ||
               toY == BOARD_HEIGHT-1 && piece == WhiteQueen ||
               toY >= BOARD_HEIGHT-2 && piece == WhiteKnight) {
-               *promoChoice = '+';
+               *promoChoice = '^';
                return FALSE;
            }
        }
@@ -5738,7 +5744,7 @@ HasPromotionChoice(int fromX, int fromY, int toX, int toY, char *promoChoice)
              gameMode == IcsPlayingBlack &&  WhiteOnMove(currentMove);
     if(appData.testLegality && !premove) {
        moveType = LegalityTest(boards[currentMove], PosFlags(currentMove),
-                       fromY, fromX, toY, toX, NULLCHAR);
+                       fromY, fromX, toY, toX, gameInfo.variant == VariantShogi ? '^' : NULLCHAR);
        if(moveType != WhitePromotion && moveType  != BlackPromotion)
            return FALSE;
     }
@@ -8644,7 +8650,7 @@ ApplyMove(fromX, fromY, toX, toY, promoChar, board)
        board[toY][toX] = EmptySquare;
       }
     }
-    if(promoChar == '+') {
+    if(promoChar == '^') {
         /* [HGM] Shogi-style promotions, to piece implied by original (Might overwrite orinary Pawn promotion) */
         board[toY][toX] = (ChessSquare) (PROMOTED piece);
     } else if(!appData.testLegality) { // without legality testing, unconditionally believe promoChar

diff --git a/moves.c b/moves.c
index f2cc28c..a0f7b7e 100644 (file)
--- a/moves.c
+++ b/moves.c
@@ -1037,28 +1037,27 @@ ChessMove LegalityTest(board, flags, rf, ff, rt, ft, promoChar)
             if(promoChar == 'd' && (piece == WhiteRook   || piece == BlackRook)   ||
                promoChar == 'h' && (piece == WhiteBishop || piece == BlackBishop) ||
                promoChar == 'g' && (piece <= WhiteFerz || piece <= BlackFerz && piece >= BlackPawn) )
-                  promoChar = '+'; // allowed ICS notations
+                  promoChar = '^'; // allowed ICS notations
 if(appData.debugMode)fprintf(debugFP,"SHOGI promoChar = %c\n", promoChar ? promoChar : '-');
-            if(promoChar != NULLCHAR && promoChar != '+' && promoChar != '=')
-                    cl.kind = IllegalMove;
+            if(promoChar != NULLCHAR && promoChar != '^' && promoChar != '=')
+                return CharToPiece(promoChar) == EmptySquare ? ImpossibleMove : IllegalMove;
             else if(flags & F_WHITE_ON_MOVE) {
                 if( (int) piece < (int) WhiteWazir &&
                      (rf >= BOARD_HEIGHT*2/3 || rt >= BOARD_HEIGHT*2/3) ) {
                     if( (piece == WhitePawn || piece == WhiteQueen) && rt > BOARD_HEIGHT-2 ||
                          piece == WhiteKnight && rt > BOARD_HEIGHT-3) /* promotion mandatory */
-                             cl.kind = promoChar == '=' ? IllegalMove : WhitePromotion;
-                    else /* promotion optional, default is promote */
-                             cl.kind = promoChar == '=' ? WhiteNonPromotion : WhitePromotion;
-                } else cl.kind = (promoChar == NULLCHAR || promoChar == '=') ? NormalMove : IllegalMove;
+                       cl.kind = promoChar == '=' ? IllegalMove : WhitePromotion;
+                    else /* promotion optional, default is defer */
+                       cl.kind = promoChar == '^' ? WhitePromotion : WhiteNonPromotion;
+                } else cl.kind = promoChar == '^' ? IllegalMove : NormalMove;
             } else {
                 if( (int) piece < (int) BlackWazir && (rf < BOARD_HEIGHT/3 || rt < BOARD_HEIGHT/3) ) {
                     if( (piece == BlackPawn || piece == BlackQueen) && rt < 1 ||
                          piece == BlackKnight && rt < 2 ) /* promotion obligatory */
-                             cl.kind = promoChar == '=' ? IllegalMove : BlackPromotion;
-                    else /* promotion optional, default is promote */
-                             cl.kind = promoChar == '=' ? BlackNonPromotion : BlackPromotion;
-
-                } else cl.kind = (promoChar == NULLCHAR || promoChar == '=') ? NormalMove : IllegalMove;
+                       cl.kind = promoChar == '=' ? IllegalMove : BlackPromotion;
+                    else /* promotion optional, default is defer */
+                       cl.kind = promoChar == '^' ? BlackPromotion : BlackNonPromotion;
+                } else cl.kind = promoChar == '^' ? IllegalMove : NormalMove;
             }
         }
     } else
@@ -1229,42 +1228,50 @@ void Disambiguate(board, flags, closure)
 
     if (c == 'x') c = NULLCHAR; // get rid of any 'x' (which should never happen?)
     if(gameInfo.variant == VariantShogi) {
-        /* [HGM] Shogi promotions. On input, '=' means defer, NULL promote. Afterwards, c is set to '+' for promotions, NULL other */
+        /* [HGM] Shogi promotions. On input, '=' means defer, '^' promote. Afterwards, c is set to '+' for promotions, NULL other */
         if(closure->rfIn != DROP_RANK && closure->kind == NormalMove) {
             ChessSquare piece = closure->piece;
             if (c == 'd' && (piece == WhiteRook   || piece == BlackRook)   ||
                 c == 'h' && (piece == WhiteBishop || piece == BlackBishop) ||
                 c == 'g' && (piece <= WhiteFerz || piece <= BlackFerz && piece >= BlackPawn) )
-                   c = '+'; // allowed ICS notations
-            if(c != NULLCHAR && c != '+' && c != '=')
-                    closure->kind = IllegalMove; // the only allowed cases are '+', '='.
+                   c = '^'; // allowed ICS notations
+            if(c != NULLCHAR && c != '^' && c != '=') closure->kind = IllegalMove; // otherwise specifying a piece is illegal
             else if(flags & F_WHITE_ON_MOVE) {
                 if( (int) piece < (int) WhiteWazir &&
                      (closure->rf >= BOARD_HEIGHT-(BOARD_HEIGHT/3) || closure->rt >= BOARD_HEIGHT-(BOARD_HEIGHT/3)) ) {
                     if( (piece == WhitePawn || piece == WhiteQueen) && closure->rt > BOARD_HEIGHT-2 ||
                          piece == WhiteKnight && closure->rt > BOARD_HEIGHT-3) /* promotion mandatory */
-                             closure->kind = c == '=' ? IllegalMove : WhitePromotion;
-                    else /* promotion optional, default is promote */
-                             closure->kind = c == '=' ? WhiteNonPromotion  : WhitePromotion;
-                } else closure->kind = (c == NULLCHAR || c == '=') ? NormalMove : IllegalMove;
+                       closure->kind = c == '=' ? IllegalMove : WhitePromotion;
+                    else /* promotion optional, default is defer */
+                       closure->kind = c == '^' ? WhitePromotion : WhiteNonPromotion; 
+                } else closure->kind = c == '^' ? IllegalMove : NormalMove;
             } else {
                 if( (int) piece < (int) BlackWazir && (closure->rf < BOARD_HEIGHT/3 || closure->rt < BOARD_HEIGHT/3) ) {
                     if( (piece == BlackPawn || piece == BlackQueen) && closure->rt < 1 ||
                          piece == BlackKnight && closure->rt < 2 ) /* promotion obligatory */
-                             closure->kind = c == '=' ? IllegalMove : BlackPromotion;
-                    else /* promotion optional, default is promote */
-                             closure->kind = c == '=' ? BlackNonPromotion  : BlackPromotion;
-                } else closure->kind = (c == NULLCHAR || c == '=') ? NormalMove : IllegalMove;
+                       closure->kind = c == '=' ? IllegalMove : BlackPromotion;
+                    else /* promotion optional, default is defer */
+                       closure->kind = c == '^' ? BlackPromotion : BlackNonPromotion;
+                } else closure->kind = c == '^' ? IllegalMove : NormalMove;
             }
         }
-        c = (closure->kind == WhitePromotion || closure->kind == BlackPromotion) ? '+' : NULLCHAR;
+        if(closure->kind == WhitePromotion || closure->kind == BlackPromotion) c = '^'; else
+        if(closure->kind == WhiteNonPromotion || closure->kind == BlackNonPromotion) c = '=';
     } else
     if (closure->kind == WhitePromotion || closure->kind == BlackPromotion) {
-        if(c == NULLCHAR) c = 'q'; // even in Shatranj, Courier, Makruk, as Apply move corrects this to Ferz (how messy!)
+        if(c == NULLCHAR) { // missing promoChar on mandatory promotion; use default for variant
+            if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
+                c = PieceToChar(BlackFerz);
+            else if(gameInfo.variant == VariantGreat)
+                c = PieceToChar(BlackMan);
+            else
+                c = PieceToChar(BlackQueen);
+        } else if(c == '=') closure->kind = IllegalMove; // no deferral outside Shogi
     } else if (c != NULLCHAR) closure->kind = IllegalMove;
 
     closure->promoChar = ToLower(c); // this can be NULLCHAR! Note we keep original promoChar even if illegal.
-    if(c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare) closure->kind = ImpossibleMove; // but we cannot handle non-existing piece types!
+    if(c != '^' && c != '=' && c != NULLCHAR && CharToPiece(c) == EmptySquare)
+       closure->kind = ImpossibleMove; // but we cannot handle non-existing piece types!
     if (closure->count > 1) {
        closure->kind = AmbiguousMove;
     }
@@ -1492,43 +1499,12 @@ ChessMove CoordsToAlgebraic(board, flags, rf, ff, rt, ft, promoChar, out)
         if(rt+ONE <= '9')
            *outp++ = rt + ONE;
         else { *outp++ = (rt+ONE-'0')/10 + '0';*outp++ = (rt+ONE-'0')%10 + '0'; }
-       *outp = NULLCHAR;
         if (gameInfo.variant == VariantShogi) {
             /* [HGM] in Shogi non-pawns can promote */
-            if(flags & F_WHITE_ON_MOVE) {
-                if( (int) cl.piece < (int) WhiteWazir &&
-                     (rf >= BOARD_HEIGHT-(BOARD_HEIGHT/3) || rt >= BOARD_HEIGHT-(BOARD_HEIGHT/3)) ) {
-                    if( (piece == WhitePawn || piece == WhiteQueen) && rt > BOARD_HEIGHT-2 ||
-                         piece == WhiteKnight && rt > BOARD_HEIGHT-3) /* promotion mandatory */
-                             cl.kind = promoChar == '=' ? IllegalMove : WhitePromotion;
-                    else cl.kind =  WhitePromotion; /* promotion optional */
-                } else cl.kind = (promoChar == NULLCHAR || promoChar == 'x' || promoChar == '=') ?
-                                            NormalMove : IllegalMove;
-            } else {
-                if( (int) cl.piece < (int) BlackWazir && (rf < BOARD_HEIGHT/3 || rt < BOARD_HEIGHT/3) ) {
-                    if( (piece == BlackPawn || piece == BlackQueen) && rt < 1 ||
-                         piece == BlackKnight && rt < 2 ) /* promotion obligatory */
-                             cl.kind = promoChar == '=' ? IllegalMove : BlackPromotion;
-                    else cl.kind =  BlackPromotion; /* promotion optional */
-                } else cl.kind = (promoChar == NULLCHAR || promoChar == 'x' || promoChar == '=') ?
-                                            NormalMove : IllegalMove;
-            }
-            if(cl.kind == WhitePromotion || cl.kind == BlackPromotion) {
-                /* for optional promotions append '+' or '=' */
-                if(promoChar == '=') {
-                    *outp++ = '=';
-                    cl.kind = NormalMove;
-                } else *outp++ = '+';
-                *outp = NULLCHAR;
-            } else if(cl.kind == IllegalMove) {
-                /* Illegal move specifies any given promotion */
-                if(promoChar != NULLCHAR && promoChar != 'x') {
-                    *outp++ = '=';
-                    *outp++ = ToUpper(promoChar);
-                    *outp = NULLCHAR;
-                }
-            }
+            if(promoChar == '^') promoChar = '+';
+            *outp++ = promoChar; // Don't bother to correct move type, return value is never used!
         }
+       *outp = NULLCHAR;
         return cl.kind;
 
       /* [HGM] Always long notation for fairies we don't know */

diff --git a/parser.c b/parser.c
index 058d032..95769ad 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -415,32 +415,32 @@ static yyconst flex_int16_t yy_acclist[646] =
        41, 8219,   23,   41,   23,   25,   41,   41,   41,   41,
        41,    7,   41,   41,   41,   41,   41,   41,   10,   41,
        41,   41,   41,    5,   41,   41,    4,    4,   41,    4,
-       41,    4,   41,    5,    6,   41,    5,    5,   41,   41,
-       41,   41,   10,   41,   41,   35,   40,   10,   41,   24,
-       41,    9,   41,   23,   41,   36,   41,   41,   41,   41,
-       41,    7,   41,   41,   41,   41,   41,   41,   10,   41,
-       41,   41,   41,    5,   41,   41,    4,   41,    4,   41,
-
-        4,   41,    6,   41,    5,   41,   41,   41,   41,   10,
-       41,   41,   39,   39,   39,   38,   26,   26,    7,   41,
-       11,    7,   41,    3,   41,    8,   41,    7,   41,    7,
-        7,   41,    7,   41,   41,   41,   41,   20,   41,   41,
-       17,   41,   41,   41,   41,   41,   37,    4,   41,    4,
-        2,   41,    6,    5,    6,    6,   41,   41,    5,    5,
-       41,   41,   26,   40,   41,    7,   41,    3,   41,    8,
-       41,   41,    7,   41,    7,   41,   41,   41,   41,   20,
-       41,   41,   17,   41,   41,   41,   41,   41,   41,    2,
-       41,    6,   41,   41,    5,   41,   41,   39,    8,    7,
-
-        7,    3,    8,    8,   41,    7,    1,   41,   21,   41,
-       41,   20,   41,   41,   41,   41,   41,   41,   31,   37,
-        2,    2,    2,   41,    6,    6,    6,   41,   40,    8,
-       41,    1,   41,   41,   41,   20,   41,   41,   41,   41,
-       41,   41,    2,   41,    6,   41,   28,   39,    8,    1,
-       24,   24,   23,   23,   25,   25,    8,    1,    1,   41,
-       22,   21,   41,   41,   41,   12,   41,   41,   29,   37,
-       31,    2,    2,   28,   35,   40,   40,    1,   41,   41,
-       41,   41,   12,   41,   41,   19,    1,   25,    1,   22,
+       41,    4,    4,   41,    5,    6,   41,    5,    5,   41,
+       41,   41,   41,   10,   41,   41,   35,   40,   10,   41,
+       24,   41,    9,   41,   23,   41,   36,   41,   41,   41,
+       41,   41,    7,   41,   41,   41,   41,   41,   41,   10,
+       41,   41,   41,   41,    5,   41,   41,    4,   41,    4,
+
+       41,    4,   41,    6,   41,    5,   41,   41,   41,   41,
+       10,   41,   41,   39,   39,   39,   38,   26,   26,    7,
+       41,   11,    7,   41,    3,   41,    8,   41,    7,   41,
+        7,    7,   41,    7,   41,    7,   41,   41,   41,   20,
+       41,   41,   17,   41,   41,   41,   41,   41,   37,    4,
+       41,    2,   41,    6,    5,    6,    6,   41,    6,   41,
+        5,    5,   41,   41,   26,   40,   41,    7,   41,    3,
+       41,    8,   41,   41,    7,   41,    7,   41,   41,   41,
+       41,   20,   41,   41,   17,   41,   41,   41,   41,   41,
+       41,    2,   41,    6,   41,   41,    5,   41,   41,   39,
+
+        8,    7,    7,    3,    8,    8,   41,    8,    1,   41,
+       21,   41,   41,   20,   41,   41,   41,   41,   41,   41,
+       31,   37,    2,    2,    2,   41,    2,    6,    6,   41,
+       40,    8,   41,    1,   41,   41,   41,   20,   41,   41,
+       41,   41,   41,   41,    2,   41,    6,   41,   28,   39,
+        8,    1,   24,   24,   23,   23,   25,   25,    1,    1,
+       41,    1,   22,   21,   41,   41,   41,   12,   41,   41,
+       29,   37,   31,    2,   28,   35,   40,   40,    1,   41,
+       41,   41,   41,   12,   41,   41,   19,    1,   25,   22,
        20,   41,   41,   41,   12,   41,   41,   41,   41,   41,
 
        12,   41,   41,   13,   41,   41,   41,   41,   13,   41,
@@ -479,42 +479,42 @@ static yyconst flex_int16_t yy_accept[720] =
       329,  330,  331,  331,  332,  334,  334,  334,  334,  334,
       334,  334,  334,  335,  336,  337,  338,  339,  341,  342,
       343,  344,  344,  344,  344,  344,  346,  346,  347,  347,
-      348,  350,  352,  354,  355,  355,  357,  358,  360,  361,
-      362,  363,  365,  366,  367,  367,  367,  367,  367,  368,
-      370,  372,  374,  376,  376,  377,  377,  378,  379,  379,
-      380,  381,  382,  384,  384,  385,  386,  387,  388,  389,
-      391,  392,  393,  394,  396,  397,  397,  399,  401,  403,
-
-      405,  407,  408,  409,  410,  412,  413,  413,  413,  414,
-      415,  415,  415,  416,  416,  416,  417,  417,  417,  418,
-      418,  419,  419,  420,  420,  420,  420,  421,  421,  421,
-      421,  421,  421,  421,  421,  422,  424,  424,  424,  426,
-      428,  429,  429,  430,  430,  431,  433,  435,  436,  436,
-      436,  436,  436,  436,  436,  437,  438,  440,  440,  441,
-      443,  444,  445,  446,  447,  447,  447,  447,  447,  448,
-      449,  450,  450,  451,  453,  454,  455,  455,  455,  456,
-      458,  459,  460,  460,  462,  463,  463,  464,  464,  464,
-      464,  464,  465,  465,  466,  466,  466,  468,  470,  472,
-
-      473,  473,  475,  477,  478,  479,  480,  482,  483,  485,
-      486,  487,  488,  489,  490,  492,  494,  495,  497,  498,
-      498,  498,  498,  498,  499,  499,  499,  499,  499,  500,
-      501,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  503,  503,  504,  506,  507,  509,  509,  509,  509,
-      509,  509,  510,  511,  512,  512,  514,  514,  515,  516,
-      517,  518,  519,  519,  519,  521,  521,  521,  522,  522,
-      523,  525,  526,  526,  527,  527,  529,  529,  529,  529,
-      529,  529,  529,  529,  530,  530,  530,  532,  534,  535,
-      536,  538,  539,  540,  541,  542,  543,  545,  547,  547,
-
-      547,  547,  547,  547,  547,  549,  549,  550,  551,  551,
-      552,  552,  553,  553,  554,  554,  555,  555,  556,  556,
-      557,  557,  557,  558,  558,  559,  561,  561,  561,  562,
-      562,  562,  563,  564,  564,  564,  564,  564,  564,  565,
-      566,  568,  569,  571,  571,  572,  573,  574,  574,  574,
-      576,  576,  576,  577,  578,  578,  578,  580,  581,  582,
-      583,  585,  586,  586,  587,  587,  587,  587,  587,  588,
-      588,  589,  590,  590,  590,  591,  591,  591,  592,  592,
+      348,  350,  352,  353,  355,  356,  356,  358,  359,  361,
+      362,  363,  364,  366,  367,  368,  368,  368,  368,  368,
+      369,  371,  373,  375,  377,  377,  378,  378,  379,  380,
+      380,  381,  382,  383,  385,  385,  386,  387,  388,  389,
+      390,  392,  393,  394,  395,  397,  398,  398,  400,  402,
+
+      404,  406,  408,  409,  410,  411,  413,  414,  414,  414,
+      415,  416,  416,  416,  417,  417,  417,  418,  418,  418,
+      419,  419,  420,  420,  421,  421,  421,  421,  422,  422,
+      422,  422,  422,  422,  422,  422,  423,  425,  425,  425,
+      427,  429,  430,  430,  431,  431,  432,  434,  436,  437,
+      438,  438,  438,  438,  438,  438,  438,  439,  440,  442,
+      442,  443,  445,  446,  447,  448,  449,  449,  449,  449,
+      449,  450,  451,  452,  452,  454,  455,  456,  456,  456,
+      457,  459,  460,  461,  462,  462,  464,  465,  465,  466,
+      466,  466,  466,  466,  467,  467,  468,  468,  468,  470,
+
+      472,  474,  475,  475,  477,  479,  480,  481,  482,  484,
+      485,  487,  488,  489,  490,  491,  492,  494,  496,  497,
+      499,  500,  500,  500,  500,  500,  501,  501,  501,  501,
+      501,  502,  503,  504,  504,  504,  504,  504,  504,  504,
+      504,  504,  504,  505,  505,  506,  508,  509,  511,  511,
+      511,  511,  511,  511,  512,  513,  514,  514,  516,  516,
+      517,  518,  519,  520,  521,  521,  521,  523,  523,  523,
+      524,  524,  525,  527,  528,  529,  529,  529,  531,  531,
+      531,  531,  531,  531,  531,  531,  532,  532,  532,  534,
+      536,  537,  538,  540,  541,  542,  543,  544,  545,  547,
+
+      549,  549,  549,  549,  549,  549,  549,  551,  551,  552,
+      553,  553,  554,  554,  555,  555,  556,  556,  557,  557,
+      558,  558,  559,  559,  559,  559,  560,  562,  563,  563,
+      563,  564,  564,  564,  565,  566,  566,  566,  566,  566,
+      566,  567,  568,  570,  571,  573,  573,  574,  575,  575,
+      575,  577,  577,  577,  578,  579,  579,  579,  581,  582,
+      583,  584,  586,  587,  587,  588,  588,  588,  588,  588,
+      589,  589,  590,  590,  590,  591,  591,  591,  592,  592,
       592,  592,  592,  593,  594,  595,  597,  598,  598,  598,
       598,  598,  598,  599,  600,  601,  603,  604,  604,  604,
 
@@ -544,11 +544,11 @@ static yyconst flex_int32_t yy_ec[256] =
        23,    1,    1,   24,   25,   26,   27,   28,   29,   30,
        31,   32,   33,   33,   34,   35,   36,   37,   38,   39,
        39,   40,   41,   42,   43,   42,   44,   45,   42,   42,
-       46,    1,   47,    1,   48,    1,   49,   50,   51,   52,
+       46,    1,   47,   48,   49,    1,   50,   51,   52,   53,
 
-       53,   54,   55,   56,   57,   58,   59,   60,   61,   62,
-       63,   64,   65,   66,   67,   68,   69,   70,   71,   72,
-       73,   70,   74,    1,   75,    1,    1,    1,    1,    1,
+       54,   55,   56,   57,   58,   59,   60,   61,   62,   63,
+       64,   65,   66,   67,   68,   69,   70,   71,   72,   73,
+       74,   71,   75,    1,   76,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -565,109 +565,109 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[76] =
+static yyconst flex_int32_t yy_meta[77] =
     {   0,
         1,    2,    3,    2,    1,    1,    1,    1,    4,    5,
         6,    1,    7,    8,    1,    1,    9,    9,    9,    9,
        10,    1,   11,    1,   12,   12,   12,   12,   12,   12,
        12,   12,   13,   12,   13,   13,   12,   12,   12,   12,
-       13,   13,   13,   12,   14,    1,    1,    1,   15,   15,
-       15,   15,   16,   15,   15,   15,   15,   15,   15,   15,
-       17,   18,   18,   18,   18,   18,   17,   17,   17,   17,
-       17,   19,   17,    1,    1
+       13,   13,   13,   12,   14,    1,    1,   15,    1,   16,
+       16,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   18,   19,   19,   19,   19,   19,   18,   18,   18,
+       18,   18,   20,   18,    1,    1
     } ;
 
 static yyconst flex_int16_t yy_base[807] =
     {   0,
-        0,   75, 3179, 4554,  126,  135,    0,  146, 3113,  144,
-      155,  175,  166, 3113,  237,  163, 3059, 3033,  123,  249,
-      245,  261,  253,  283,  300,  356,  418,  256,  259,  272,
-      277,  286,  336,  293,  227,  295,  347,  334,  149,  150,
-      387,  322,  376,  404,  406, 3081,  401,  437,  489,  441,
-      218,  554,  329, 3028, 3015,  275,  400,  395,  562,  482,
-      468,  573,  616,  429,  391,  535,  566,  589,  591,  599,
-      601,  628,  631,  633,  685,  686,  687,  691,  693,  709,
-      721, 3025,  477,    0, 3069,  303,  735,  176, 4554, 3062,
-      783,  167,  364, 3056, 3056, 3054,  462,  755, 3054,  480,
-
-      180,  715, 3053,    0, 3066, 4554,    0,  807,    0,  859,
-        0,  919,  964, 3019, 3014, 3017, 3022, 2995,  577, 2995,
-     3024, 3023, 2993, 3010, 3001, 3009, 1035,  465, 1110, 4554,
-     1137, 1189,    0, 1214, 1266,  604,  729,  755, 2987, 2991,
-     2990, 2985, 2994,  352, 2972,  774, 3042, 3041,  643, 3040,
-      789,  711,  565,  796, 1338,  370,  695,  561, 1403, 1455,
-     3039, 1515, 2993, 2988,  802,  742,  758,  763, 2972, 3001,
-      809, 2971,  803, 2980, 1539, 1591, 3032, 1616, 1668,  925,
-      932, 1002,  716,  926,  939,  805,  946,  806, 2969,  652,
-      712,  716,  732,  776, 1043,  995, 3023, 2957, 4554,  945,
-
-     1051, 3027, 3026, 3025, 3014, 3023, 3018,    0, 4554, 3017,
-     3016, 3015, 3012, 3001, 1063,  965,  978, 1009, 1717, 1753,
-     1014, 1056, 1068, 1072, 1805, 1128, 2943, 2936, 2935, 2948,
-     2943,  568, 1073, 1110, 2924,  818, 2941, 2979, 2935, 2931,
-     1133,  613, 1133,  300, 1878, 1944,    0, 1949,    0, 2980,
-     2978, 2977, 1128, 1149, 1412, 2000, 2977, 2975,  751, 2932,
-     2930, 2966, 2911, 4554, 1527,  836, 2973,  397, 2969,  861,
-     1154,  810, 1156,  785, 2967,  534, 1419, 2045, 2966, 1424,
-     1522, 1523, 2097, 2964, 1744, 1886, 1134, 1887, 1425, 1162,
-     1888, 1153, 1922, 2162, 2167, 2963, 1339, 2955, 1780, 2218,
-
-     1340, 1404, 1057, 1906, 1406, 1892, 1463, 2912, 4554,  895,
-      946,  951,  976,  999, 1069, 4554, 1566, 2953, 2952, 2887,
-     2886, 1326, 2262, 2942, 2941, 2937, 2936,  385, 2935,  494,
-     2930,  978, 1937,  989, 4554, 2325, 1947, 1430,    0, 2361,
-      806, 1131, 2358, 2036, 1267, 2935, 2934, 1561, 2877, 2870,
-     2863, 2857, 2855, 2859, 2861, 2860,  270,  823,  851,    0,
-     2880, 2861, 2861, 2857, 1164, 1190, 1135, 1559, 2889, 2881,
-     1737, 1899, 4554, 2042, 1910, 2880, 1080, 1911, 1912, 2879,
-     1298, 4554, 2825,    0, 2825, 2261, 2883, 2261, 2323, 2837,
-     2816, 2875,  758, 1927,  822, 1351, 2410, 1458, 2446, 2483,
-
-     2873, 2003, 2861, 2488, 2265, 2317, 2319, 2037, 1594, 2046,
-     1941, 1902, 2320, 2493, 2506, 2165, 2535, 1671, 2221, 2107,
-     2818, 1225, 2855, 1268, 1271, 1277, 1374, 1406, 1806, 2844,
-     2838, 1998, 2836, 2770, 2824, 2741, 2802, 2736, 2792, 1894,
-     4554, 1936, 2320, 2795, 4554, 2590, 2744, 2726, 1996, 2719,
-     2714, 2701, 2763,  785, 2453, 2762, 1581, 2736, 2711, 2697,
-     2694, 2749, 1404, 1712, 4554, 2742, 2375, 2322, 2323, 2362,
-     2735, 2726, 2165, 4554, 2665,    0, 2684, 2455, 2680, 2069,
-     2666, 2617, 2610, 1499, 1757, 1817, 2536, 2627, 2542, 2540,
-     2544, 2543, 2545, 2546, 2549, 2564, 2560, 2553, 2420,  902,
-
-     1460, 2665, 1628, 1673, 4554, 2569, 2638, 2508, 2636, 2635,
-     2570, 2569, 2632, 2631, 2566, 2565, 2601, 2600, 2534, 2532,
-     2589, 2584, 4554, 2567, 2568, 2573, 2520, 2522, 2529,  550,
-     2505, 4554, 2510, 2517, 2468, 2444, 2472, 2447, 2458, 2429,
-     1859, 2445, 4554, 2591, 4554, 2457, 4554, 2452, 2670, 2462,
-     2412, 2407, 2459, 1790, 2178,  787, 2593, 2630, 2665, 2671,
-     2672, 2673, 2681, 4554, 2408, 2449, 1841, 2690, 2448, 2453,
-     2428, 4554, 2368, 2372, 4554, 2366, 2416, 2410, 2319, 2376,
-     2308, 2280, 2301, 2243, 2221,    0, 2202, 2694, 2235, 2167,
-     1925, 1113, 2682, 2695, 2696, 2706, 2709, 2682, 2170, 2193,
-
-     1882, 2113, 2105, 2015, 2056, 1787, 2045, 1955, 2777, 1960,
-     1878, 1873, 2089, 1963, 2852, 2710, 2721, 1753, 1743, 1738,
-     4554, 1622, 2057, 2058, 2927, 2159,    0, 1624, 1541, 1990,
-     2116, 3002, 2671, 2184, 2711, 2730, 1531, 1502, 2703, 1501,
-     1365, 1363, 1250, 1988, 1755, 2718, 1143, 1109, 2737, 1096,
-     1065, 2705, 2179, 1065, 1036,  948,  976, 2322, 1991, 2739,
-     2772,  936,  905, 2740, 2539,  713, 2182, 2183,    0,  765,
-      710,  681, 2328, 2771, 2773,    0, 2747,  627, 4554,  504,
-     2467,  453, 4554,  372,  418, 4554, 2088, 2788, 2783, 2806,
-      266,  199, 2084, 2815, 2826,  199, 2371,  373, 1311, 1604,
-
-     2827, 2828, 2830, 2834, 2836, 2866, 2879, 2881, 2882, 2894,
-     2901, 2903, 2909, 2910, 1946,  165, 4554, 4554, 3074, 3093,
-     3106, 3120, 3139, 3158, 3174, 3193, 3212, 3230, 2162, 2251,
-     2253, 3248, 3267, 2293, 3286, 3305, 3321, 3340, 3359, 3378,
-     3397, 3416, 3435, 3454, 3466, 3485, 3504, 3523, 3542, 3550,
-     2410, 3565, 3581, 3600, 3616, 3635, 3654, 3673, 3692, 3711,
-     3730, 3749, 3768, 3787, 3806, 3818, 3833, 3847, 3866, 3885,
-     3904, 3920, 3935, 3951, 3970, 3986, 4005, 4024, 4043, 4062,
-     4081, 4100, 4119, 4134, 4148, 4167, 4186, 4205, 4224, 4243,
-     4262, 4281, 4300, 4315, 4334, 4353, 4372, 4387, 4401, 4420,
-
-     4439, 4458, 4477, 4496, 4515, 4534
+        0,   76, 3128, 4684,  128,  137,    0,  148, 3123,  146,
+      158,  178,  169, 3120,  241,  165, 3065, 3054,  126,  253,
+      249,  270,  257,  261,  300,  357,  420,  260,  272,  281,
+      286,  295,  337,  326,  339,  351,  293,  255,  152,  176,
+      400,  395,  418,  404,  426, 3116,  317,  446,  501,  478,
+      167,  567,  221, 3062, 3051,  164,  403,  439,  471,  494,
+      478,  576,  627,  545,  548,  584,  560,  553,  602,  450,
+      604,  367,  642,  644,  687,  697,  698,  704,  705,  711,
+      724, 3061,  612,    0, 3106,  299,  650,  181, 4684, 3102,
+      787,  731,  310, 3096, 3096, 3094,  521,  751, 3094,  671,
+
+      167,  735, 3093,    0, 3106, 4684,    0,  811,    0,  864,
+        0,  925,  971, 3058, 3053, 3056, 3061, 3033,  758, 3033,
+     3063, 3062, 3031, 3044, 3035, 3045, 1043,  309, 1119, 4684,
+     1146, 1199,    0, 1224, 1277,  762,  766,  770, 3022, 3026,
+     3025, 3020, 3029,  310, 3010,  810, 3081, 3080,  426, 3079,
+      752,  793,  381,  800, 1350,  338,  445,  448, 1416, 1469,
+     3078, 1530, 3031, 3025,  802,  655,  725,  774, 3009, 3039,
+      813, 3008,  938, 3017, 1554, 1607, 3070, 1632, 1685,  931,
+      944, 1051,  581,  945,  946,  750,  739,  812, 3002,  458,
+      473,  567,  679,  720, 1002,  839, 3057, 2991, 4684, 1059,
+
+     1064, 3062, 3059, 3048, 3033, 3042, 3041,    0, 4684, 3040,
+     3039, 3038, 3037, 3036,  578,  857,  893,  954, 1735, 1772,
+      972,  985, 1010, 1068, 1825, 1065, 2981, 2974, 2973, 2986,
+     2981,  633, 1022, 1094, 2962, 1010, 2979, 3018, 2973, 2969,
+     1141,  401, 1145,  719, 1899, 1966,    0, 1971,    0, 3018,
+     3016, 3015, 4684, 1134, 1158, 1425, 2023, 3015, 3013,  601,
+     2971, 2966, 3003, 2947, 4684, 1169, 1145, 3011,  198, 3011,
+     1170, 1135,  947, 1351,  760, 3009, 1060, 1432, 2069, 3008,
+     1437, 1536, 1533, 2122, 3007, 1762, 1907, 1419, 1908, 1161,
+     1352, 1763, 1162, 1913, 2188, 2193, 3006, 1066, 2998, 1799,
+
+     2245, 1418, 1417,  948, 1927, 1471, 1067, 1287, 2954, 4684,
+      788,  809,  825,  843,  869,  985, 4684, 1559, 2996, 2995,
+     2929, 2927, 1306, 2290, 2984, 2983, 2982, 2981,  950, 2976,
+      266, 2975, 1098, 1940,  638, 4684, 2354, 1941, 1379,    0,
+     2393, 1132, 1608, 2392, 1943, 1686, 2980, 2979, 4684, 1442,
+     2914, 2909, 2903, 2901, 2901, 2905, 2907, 2906,  792,  966,
+     1004,    0, 2927, 2908, 2909, 2907, 1416, 1417, 1164, 1729,
+     2955, 2948, 1498, 1554, 2065, 1895, 2947,  943, 1929, 1930,
+     2945, 4684, 1149, 4684, 2889,    0, 2887, 2289, 2946, 1952,
+     2352, 2897, 2878, 2938, 1113, 2026,  174, 1182, 2445, 1353,
+
+     2484, 2524, 2936, 1960, 2928, 2097, 2084, 2293, 2348, 2529,
+     1472, 1942, 2349, 2282, 2346, 2482, 2539, 2191, 2392, 1828,
+     1949, 2031, 2884, 1006, 2924, 1024, 1096, 1278, 1282, 1582,
+     2063, 2923, 2922, 1581, 2921, 2855, 2919, 2853, 2913, 2841,
+     2898, 2065, 4684, 2123, 2246, 2904, 4684, 2578, 2859, 2839,
+     2306, 2838, 2833, 2820, 2881, 1558, 2496, 2869, 1597, 2843,
+     2817, 2796, 2795, 2851, 1764, 2258, 4684, 2846, 2263, 2482,
+     2521, 2541, 2836, 4684, 2809, 1233, 2752,    0, 2799, 2551,
+     2794, 1951, 2794, 2748, 2734, 1354, 1774, 1770, 2350, 2619,
+     2531, 2534, 2661, 2657, 2487, 2071, 2581, 2664, 2660, 2525,
+
+     2621, 1645, 1423, 2787, 1585, 1612, 4684, 2673, 2786, 2664,
+     2784, 2783, 2717, 2714, 2774, 2772, 2705, 2703, 2759, 2749,
+     2678, 2677, 2733, 2728, 2665, 2666, 2720, 4684, 2660, 2652,
+     2626, 2019, 2648, 4684, 2652, 2689, 2625, 2565, 2609, 2582,
+     2593, 2565,  682, 2582, 4684, 2457, 4684, 2620, 2585, 2698,
+     2591, 2540, 2533, 2568, 2015, 1599,  428, 2687, 2690, 2698,
+     2700, 2701, 2711, 2627, 4684, 2511, 2531, 1690, 2716, 2528,
+     2533, 2494, 2434, 2437, 4684, 2406, 2456, 2452, 2393, 2452,
+     2376, 2338, 2363, 2310, 2319,    0, 2270, 2725, 2297, 2228,
+     1771,  344, 2716, 2720, 2729, 2616, 2737, 2745, 2232, 2221,
+
+     1799, 2145, 2137, 2244, 2147, 1773, 2128, 2070, 2821, 2058,
+     2053, 2012, 1935,  754, 2897, 2742, 2759, 1975, 1983, 1884,
+     4684, 1844, 1816, 1888, 2973, 1962,    0, 1813, 1777, 1982,
+     2073, 3049, 2203, 2085, 2743, 2762, 1763, 1754, 2542, 1661,
+     1490, 1423, 1402, 2196,  586, 2207, 1411, 1374, 2763, 1230,
+     1152, 2736, 2537, 1164, 1136, 1120, 1129, 2035, 1938, 2409,
+     2753, 1002,  943, 2772, 2308,  929, 2208, 2408,    0,  938,
+      832,  830, 2036, 2768, 2784,    0, 2777,  772, 4684,  676,
+     2541,  730, 4684,  492,  392, 4684, 2200, 2827, 2810, 2786,
+      328,  314, 2293, 2674, 2802,  253, 2669, 1543, 2033, 2165,
+
+     2804, 2805, 2846, 2847, 2851, 2860, 2872, 2873, 2876, 2879,
+     2881, 2886, 2911, 2923, 2334,  158, 4684, 4684, 3122, 3142,
+     3156, 3170, 3190, 3210, 3227, 3247, 3267, 3286, 2025, 2188,
+     2219, 3305, 3325, 2392, 3345, 3365, 3382, 3402, 3422, 3442,
+     3462, 3482, 3502, 3522, 3535, 3555, 3575, 3595, 3615, 3624,
+     2398, 3640, 3657, 3677, 3694, 3714, 3734, 3754, 3774, 3794,
+     3814, 3834, 3854, 3874, 3894, 3907, 3923, 3938, 3958, 3978,
+     3998, 4015, 4031, 4048, 4068, 4085, 4105, 4125, 4145, 4165,
+     4185, 4205, 4225, 4241, 4256, 4276, 4296, 4316, 4336, 4356,
+     4376, 4396, 4416, 4432, 4452, 4472, 4492, 4508, 4523, 4543,
+
+     4563, 4583, 4603, 4623, 4643, 4663
     } ;
 
 static yyconst flex_int16_t yy_def[807] =
@@ -699,41 +699,41 @@ static yyconst flex_int16_t yy_def[807] =
       719,  719,  718,  219,  718,  745,  718,  718,  718,  718,
       718,  718,  719,  719,  719,  719,  719,  719,  719,  719,
       719,  746,  747,  748,  749,  719,  750,  719,  751,  750,
-      719,  248,  719,  752,  752,  719,  255,  719,  719,  719,
-      719,  719,  719,  718,  724,  718,  753,  718,  754,  755,
-      755,  755,  755,  756,  753,  757,  755,  755,  220,  755,
-      755,  278,  718,  226,  755,  755,  755,  755,  755,  755,
-      755,  755,  755,  755,  282,  751,  755,  295,  755,  294,
-
-      755,  755,  755,  755,  755,  755,  724,  718,  718,  758,
-      759,  760,  761,  758,  762,  718,  763,  764,  764,  765,
-      765,  718,  718,  718,  718,  718,  719,  718,  718,  718,
-      718,  718,  718,  718,  718,  719,  766,  718,  719,  719,
-      767,  767,  719,  766,  767,  719,  343,  719,  718,  718,
-      718,  718,  718,  718,  719,  719,  719,  718,  719,  719,
-      719,  719,  719,  719,  768,  768,  769,  770,  771,  718,
-      719,  718,  718,  772,  773,  718,  718,  773,  773,  719,
-      719,  718,  718,  719,  719,  724,  718,  718,  718,  718,
-      718,  774,  718,  755,  775,  775,  755,  755,  397,  755,
-
-      344,  755,  400,  755,  755,  755,  755,  755,  755,  755,
-      755,  755,  755,  755,  776,  755,  755,  755,  755,  724,
-      718,  777,  778,  779,  780,  781,  782,  783,  784,  718,
-      344,  718,  785,  786,  787,  788,  789,  790,  718,  718,
-      718,  784,  784,  719,  718,  719,  718,  718,  718,  718,
-      718,  718,  719,  719,  718,  719,  718,  719,  719,  719,
-      719,  719,  791,  792,  718,  793,  718,  794,  794,  794,
-      719,  718,  718,  718,  718,  719,  718,  724,  718,  718,
-      718,  718,  718,  795,  796,  796,  755,  755,  755,  755,
-      755,  755,  755,  755,  755,  755,  755,  755,  724,  718,
-
-      779,  797,  780,  781,  718,  783,  718,  798,  785,  785,
-      786,  786,  787,  787,  788,  788,  789,  789,  790,  790,
-      718,  718,  718,  798,  798,  719,  718,  718,  718,  718,
-      718,  718,  719,  799,  718,  718,  718,  718,  719,  719,
-      719,  719,  718,  718,  718,  718,  718,  718,  724,  718,
-      718,  718,  795,  795,  796,  796,  755,  755,  755,  755,
-      755,  755,  724,  718,  718,  797,  779,  783,  718,  718,
+      719,  248,  718,  719,  752,  752,  719,  256,  719,  719,
+      719,  719,  719,  719,  718,  724,  718,  753,  718,  754,
+      755,  755,  755,  755,  756,  753,  757,  755,  755,  220,
+      755,  755,  279,  718,  226,  755,  755,  755,  755,  755,
+      755,  755,  755,  755,  755,  283,  751,  755,  296,  755,
+
+      295,  755,  755,  755,  755,  755,  755,  724,  718,  718,
+      758,  759,  760,  761,  758,  762,  718,  763,  764,  764,
+      765,  765,  718,  718,  718,  718,  718,  719,  718,  718,
+      718,  718,  718,  718,  718,  718,  719,  766,  718,  719,
+      719,  767,  767,  719,  766,  767,  719,  344,  718,  719,
+      718,  718,  718,  718,  718,  718,  719,  719,  719,  718,
+      719,  719,  719,  719,  719,  719,  768,  768,  769,  770,
+      771,  718,  719,  718,  772,  773,  718,  718,  773,  773,
+      719,  718,  719,  718,  718,  719,  719,  724,  718,  718,
+      718,  718,  718,  774,  718,  755,  775,  775,  755,  755,
+
+      399,  755,  345,  755,  402,  755,  755,  755,  755,  755,
+      755,  755,  755,  755,  755,  755,  776,  755,  755,  755,
+      755,  724,  718,  777,  778,  779,  780,  781,  782,  783,
+      784,  718,  345,  718,  785,  786,  787,  788,  789,  790,
+      718,  718,  718,  784,  784,  719,  718,  719,  718,  718,
+      718,  718,  718,  718,  719,  719,  718,  719,  718,  719,
+      719,  719,  719,  719,  791,  792,  718,  793,  718,  794,
+      794,  794,  719,  718,  718,  718,  718,  719,  718,  724,
+      718,  718,  718,  718,  718,  795,  796,  796,  755,  755,
+      755,  755,  755,  755,  755,  755,  755,  755,  755,  755,
+
+      724,  718,  779,  797,  780,  781,  718,  783,  718,  798,
+      785,  785,  786,  786,  787,  787,  788,  788,  789,  789,
+      790,  790,  718,  718,  798,  798,  719,  718,  718,  718,
+      718,  718,  718,  718,  719,  799,  718,  718,  718,  718,
+      719,  719,  719,  719,  718,  718,  718,  718,  718,  724,
+      718,  718,  718,  795,  795,  796,  796,  755,  755,  755,
+      755,  755,  755,  724,  718,  718,  797,  779,  783,  718,
       718,  718,  718,  718,  718,  718,  799,  799,  718,  718,
       718,  718,  719,  719,  719,  719,  719,  724,  718,  718,
       796,  796,  755,  755,  755,  755,  755,  724,  718,  718,
@@ -763,520 +763,534 @@ static yyconst flex_int16_t yy_def[807] =
       718,  718,  718,  718,  718,  718
     } ;
 
-static yyconst flex_int16_t yy_nxt[4630] =
+static yyconst flex_int16_t yy_nxt[4761] =
     {   0,
         4,    4,    4,    5,    4,    4,    6,    4,    7,    8,
         4,    9,   10,    7,    4,    4,   11,   12,   13,   13,
         4,   14,    4,    4,   15,   16,   17,   18,   15,   15,
        19,   15,   15,   15,   15,   20,   21,   22,   21,   23,
-       24,   21,   21,   25,   21,   26,    4,    4,   27,   28,
-       29,   30,   31,   32,   33,   34,   35,   36,   37,   38,
-       39,   40,   41,   40,   40,   42,   43,   40,   40,   40,
-       44,   40,   40,   45,    4,    4,    4,    4,    5,    4,
-       46,    6,   46,    7,    8,    4,    9,   10,   47,    4,
-        4,   48,   49,   50,   50,    4,   51,    4,    4,   52,
-
-       53,   54,   55,   52,   52,   56,   52,   52,   52,   52,
-       57,   58,   59,   58,   60,   61,   58,   58,   62,   58,
-       26,    4,    4,   63,   64,   65,   66,   67,   68,   69,
-       70,   71,   72,   73,   74,   75,   76,   77,   76,   76,
-       78,   79,   76,   76,   76,   80,   76,   76,   81,    4,
-       82,   83,   83,   83,   83,   86,   89,   90,   92,  117,
-      107,  107,   87,   87,   87,   87,  113,  717,   93,   97,
-       94,   95,  107,  107,   82,   96,   97,   97,   98,   84,
-      202,  718,  203,   84,  118,  197,  718,  204,   99,  100,
-      101,  102,  102,  102,  102,  103,  214,  139,  215,  104,
-
-      104,  104,  104,  104,  104,  104,  104,   84,  104,   84,
-       84,  104,  104,  104,  104,   84,   84,   84,  104,   84,
-      106,  158,  114,  104,  104,  104,  104,  104,  104,  104,
-      104,  104,  104,  104,  104,   84,  104,  104,  104,  104,
-      104,   84,   84,   84,   84,   84,   84,   84,  107,  198,
-      108,  670,  109,  110,  110,  110,  110,  111,  696,  113,
-      107,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  455,  121,  136,  136,  119,  119,  119,
-      119,  108,  135,  135,  135,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  120,  122,  119,
-
-      119,  119,  119,  113,  368,  123,  135,  136,  108,  135,
-      135,  166,  193,  194,  138,  137,  119,  119,  119,  119,
-      136,  136,  135,  135,  135,  136,  136,  564,  135,  135,
-      135,  456,  113,  107,  136,  136,  167,  116,  135,  135,
-      135,  136,  136,  136,  136,  107,  369,  135,  135,  135,
-      124,  135,  135,  135,  145,  125,  126,  127,  127,  127,
-      126,  126,  126,  126,  126,  126,  126,  126,  126,  128,
-      126,  126,  117,  269,  142,  699,  126,  126,  126,  126,
-      205,  206,  136,  136,  136,  136,  214,  107,  163,  135,
-      135,  135,  135,  135,  433,  136,  136,  118,  107,  107,
-
-      140,  126,  130,  126,  135,  135,  135,  113,  145,   84,
-      107,  168,  168,  168,  168,  107,  168,  168,  168,  168,
-      686,  150,  146,  146,  146,  146,  147,  107,  692,  126,
-      126,  131,  113,  718,  132,  132,  132,  132,  133,  180,
-       92,  179,  179,  124,   97,   84,  182,  147,  169,  141,
-      151,  390,   94,  152,  149,  683,  718,  153,  434,  143,
-      391,  150,  134,   97,   97,   97,  135,  135,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  242,  179,
-      147,   97,   97,   97,  168,  168,  168,  168,  181,  134,
-       97,   97,   98,   83,   83,   83,   83,   84,  168,  168,
-
-      168,  168,  154,  100,  101,  155,  155,  155,  155,  156,
-      214,  130,  215,  157,  157,  157,  157,  157,  157,  157,
-      157,  149,  157,  149,  149,  157,  157,  157,  157,  149,
-      149,  149,  157,  149,  172,  173,  106,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  149,
-      157,  157,  157,  157,  157,  149,  149,  149,  149,  149,
-      149,  149,   84,  275,  276,  107,  691,  159,  269,  109,
-      160,  160,  160,  160,  161,  170,  113,  107,  168,  168,
-      168,  168,  207,  180,  180,  179,  179,  179,  395,  168,
-      168,  168,  168,   84,   84,   84,   84,  396,  159,  171,
-
-      165,  575,  162,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  180,  180,  532,  179,  179,  179,
-      256,  256,  256,  256,  354,  159,  366,  166,  174,  175,
-      354,  718,  176,  176,  176,  176,  177,  180,  180,  180,
-      180,  179,  179,  179,  179,  179,  179,  180,  180,  180,
-      180,   84,  167,  179,  179,  179,  179,  179,  179,  130,
-      178,  191,  309,  150,  179,  179,  180,  180,  180,  180,
-      180,  180,  180,  180,  180,  180,  180,  180,  679,  180,
-      180,  180,  180,  686,  179,  179,  179,  178,  179,  179,
-      179,  179,  179,   84,   84,   84,  107,  107,  107,   84,
-
-      184,   84,  107,   84,  107,  150,  150,  150,  107,  107,
-      107,  150,  113,  150,  107,  150,  107,   84,   97,   84,
-      107,  193,  310,  145,   84,  193,  310,  272,   84,  150,
-      718,  150,  107,  183,  188,  718,  150,  146,  146,  146,
-      146,  312,  313,  186,  191,  256,  256,  256,  256,  185,
-       84,  195,  195,  195,  195,  196,   97,   97,   97,  484,
-      173,  484,  150,  684,  187,  383,   84,  683,  210,  680,
-      211,  256,  256,  256,  256,  212,  145,  260,  150,  149,
-      149,  149,  149,  289,  288,  315,  316,  275,  276,  106,
-      146,  146,  146,  146,  265,  147,  111,   84,  109,  200,
-
-      200,  200,  200,  111,   84,  270,  271,  261,  145,  150,
-       84,   84,  273,   84,  384,  342,  150,   84,   84,  307,
-      533,  358,  150,  150,  106,  150,  288,  111,  345,  150,
-      150,  201,  201,  201,  201,  201,  201,  201,  201,  201,
-      201,  201,  201,  592,  359,  533,  272,  387,  147,  457,
-      287,  292,  388,  389,  111,  217,  217,  217,  217,  217,
-      217,  217,  217,  217,  217,  217,  217,   84,  359,   84,
-      485,  291,  219,  457,  394,   84,   84,   84,   84,  220,
-      147,  150,  458,  221,  221,  221,  221,  221,  221,  221,
-      221,  221,  221,  221,   84,   84,   84,   84,   84,   84,
-
-       84,   84,   84,  219,  315,  316,  459,  222,  222,  222,
-      222,  222,  222,  222,  222,  222,  222,  222,  222,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-      219,   84,  224,   84,   84,  225,  225,  225,  225,  226,
-       84,  300,  300,  300,  300,  150,  150,   84,  300,  300,
-      300,  300,  150,  564,   84,  312,  313,  676,  226,  150,
-      423,  424,  565,  224,  676,  226,  150,  222,  222,  222,
-      222,  222,  222,  222,  222,  222,  222,  222,  222,  671,
-      303,  335,  335,  335,  335,  426,  194,  435,  305,  226,
-      224,  227,  439,  228,  336,  336,  336,  336,  229,  230,
-
-      670,  272,  306,  231,  191,  309,  440,  232,  315,  316,
-       84,  317,  317,  317,  317,  227,  226,  228,  300,  300,
-      300,  300,  150,  229,  230,  337,  337,  337,  337,  231,
-      339,  339,  339,  339,  232,  126,  127,  127,  127,  126,
-      126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
-      126,  436,  191,  309,  304,  126,  126,  126,  126,  195,
-      195,  195,  195,  196,  226,   84,  333,  323,  323,  323,
-      323,  226,  340,  340,  340,  340,  334,  150,  426,  194,
-      126,  130,  126,  334,  341,  341,  341,  341,  669,  340,
-      340,  340,  340,  669,  383,  226,   84,   84,   84,   84,
-
-       84,   84,   84,   84,   84,   84,   84,  405,  126,  126,
-      126,  243,  243,  243,  244,  106,  126,  126,  126,  126,
-      126,  126,  226,  355,  126,  126,  340,  340,  340,  340,
-      126,  126,  666,  126,  243,  243,  243,  244,  373,  368,
-      718,  718,   84,  382,  374,  374,  374,  374,  718,  340,
-      340,  340,  340,  718,  150,  126,  130,  328,  255,  332,
-      356,   84,   84,  665,   84,  375,  375,  375,  375,  663,
-       84,  257,  718,  150,  150,  410,  150,  366,  662,  130,
-      614,  369,  150,  126,  126,  246,  246,  246,  246,  246,
-      246,  246,  246,  246,  246,  246,  246,   84,  247,  718,
-
-      364,  377,  248,  463,  407,   84,   84,   84,   84,  249,
-      130,  250,  412,  251,  251,  251,  251,  251,  251,  251,
+       24,   21,   21,   25,   21,   26,    4,    4,    4,   27,
+       28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
+       38,   39,   40,   41,   40,   40,   42,   43,   40,   40,
+       40,   44,   40,   40,   45,    4,    4,    4,    4,    5,
+        4,   46,    6,   46,    7,    8,    4,    9,   10,   47,
+        4,    4,   48,   49,   50,   50,    4,   51,    4,    4,
+
+       52,   53,   54,   55,   52,   52,   56,   52,   52,   52,
+       52,   57,   58,   59,   58,   60,   61,   58,   58,   62,
+       58,   26,    4,    4,    4,   63,   64,   65,   66,   67,
+       68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
+       76,   76,   78,   79,   76,   76,   76,   80,   76,   76,
+       81,    4,   82,   83,   83,   83,   83,   86,   89,   90,
+      717,   92,  117,  107,   87,   87,   87,   87,  113,  106,
+      158,   93,   97,   94,   95,  107,  106,   82,   96,   97,
+       97,   98,   84,  214,  718,  215,   84,  107,  118,  718,
+      197,   99,  100,  101,  102,  102,  102,  102,  103,  107,
+
+      166,  139,  104,  104,  104,  104,  104,  104,  104,  104,
+       84,  104,   84,   84,  104,  104,  104,  104,   84,   84,
+       84,  104,   84,  487,  113,  114,  167,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,   84,
+      104,  104,  104,  104,  104,   84,   84,   84,   84,   84,
+       84,   84,  107,  392,  108,  198,  109,  110,  110,  110,
+      110,  111,  393,  113,  107,  119,  119,  119,  119,  119,
+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
+      119,  163,  214,  121,  215,  108,  119,  119,  119,  119,
+      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
+
+      112,  112,  120,  113,  136,  136,  670,  122,  193,  194,
+      123,  135,  145,  108,  135,  135,  119,  119,  119,  119,
+      137,  136,  242,  135,  135,   84,  205,  206,  138,  124,
+      136,  136,  135,  135,  135,  136,  136,  150,  135,  135,
+      135,  270,  136,  136,  136,  136,  106,  116,  135,  135,
+      135,  135,  135,  135,  214,  130,  125,  126,  127,  127,
+      127,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+      128,  126,  126,  117,  696,  136,  136,  126,  126,  126,
+      126,  135,  135,  135,  270,  147,  136,  136,  136,  136,
+      565,  135,  135,  135,  686,  135,  135,  135,  207,  118,
+
+      136,  136,  126,  130,  126,  126,  107,  113,  135,  135,
+      135,  107,  614,  140,  368,  107,  180,  180,  107,  168,
+      168,  168,  168,  107,  179,  179,  179,  107,  145,  107,
+      106,  126,  126,  131,   84,  718,  132,  132,  132,  132,
+      133,  107,  146,  146,  146,  146,  150,  130,  142,   92,
+      276,  277,  169,   84,   84,  168,  168,  168,  168,  151,
+      143,   94,  152,  141,  134,  150,  153,  191,  310,  135,
+      135,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,   97,  193,  311,  170,  592,  124,  168,  168,  168,
+      168,  149,  134,  718,  168,  168,  168,  168,  150,  180,
+
+      180,  147,   97,   97,   98,  179,  179,  179,  171,   84,
+      168,  168,  168,  168,  154,  100,  101,  155,  155,  155,
+      155,  156,   97,   97,   97,  157,  157,  157,  157,  157,
+      157,  157,  157,  149,  157,  149,  149,  157,  157,  157,
+      157,  149,  149,  149,  157,  149,  173,  172,  113,  692,
+      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
+      157,  157,  149,  157,  157,  157,  157,  157,  149,  149,
+      149,  149,  149,  149,  149,   84,  193,  311,  107,  113,
+      159,  334,  109,  160,  160,  160,  160,  161,  106,   84,
+      107,  335,  168,  168,  168,  168,  179,  180,  335,  179,
+
+      179,  150,  180,  180,  182,  181,  179,  179,  179,  180,
+      180,  159,  179,  179,  179,  385,  162,  162,  162,  162,
+      162,  162,  162,  162,  162,  162,  162,  162,   83,   83,
+       83,   83,  174,  180,  180,  179,  179,  179,  166,  159,
+      175,  441,  718,  176,  176,  176,  176,  177,  659,  290,
+      165,  180,  180,  180,  180,  442,  179,  179,  179,  191,
+      179,  179,  179,   84,  167,  386,  195,  195,  195,  195,
+      196,  178,   97,   97,   97,  150,  179,  179,  180,  180,
+      180,  180,  180,  180,  180,  180,  180,  180,  313,  314,
+      356,  180,  180,  180,  180,   84,  356,  289,  107,  178,
+
+      179,  179,  179,  179,  179,   84,   84,  150,  107,  107,
+      107,  184,   84,   84,  113,  107,  107,  150,  150,   84,
+      107,  107,  107,  370,  150,  150,  145,  107,  107,  316,
+      317,  150,  683,   84,  107,  585,  183,  188,   97,  691,
+      146,  146,  146,  146,  202,  150,  203,   84,   84,  586,
+      718,  204,   97,   97,   97,  718,  106,  186,   84,  150,
+       84,  185,  276,  277,  210,  371,  211,  187,  271,  272,
+      150,  212,  150,  173,   84,   84,   84,   84,  257,  257,
+      257,  257,  257,  257,  257,  257,  257,  257,  257,  257,
+      149,  149,  149,  149,  289,  457,  307,  316,  317,  147,
+
+      111,   84,  109,  200,  200,  200,  200,  111,   84,  273,
+       84,  631,  145,  150,  145,  261,  274,  292,  313,  314,
+      150,   84,  150,  262,  679,  308,  146,  146,  146,  146,
+      266,  111,  686,  150,  425,  426,  201,  201,  201,  201,
+      201,  201,  201,  201,  201,  201,  201,  201,  191,  310,
+      273,  288,  428,  194,  458,  318,  318,  318,  318,  111,
+      217,  217,  217,  217,  217,  217,  217,  217,  217,  217,
+      217,  217,   84,  336,  336,  336,  336,  219,  316,  317,
+       84,   84,   84,   84,  220,  147,  684,  147,  221,  221,
+      221,  221,  221,  221,  221,  221,  221,  221,  221,   84,
+
+       84,   84,   84,   84,   84,   84,   84,   84,  219,  337,
+      337,  337,  337,  222,  222,  222,  222,  222,  222,  222,
+      222,  222,  222,  222,  222,   84,   84,   84,   84,   84,
+       84,   84,   84,   84,   84,   84,  219,   84,  224,   84,
+      683,  225,  225,  225,  225,  226,   84,  301,  301,  301,
+      301,  150,   84,   84,   84,   84,   84,  385,  150,  435,
+      301,  301,  301,  301,  150,  150,  150,  150,  150,  224,
+      338,  338,  338,  338,  222,  222,  222,  222,  222,  222,
+      222,  222,  222,  222,  222,  222,  680,  293,  340,  340,
+      340,  340,  459,  304,  428,  194,  676,  224,  227,  407,
+
+      228,  341,  341,  341,  341,  229,  230,  384,  306,  273,
+      231,  191,  310,  360,  232,  425,  426,  459,  195,  195,
+      195,  195,  196,  227,  436,  228,  342,  342,  342,  342,
+      676,  229,  230,  504,  505,  460,  361,  231,  341,  341,
+      341,  341,  232,  126,  127,  127,  127,  126,  126,  126,
+      126,  126,  126,  126,  126,  126,  126,  126,  126,   84,
+      461,  361,  106,  126,  126,  126,  126,  301,  301,  301,
+      301,  150,  226,  357,   84,   84,  253,  226,  718,  226,
+      324,  324,  324,  324,  226,  718,  150,  150,  126,  130,
+      126,  126,   84,   84,   84,   84,   84,   84,   84,   84,
+
+       84,   84,   84,  226,  305,  428,  194,  437,  226,  718,
+      341,  341,  341,  341,  486,  397,  486,  126,  126,  126,
+      243,  243,  243,  244,  398,  126,  126,  126,  126,  126,
+      126,  226,  671,  126,  126,  415,  226,  718,  329,  126,
+      126,  343,  126,   84,  253,  358,  243,  243,  243,  244,
+      375,  375,  375,  375,  346,  150,  389,  341,  341,  341,
+      341,  390,  391,  477,  126,  130,  126,  256,  370,   84,
+       84,  145,  438,  670,  376,  376,  376,  376,   84,  349,
+      258,  150,  150,  396,  106,  388,  388,  388,  388,  669,
+      150,  130,  669,  126,  126,  246,  246,  246,  246,  246,
+
+      246,  246,  246,  246,  246,  246,  246,   84,  247,  366,
+      371,  378,  248,  478,  411,   84,   84,   84,   84,  249,
+      666,  250,  414,  251,  251,  251,  251,  251,  251,  251,
       251,  251,  251,  251,  251,  251,  251,  251,  251,  251,
-      251,  251,  251,  252,  423,  424,  130,  253,  253,  253,
-      253,  253,  253,  253,  253,  253,  253,  253,  253,  251,
+      251,  251,  251,  252,  147,  488,  253,  477,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
       251,  251,  251,  251,  251,  251,  251,  251,  251,  251,
-      252,  251,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,   84,  255,  342,  502,  503,   84,
-      426,  194,  256,  256,  256,  256,  502,  503,  257,  718,
-      258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
-
-      258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
-      258,  657,  475,  701,   84,   84,   84,   84,  259,   84,
+      251,  252,  251,  135,  135,  135,  135,  135,  135,  135,
+      135,  135,  135,  135,  135,   84,  256,  504,  505,  145,
+       84,  428,  194,  257,  257,  257,  257,  382,  665,  258,
+
+      422,  259,  259,  259,  259,  259,  259,  259,  259,  259,
+      259,  259,  259,  259,  259,  259,  259,  259,  259,  259,
+      259,  259,  431,  431,  431,  431,   84,   84,   84,   84,
+      260,   84,   84,   84,   84,   84,   84,   84,   84,   84,
        84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   84,   84,   97,
-       97,   97,  429,  429,  429,  429,   84,   84,   84,  373,
-      382,  149,  100,  106,  155,  155,  155,  155,  150,  150,
-      150,  476,  157,  157,  157,  157,  157,  157,  157,  157,
-      149,  157,  149,  149,  157,  157,  157,  157,  149,  149,
-      149,  157,  149,  426,  194,  264,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  149,  157,
-
-      157,  157,  157,  157,  149,  149,  149,  149,  149,  149,
-      149,   84,   84,  486,   84,  191,  505,  463,  383,  419,
-      506,  718,  656,  150,  150,  655,  150,   84,  718,  718,
-      718,  718,   84,   84,  718,  397,  397,  397,  397,  150,
-      398,  398,  398,  398,  150,  150,  441,  441,  441,  441,
-      543,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,   84,  718,  145,   84,  418,  278,  502,
-      503,  149,  149,  149,  149,  279,  420,  409,  150,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      149,  149,  149,  149,  149,  149,  149,  149,  149,  278,
-
-      554,  393,  554,  281,  281,  281,  281,  281,  281,  281,
-      281,  281,  281,  281,  281,  149,  149,  149,  149,  149,
-      149,  149,  149,  149,  149,  149,  278,  149,  282,  145,
-       84,  283,  283,  283,  283,  284,  654,  147,  399,  399,
-      399,  399,  150,  386,  386,  386,  386,  149,  149,  149,
-      149,  149,  149,  149,  149,  149,  149,  149,  651,  282,
-      464,  464,  464,  281,  281,  281,  281,  281,  281,  281,
-      281,  281,  281,  281,  281,  191,  309,  446,  446,  446,
-      446,  650,  428,  428,  428,  428,  282,  294,  294,  294,
-      294,  294,  294,  294,  294,  294,  294,  294,  294,   84,
-
-      247,  147,   84,  643,  295,  465,  701,  149,  149,  149,
-      149,  296,  537,  250,  150,  297,  297,  297,  297,  297,
-      297,  297,  297,  297,  297,  297,  297,  297,  297,  297,
-      297,  297,  297,  297,  297,  298,  538,  426,  194,  299,
-      299,  299,  299,  299,  299,  299,  299,  299,  299,  299,
-      299,  297,  297,  297,  297,  297,  297,  297,  297,  297,
-      297,  297,  298,  297,  179,  179,  179,  179,  179,  179,
-      179,  179,  179,  179,  179,  179,   84,  255,  264,   84,
-      642,  149,  502,  503,  300,  300,  300,  300,  150,  638,
-      257,  150,  301,  301,  301,  301,  301,  301,  301,  301,
-
-      301,  301,  301,  301,  301,  301,  301,  301,  301,  301,
-      301,  301,  301,  464,  464,  464,  149,  149,  149,  149,
-      302,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+       84,   97,   97,   97,  333,  555,  395,  555,   84,   84,
+       84,   84,  147,  149,  100,  412,  155,  155,  155,  155,
+      150,  150,  150,  150,  157,  157,  157,  157,  157,  157,
+      157,  157,  149,  157,  149,  149,  157,  157,  157,  157,
+      149,  149,  149,  157,  149,  443,  443,  443,  443,  157,
+
+      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
+      157,  149,  157,  157,  157,  157,  157,  149,  149,  149,
+      149,  149,  149,  149,   84,   84,   84,   84,  384,  368,
+      465,  385,  504,  505,  718,  663,  150,  150,  150,  150,
+       84,  718,  718,  718,  718,   84,  662,  718,  399,  399,
+      399,  399,  150,  400,  400,  400,  400,  150,  448,  448,
+      448,  448,  130,  130,  657,  278,  278,  278,  278,  278,
+      278,  278,  278,  278,  278,  278,  278,   84,  718,   84,
+       84,  420,  279,  656,  421,  149,  149,  149,  149,  280,
+      409,  150,  150,  281,  281,  281,  281,  281,  281,  281,
+
+      281,  281,  281,  281,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  279,  375,  375,  375,  375,  282,  282,
+      282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
       149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
-      149,  221,  221,  221,  221,  221,  221,  221,  221,  221,
-      221,  221,   84,  374,  374,  374,  374,  106,  465,  106,
-      399,  399,  399,  399,  150,  222,  222,  222,  222,  222,
-      222,  222,  222,  222,  222,  222,  222,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,   84,  621,
-      373,  554,  393,  554,  405,  637,  415,  415,  415,  415,
-
-      150,  322,  322,  322,  322,  322,  322,  322,  322,  322,
-      322,  322,  322,   84,  342,  442,  659,  555,  343,  106,
-      564,   84,   84,   84,   84,  344,  535,  345,  443,  346,
-      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
-      346,  346,  346,  346,  346,  346,  346,  346,  346,  347,
-      502,  503,  535,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,  343,   84,  126,  243,
-      243,  243,  244,  556,  126,  126,  126,  126,  126,  126,
-      358,  437,  126,  126,   84,   84,   84,  521,  126,  126,
-
-       84,  126,  399,  399,  399,  399,  150,  150,  150,  522,
-       84,  585,  150,  408,   84,  468,  468,  468,  468,  378,
-      718,  378,  150,  126,  130,  586,  150,  106,  613,  629,
-       84,  628,  379,  718,  718,   84,  406,  408,  399,  399,
-      399,  399,  150,  272,  411,  718,  437,  150,  701,   84,
-      334,  126,  126,  255,  495,  438,  406,  334,  718,  413,
-      344,  150,  473,  718,  718,  106,  257,  344,  258,  258,
-      258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
-      258,  258,  258,  258,  258,  258,  258,  258,  258,  413,
-      106,  344,  106,  106,  673,  494,  259,  371,  371,  371,
-
-      371,  371,  371,  371,  371,  371,  371,  371,  371,  378,
-      438,   84,  627,  445,  508,  508,  508,  508,  344,  631,
-      716,  623,  379,  150,  380,  380,  380,  380,  380,  380,
-      380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
-      380,  380,  380,  380,  380,   84,  644,  658,  529,  718,
-       84,  469,  381,   84,   84,   84,  718,  150,   84,   84,
-       84,   84,  529,  529,  470,  150,  150,  620,  492,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      718,  621,  210,  272,  211,  623,  106,  639,  639,  212,
-      106,  106,  493,  281,  281,  281,  281,  281,  281,  281,
-
-      281,  281,  281,  281,  281,   84,  342,  718,  622,  145,
-      400,  639,  639,  149,  149,  149,  149,  401,  106,  345,
-      499,  402,  402,  402,  402,  402,  402,  402,  402,  402,
-      402,  402,  402,  402,  402,  402,  402,  402,  402,  402,
-      402,  403,  630,  697,  693,  404,  404,  404,  404,  404,
-      404,  404,  404,  404,  404,  404,  404,  149,  149,  149,
-      149,  149,  149,  149,  149,  149,  149,  149,  400,  149,
-       84,  255,  604,   84,  619,  474,  216,  216,  645,  475,
-      106,  147,  150,  640,  257,  150,  301,  301,  301,  301,
-      301,  301,  301,  301,  301,  301,  301,  301,  301,  301,
-
-      301,  301,  301,  301,  301,  301,  301,  641,  647,  639,
-      681,  571,  639,  639,  302,  414,  414,  414,  414,  414,
-      414,  414,  414,  414,  414,  414,  414,  378,  474,   84,
-      591,  618,  648,  639,  612,  681,  639,  639,  611,  668,
-      379,  150,  416,  416,  416,  416,  416,  416,  416,  416,
-      416,  416,  416,  416,  416,  416,  416,  416,  416,  416,
-      416,  416,  416,  145,   92,  218,  218,  223,  223,  610,
-      417,  342,  586,   84,  479,  344,   94,  478,  478,  478,
-      478,   96,  344,  272,  345,  150,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-
-      430,  430,  430,  430,  430,  430,  431,  254,  254,  609,
+      149,  279,  149,  283,   84,  699,  284,  284,  284,  284,
+      285,  655,  401,  401,  401,  401,  150,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  191,  310,
+      470,  470,  470,  470,  283,  430,  430,  430,  430,  282,
+      282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
+      282,  191,  507,  535,  428,  194,  508,  510,  510,  510,
+
+      510,  106,  283,  295,  295,  295,  295,  295,  295,  295,
+      295,  295,  295,  295,  295,   84,  247,  718,  147,  535,
+      296,  504,  505,  149,  149,  149,  149,  297,  539,  250,
+      718,  298,  298,  298,  298,  298,  298,  298,  298,  298,
+      298,  298,  298,  298,  298,  298,  298,  298,  298,  298,
+      298,  299,  591,  540,  253,  718,  300,  300,  300,  300,
+      300,  300,  300,  300,  300,  300,  300,  300,  298,  298,
+      298,  298,  298,  298,  298,  298,  298,  298,  298,  299,
+      298,  179,  179,  179,  179,  179,  179,  179,  179,  179,
+      179,  179,  179,   84,  256,  343,  654,  565,  149,  504,
+
+      505,  301,  301,  301,  301,  150,  566,  258,  718,  302,
+      302,  302,  302,  302,  302,  302,  302,  302,  302,  302,
+      302,  302,  302,  302,  302,  302,  302,  302,  302,  302,
+      466,  466,  466,  718,  149,  149,  149,  149,  303,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  221,
+      221,  221,  221,  221,  221,  221,  221,  221,  221,  221,
+       84,   84,  106,  106,  613,  467,  106,  465,  401,  401,
+      401,  401,  150,  150,  222,  222,  222,  222,  222,  222,
+      222,  222,  222,  222,  222,  222,  339,  339,  339,  339,
+
+      339,  339,  339,  339,  339,  339,  339,   84,  439,  253,
+      545,  651,  537,  407,  650,  417,  417,  417,  417,  150,
+      413,  323,  323,  323,  323,  323,  323,  323,  323,  323,
+      323,  323,  323,   84,  343,  556,   84,  557,  344,  537,
+      643,   84,   84,   84,   84,  345,  639,  346,  150,  347,
+      347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
+      347,  347,  347,  347,  347,  347,  347,  347,  347,  348,
+      642,  639,  349,  440,  350,  350,  350,  350,  350,  350,
+      350,  350,  350,  350,  350,  350,   84,   84,   84,   84,
+       84,   84,   84,   84,   84,   84,   84,  344,   84,  126,
+
+      243,  243,  243,  244,  379,  126,  126,  126,  126,  126,
+      126,  360,  638,  126,  126,   84,   84,  380,  639,  126,
+      126,   84,  126,  401,  401,  401,  401,  150,  150,  401,
+      401,  401,  401,  150,  410,   84,  621,  106,  718,  379,
+      106,  673,  382,  639,  126,  130,  126,  150,  476,  439,
+       84,  718,  718,  335,  345,   92,  718,   84,  408,  410,
+      335,  345,  150,  718,  210,  481,  211,   94,   84,  150,
+      349,  212,   96,  126,  126,  256,  718,  718,  408,  273,
+      150,  415,  718,  718,  106,  345,  640,  718,  258,  630,
+      259,  259,  259,  259,  259,  259,  259,  259,  259,  259,
+
+      259,  259,  259,  259,  259,  259,  259,  259,  259,  259,
+      259,  641,  273,  345,  440,  718,  555,  395,  555,  260,
+      373,  373,  373,  373,  373,  373,  373,  373,  373,  373,
+      373,  373,  379,  145,   84,  701,  637,  106,  106,  644,
+      216,  216,  273,  565,  501,  380,  150,  381,  381,  381,
+      381,  381,  381,  381,  381,  381,  381,  381,  381,  381,
+      381,  381,  381,  381,  381,  381,  381,  381,  523,  629,
+      382,  575,  444,   84,  471,  106,  383,   84,   84,   84,
+      524,   84,   84,   84,   84,  445,  534,  472,  672,  150,
+      687,  150,   84,  281,  281,  281,  281,  281,  281,  281,
+
+      281,  281,  281,  281,  150,   84,  147,  628,  265,  647,
+      447,  627,  474,  490,  490,  490,  490,  150,  282,  282,
+      282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
+       84,  343,  718,  562,  648,  402,  645,  623,  149,  149,
+      149,  149,  403,  491,  346,  718,  404,  404,  404,  404,
+      404,  404,  404,  404,  404,  404,  404,  404,  404,  404,
+      404,  404,  404,  404,  404,  404,  405,  701,  623,  349,
+      718,  406,  406,  406,  406,  406,  406,  406,  406,  406,
+      406,  406,  406,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  402,  149,   84,  256,  106,   84,
+
+      622,  382,  106,  218,  218,  604,  646,  619,  150,  395,
+      258,  150,  302,  302,  302,  302,  302,  302,  302,  302,
+      302,  302,  302,  302,  302,  302,  302,  302,  302,  302,
+      302,  302,  302,  639,  223,  223,  681,  661,  639,  572,
+      265,  303,  416,  416,  416,  416,  416,  416,  416,  416,
+      416,  416,  416,  416,  379,  444,  658,  693,  639,  466,
+      466,  466,  661,  639,  546,  546,  546,  380,  718,  418,
+      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
+      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
+       84,  145,  382,  718,  618,  106,  612,  620,  419,  343,
+
+      611,   84,  150,  345,  467,  480,  480,  480,  480,  547,
+      345,  621,  346,  150,  432,  432,  432,  432,  432,  432,
       432,  432,  432,  432,  432,  432,  432,  432,  432,  432,
-      432,  432,  455,  489,  106,   84,  480,   84,   84,  442,
-      106,  469,  718,  344,  342,  147,  481,  150,  101,  150,
-      150,  609,  718,  103,  470,  718,  608,  345,  607,  346,
-      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
-      346,  346,  346,  346,  346,  346,  346,  346,  346,  346,
-      442,  469,  496,  106,  672,  490,  544,  544,  544,  606,
-      491,  687,  605,  443,  718,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-
-      444,  444,  444,  444,  444,  444,  348,  348,  348,  348,
-      348,  348,  348,  348,  348,  348,  348,  348,   84,  342,
-      578,  545,  145,  672,  372,  372,  578,  604,  603,  602,
-      150,  601,  345,  563,  402,  402,  402,  402,  402,  402,
-      402,  402,  402,  402,  402,  402,  402,  402,  402,  402,
-      402,  402,  402,  402,  402,  442,  600,  145,  572,  567,
-      599,  393,  534,  590,  589,  266,  474,  547,  443,  549,
-      487,  487,  487,  487,  487,  487,  487,  487,  487,  487,
-      487,  487,  487,  487,  487,  487,  487,  487,  487,  487,
-      487,   84,  535,  587,  147,  584,   84,  639,  583,  582,
-
-      581,   84,  536,  150,  488,  488,  488,  488,  150,  415,
-      415,  415,  415,  150,   84,  469,  580,  524,  535,  149,
-      579,  639,  149,  149,  149,  149,  150,  578,  470,  550,
-      525,  404,  404,  404,  404,  404,  404,  404,  404,  404,
-      404,  404,  404,   84,   84,  113,  523,  455,   84,  475,
-       84,   84,   84,   84,   84,  150,  150,   84,  139,  576,
-      150,   84,  150,  150,  150,  150,  150,  113,   84,  150,
-      547,  559,   84,  150,  574,  558,  718,  524,  191,  309,
-      150,  529,  573,  572,  150,  568,  568,  568,  568,  718,
-      718,  678,  544,  544,  544,  529,  529,  560,  498,  524,
-
-      558,   84,  571,  572,  570,  679,  520,  561,  520,  562,
-      518,  518,  525,  150,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  526,  526,   84,  524,  545,   84,  516,
-      516,  514,  514,  512,  512,  510,  510,  150,  523,  525,
-      150,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  145,   84,  646,  567,  552,  551,  183,   84,
-       84,   84,  214,  145,  145,  150,  588,  588,  588,  588,
-       84,  150,  150,  150,  598,  617,  145,  207,  382,  191,
-
-      505,  639,  150,   84,   84,  593,  568,  568,  568,  568,
-      588,  588,  588,  588,   84,  150,  150,   84,   84,   84,
-      393,  597,  615,  145,  595,  639,  150,  652,  548,  150,
-      150,  150,  145,  639,  636,  639,  474,  594,  596,  145,
-      667,  393,  145,  649,  147,  547,  467,  596,  661,  145,
-      664,  653,  113,  677,  542,  147,  147,  639,  541,  639,
-      690,  615,  635,  540,  539,  455,  113,  532,  550,  661,
-      531,  530,  661,  393,  393,  393,  616,  624,  624,  528,
-      624,  624,  624,  624,  624,  393,  624,  624,  624,  624,
-      393,  624,  624,  661,  527,  147,  674,  624,  624,  624,
-
-      624,  661,  661,  661,  147,  523,  688,  626,  145,  440,
-      520,  147,  518,  661,  147,  516,  694,  393,  661,  695,
-      675,  147,  624,  624,  624,  661,  661,  661,  145,  701,
-      701,  626,  701,  689,  514,  694,  701,  661,  701,  698,
-      702,  703,  661,  704,  512,  661,  510,  705,  445,  706,
-      624,  624,  624,  624,  445,  624,  624,  624,  624,  624,
-      625,  624,  624,  624,  624,  309,  624,  624,  701,  661,
-      500,  445,  633,  624,  624,  624,  269,  393,  483,  707,
-      147,  701,  634,  701,  701,  482,   88,  208,  477,  474,
-      382,  373,  708,  467,  709,  710,  701,  624,  624,  624,
-
-      147,  264,  264,  701,  264,  701,  634,  711,  264,  462,
-      264,  701,  701,  461,  712,  460,  713,  208,  454,  453,
-      452,  451,  714,  715,  450,  624,  624,  624,  624,  449,
-      624,  624,  624,  624,  624,  448,  624,  624,  624,  624,
-      264,  624,  624,  447,  445,  445,  214,  624,  624,  624,
-      624,  214,  208,  264,  207,  264,  264,  626,  207,  207,
-      321,  321,  319,  319,  421,  373,  269,  269,  264,  269,
-      268,  393,  624,  624,  624,  264,  268,  264,  364,  385,
-      356,  626,  355,  264,  264,  382,  255,  373,  373,  247,
-      363,  362,  361,  360,  357,  353,  352,  351,  350,  349,
-
-      624,  624,  624,  624,  332,  624,  624,  624,  624,  624,
-      625,  624,  624,  624,  624,  332,  624,  624,  331,  330,
-      329,  328,  633,  624,  624,  624,  328,  327,  326,  325,
-      324,  321,  634,  319,  308,  269,  293,  291,  290,  289,
-      286,  285,  269,  269,  268,  266,  264,  624,  624,  624,
-      263,  239,  208,  262,  237,  130,  634,  241,  240,  239,
-      208,  238,  237,  236,  236,  235,  234,  233,  106,  214,
-      213,  207,  208,  207,  199,  624,  624,   84,  191,  189,
-      165,   84,   84,  164,  148,   84,   84,   84,   84,   84,
-       84,   84,   84,   85,   85,   85,   85,   85,  116,   85,
-
+      432,  432,  432,  432,  433,  497,  701,  349,  610,  434,
+      434,  434,  434,  434,  434,  434,  434,  434,  434,  434,
+      434,  457,  492,  697,   84,  482,   84,   84,   84,  531,
+      447,  678,  345,  343,  147,  483,  150,  101,  150,  150,
+      150,  586,  103,  531,  531,  679,  346,  609,  347,  347,
+      347,  347,  347,  347,  347,  347,  347,  347,  347,  347,
+      347,  347,  347,  347,  347,  347,  347,  347,  347,  498,
+
+       84,  349,  444,  609,  496,  608,  477,  255,  255,  716,
+      493,  395,  150,  374,  374,  445,  607,  446,  446,  446,
+      446,  446,  446,  446,  446,  446,  446,  446,  446,  446,
+      446,  446,  446,  446,  446,  446,  446,  446,  639,  661,
+      447,  350,  350,  350,  350,  350,  350,  350,  350,  350,
+      350,  350,  350,   84,  343,  606,  500,  605,  546,  546,
+      546,  681,  578,  639,  661,  150,  578,  346,  604,  404,
+      404,  404,  404,  404,  404,  404,  404,  404,  404,  404,
+      404,  404,  404,  404,  404,  404,  404,  404,  404,  404,
+       84,  471,  349,  444,  603,   84,  602,  601,  417,  417,
+
+      417,  417,  150,  547,  472,  536,  445,  150,  489,  489,
+      489,  489,  489,  489,  489,  489,  489,  489,  489,  489,
+      489,  489,  489,  489,  489,  489,  489,  489,  489,  474,
+      718,  447,   84,   84,  113,  537,  600,   84,  528,   84,
+      561,  568,   84,  718,  150,  150,  538,   84,  471,  150,
+      471,  150,  149,  145,  150,  149,  149,  149,  149,  150,
+      494,  472,  537,  718,  599,  550,  652,  639,  718,  559,
+      395,  639,  639,  406,  406,  406,  406,  406,  406,  406,
+      406,  406,  406,  406,  406,  495,  474,  525,  718,   84,
+      590,  653,  639,  589,  267,  559,  639,  639,  668,  382,
+
+      526,  150,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  145,   84,  528,  551,   84,  525,  145,
+      474,  587,  584,  583,  564,  582,  150,  581,  580,  150,
+      598,  526,  563,  558,  558,  558,  558,  558,  558,  558,
+      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
+      558,  558,  558,  558,  457,   84,  528,  113,   84,   84,
+      474,  106,   84,  525,  718,  525,  395,  150,  579,  531,
+      150,  150,  191,  310,  150,  560,  526,  718,  718,  569,
+      569,  569,  569,  531,  531,   84,  147,  528,   84,  578,
+
+      145,  139,  147,  576,  661,  574,   84,  150,   84,   84,
+      150,  528,  718,  718,  588,  588,  588,  588,  150,   84,
+      150,  150,  672,  573,   84,  191,  507,  145,   84,  661,
+      528,  150,  569,  569,  569,  569,  150,   84,  593,  183,
+      150,  588,  588,  588,  588,   84,  572,  145,  571,  150,
+       84,   84,  522,  522,  595,  395,  615,  150,  617,  520,
+      597,  145,  150,  150,  145,  145,  639,  594,  596,  520,
+      395,  667,  636,  147,  145,  649,  664,  674,  518,  145,
+      518,  596,  516,  661,  516,  677,  395,  615,  145,  514,
+      690,  639,  514,  512,  512,  635,  447,  568,  661,  695,
+
+      551,  553,  675,  688,  145,  616,  701,  701,  661,  552,
+      214,  207,  395,  384,  661,  698,  549,  702,  703,  382,
+      147,  624,  624,  661,  624,  624,  624,  624,  624,  395,
+      624,  624,  624,  624,  147,  624,  624,  147,  147,  661,
+      661,  624,  624,  624,  624,  689,  474,  147,  701,  701,
+      469,  626,  147,  701,  113,  694,  544,  661,  543,  704,
+      705,  147,  701,  694,  706,  661,  624,  624,  624,  624,
+      542,  541,  457,  707,  701,  701,  626,  147,  701,  265,
+      265,  701,  661,  701,  113,  708,  709,  534,  701,  710,
+      533,  532,  711,  530,  712,  624,  624,  624,  624,  713,
+
+      624,  624,  624,  624,  624,  625,  624,  624,  624,  624,
+      529,  624,  624,  701,  447,  442,  522,  633,  624,  624,
+      624,  265,  265,  520,  714,  701,  265,  634,  518,  516,
+      514,  512,  349,  349,  310,  265,  715,  502,  349,  270,
+      395,  485,  624,  624,  624,  624,  484,  265,  265,   88,
+      208,  265,  634,  479,  265,  382,  265,  384,  253,  469,
+      464,  265,  463,  462,  208,  456,  455,  454,  453,  452,
+      451,  624,  624,  624,  624,  450,  624,  624,  624,  624,
+      624,  449,  624,  624,  624,  624,  265,  624,  624,  349,
+      349,  214,  214,  624,  624,  624,  624,  208,  265,  207,
+
+      207,  207,  322,  626,  322,  320,  320,  423,  253,  270,
+      270,  270,  269,  395,  269,  366,  387,  358,  624,  624,
+      624,  624,  357,  384,  256,  253,  253,  247,  626,  365,
+      364,  363,  362,  359,  355,  354,  353,  352,  351,  333,
+      333,  332,  331,  330,  329,  329,  328,  624,  624,  624,
+      624,  327,  624,  624,  624,  624,  624,  625,  624,  624,
+      624,  624,  326,  624,  624,  325,  322,  320,  309,  633,
+      624,  624,  624,  270,  294,  292,  291,  290,  287,  634,
+      286,  270,  270,  269,  267,  265,  264,  239,  208,  263,
+      237,  130,  241,  240,  624,  624,  624,  624,  239,  208,
+
+      238,  237,  236,  236,  634,  235,  234,  233,  106,  214,
+      213,  207,  208,  207,  199,  191,  189,  165,  164,  148,
+      116,  115,  106,  624,  624,   84,   88,  718,  718,   84,
+       84,  718,  718,   84,   84,   84,  718,   84,   84,   84,
+       84,   84,   85,   85,   85,   85,   85,  718,   85,   85,
        85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
-       85,   85,   91,   91,  115,  106,   88,   91,   91,   91,
+       85,   85,   91,   91,  718,  718,  718,   91,   91,   91,
+      105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
       105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
-      105,  105,  105,  105,  105,  105,  105,  105,  105,  129,
       129,  129,  129,  129,  129,  129,  129,  129,  129,  129,
-      129,  129,  129,  129,  129,  129,  129,  129,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  149,  718,  718,
-      718,  149,  149,  149,  718,  149,  149,  149,  149,  149,
-      149,  149,  149,  190,  190,  190,  190,  190,  718,  190,
 
-      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  190,  192,  192,  192,  192,  192,  192,  192,  192,
+      129,  129,  129,  129,  129,  129,  129,  129,  129,  129,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
+      149,  718,  718,  718,  149,  149,  149,  718,  149,  149,
+      149,  718,  149,  149,  149,  149,  149,  190,  190,  190,
+      190,  190,  718,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  192,  192,  192,
       192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
-      192,  209,  209,  718,  718,  718,  718,  718,  718,  718,
-      718,  209,  718,  718,  209,  209,  718,  209,  126,  126,
+      192,  192,  192,  192,  192,  192,  192,  209,  209,  718,
+      718,  718,  718,  718,  718,  718,  718,  209,  718,  718,
+
+      718,  209,  209,  718,  209,  126,  126,  126,  126,  126,
       126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
-      126,  126,  126,  126,  126,  126,  126,  245,  245,  245,
+      126,  126,  126,  126,  126,  245,  245,  245,  245,  245,
       245,  245,  245,  245,  245,  245,  245,  245,  245,  245,
-      245,  245,  245,  245,  245,  245,  145,  145,  145,  145,
+      245,  245,  245,  245,  245,  145,  145,  145,  145,  145,
       145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
-
-      145,  145,  145,  145,  145,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  149,  718,  718,  718,  149,  149,
-      149,  718,  149,  149,  149,  149,  149,  149,  149,  149,
-      274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
-      274,  274,  274,  274,  274,  274,  274,  274,  274,  190,
+      145,  145,  145,  145,  145,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  149,  718,  718,  718,  149,
+      149,  149,  718,  149,  149,  149,  718,  149,  149,  149,
+
+      149,  149,  275,  275,  275,  275,  275,  275,  275,  275,
+      275,  275,  275,  275,  275,  275,  275,  275,  275,  275,
+      275,  275,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  190,  190,  190,  190,  190,  190,  190,  192,  192,
+      190,  190,  192,  192,  192,  192,  192,  192,  192,  192,
       192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
-      192,  192,  192,  192,  192,  192,  192,  311,  311,  311,
-
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  314,  314,  314,  314,
-      314,  314,  314,  314,  314,  314,  314,  314,  314,  314,
-      314,  314,  314,  314,  314,  318,  318,  718,  318,  318,
-      318,  318,  318,  318,  318,  318,  318,  318,  318,  318,
-      318,  318,  318,  318,  320,  320,  718,  320,  320,  320,
-      320,  320,  320,  320,  320,  320,  320,  320,  320,  320,
-      320,  320,  320,  322,  718,  322,  718,  718,  718,  322,
-      322,  322,  718,  718,  322,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-
-      365,  365,  365,  365,  126,  126,  126,  126,  126,  126,
-      126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
-      126,  126,  126,  367,  367,  367,  367,  367,  367,  367,
+      192,  192,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  315,  315,  315,  315,  315,  315,  315,  315,
+      315,  315,  315,  315,  315,  315,  315,  315,  315,  315,
+
+      315,  315,  319,  319,  718,  319,  319,  319,  319,  319,
+      319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+      319,  319,  321,  321,  718,  321,  321,  321,  321,  321,
+      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      321,  321,  323,  718,  323,  718,  718,  718,  323,  718,
+      323,  323,  718,  718,  323,  367,  367,  367,  367,  367,
       367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
-      367,  367,  245,  245,  245,  245,  245,  245,  245,  245,
+      367,  367,  367,  367,  367,  126,  126,  126,  126,  126,
+      126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+      126,  126,  126,  126,  126,  369,  369,  369,  369,  369,
+
+      369,  369,  369,  369,  369,  369,  369,  369,  369,  369,
+      369,  369,  369,  369,  369,  245,  245,  245,  245,  245,
       245,  245,  245,  245,  245,  245,  245,  245,  245,  245,
-      245,  370,  370,  370,  370,  370,  370,  370,  370,  376,
-      718,  718,  718,  376,  718,  376,  376,  376,  376,  718,
-      376,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  149,
-      718,  718,  718,  149,  149,  149,  718,  149,  149,  149,
-      149,  149,  149,  149,  149,  274,  274,  274,  274,  274,
-      274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
-      274,  274,  274,  274,  105,  105,  105,  105,  105,  105,
+      245,  245,  245,  245,  245,  372,  372,  372,  718,  372,
+      372,  372,  372,  372,  377,  718,  718,  718,  377,  718,
+      377,  377,  377,  377,  718,  718,  377,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  268,  268,  268,  268,  268,  394,  394,  394,
+      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
+      394,  394,  394,  394,  394,  394,  394,  149,  718,  718,
+
+      718,  149,  149,  149,  718,  149,  149,  149,  718,  149,
+      149,  149,  149,  149,  275,  275,  275,  275,  275,  275,
+      275,  275,  275,  275,  275,  275,  275,  275,  275,  275,
+      275,  275,  275,  275,  105,  105,  105,  105,  105,  105,
       105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
-      105,  105,  105,  314,  314,  314,  314,  314,  314,  314,
-      314,  314,  314,  314,  314,  314,  314,  314,  314,  314,
-      314,  314,  311,  311,  311,  311,  311,  311,  311,  311,
-
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  422,  422,  422,  422,  422,  422,  422,  422,  422,
-      422,  422,  422,  422,  422,  422,  422,  422,  422,  422,
-      425,  425,  425,  425,  425,  425,  425,  425,  425,  425,
-      425,  425,  425,  425,  425,  425,  425,  425,  425,  427,
+      105,  105,  105,  105,  315,  315,  315,  315,  315,  315,
+      315,  315,  315,  315,  315,  315,  315,  315,  315,  315,
+      315,  315,  315,  315,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  424,  424,  424,  424,  424,  424,
+
+      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
+      424,  424,  424,  424,  427,  427,  427,  427,  427,  427,
       427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  190,  190,
+      427,  427,  427,  427,  429,  429,  429,  429,  429,  429,
+      429,  429,  429,  429,  429,  429,  429,  429,  429,  429,
+      429,  429,  429,  429,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  190,  190,  190,  190,  190,  190,  318,  318,  718,
-      318,  318,  318,  318,  318,  318,  318,  318,  318,  318,
-
-      318,  318,  318,  318,  318,  318,  320,  320,  718,  320,
-      320,  320,  320,  320,  320,  320,  320,  320,  320,  320,
-      320,  320,  320,  320,  320,  432,  718,  432,  718,  718,
-      718,  432,  432,  432,  718,  718,  432,  430,  718,  718,
-      718,  718,  718,  430,  430,  430,  430,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  367,  367,  367,  367,
+      190,  190,  190,  190,  319,  319,  718,  319,  319,  319,
+      319,  319,  319,  319,  319,  319,  319,  319,  319,  319,
+      319,  319,  319,  319,  321,  321,  718,  321,  321,  321,
+
+      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      321,  321,  321,  321,  434,  718,  434,  718,  718,  718,
+      434,  718,  434,  434,  718,  718,  434,  432,  718,  718,
+      718,  718,  718,  432,  432,  432,  432,  432,  367,  367,
       367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
-      367,  367,  367,  367,  367,  126,  126,  126,  126,  126,
+      367,  367,  367,  367,  367,  367,  367,  367,  369,  369,
+      369,  369,  369,  369,  369,  369,  369,  369,  369,  369,
+      369,  369,  369,  369,  369,  369,  369,  369,  126,  126,
       126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
-
-      126,  126,  126,  126,  466,  466,  466,  466,  466,  466,
-      466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
-      466,  466,  466,  471,  471,  718,  718,  471,  471,  718,
-      471,  471,  471,  471,  471,  471,  471,  471,  471,  472,
-      718,  718,  718,  718,  718,  472,  472,  472,  472,  718,
-      472,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
+      126,  126,  126,  126,  126,  126,  126,  126,  468,  468,
+
+      468,  468,  468,  468,  468,  468,  468,  468,  468,  468,
+      468,  468,  468,  468,  468,  468,  468,  468,  473,  473,
+      718,  718,  473,  473,  718,  473,  473,  473,  473,  473,
+      473,  473,  473,  473,  473,  475,  718,  718,  718,  718,
+      718,  475,  475,  475,  475,  475,  718,  475,  394,  394,
+      394,  394,  394,  394,  394,  394,  394,  394,  394,  394,
+      394,  394,  394,  394,  394,  394,  394,  394,  105,  105,
       105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
-      105,  105,  105,  105,  105,  105,  105,  105,  105,  497,
-      497,  718,  718,  497,  497,  497,  497,  497,  497,  497,
-
-      497,  497,  497,  497,  497,  422,  422,  422,  422,  422,
-      422,  422,  422,  422,  422,  422,  422,  422,  422,  422,
-      422,  422,  422,  422,  423,  423,  423,  423,  423,  423,
-      423,  423,  423,  423,  423,  423,  423,  423,  423,  423,
-      423,  423,  423,  501,  501,  501,  501,  501,  501,  501,
-      501,  501,  501,  501,  501,  501,  501,  501,  501,  501,
-      501,  501,  425,  425,  425,  425,  425,  425,  425,  425,
-      425,  425,  425,  425,  425,  425,  425,  425,  425,  425,
-      425,  504,  504,  504,  504,  504,  504,  504,  504,  504,
-      504,  504,  504,  504,  504,  504,  504,  504,  504,  504,
+      105,  105,  105,  105,  105,  105,  105,  105,  499,  499,
+      718,  718,  499,  499,  499,  499,  499,  499,  499,  499,
 
+      499,  499,  499,  499,  499,  424,  424,  424,  424,  424,
+      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
+      424,  424,  424,  424,  424,  425,  425,  425,  425,  425,
+      425,  425,  425,  425,  425,  425,  425,  425,  425,  425,
+      425,  425,  425,  425,  425,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  427,  427,  427,  427,  427,
       427,  427,  427,  427,  427,  427,  427,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  427,  427,  427,  190,
+      427,  427,  427,  427,  427,  506,  506,  506,  506,  506,
+      506,  506,  506,  506,  506,  506,  506,  506,  506,  506,
+
+      506,  506,  506,  506,  506,  429,  429,  429,  429,  429,
+      429,  429,  429,  429,  429,  429,  429,  429,  429,  429,
+      429,  429,  429,  429,  429,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  190,  190,  190,  190,  190,  190,  190,  507,  718,
-      718,  718,  718,  718,  507,  507,  507,  507,  509,  509,
-      718,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  511,  511,  718,
+      190,  190,  190,  190,  190,  509,  718,  718,  718,  718,
+      718,  509,  509,  509,  509,  509,  511,  511,  718,  511,
       511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
       511,  511,  511,  511,  511,  511,  513,  513,  718,  513,
       513,  513,  513,  513,  513,  513,  513,  513,  513,  513,
+      513,  513,  513,  513,  513,  513,  515,  515,  718,  515,
 
-      513,  513,  513,  513,  513,  515,  515,  718,  515,  515,
       515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
-      515,  515,  515,  515,  517,  517,  718,  517,  517,  517,
+      515,  515,  515,  515,  515,  515,  517,  517,  718,  517,
       517,  517,  517,  517,  517,  517,  517,  517,  517,  517,
-      517,  517,  517,  519,  519,  718,  519,  519,  519,  519,
+      517,  517,  517,  517,  517,  517,  519,  519,  718,  519,
       519,  519,  519,  519,  519,  519,  519,  519,  519,  519,
-      519,  519,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  365,  365,  365,  365,  365,  365,  365,  365,  365,
-      365,  126,  126,  126,  126,  126,  126,  126,  126,  126,
-      126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+      519,  519,  519,  519,  519,  519,  521,  521,  718,  521,
+      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
+      521,  521,  521,  521,  521,  521,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  126,  126,  126,  126,
 
-      466,  466,  466,  466,  466,  466,  466,  466,  466,  466,
-      466,  466,  466,  466,  466,  466,  466,  466,  466,  546,
-      718,  718,  718,  718,  718,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  105,  105,  105,  105,  105,  105,  105,
+      126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+      126,  126,  126,  126,  126,  126,  468,  468,  468,  468,
+      468,  468,  468,  468,  468,  468,  468,  468,  468,  468,
+      468,  468,  468,  468,  468,  468,  548,  718,  718,  718,
+      718,  718,  548,  548,  548,  548,  548,  548,  548,  548,
+      548,  548,  554,  554,  554,  554,  554,  554,  554,  554,
+      554,  554,  554,  554,  554,  554,  554,  554,  554,  554,
+      554,  554,  105,  105,  105,  105,  105,  105,  105,  105,
       105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
-      105,  105,  566,  566,  566,  566,  718,  566,  566,  566,
-      566,  566,  566,  566,  566,  566,  566,  566,  566,  566,
-      566,  569,  718,  718,  718,  718,  718,  569,  569,  569,
+      105,  105,  567,  567,  567,  567,  718,  567,  567,  567,
 
-      569,  577,  577,  718,  577,  577,  577,  577,  577,  577,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567,  567,  570,  718,  718,  718,  718,  718,  570,  570,
+      570,  570,  570,  577,  577,  718,  577,  577,  577,  577,
       577,  577,  577,  577,  577,  577,  577,  577,  577,  577,
-      625,  625,  718,  625,  625,  625,  625,  625,  625,  625,
-      625,  625,  625,  625,  625,  625,  625,  625,  625,  632,
-      632,  718,  632,  632,  632,  632,  632,  632,  632,  632,
-      632,  632,  632,  632,  632,  632,  632,  632,  624,  624,
-      718,  624,  624,  624,  624,  624,  624,  624,  624,  624,
-      624,  624,  624,  624,  624,  624,  624,  660,  660,  660,
+      577,  577,  577,  625,  625,  718,  625,  625,  625,  625,
+      625,  625,  625,  625,  625,  625,  625,  625,  625,  625,
+      625,  625,  625,  632,  632,  718,  632,  632,  632,  632,
+      632,  632,  632,  632,  632,  632,  632,  632,  632,  632,
+      632,  632,  632,  624,  624,  718,  624,  624,  624,  624,
+      624,  624,  624,  624,  624,  624,  624,  624,  624,  624,
+
+      624,  624,  624,  660,  660,  660,  660,  660,  660,  660,
       660,  660,  660,  660,  660,  660,  660,  660,  660,  660,
-      660,  660,  660,  660,  660,  660,  682,  682,  682,  682,
-
+      660,  660,  660,  682,  682,  682,  682,  682,  682,  682,
       682,  682,  682,  682,  682,  682,  682,  682,  682,  682,
-      682,  682,  682,  682,  682,  685,  685,  685,  685,  685,
+      682,  682,  682,  685,  685,  685,  685,  685,  685,  685,
       685,  685,  685,  685,  685,  685,  685,  685,  685,  685,
-      685,  685,  685,  685,  700,  700,  700,  700,  700,  700,
+      685,  685,  685,  700,  700,  700,  700,  700,  700,  700,
       700,  700,  700,  700,  700,  700,  700,  700,  700,  700,
       700,  700,  700,    3,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
+
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
-
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
-      718,  718,  718,  718,  718,  718,  718,  718,  718
+      718,  718,  718,  718,  718,  718,  718,  718,  718,  718
     } ;
 
-static yyconst flex_int16_t yy_chk[4630] =
+static yyconst flex_int16_t yy_chk[4761] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1285,7 +1299,7 @@ static yyconst flex_int16_t yy_chk[4630] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    2,    2,    2,    2,    2,
+        1,    1,    1,    1,    1,    1,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
 
@@ -1294,499 +1308,513 @@ static yyconst flex_int16_t yy_chk[4630] =
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        5,    6,    6,    6,    6,    8,   10,   10,   11,   19,
-       39,   40,    8,    8,    8,    8,   16,  716,   11,   13,
-       11,   11,   39,   40,    5,   11,   12,   12,   12,   13,
-       92,   13,   92,   12,   19,   88,   13,   92,   12,   12,
-       12,   12,   12,   12,   12,   12,  101,   39,  101,   12,
+        2,    2,    5,    6,    6,    6,    6,    8,   10,   10,
+      716,   11,   19,   39,    8,    8,    8,    8,   16,   51,
+       51,   11,   13,   11,   11,   39,  397,    5,   11,   12,
+       12,   12,   13,  101,   13,  101,   12,   40,   19,   13,
+       88,   12,   12,   12,   12,   12,   12,   12,   12,   40,
 
+       56,   39,   12,   12,   12,   12,   12,   12,   12,   12,
        12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
+       12,   12,   12,  397,   53,   16,   56,   12,   12,   12,
        12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-       51,   51,   16,   12,   12,   12,   12,   12,   12,   12,
        12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,   12,   15,   88,
-       15,  696,   15,   15,   15,   15,   15,   15,  692,   28,
-       15,   21,   21,   21,   21,   20,   20,   20,   20,   23,
-       23,   23,   23,  357,   22,   35,   35,   22,   22,   22,
-       22,   15,   35,   35,   35,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   20,   22,   24,
-
-       24,   24,   24,   25,  244,   23,   28,   29,   15,   29,
-       29,   56,   86,   86,   29,   28,   25,   25,   25,   25,
-       30,   30,   30,   30,   30,   31,   31,  691,   31,   31,
-       31,  357,   53,   42,   32,   32,   56,   30,   32,   32,
-       32,   34,   34,   36,   36,   42,  244,   34,   34,   34,
-       24,   36,   36,   36,  144,   25,   26,   26,   26,   26,
+       12,   12,   15,  269,   15,   88,   15,   15,   15,   15,
+       15,   15,  269,   28,   15,   21,   21,   21,   21,   20,
+       20,   20,   20,   23,   23,   23,   23,   24,   24,   24,
+       24,   53,  331,   22,  331,   15,   22,   22,   22,   22,
+       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
+
+       15,   15,   20,   25,   38,   38,  696,   22,   86,   86,
+       23,   28,  144,   15,   38,   38,   25,   25,   25,   25,
+       28,   29,  128,   29,   29,   47,   93,   93,   29,   24,
+       30,   30,   30,   30,   30,   31,   31,   47,   31,   31,
+       31,  156,   37,   37,   32,   32,  592,   30,   32,   32,
+       32,   37,   37,   37,  156,  128,   25,   26,   26,   26,
        26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
-       26,   26,   33,  156,   42,  698,   26,   26,   26,   26,
-       93,   93,   38,   38,   33,   33,  156,   43,   53,   33,
-       33,   33,   38,   38,  328,   37,   37,   33,   41,   43,
-
-       41,   26,   26,   26,   37,   37,   37,   44,   45,   47,
-       41,   58,   58,   58,   58,   44,   57,   57,   57,   57,
-      685,   47,   45,   45,   45,   45,  144,   44,  684,   26,
-       26,   27,   64,   27,   27,   27,   27,   27,   27,   65,
-       48,   65,   65,   43,   50,   48,   65,  698,   57,   41,
-       48,  268,   48,   48,   50,  682,   50,   48,  328,   44,
-      268,   50,   27,   97,   97,   97,   27,   27,   27,   27,
-       27,   27,   27,   27,   27,   27,   27,   27,  128,   64,
-       45,  100,  100,  100,   61,   61,   61,   61,   64,   27,
-       49,   49,   49,   83,   83,   83,   83,   49,   60,   60,
-
-       60,   60,   49,   49,   49,   49,   49,   49,   49,   49,
-      330,  128,  330,   49,   49,   49,   49,   49,   49,   49,
+       26,   26,   26,   33,  692,   34,   34,   26,   26,   26,
+       26,   34,   34,   34,  153,  144,   33,   33,   35,   35,
+      691,   33,   33,   33,  685,   35,   35,   35,  153,   33,
+
+       36,   36,   26,   26,   26,   26,   42,   44,   36,   36,
+       36,   41,  592,   41,  242,   44,   72,   72,   42,   57,
+       57,   57,   57,   41,   72,   72,   72,   44,   45,   43,
+      557,   26,   26,   27,  149,   27,   27,   27,   27,   27,
+       27,   43,   45,   45,   45,   45,  149,  242,   42,   48,
+      158,  158,   57,  157,   48,   58,   58,   58,   58,   48,
+       44,   48,   48,   41,   27,  157,   48,  190,  190,   27,
+       27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
+       27,   50,  191,  191,   59,  557,   43,   59,   59,   59,
+       59,   50,   27,   50,   61,   61,   61,   61,   50,   70,
+
+       70,   45,   49,   49,   49,   70,   70,   70,   59,   49,
+       60,   60,   60,   60,   49,   49,   49,   49,   49,   49,
+       49,   49,   97,   97,   97,   49,   49,   49,   49,   49,
        49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   60,   61,  276,   49,   49,   49,
+       49,   49,   49,   49,   49,   49,   61,   60,   64,  684,
        49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
        49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   52,  158,  158,   52,  680,   52,  153,   52,
-       52,   52,   52,   52,   52,   59,   62,   52,   59,   59,
-       59,   59,  153,   66,   66,   66,   66,   66,  276,   62,
-       62,   62,   62,  119,  119,  119,  119,  276,   52,   59,
-
-       66,  530,   52,   52,   52,   52,   52,   52,   52,   52,
-       52,   52,   52,   52,   67,   67,  530,   67,   67,   67,
-      136,  136,  136,  136,  232,   52,  242,   69,   62,   63,
-      232,   63,   63,   63,   63,   63,   63,   68,   68,   69,
-       69,   68,   68,   68,   69,   69,   69,   70,   70,   71,
-       71,  149,   69,   70,   70,   70,   71,   71,   71,  242,
-       63,  190,  190,  149,   63,   63,   63,   63,   63,   63,
-       63,   63,   63,   63,   63,   63,   72,   72,  678,   73,
-       73,   74,   74,  672,   72,   72,   72,   63,   73,   73,
-       73,   74,   74,   75,   76,   77,   75,   76,   77,   78,
-
-       77,   79,   78,  157,   79,   75,   76,   77,   75,   76,
-       77,   78,   80,   79,   78,  157,   79,   80,  102,  152,
-       80,  191,  191,   81,  183,  192,  192,  152,  102,   80,
-      102,  152,   80,   75,   81,  102,  183,   81,   81,   81,
-       81,  193,  193,   78,   87,  137,  137,  137,  137,   77,
-      166,   87,   87,   87,   87,   87,   98,   98,   98,  393,
-       79,  393,  166,  671,   80,  259,  167,  670,   98,  666,
-       98,  138,  138,  138,  138,   98,  146,  137,  167,  168,
-      168,  168,  168,  183,  166,  194,  194,  274,  274,  556,
-      146,  146,  146,  146,  146,   81,   91,  151,   91,   91,
-
-       91,   91,   91,   91,  154,  151,  151,  138,  188,  151,
-      165,  173,  154,  186,  259,  341,  154,  171,  272,  188,
-      454,  236,  165,  173,  395,  186,  167,   91,  341,  171,
-      272,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-       91,   91,   91,  556,  236,  454,  171,  266,  146,  358,
-      165,  173,  266,  266,   91,  108,  108,  108,  108,  108,
-      108,  108,  108,  108,  108,  108,  108,  110,  236,  270,
-      395,  186,  110,  358,  270,  110,  110,  110,  110,  110,
-      188,  270,  359,  110,  110,  110,  110,  110,  110,  110,
+       49,   49,   49,   49,   49,   52,  192,  192,   52,   62,
+       52,  215,   52,   52,   52,   52,   52,   52,  645,  183,
+       52,  215,   62,   62,   62,   62,   64,   65,  215,   65,
+
+       65,  183,   68,   68,   65,   64,   68,   68,   68,   67,
+       67,   52,   67,   67,   67,  260,   52,   52,   52,   52,
+       52,   52,   52,   52,   52,   52,   52,   52,   83,   83,
+       83,   83,   62,   66,   66,   66,   66,   66,   69,   52,
+       63,  335,   63,   63,   63,   63,   63,   63,  645,  183,
+       66,   69,   69,   71,   71,  335,   69,   69,   69,   87,
+       71,   71,   71,  166,   69,  260,   87,   87,   87,   87,
+       87,   63,  100,  100,  100,  166,   63,   63,   63,   63,
+       63,   63,   63,   63,   63,   63,   63,   63,  193,  193,
+      232,   73,   73,   74,   74,   75,  232,  166,   75,   63,
+
+       73,   73,   73,   74,   74,   76,   77,   75,   76,   77,
+       75,   77,   78,   79,   80,   78,   79,   76,   77,   80,
+       76,   77,   80,  244,   78,   79,   81,   78,   79,  194,
+      194,   80,  682,  167,   80,  543,   75,   81,  102,  680,
+       81,   81,   81,   81,   92,  167,   92,  187,  102,  543,
+      102,   92,   98,   98,   98,  102,  614,   78,  186,  187,
+      151,   77,  275,  275,   98,  244,   98,   80,  151,  151,
+      186,   98,  151,   79,  119,  119,  119,  119,  136,  136,
+      136,  136,  137,  137,  137,  137,  138,  138,  138,  138,
+      168,  168,  168,  168,  167,  359,  187,  311,  311,   81,
+
+       91,  152,   91,   91,   91,   91,   91,   91,  154,  152,
+      165,  614,  146,  152,  188,  137,  154,  186,  312,  312,
+      154,  171,  165,  138,  678,  188,  146,  146,  146,  146,
+      146,   91,  672,  171,  313,  313,   91,   91,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   91,  196,  196,
+      171,  165,  314,  314,  359,  196,  196,  196,  196,   91,
+      108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
+      108,  108,  110,  216,  216,  216,  216,  110,  315,  315,
+      110,  110,  110,  110,  110,  146,  671,  188,  110,  110,
       110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
 
-      110,  110,  110,  110,  310,  310,  359,  110,  110,  110,
-      110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+      110,  110,  110,  110,  110,  110,  110,  110,  110,  217,
+      217,  217,  217,  110,  110,  110,  110,  110,  110,  110,
       110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-      110,  110,  112,  180,  184,  112,  112,  112,  112,  112,
-      181,  180,  180,  180,  180,  180,  184,  185,  181,  181,
-      181,  181,  181,  500,  187,  311,  311,  663,  200,  185,
-      312,  312,  500,  112,  662,  200,  187,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  657,
-      181,  216,  216,  216,  216,  313,  313,  332,  184,  200,
-      112,  113,  334,  113,  217,  217,  217,  217,  113,  113,
-
-      656,  185,  187,  113,  196,  196,  334,  113,  314,  314,
-      182,  196,  196,  196,  196,  113,  200,  113,  182,  182,
-      182,  182,  182,  113,  113,  218,  218,  218,  218,  113,
-      221,  221,  221,  221,  113,  127,  127,  127,  127,  127,
-      127,  127,  127,  127,  127,  127,  127,  127,  127,  127,
-      127,  332,  195,  195,  182,  127,  127,  127,  127,  195,
-      195,  195,  195,  195,  201,  303,  215,  201,  201,  201,
-      201,  201,  222,  222,  222,  222,  215,  303,  315,  315,
-      127,  127,  127,  215,  223,  223,  223,  223,  655,  233,
-      233,  233,  233,  654,  377,  201,  224,  224,  224,  224,
-
-      224,  224,  224,  224,  224,  224,  224,  303,  127,  127,
-      129,  129,  129,  129,  129,  592,  129,  129,  129,  129,
-      129,  129,  201,  233,  129,  129,  234,  234,  234,  234,
-      129,  129,  651,  129,  243,  243,  243,  243,  253,  367,
-      342,  226,  287,  377,  253,  253,  253,  253,  226,  241,
-      241,  241,  241,  342,  287,  129,  129,  271,  254,  273,
-      234,  292,  271,  650,  273,  254,  254,  254,  254,  648,
-      290,  254,  226,  292,  271,  290,  273,  365,  647,  243,
-      592,  367,  290,  129,  129,  131,  131,  131,  131,  131,
-      131,  131,  131,  131,  131,  131,  131,  132,  132,  226,
-
-      241,  254,  132,  366,  287,  132,  132,  132,  132,  132,
-      365,  132,  292,  132,  132,  132,  132,  132,  132,  132,
+      110,  110,  110,  110,  110,  110,  110,  110,  112,  180,
+      670,  112,  112,  112,  112,  112,  173,  180,  180,  180,
+      180,  180,  181,  184,  185,  273,  304,  378,  173,  329,
+      181,  181,  181,  181,  181,  184,  185,  273,  304,  112,
+      218,  218,  218,  218,  112,  112,  112,  112,  112,  112,
+      112,  112,  112,  112,  112,  112,  666,  173,  221,  221,
+      221,  221,  360,  181,  316,  316,  663,  112,  113,  304,
+
+      113,  222,  222,  222,  222,  113,  113,  378,  184,  185,
+      113,  195,  195,  236,  113,  424,  424,  360,  195,  195,
+      195,  195,  195,  113,  329,  113,  223,  223,  223,  223,
+      662,  113,  113,  426,  426,  361,  236,  113,  233,  233,
+      233,  233,  113,  127,  127,  127,  127,  127,  127,  127,
+      127,  127,  127,  127,  127,  127,  127,  127,  127,  182,
+      361,  236,  277,  127,  127,  127,  127,  182,  182,  182,
+      182,  182,  200,  233,  298,  307,  298,  201,  226,  200,
+      201,  201,  201,  201,  201,  226,  298,  307,  127,  127,
+      127,  127,  224,  224,  224,  224,  224,  224,  224,  224,
+
+      224,  224,  224,  200,  182,  427,  427,  333,  201,  226,
+      234,  234,  234,  234,  395,  277,  395,  127,  127,  129,
+      129,  129,  129,  129,  277,  129,  129,  129,  129,  129,
+      129,  200,  657,  129,  129,  307,  201,  226,  272,  129,
+      129,  342,  129,  272,  254,  234,  243,  243,  243,  243,
+      254,  254,  254,  254,  342,  272,  267,  241,  241,  241,
+      241,  267,  267,  383,  129,  129,  129,  255,  369,  290,
+      293,  266,  333,  656,  255,  255,  255,  255,  271,  342,
+      255,  290,  293,  271,  398,  266,  266,  266,  266,  655,
+      271,  243,  654,  129,  129,  131,  131,  131,  131,  131,
+
+      131,  131,  131,  131,  131,  131,  131,  132,  132,  241,
+      369,  255,  132,  383,  290,  132,  132,  132,  132,  132,
+      651,  132,  293,  132,  132,  132,  132,  132,  132,  132,
       132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
-      132,  132,  132,  132,  422,  422,  366,  132,  132,  132,
+      132,  132,  132,  132,  266,  398,  132,  476,  132,  132,
       132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
       132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
-      132,  132,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  135,  135,  345,  424,  424,  135,
-      425,  425,  135,  135,  135,  135,  426,  426,  135,  345,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
+      132,  132,  132,  134,  134,  134,  134,  134,  134,  134,
+      134,  134,  134,  134,  134,  135,  135,  428,  428,  308,
+      135,  429,  429,  135,  135,  135,  135,  476,  650,  135,
 
+      308,  135,  135,  135,  135,  135,  135,  135,  135,  135,
       135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  643,  381,  699,  135,  135,  135,  135,  135,  135,
+      135,  135,  323,  323,  323,  323,  135,  135,  135,  135,
       135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  155,
-      155,  155,  322,  322,  322,  322,  155,  297,  301,  297,
-      301,  155,  155,  396,  155,  155,  155,  155,  155,  297,
-      301,  381,  155,  155,  155,  155,  155,  155,  155,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
-      155,  155,  155,  427,  427,  699,  155,  155,  155,  155,
+      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
+      135,  155,  155,  155,  274,  486,  486,  486,  155,  274,
+      291,  400,  308,  155,  155,  291,  155,  155,  155,  155,
+      155,  274,  291,  400,  155,  155,  155,  155,  155,  155,
       155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  339,  339,  339,  339,  155,
 
       155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
-      155,  159,  302,  396,  305,  428,  428,  463,  302,  305,
-      428,  255,  642,  159,  302,  641,  305,  277,  255,  255,
-      255,  255,  280,  289,  255,  277,  277,  277,  277,  277,
-      280,  280,  280,  280,  280,  289,  338,  338,  338,  338,
-      463,  159,  159,  159,  159,  159,  159,  159,  159,  159,
-      159,  159,  159,  160,  255,  307,  398,  302,  160,  501,
-      501,  160,  160,  160,  160,  160,  307,  289,  398,  160,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  159,  303,  302,  288,  302,  367,
+      368,  303,  503,  503,  256,  648,  159,  303,  302,  288,
+      278,  256,  256,  256,  256,  281,  647,  256,  278,  278,
+      278,  278,  278,  281,  281,  281,  281,  281,  350,  350,
+      350,  350,  367,  368,  643,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  160,  256,  306,
+      411,  303,  160,  642,  306,  160,  160,  160,  160,  160,
+      288,  306,  411,  160,  160,  160,  160,  160,  160,  160,
+
       160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  373,  373,  373,  373,  160,  160,
       160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-
-      484,  484,  484,  160,  160,  160,  160,  160,  160,  160,
       160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  162,  265,
-      281,  162,  162,  162,  162,  162,  640,  307,  281,  281,
-      281,  281,  281,  265,  265,  265,  265,  282,  282,  282,
-      282,  282,  282,  282,  282,  282,  282,  282,  638,  162,
-      368,  368,  368,  162,  162,  162,  162,  162,  162,  162,
-      162,  162,  162,  162,  162,  317,  317,  348,  348,  348,
-      348,  637,  317,  317,  317,  317,  162,  175,  175,  175,
-      175,  175,  175,  175,  175,  175,  175,  175,  175,  176,
-
-      176,  265,  409,  629,  176,  368,  700,  176,  176,  176,
-      176,  176,  457,  176,  409,  176,  176,  176,  176,  176,
+      160,  160,  160,  162,  282,  698,  162,  162,  162,  162,
+      162,  641,  282,  282,  282,  282,  282,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  318,  318,
+      374,  374,  374,  374,  162,  318,  318,  318,  318,  162,
+      162,  162,  162,  162,  162,  162,  162,  162,  162,  162,
+      162,  430,  430,  456,  505,  505,  430,  434,  434,  434,
+
+      434,  556,  162,  175,  175,  175,  175,  175,  175,  175,
+      175,  175,  175,  175,  175,  176,  176,  343,  698,  456,
+      176,  506,  506,  176,  176,  176,  176,  176,  459,  176,
+      343,  176,  176,  176,  176,  176,  176,  176,  176,  176,
       176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  457,  503,  503,  176,
+      176,  176,  556,  459,  176,  343,  176,  176,  176,  176,
       176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
       176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  176,  178,  178,  178,  178,  178,  178,
-      178,  178,  178,  178,  178,  178,  179,  179,  700,  418,
-      628,  179,  504,  504,  179,  179,  179,  179,  179,  622,
-      179,  418,  179,  179,  179,  179,  179,  179,  179,  179,
+      176,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  179,  179,  346,  640,  502,  179,  568,
 
+      568,  179,  179,  179,  179,  179,  502,  179,  346,  179,
       179,  179,  179,  179,  179,  179,  179,  179,  179,  179,
-      179,  179,  179,  464,  464,  464,  179,  179,  179,  179,
       179,  179,  179,  179,  179,  179,  179,  179,  179,  179,
+      370,  370,  370,  346,  179,  179,  179,  179,  179,  179,
       179,  179,  179,  179,  179,  179,  179,  179,  179,  179,
-      179,  219,  219,  219,  219,  219,  219,  219,  219,  219,
-      219,  219,  285,  371,  371,  371,  371,  645,  464,  485,
-      285,  285,  285,  285,  285,  219,  219,  219,  219,  219,
-      219,  219,  219,  219,  219,  219,  219,  220,  220,  220,
-      220,  220,  220,  220,  220,  220,  220,  220,  299,  620,
-      299,  554,  554,  554,  285,  619,  299,  299,  299,  299,
-
-      299,  220,  220,  220,  220,  220,  220,  220,  220,  220,
-      220,  220,  220,  225,  225,  429,  645,  485,  225,  486,
-      618,  225,  225,  225,  225,  225,  606,  225,  429,  225,
+      179,  179,  179,  179,  179,  179,  179,  179,  179,  219,
+      219,  219,  219,  219,  219,  219,  219,  219,  219,  219,
+      286,  292,  488,  591,  591,  370,  487,  465,  286,  286,
+      286,  286,  286,  292,  219,  219,  219,  219,  219,  219,
+      219,  219,  219,  219,  219,  219,  220,  220,  220,  220,
+
+      220,  220,  220,  220,  220,  220,  220,  300,  601,  300,
+      465,  638,  606,  286,  637,  300,  300,  300,  300,  300,
+      292,  220,  220,  220,  220,  220,  220,  220,  220,  220,
+      220,  220,  220,  225,  225,  487,  420,  488,  225,  606,
+      629,  225,  225,  225,  225,  225,  623,  225,  420,  225,
       225,  225,  225,  225,  225,  225,  225,  225,  225,  225,
       225,  225,  225,  225,  225,  225,  225,  225,  225,  225,
-      567,  567,  606,  225,  225,  225,  225,  225,  225,  225,
+      628,  623,  225,  601,  225,  225,  225,  225,  225,  225,
       225,  225,  225,  225,  225,  225,  225,  225,  225,  225,
-      225,  225,  225,  225,  225,  225,  225,  225,  245,  245,
-      245,  245,  245,  486,  245,  245,  245,  245,  245,  245,
-      288,  601,  245,  245,  286,  288,  291,  440,  245,  245,
-
-      306,  245,  286,  286,  286,  286,  286,  288,  291,  440,
-      412,  541,  306,  288,  304,  372,  372,  372,  372,  375,
-      378,  379,  412,  245,  245,  541,  304,  591,  591,  612,
-      293,  611,  375,  378,  379,  394,  286,  288,  293,  293,
-      293,  293,  293,  394,  291,  442,  333,  394,  715,  411,
-      333,  245,  245,  246,  412,  601,  304,  333,  442,  306,
-      337,  411,  375,  378,  379,  614,  246,  337,  246,  246,
+      225,  225,  225,  225,  225,  225,  225,  225,  225,  245,
+
+      245,  245,  245,  245,  376,  245,  245,  245,  245,  245,
+      245,  289,  622,  245,  245,  287,  289,  376,  624,  245,
+      245,  294,  245,  287,  287,  287,  287,  287,  289,  294,
+      294,  294,  294,  294,  289,  305,  620,  613,  379,  380,
+      659,  659,  376,  624,  245,  245,  245,  305,  376,  334,
+      412,  379,  380,  334,  338,  390,  345,  421,  287,  289,
+      334,  338,  412,  345,  482,  390,  482,  390,  404,  421,
+      404,  482,  390,  245,  245,  246,  379,  380,  305,  412,
+      404,  294,  379,  380,  630,  338,  626,  345,  246,  613,
+      246,  246,  246,  246,  246,  246,  246,  246,  246,  246,
+
       246,  246,  246,  246,  246,  246,  246,  246,  246,  246,
-      246,  246,  246,  246,  246,  246,  246,  246,  246,  293,
-      644,  337,  630,  659,  659,  411,  246,  248,  248,  248,
-
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  256,
-      333,  402,  610,  402,  432,  432,  432,  432,  337,  614,
-      715,  608,  256,  402,  256,  256,  256,  256,  256,  256,
-      256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
-      256,  256,  256,  256,  256,  408,  630,  644,  449,  344,
-      374,  374,  256,  278,  410,  374,  344,  408,  374,  374,
-      374,  374,  449,  449,  374,  278,  410,  604,  408,  278,
-      278,  278,  278,  278,  278,  278,  278,  278,  278,  278,
-      344,  604,  480,  410,  480,  607,  693,  623,  624,  480,
-      687,  613,  408,  278,  278,  278,  278,  278,  278,  278,
-
-      278,  278,  278,  278,  278,  283,  283,  344,  605,  420,
-      283,  623,  624,  283,  283,  283,  283,  283,  631,  283,
-      420,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  613,  693,  687,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-      294,  294,  603,  416,  602,  416,  729,  729,  631,  473,
-      555,  420,  294,  626,  294,  416,  294,  294,  294,  294,
-      294,  294,  294,  294,  294,  294,  294,  294,  294,  294,
-
-      294,  294,  294,  294,  294,  294,  294,  626,  634,  653,
-      667,  600,  667,  668,  294,  295,  295,  295,  295,  295,
-      295,  295,  295,  295,  295,  295,  295,  300,  473,  419,
-      555,  599,  634,  653,  590,  668,  667,  668,  589,  653,
-      300,  419,  300,  300,  300,  300,  300,  300,  300,  300,
-      300,  300,  300,  300,  300,  300,  300,  300,  300,  300,
-      300,  300,  300,  386,  388,  730,  730,  731,  731,  587,
-      300,  323,  585,  405,  388,  323,  388,  386,  386,  386,
-      386,  388,  323,  419,  323,  405,  323,  323,  323,  323,
-      323,  323,  323,  323,  323,  323,  323,  323,  323,  323,
-
-      323,  323,  323,  323,  323,  323,  323,  734,  734,  584,
-      323,  323,  323,  323,  323,  323,  323,  323,  323,  323,
-      323,  323,  407,  405,  658,  406,  389,  407,  413,  443,
-      673,  468,  469,  323,  336,  386,  389,  406,  389,  407,
-      413,  583,  443,  389,  468,  469,  582,  336,  581,  336,
-      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
-      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
-      340,  470,  413,  697,  658,  406,  467,  467,  467,  580,
-      407,  673,  579,  340,  470,  340,  340,  340,  340,  340,
-      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
-
-      340,  340,  340,  340,  340,  340,  343,  343,  343,  343,
-      343,  343,  343,  343,  343,  343,  343,  343,  397,  397,
-      578,  467,  499,  697,  751,  751,  577,  576,  574,  573,
-      397,  571,  397,  499,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
-      397,  397,  397,  397,  397,  399,  570,  478,  569,  566,
-      565,  553,  455,  552,  551,  550,  548,  546,  399,  478,
+      246,  626,  421,  338,  334,  345,  555,  555,  555,  246,
+      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
+      248,  248,  257,  422,  396,  699,  619,  658,  673,  630,
+      729,  729,  396,  618,  422,  257,  396,  257,  257,  257,
+      257,  257,  257,  257,  257,  257,  257,  257,  257,  257,
+      257,  257,  257,  257,  257,  257,  257,  257,  442,  612,
+      257,  532,  431,  375,  375,  631,  257,  279,  375,  496,
+      442,  375,  375,  375,  375,  431,  532,  375,  658,  279,
+      673,  496,  407,  279,  279,  279,  279,  279,  279,  279,
+
+      279,  279,  279,  279,  407,  406,  422,  611,  699,  634,
+      431,  610,  375,  406,  406,  406,  406,  406,  279,  279,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      284,  284,  444,  496,  634,  284,  631,  608,  284,  284,
+      284,  284,  284,  407,  284,  444,  284,  284,  284,  284,
+      284,  284,  284,  284,  284,  284,  284,  284,  284,  284,
+      284,  284,  284,  284,  284,  284,  284,  700,  607,  284,
+      444,  284,  284,  284,  284,  284,  284,  284,  284,  284,
+      284,  284,  284,  284,  284,  284,  284,  284,  284,  284,
+      284,  284,  284,  284,  284,  284,  295,  295,  644,  418,
+
+      605,  418,  687,  730,  730,  603,  633,  602,  295,  646,
+      295,  418,  295,  295,  295,  295,  295,  295,  295,  295,
+      295,  295,  295,  295,  295,  295,  295,  295,  295,  295,
+      295,  295,  295,  633,  731,  731,  667,  646,  667,  600,
+      700,  295,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  301,  445,  644,  687,  633,  466,
+      466,  466,  646,  667,  469,  469,  469,  301,  445,  301,
+      301,  301,  301,  301,  301,  301,  301,  301,  301,  301,
+      301,  301,  301,  301,  301,  301,  301,  301,  301,  301,
+      414,  388,  301,  445,  599,  693,  590,  604,  301,  324,
+
+      589,  408,  414,  324,  466,  388,  388,  388,  388,  469,
+      324,  604,  324,  408,  324,  324,  324,  324,  324,  324,
+      324,  324,  324,  324,  324,  324,  324,  324,  324,  324,
+      324,  324,  324,  324,  324,  414,  715,  324,  587,  324,
+      324,  324,  324,  324,  324,  324,  324,  324,  324,  324,
+      324,  409,  408,  693,  415,  391,  409,  413,  489,  451,
+      489,  665,  324,  337,  388,  391,  415,  391,  409,  413,
+      489,  585,  391,  451,  451,  665,  337,  584,  337,  337,
+      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
+      337,  337,  337,  337,  337,  337,  337,  337,  337,  415,
+
+      419,  337,  341,  583,  413,  582,  419,  734,  734,  715,
+      409,  660,  419,  751,  751,  341,  581,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  668,  660,
+      341,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  399,  399,  580,  419,  579,  546,  546,
+      546,  668,  578,  668,  660,  399,  577,  399,  576,  399,
       399,  399,  399,  399,  399,  399,  399,  399,  399,  399,
       399,  399,  399,  399,  399,  399,  399,  399,  399,  399,
-      399,  400,  455,  542,  499,  540,  404,  681,  539,  538,
-
-      537,  414,  455,  400,  404,  404,  404,  404,  404,  414,
-      414,  414,  414,  414,  415,  415,  536,  508,  455,  415,
-      535,  681,  415,  415,  415,  415,  415,  534,  415,  478,
-      508,  400,  400,  400,  400,  400,  400,  400,  400,  400,
-      400,  400,  400,  417,  487,  489,  487,  491,  490,  417,
-      489,  492,  491,  493,  494,  417,  487,  495,  533,  531,
-      490,  498,  489,  492,  491,  493,  494,  496,  497,  495,
-      497,  492,  496,  498,  528,  490,  524,  525,  506,  506,
-      497,  529,  527,  526,  496,  506,  506,  506,  506,  524,
-      525,  665,  544,  544,  544,  529,  529,  493,  417,  446,
-
-      490,  557,  522,  557,  521,  665,  520,  494,  519,  495,
-      518,  517,  446,  557,  446,  446,  446,  446,  446,  446,
-      446,  446,  446,  446,  446,  446,  446,  446,  446,  446,
-      446,  446,  446,  446,  446,  488,  488,  544,  558,  516,
-      515,  514,  513,  512,  511,  510,  509,  488,  507,  488,
-      558,  488,  488,  488,  488,  488,  488,  488,  488,  488,
-      488,  488,  488,  488,  488,  488,  488,  488,  488,  488,
-      488,  488,  549,  559,  633,  502,  483,  482,  558,  560,
-      561,  562,  481,  563,  598,  559,  549,  549,  549,  549,
-      593,  560,  561,  562,  563,  598,  588,  479,  477,  568,
-
-      568,  633,  593,  594,  595,  559,  568,  568,  568,  568,
-      588,  588,  588,  588,  596,  594,  595,  597,  616,  635,
-      646,  562,  593,  617,  561,  633,  596,  639,  475,  597,
-      616,  635,  636,  639,  617,  652,  472,  560,  561,  649,
-      652,  660,  664,  636,  549,  471,  466,  595,  646,  677,
-      649,  639,  462,  664,  461,  563,  598,  639,  460,  652,
-      677,  594,  616,  459,  458,  456,  453,  452,  588,  660,
-      451,  450,  646,  674,  661,  675,  597,  609,  609,  448,
-      609,  609,  609,  609,  609,  689,  609,  609,  609,  609,
-      688,  609,  609,  660,  447,  617,  661,  609,  609,  609,
-
-      609,  674,  661,  675,  636,  444,  674,  609,  690,  439,
-      438,  649,  437,  689,  664,  436,  688,  694,  688,  690,
-      661,  677,  609,  609,  609,  674,  661,  675,  695,  701,
-      702,  609,  703,  675,  435,  689,  704,  689,  705,  695,
-      701,  702,  688,  703,  434,  694,  433,  704,  431,  705,
-      609,  609,  615,  615,  430,  615,  615,  615,  615,  615,
-      615,  615,  615,  615,  615,  423,  615,  615,  706,  694,
-      421,  403,  615,  615,  615,  615,  401,  392,  391,  706,
-      690,  707,  615,  708,  709,  390,  387,  385,  383,  380,
-      376,  370,  707,  369,  708,  709,  710,  615,  615,  615,
-
-      695,  701,  702,  711,  703,  712,  615,  710,  704,  364,
-      705,  713,  714,  363,  711,  362,  712,  361,  356,  355,
-      354,  353,  713,  714,  352,  615,  615,  625,  625,  351,
-      625,  625,  625,  625,  625,  350,  625,  625,  625,  625,
-      706,  625,  625,  349,  347,  346,  331,  625,  625,  625,
-      625,  329,  327,  707,  326,  708,  709,  625,  325,  324,
-      321,  320,  319,  318,  308,  298,  296,  284,  710,  279,
-      275,  269,  625,  625,  625,  711,  267,  712,  263,  262,
-      261,  625,  260,  713,  714,  258,  257,  252,  251,  250,
-      240,  239,  238,  237,  235,  231,  230,  229,  228,  227,
-
-      625,  625,  632,  632,  214,  632,  632,  632,  632,  632,
-      632,  632,  632,  632,  632,  213,  632,  632,  212,  211,
-      210,  207,  632,  632,  632,  632,  206,  205,  204,  203,
-      202,  198,  632,  197,  189,  177,  174,  172,  170,  169,
-      164,  163,  161,  150,  148,  147,  145,  632,  632,  632,
-      143,  142,  141,  140,  139,  126,  632,  125,  124,  123,
-      122,  121,  120,  118,  117,  116,  115,  114,  105,  103,
-       99,   96,   95,   94,   90,  632,  632,  719,   85,   82,
-       55,  719,  719,   54,   46,  719,  719,  719,  719,  719,
-      719,  719,  719,  720,  720,  720,  720,  720,   18,  720,
-
+      416,  470,  399,  401,  574,  495,  573,  572,  416,  416,
+
+      416,  416,  416,  546,  470,  457,  401,  495,  401,  401,
+      401,  401,  401,  401,  401,  401,  401,  401,  401,  401,
+      401,  401,  401,  401,  401,  401,  401,  401,  401,  470,
+      471,  401,  402,  500,  491,  457,  571,  410,  570,  491,
+      495,  567,  492,  471,  402,  500,  457,  417,  417,  410,
+      472,  491,  417,  480,  492,  417,  417,  417,  417,  417,
+      410,  417,  457,  472,  566,  480,  639,  653,  471,  492,
+      554,  681,  639,  402,  402,  402,  402,  402,  402,  402,
+      402,  402,  402,  402,  402,  410,  417,  448,  472,  497,
+      553,  639,  653,  552,  551,  492,  681,  639,  653,  549,
+
+      448,  497,  448,  448,  448,  448,  448,  448,  448,  448,
+      448,  448,  448,  448,  448,  448,  448,  448,  448,  448,
+      448,  448,  448,  501,  596,  448,  480,  490,  490,  564,
+      548,  544,  542,  541,  501,  540,  596,  539,  538,  490,
+      564,  490,  497,  490,  490,  490,  490,  490,  490,  490,
+      490,  490,  490,  490,  490,  490,  490,  490,  490,  490,
+      490,  490,  490,  490,  493,  494,  490,  498,  499,  493,
+      499,  697,  498,  510,  525,  526,  694,  494,  537,  531,
+      499,  493,  508,  508,  498,  494,  510,  525,  526,  508,
+      508,  508,  508,  531,  531,  558,  501,  558,  559,  536,
+
+      550,  535,  564,  533,  694,  530,  560,  558,  561,  562,
+      559,  510,  525,  526,  550,  550,  550,  550,  560,  563,
+      561,  562,  697,  529,  593,  569,  569,  588,  594,  694,
+      527,  563,  569,  569,  569,  569,  593,  595,  560,  559,
+      594,  588,  588,  588,  588,  597,  524,  598,  523,  595,
+      616,  635,  522,  521,  562,  661,  593,  597,  598,  520,
+      563,  617,  616,  635,  636,  649,  652,  561,  562,  519,
+      674,  652,  617,  550,  664,  636,  649,  661,  518,  677,
+      517,  595,  516,  661,  515,  664,  675,  594,  690,  514,
+      677,  652,  513,  512,  511,  616,  509,  504,  674,  690,
+
+      588,  485,  661,  674,  695,  597,  701,  702,  661,  484,
+      483,  481,  689,  479,  675,  695,  477,  701,  702,  475,
+      598,  609,  609,  674,  609,  609,  609,  609,  609,  688,
+      609,  609,  609,  609,  617,  609,  609,  636,  649,  675,
+      689,  609,  609,  609,  609,  675,  473,  664,  703,  704,
+      468,  609,  677,  705,  464,  688,  463,  688,  462,  703,
+      704,  690,  706,  689,  705,  689,  609,  609,  609,  609,
+      461,  460,  458,  706,  707,  708,  609,  695,  709,  701,
+      702,  710,  688,  711,  455,  707,  708,  454,  712,  709,
+      453,  452,  710,  450,  711,  609,  609,  615,  615,  712,
+
+      615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
+      449,  615,  615,  713,  446,  441,  440,  615,  615,  615,
+      615,  703,  704,  439,  713,  714,  705,  615,  438,  437,
+      436,  435,  433,  432,  425,  706,  714,  423,  405,  403,
+      394,  393,  615,  615,  615,  615,  392,  707,  708,  389,
+      387,  709,  615,  385,  710,  381,  711,  377,  372,  371,
+      366,  712,  365,  364,  363,  358,  357,  356,  355,  354,
+      353,  615,  615,  625,  625,  352,  625,  625,  625,  625,
+      625,  351,  625,  625,  625,  625,  713,  625,  625,  348,
+      347,  332,  330,  625,  625,  625,  625,  328,  714,  327,
+
+      326,  325,  322,  625,  321,  320,  319,  309,  299,  297,
+      285,  280,  276,  270,  268,  264,  263,  262,  625,  625,
+      625,  625,  261,  259,  258,  252,  251,  250,  625,  240,
+      239,  238,  237,  235,  231,  230,  229,  228,  227,  214,
+      213,  212,  211,  210,  207,  206,  205,  625,  625,  632,
+      632,  204,  632,  632,  632,  632,  632,  632,  632,  632,
+      632,  632,  203,  632,  632,  202,  198,  197,  189,  632,
+      632,  632,  632,  177,  174,  172,  170,  169,  164,  632,
+      163,  161,  150,  148,  147,  145,  143,  142,  141,  140,
+      139,  126,  125,  124,  632,  632,  632,  632,  123,  122,
+
+      121,  120,  118,  117,  632,  116,  115,  114,  105,  103,
+       99,   96,   95,   94,   90,   85,   82,   55,   54,   46,
+       18,   17,   14,  632,  632,  719,    9,    3,    0,  719,
+      719,    0,    0,  719,  719,  719,    0,  719,  719,  719,
+      719,  719,  720,  720,  720,  720,  720,    0,  720,  720,
       720,  720,  720,  720,  720,  720,  720,  720,  720,  720,
-      720,  720,  721,  721,   17,   14,    9,  721,  721,  721,
+      720,  720,  721,  721,    0,    0,    0,  721,  721,  721,
+      722,  722,  722,  722,  722,  722,  722,  722,  722,  722,
       722,  722,  722,  722,  722,  722,  722,  722,  722,  722,
-      722,  722,  722,  722,  722,  722,  722,  722,  722,  723,
       723,  723,  723,  723,  723,  723,  723,  723,  723,  723,
-      723,  723,  723,  723,  723,  723,  723,  723,  724,  724,
-      724,  724,  724,  724,  724,  724,  724,  724,  724,  724,
-      724,  724,  724,  724,  724,  724,  724,  725,    3,    0,
-        0,  725,  725,  725,    0,  725,  725,  725,  725,  725,
-      725,  725,  725,  726,  726,  726,  726,  726,    0,  726,
 
-      726,  726,  726,  726,  726,  726,  726,  726,  726,  726,
-      726,  726,  727,  727,  727,  727,  727,  727,  727,  727,
+      723,  723,  723,  723,  723,  723,  723,  723,  723,  723,
+      724,  724,  724,  724,  724,  724,  724,  724,  724,  724,
+      724,  724,  724,  724,  724,  724,  724,  724,  724,  724,
+      725,    0,    0,    0,  725,  725,  725,    0,  725,  725,
+      725,    0,  725,  725,  725,  725,  725,  726,  726,  726,
+      726,  726,    0,  726,  726,  726,  726,  726,  726,  726,
+      726,  726,  726,  726,  726,  726,  726,  727,  727,  727,
       727,  727,  727,  727,  727,  727,  727,  727,  727,  727,
-      727,  728,  728,    0,    0,    0,    0,    0,    0,    0,
-        0,  728,    0,    0,  728,  728,    0,  728,  732,  732,
+      727,  727,  727,  727,  727,  727,  727,  728,  728,    0,
+        0,    0,    0,    0,    0,    0,    0,  728,    0,    0,
+
+        0,  728,  728,    0,  728,  732,  732,  732,  732,  732,
       732,  732,  732,  732,  732,  732,  732,  732,  732,  732,
-      732,  732,  732,  732,  732,  732,  732,  733,  733,  733,
+      732,  732,  732,  732,  732,  733,  733,  733,  733,  733,
       733,  733,  733,  733,  733,  733,  733,  733,  733,  733,
-      733,  733,  733,  733,  733,  733,  735,  735,  735,  735,
+      733,  733,  733,  733,  733,  735,  735,  735,  735,  735,
       735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-
       735,  735,  735,  735,  735,  736,  736,  736,  736,  736,
       736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
-      736,  736,  736,  736,  737,    0,    0,    0,  737,  737,
-      737,    0,  737,  737,  737,  737,  737,  737,  737,  737,
+      736,  736,  736,  736,  736,  737,    0,    0,    0,  737,
+      737,  737,    0,  737,  737,  737,    0,  737,  737,  737,
+
+      737,  737,  738,  738,  738,  738,  738,  738,  738,  738,
       738,  738,  738,  738,  738,  738,  738,  738,  738,  738,
-      738,  738,  738,  738,  738,  738,  738,  738,  738,  739,
+      738,  738,  739,  739,  739,  739,  739,  739,  739,  739,
       739,  739,  739,  739,  739,  739,  739,  739,  739,  739,
-      739,  739,  739,  739,  739,  739,  739,  739,  740,  740,
+      739,  739,  740,  740,  740,  740,  740,  740,  740,  740,
       740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
-      740,  740,  740,  740,  740,  740,  740,  741,  741,  741,
-
+      740,  740,  741,  741,  741,  741,  741,  741,  741,  741,
       741,  741,  741,  741,  741,  741,  741,  741,  741,  741,
-      741,  741,  741,  741,  741,  741,  742,  742,  742,  742,
+      741,  741,  742,  742,  742,  742,  742,  742,  742,  742,
       742,  742,  742,  742,  742,  742,  742,  742,  742,  742,
-      742,  742,  742,  742,  742,  743,  743,    0,  743,  743,
+
+      742,  742,  743,  743,    0,  743,  743,  743,  743,  743,
       743,  743,  743,  743,  743,  743,  743,  743,  743,  743,
-      743,  743,  743,  743,  744,  744,    0,  744,  744,  744,
+      743,  743,  744,  744,    0,  744,  744,  744,  744,  744,
       744,  744,  744,  744,  744,  744,  744,  744,  744,  744,
-      744,  744,  744,  745,    0,  745,    0,    0,    0,  745,
+      744,  744,  745,    0,  745,    0,    0,    0,  745,    0,
       745,  745,    0,    0,  745,  746,  746,  746,  746,  746,
       746,  746,  746,  746,  746,  746,  746,  746,  746,  746,
-
-      746,  746,  746,  746,  747,  747,  747,  747,  747,  747,
+      746,  746,  746,  746,  746,  747,  747,  747,  747,  747,
       747,  747,  747,  747,  747,  747,  747,  747,  747,  747,
-      747,  747,  747,  748,  748,  748,  748,  748,  748,  748,
+      747,  747,  747,  747,  747,  748,  748,  748,  748,  748,
+
       748,  748,  748,  748,  748,  748,  748,  748,  748,  748,
-      748,  748,  749,  749,  749,  749,  749,  749,  749,  749,
+      748,  748,  748,  748,  748,  749,  749,  749,  749,  749,
       749,  749,  749,  749,  749,  749,  749,  749,  749,  749,
-      749,  750,  750,  750,  750,  750,  750,  750,  750,  752,
-        0,    0,    0,  752,    0,  752,  752,  752,  752,    0,
-      752,  753,  753,  753,  753,  753,  753,  753,  753,  753,
+      749,  749,  749,  749,  749,  750,  750,  750,    0,  750,
+      750,  750,  750,  750,  752,    0,    0,    0,  752,    0,
+      752,  752,  752,  752,    0,    0,  752,  753,  753,  753,
       753,  753,  753,  753,  753,  753,  753,  753,  753,  753,
-
+      753,  753,  753,  753,  753,  753,  753,  754,  754,  754,
       754,  754,  754,  754,  754,  754,  754,  754,  754,  754,
-      754,  754,  754,  754,  754,  754,  754,  754,  754,  755,
-        0,    0,    0,  755,  755,  755,    0,  755,  755,  755,
-      755,  755,  755,  755,  755,  756,  756,  756,  756,  756,
+      754,  754,  754,  754,  754,  754,  754,  755,    0,    0,
+
+        0,  755,  755,  755,    0,  755,  755,  755,    0,  755,
+      755,  755,  755,  755,  756,  756,  756,  756,  756,  756,
       756,  756,  756,  756,  756,  756,  756,  756,  756,  756,
       756,  756,  756,  756,  757,  757,  757,  757,  757,  757,
       757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
-      757,  757,  757,  758,  758,  758,  758,  758,  758,  758,
+      757,  757,  757,  757,  758,  758,  758,  758,  758,  758,
       758,  758,  758,  758,  758,  758,  758,  758,  758,  758,
-      758,  758,  759,  759,  759,  759,  759,  759,  759,  759,
-
+      758,  758,  758,  758,  759,  759,  759,  759,  759,  759,
       759,  759,  759,  759,  759,  759,  759,  759,  759,  759,
-      759,  760,  760,  760,  760,  760,  760,  760,  760,  760,
+      759,  759,  759,  759,  760,  760,  760,  760,  760,  760,
+
       760,  760,  760,  760,  760,  760,  760,  760,  760,  760,
+      760,  760,  760,  760,  761,  761,  761,  761,  761,  761,
       761,  761,  761,  761,  761,  761,  761,  761,  761,  761,
-      761,  761,  761,  761,  761,  761,  761,  761,  761,  762,
+      761,  761,  761,  761,  762,  762,  762,  762,  762,  762,
       762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
-      762,  762,  762,  762,  762,  762,  762,  762,  763,  763,
+      762,  762,  762,  762,  763,  763,  763,  763,  763,  763,
       763,  763,  763,  763,  763,  763,  763,  763,  763,  763,
-      763,  763,  763,  763,  763,  763,  763,  764,  764,    0,
+      763,  763,  763,  763,  764,  764,    0,  764,  764,  764,
       764,  764,  764,  764,  764,  764,  764,  764,  764,  764,
+      764,  764,  764,  764,  765,  765,    0,  765,  765,  765,
 
-      764,  764,  764,  764,  764,  764,  765,  765,    0,  765,
       765,  765,  765,  765,  765,  765,  765,  765,  765,  765,
-      765,  765,  765,  765,  765,  766,    0,  766,    0,    0,
-        0,  766,  766,  766,    0,    0,  766,  767,    0,    0,
-        0,    0,    0,  767,  767,  767,  767,  768,  768,  768,
+      765,  765,  765,  765,  766,    0,  766,    0,    0,    0,
+      766,    0,  766,  766,    0,    0,  766,  767,    0,    0,
+        0,    0,    0,  767,  767,  767,  767,  767,  768,  768,
       768,  768,  768,  768,  768,  768,  768,  768,  768,  768,
-      768,  768,  768,  768,  768,  768,  769,  769,  769,  769,
+      768,  768,  768,  768,  768,  768,  768,  768,  769,  769,
       769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
-      769,  769,  769,  769,  769,  770,  770,  770,  770,  770,
+      769,  769,  769,  769,  769,  769,  769,  769,  770,  770,
       770,  770,  770,  770,  770,  770,  770,  770,  770,  770,
+      770,  770,  770,  770,  770,  770,  770,  770,  771,  771,
 
-      770,  770,  770,  770,  771,  771,  771,  771,  771,  771,
       771,  771,  771,  771,  771,  771,  771,  771,  771,  771,
-      771,  771,  771,  772,  772,    0,    0,  772,  772,    0,
-      772,  772,  772,  772,  772,  772,  772,  772,  772,  773,
-        0,    0,    0,    0,    0,  773,  773,  773,  773,    0,
-      773,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      771,  771,  771,  771,  771,  771,  771,  771,  772,  772,
+        0,    0,  772,  772,    0,  772,  772,  772,  772,  772,
+      772,  772,  772,  772,  772,  773,    0,    0,    0,    0,
+        0,  773,  773,  773,  773,  773,    0,  773,  774,  774,
       774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  774,  774,  775,  775,
       775,  775,  775,  775,  775,  775,  775,  775,  775,  775,
-      775,  775,  775,  775,  775,  775,  775,  775,  775,  776,
-      776,    0,    0,  776,  776,  776,  776,  776,  776,  776,
+      775,  775,  775,  775,  775,  775,  775,  775,  776,  776,
+        0,    0,  776,  776,  776,  776,  776,  776,  776,  776,
 
       776,  776,  776,  776,  776,  777,  777,  777,  777,  777,
       777,  777,  777,  777,  777,  777,  777,  777,  777,  777,
-      777,  777,  777,  777,  778,  778,  778,  778,  778,  778,
+      777,  777,  777,  777,  777,  778,  778,  778,  778,  778,
       778,  778,  778,  778,  778,  778,  778,  778,  778,  778,
-      778,  778,  778,  779,  779,  779,  779,  779,  779,  779,
+      778,  778,  778,  778,  778,  779,  779,  779,  779,  779,
       779,  779,  779,  779,  779,  779,  779,  779,  779,  779,
-      779,  779,  780,  780,  780,  780,  780,  780,  780,  780,
+      779,  779,  779,  779,  779,  780,  780,  780,  780,  780,
       780,  780,  780,  780,  780,  780,  780,  780,  780,  780,
-      780,  781,  781,  781,  781,  781,  781,  781,  781,  781,
+      780,  780,  780,  780,  780,  781,  781,  781,  781,  781,
       781,  781,  781,  781,  781,  781,  781,  781,  781,  781,
 
+      781,  781,  781,  781,  781,  782,  782,  782,  782,  782,
       782,  782,  782,  782,  782,  782,  782,  782,  782,  782,
-      782,  782,  782,  782,  782,  782,  782,  782,  782,  783,
+      782,  782,  782,  782,  782,  783,  783,  783,  783,  783,
       783,  783,  783,  783,  783,  783,  783,  783,  783,  783,
-      783,  783,  783,  783,  783,  783,  783,  783,  784,    0,
-        0,    0,    0,    0,  784,  784,  784,  784,  785,  785,
-        0,  785,  785,  785,  785,  785,  785,  785,  785,  785,
-      785,  785,  785,  785,  785,  785,  785,  786,  786,    0,
+      783,  783,  783,  783,  783,  784,    0,    0,    0,    0,
+        0,  784,  784,  784,  784,  784,  785,  785,    0,  785,
+      785,  785,  785,  785,  785,  785,  785,  785,  785,  785,
+      785,  785,  785,  785,  785,  785,  786,  786,    0,  786,
       786,  786,  786,  786,  786,  786,  786,  786,  786,  786,
       786,  786,  786,  786,  786,  786,  787,  787,    0,  787,
-      787,  787,  787,  787,  787,  787,  787,  787,  787,  787,
 
-      787,  787,  787,  787,  787,  788,  788,    0,  788,  788,
+      787,  787,  787,  787,  787,  787,  787,  787,  787,  787,
+      787,  787,  787,  787,  787,  787,  788,  788,    0,  788,
       788,  788,  788,  788,  788,  788,  788,  788,  788,  788,
-      788,  788,  788,  788,  789,  789,    0,  789,  789,  789,
+      788,  788,  788,  788,  788,  788,  789,  789,    0,  789,
       789,  789,  789,  789,  789,  789,  789,  789,  789,  789,
-      789,  789,  789,  790,  790,    0,  790,  790,  790,  790,
+      789,  789,  789,  789,  789,  789,  790,  790,    0,  790,
       790,  790,  790,  790,  790,  790,  790,  790,  790,  790,
-      790,  790,  791,  791,  791,  791,  791,  791,  791,  791,
+      790,  790,  790,  790,  790,  790,  791,  791,  791,  791,
       791,  791,  791,  791,  791,  791,  791,  791,  791,  791,
-      791,  792,  792,  792,  792,  792,  792,  792,  792,  792,
-      792,  792,  792,  792,  792,  792,  792,  792,  792,  792,
+      791,  791,  791,  791,  791,  791,  792,  792,  792,  792,
 
+      792,  792,  792,  792,  792,  792,  792,  792,  792,  792,
+      792,  792,  792,  792,  792,  792,  793,  793,  793,  793,
       793,  793,  793,  793,  793,  793,  793,  793,  793,  793,
-      793,  793,  793,  793,  793,  793,  793,  793,  793,  794,
-        0,    0,    0,    0,    0,  794,  794,  794,  794,  794,
-      794,  794,  794,  794,  795,  795,  795,  795,  795,  795,
+      793,  793,  793,  793,  793,  793,  794,    0,    0,    0,
+        0,    0,  794,  794,  794,  794,  794,  794,  794,  794,
+      794,  794,  795,  795,  795,  795,  795,  795,  795,  795,
       795,  795,  795,  795,  795,  795,  795,  795,  795,  795,
-      795,  795,  795,  796,  796,  796,  796,  796,  796,  796,
+      795,  795,  796,  796,  796,  796,  796,  796,  796,  796,
       796,  796,  796,  796,  796,  796,  796,  796,  796,  796,
       796,  796,  797,  797,  797,  797,    0,  797,  797,  797,
-      797,  797,  797,  797,  797,  797,  797,  797,  797,  797,
-      797,  798,    0,    0,    0,    0,    0,  798,  798,  798,
 
-      798,  799,  799,    0,  799,  799,  799,  799,  799,  799,
+      797,  797,  797,  797,  797,  797,  797,  797,  797,  797,
+      797,  797,  798,    0,    0,    0,    0,    0,  798,  798,
+      798,  798,  798,  799,  799,    0,  799,  799,  799,  799,
       799,  799,  799,  799,  799,  799,  799,  799,  799,  799,
-      800,  800,    0,  800,  800,  800,  800,  800,  800,  800,
-      800,  800,  800,  800,  800,  800,  800,  800,  800,  801,
-      801,    0,  801,  801,  801,  801,  801,  801,  801,  801,
-      801,  801,  801,  801,  801,  801,  801,  801,  802,  802,
-        0,  802,  802,  802,  802,  802,  802,  802,  802,  802,
-      802,  802,  802,  802,  802,  802,  802,  803,  803,  803,
+      799,  799,  799,  800,  800,    0,  800,  800,  800,  800,
+      800,  800,  800,  800,  800,  800,  800,  800,  800,  800,
+      800,  800,  800,  801,  801,    0,  801,  801,  801,  801,
+      801,  801,  801,  801,  801,  801,  801,  801,  801,  801,
+      801,  801,  801,  802,  802,    0,  802,  802,  802,  802,
+      802,  802,  802,  802,  802,  802,  802,  802,  802,  802,
+
+      802,  802,  802,  803,  803,  803,  803,  803,  803,  803,
       803,  803,  803,  803,  803,  803,  803,  803,  803,  803,
-      803,  803,  803,  803,  803,  803,  804,  804,  804,  804,
-
+      803,  803,  803,  804,  804,  804,  804,  804,  804,  804,
       804,  804,  804,  804,  804,  804,  804,  804,  804,  804,
-      804,  804,  804,  804,  804,  805,  805,  805,  805,  805,
+      804,  804,  804,  805,  805,  805,  805,  805,  805,  805,
       805,  805,  805,  805,  805,  805,  805,  805,  805,  805,
-      805,  805,  805,  805,  806,  806,  806,  806,  806,  806,
+      805,  805,  805,  806,  806,  806,  806,  806,  806,  806,
       806,  806,  806,  806,  806,  806,  806,  806,  806,  806,
       806,  806,  806,  718,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
+
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
-
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
       718,  718,  718,  718,  718,  718,  718,  718,  718,  718,
-      718,  718,  718,  718,  718,  718,  718,  718,  718
+      718,  718,  718,  718,  718,  718,  718,  718,  718,  718
     } ;
 
 extern int yy_flex_debug;
@@ -1878,7 +1906,7 @@ char *yytext;
  * Ranks can be 0-9. The parser returns 0 for off-board files and ranks.
  * For an unknown piece (as mover or promotion piece) it returns
  * IllegalMove, like it does when the piece doesn't match.
- * Promotions can now also be appended Shogi-style, a bare '=' or '+',
+ * Promotions can now also be appended Shogi-style, a bare '=' or '^',
  * and this is then returned as promotion character. The piece indicator
  * can be prefixed by a '+' to indicate it is a promoted piece.
  */
@@ -1987,7 +2015,7 @@ int yyback P((int *, int));
 int yywrap P((void));
 extern void CopyBoard P((Board to, Board from));
 
-#line 1991 "parser.c"
+#line 2019 "parser.c"
 
 #define INITIAL 0
 
@@ -2146,7 +2174,7 @@ YY_DECL
 #line 179 "parser.l"
 
 
-#line 2150 "parser.c"
+#line 2178 "parser.c"
 
        if ( !(yy_init) )
                {
@@ -2212,7 +2240,7 @@ yy_match:
                        *(yy_state_ptr)++ = yy_current_state;
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 4554 );
+               while ( yy_base[yy_current_state] != 4684 );
 
 yy_find_action:
                yy_current_state = *--(yy_state_ptr);
@@ -2300,8 +2328,6 @@ YY_RULE_SETUP
             c = currentMoveString[4] = ToLower(yytext[yyleng-1]);
        }
        currentMoveString[5] = NULLCHAR;
-        if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)
-            return IllegalMove; /* [HGM] promotion to invalid piece */
     }
 
     if (appData.debugMode) {
@@ -2335,17 +2361,19 @@ YY_RULE_SETUP
                           currentMoveString[2] - AAA,
                          currentMoveString[4]);
 
-    if (currentMoveString[4] == NULLCHAR &&
-        (result == WhitePromotion  || result == BlackPromotion)) {
+    if (currentMoveString[4] == NULLCHAR) {
+      if(result == WhitePromotion  || result == BlackPromotion) {
         if(gameInfo.variant == VariantCourier || gameInfo.variant == VariantShatranj)
             currentMoveString[4] = PieceToChar(BlackFerz);
         else if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
         else if(gameInfo.variant == VariantShogi)
-            currentMoveString[4] = '+';
+            currentMoveString[4] = '^';
         else
             currentMoveString[4] = PieceToChar(BlackQueen);
-       currentMoveString[5] = NULLCHAR;
+      } else if(result == WhiteNonPromotion  || result == BlackNonPromotion)
+            currentMoveString[4] = '=';
+      currentMoveString[5] = NULLCHAR;
     }
 
     return (int) result;
@@ -2381,8 +2409,6 @@ YY_RULE_SETUP
             c = currentMoveString[4] = ToLower(yytext[yyleng-1]);
        }
        currentMoveString[5] = NULLCHAR;
-        if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)
-            return IllegalMove;
     }
 
     /* [HGM] do not allow values beyond board size */
@@ -2411,11 +2437,12 @@ YY_RULE_SETUP
         else if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
         else if(gameInfo.variant == VariantShogi)
-            currentMoveString[4] = '+'; // Queen might not be defined in mini variants!
+            currentMoveString[4] = '^'; // Queen might not be defined in mini variants!
         else
             currentMoveString[4] = PieceToChar(BlackQueen);
-       currentMoveString[5] = NULLCHAR;
-      }
+      } else if(result == WhiteNonPromotion  || result == BlackNonPromotion)
+            currentMoveString[4] = '=';
+      currentMoveString[5] = NULLCHAR;
     } else if(appData.testLegality && // strip off unnecessary and false promo characters
        !(result == WhitePromotion  || result == BlackPromotion ||
          result == WhiteNonPromotion || result == BlackNonPromotion)) currentMoveString[4] = NULLCHAR;
@@ -2425,11 +2452,11 @@ YY_RULE_SETUP
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 339 "parser.l"
+#line 338 "parser.l"
 {
     /*
      * Simple algebraic move, in capitals
-     * [HGM] Engine moves are received in this format, with lower-case promoChar!
+     * [HGM] Some Xiangqi engines use this format ('ICCS notation'). So no promotions!
      */
     int skip = 0;
     ChessMove result;
@@ -2465,23 +2492,12 @@ YY_RULE_SETUP
                           currentMoveString[2] - AAA,
                          currentMoveString[4]);
 
-    if (currentMoveString[4] == NULLCHAR &&
-        (result == WhitePromotion  || result == BlackPromotion)) {
-        if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
-            currentMoveString[4] = PieceToChar(BlackFerz);
-        else if(gameInfo.variant == VariantGreat)
-            currentMoveString[4] = PieceToChar(BlackMan);
-        else
-            currentMoveString[4] = PieceToChar(BlackQueen);
-       currentMoveString[5] = NULLCHAR;
-    }
-
     return (int) result;
 }
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 392 "parser.l"
+#line 380 "parser.l"
 {
     /*
      * Pawn move, possibly with promotion
@@ -2509,10 +2525,6 @@ YY_RULE_SETUP
        cl.ftIn <  BOARD_LEFT     )
       return ImpossibleMove;
 
-    if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)
-      return IllegalMove;
-
-
     Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
@@ -2527,7 +2539,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 436 "parser.l"
+#line 420 "parser.l"
 {
     /*
      * Pawn capture, possibly with promotion, possibly ambiguous
@@ -2566,9 +2578,6 @@ YY_RULE_SETUP
        cl.ftIn <  BOARD_LEFT     )
       return ImpossibleMove;
 
-    if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)
-      return IllegalMove;
-
     Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
@@ -2583,7 +2592,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 489 "parser.l"
+#line 470 "parser.l"
 {
     /*
      * unambiguously abbreviated Pawn capture, possibly with promotion
@@ -2640,8 +2649,8 @@ YY_RULE_SETUP
        else
           c = currentMoveString[4] = ToLower(yytext[yyleng-1]);
        currentMoveString[5] = NULLCHAR;
-        if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)
-            return IllegalMove;
+        if(c != '=' && c != '^' && CharToPiece(c) == EmptySquare)
+            return ImpossibleMove;
     } else {
        currentMoveString[4] = NULLCHAR;
     }
@@ -2654,15 +2663,19 @@ YY_RULE_SETUP
                           currentMoveString[2] - AAA,
                          currentMoveString[4]);
 
-    if (currentMoveString[4] == NULLCHAR &&
-        (result == WhitePromotion  || result == BlackPromotion)) {
+    if (currentMoveString[4] == NULLCHAR) {
+      if(result == WhitePromotion  || result == BlackPromotion) {
         currentMoveString[4] = PieceToChar(BlackQueen);
        // [HGM] shatranj: take care of variants without Queen
        if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
             currentMoveString[4] = PieceToChar(BlackFerz);
        if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
-       currentMoveString[5] = NULLCHAR;
+       if(gameInfo.variant == VariantShogi)
+            currentMoveString[4] = '^';
+      } else if(result == WhiteNonPromotion  || result == BlackNonPromotion)
+            currentMoveString[4] = '=';
+      currentMoveString[5] = NULLCHAR;
     }
 
     if (result != IllegalMove) return (int) result;
@@ -2700,7 +2713,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 603 "parser.l"
+#line 588 "parser.l"
 {
     /*
      * piece move, possibly ambiguous
@@ -2759,7 +2772,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 659 "parser.l"
+#line 644 "parser.l"
 {
     /*
      * piece move with rank or file disambiguator
@@ -2822,7 +2835,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 719 "parser.l"
+#line 704 "parser.l"
 {
     int rf, ff, rt, ft;
 
@@ -2882,7 +2895,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 776 "parser.l"
+#line 761 "parser.l"
 {
     int rf, ff, rt, ft;
 
@@ -2940,7 +2953,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 831 "parser.l"
+#line 816 "parser.l"
 {
     /* Bughouse piece drop. */
     currentMoveString[1] = '@';
@@ -2967,7 +2980,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 855 "parser.l"
+#line 840 "parser.l"
 {
     if (WhiteOnMove(yyboardindex))
       return (int) BlackWins;
@@ -2977,35 +2990,35 @@ YY_RULE_SETUP
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 862 "parser.l"
+#line 847 "parser.l"
 {
     return (int) (ToUpper(yytext[0]) == 'W' ? BlackWins : WhiteWins);
 }
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 866 "parser.l"
+#line 851 "parser.l"
 {
     return (int) GameUnfinished;
 }
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 870 "parser.l"
+#line 855 "parser.l"
 {
     return (int) GameIsDrawn;
 }
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 874 "parser.l"
+#line 859 "parser.l"
 {
     return (int) GameIsDrawn;
 }
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 878 "parser.l"
+#line 863 "parser.l"
 {
     if (WhiteOnMove(yyboardindex))
       return (int) BlackWins;
@@ -3015,7 +3028,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 885 "parser.l"
+#line 870 "parser.l"
 {
     if (WhiteOnMove(yyboardindex))
       return (int) BlackWins;
@@ -3025,56 +3038,56 @@ YY_RULE_SETUP
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 892 "parser.l"
+#line 877 "parser.l"
 {
     return (int) GameIsDrawn;
 }
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 896 "parser.l"
+#line 881 "parser.l"
 {
     return (int) GameIsDrawn;
 }
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 900 "parser.l"
+#line 885 "parser.l"
 { 
     return (int) (ToUpper(yytext[0]) == 'W' ? WhiteWins : BlackWins);
 }
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 904 "parser.l"
+#line 889 "parser.l"
 { 
     return (int) (ToUpper(yytext[0]) == 'W' ? BlackWins : WhiteWins);
 }
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 908 "parser.l"
+#line 893 "parser.l"
 { 
     return (int) WhiteWins;
 }
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 912 "parser.l"
+#line 897 "parser.l"
 { 
     return (int) BlackWins;
 }
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 916 "parser.l"
+#line 901 "parser.l"
 {
     return (int) GameIsDrawn;
 }
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 920 "parser.l"
+#line 905 "parser.l"
 {
     return (int) GameUnfinished;
 }
@@ -3082,7 +3095,7 @@ YY_RULE_SETUP
 case 27:
 /* rule 27 can match eol */
 YY_RULE_SETUP
-#line 924 "parser.l"
+#line 909 "parser.l"
 {
     /* move numbers */
     if ((yyleng == 1) && (yytext[0] == '1'))
@@ -3091,7 +3104,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 930 "parser.l"
+#line 915 "parser.l"
 {
     /* elapsed time indication, e.g. (0:12) or {10:21.071} */ 
     return (int) ElapsedTime;
@@ -3100,7 +3113,7 @@ YY_RULE_SETUP
 case 29:
 /* rule 29 can match eol */
 YY_RULE_SETUP
-#line 935 "parser.l"
+#line 920 "parser.l"
 {
     /* position diagram enclosed in [-- --] */
     return (int) PositionDiagram;
@@ -3112,7 +3125,7 @@ case 30:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 940 "parser.l"
+#line 925 "parser.l"
 {
     /* position diagram enclosed in {-- --} */
     return (int) PositionDiagram;
@@ -3121,14 +3134,14 @@ YY_RULE_SETUP
 case 31:
 /* rule 31 can match eol */
 YY_RULE_SETUP
-#line 945 "parser.l"
+#line 930 "parser.l"
 {
     return (int) PGNTag;
 }    
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 949 "parser.l"
+#line 934 "parser.l"
 {
     return (int) GNUChessGame;
 }
@@ -3139,14 +3152,14 @@ case 33:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 953 "parser.l"
+#line 938 "parser.l"
 {
     return (int) XBoardGame;
 }
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 957 "parser.l"
+#line 942 "parser.l"
 {                              /* numeric annotation glyph */
     return (int) NAG;
 }
@@ -3154,7 +3167,7 @@ YY_RULE_SETUP
 case 35:
 /* rule 35 can match eol */
 YY_RULE_SETUP
-#line 961 "parser.l"
+#line 946 "parser.l"
 {                              /* anything in {} */
     return (int) Comment; 
 }
@@ -3164,7 +3177,7 @@ case 36:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 965 "parser.l"
+#line 950 "parser.l"
 {                                          /* ; to end of line */
     return (int) Comment;
 }
@@ -3172,7 +3185,7 @@ YY_RULE_SETUP
 case 37:
 /* rule 37 can match eol */
 YY_RULE_SETUP
-#line 969 "parser.l"
+#line 954 "parser.l"
 {                              /* anything in [] */
     return (int) Comment; 
 }
@@ -3180,7 +3193,7 @@ YY_RULE_SETUP
 case 38:
 /* rule 38 can match eol */
 YY_RULE_SETUP
-#line 973 "parser.l"
+#line 958 "parser.l"
 { /* very nested () */
     return (int) Comment; 
 }
@@ -3188,7 +3201,7 @@ YY_RULE_SETUP
 case 39:
 /* rule 39 can match eol */
 YY_RULE_SETUP
-#line 977 "parser.l"
+#line 962 "parser.l"
 {                              /* >=2 chars in () */
     return (int) Comment; 
 }       
@@ -3196,14 +3209,14 @@ YY_RULE_SETUP
 case 40:
 /* rule 40 can match eol */
 YY_RULE_SETUP
-#line 981 "parser.l"
+#line 966 "parser.l"
 {
         /* Skip mail headers */
 }
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 985 "parser.l"
+#line 970 "parser.l"
 {
         /* Skip random words */
 }
@@ -3211,17 +3224,17 @@ YY_RULE_SETUP
 case 42:
 /* rule 42 can match eol */
 YY_RULE_SETUP
-#line 989 "parser.l"
+#line 974 "parser.l"
 {
         /* Skip everything else */
 }
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 993 "parser.l"
+#line 978 "parser.l"
 ECHO;
        YY_BREAK
-#line 3225 "parser.c"
+#line 3238 "parser.c"
                        case YY_STATE_EOF(INITIAL):
                                yyterminate();
 
@@ -4196,7 +4209,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 993 "parser.l"
+#line 978 "parser.l"
 
 
 

diff --git a/parser.l b/parser.l
index ba9ffa6..021047b 100644 (file)
--- a/parser.l
+++ b/parser.l
@@ -66,7 +66,7 @@
  * Ranks can be 0-9. The parser returns 0 for off-board files and ranks.
  * For an unknown piece (as mover or promotion piece) it returns
  * IllegalMove, like it does when the piece doesn't match.
- * Promotions can now also be appended Shogi-style, a bare '=' or '+',
+ * Promotions can now also be appended Shogi-style, a bare '=' or '^',
  * and this is then returned as promotion character. The piece indicator
  * can be prefixed by a '+' to indicate it is a promoted piece.
  */
@@ -178,7 +178,7 @@ extern void CopyBoard P((Board to, Board from));
 %}
 %%
 
-"+"?[A-Z][/]?[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|=)? {
+"+"?[A-Z][/]?[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|[=^])? {
     /*
      * Fully-qualified algebraic move, possibly with promotion
      */
@@ -216,8 +216,6 @@ extern void CopyBoard P((Board to, Board from));
             c = currentMoveString[4] = ToLower(yytext[yyleng-1]);
        }
        currentMoveString[5] = NULLCHAR;
-        if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)
-            return IllegalMove; /* [HGM] promotion to invalid piece */
     }
 
     if (appData.debugMode) {
@@ -251,23 +249,25 @@ extern void CopyBoard P((Board to, Board from));
                           currentMoveString[2] - AAA,
                          currentMoveString[4]);
 
-    if (currentMoveString[4] == NULLCHAR &&
-        (result == WhitePromotion  || result == BlackPromotion)) {
+    if (currentMoveString[4] == NULLCHAR) {
+      if(result == WhitePromotion  || result == BlackPromotion) {
         if(gameInfo.variant == VariantCourier || gameInfo.variant == VariantShatranj)
             currentMoveString[4] = PieceToChar(BlackFerz);
         else if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
         else if(gameInfo.variant == VariantShogi)
-            currentMoveString[4] = '+';
+            currentMoveString[4] = '^';
         else
             currentMoveString[4] = PieceToChar(BlackQueen);
-       currentMoveString[5] = NULLCHAR;
+      } else if(result == WhiteNonPromotion  || result == BlackNonPromotion)
+            currentMoveString[4] = '=';
+      currentMoveString[5] = NULLCHAR;
     }
 
     return (int) result;
 }
 
-[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Za-z]\)?)|=)?      {
+[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Za-z]\)?)|[=^])?      {
     /*
      * Simple algebraic move, possibly with promotion
      * [HGM] Engine moves are received in this format, with lower-case promoChar!
@@ -294,8 +294,6 @@ extern void CopyBoard P((Board to, Board from));
             c = currentMoveString[4] = ToLower(yytext[yyleng-1]);
        }
        currentMoveString[5] = NULLCHAR;
-        if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)
-            return IllegalMove;
     }
 
     /* [HGM] do not allow values beyond board size */
@@ -324,11 +322,12 @@ extern void CopyBoard P((Board to, Board from));
         else if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
         else if(gameInfo.variant == VariantShogi)
-            currentMoveString[4] = '+'; // Queen might not be defined in mini variants!
+            currentMoveString[4] = '^'; // Queen might not be defined in mini variants!
         else
             currentMoveString[4] = PieceToChar(BlackQueen);
-       currentMoveString[5] = NULLCHAR;
-      }
+      } else if(result == WhiteNonPromotion  || result == BlackNonPromotion)
+            currentMoveString[4] = '=';
+      currentMoveString[5] = NULLCHAR;
     } else if(appData.testLegality && // strip off unnecessary and false promo characters
        !(result == WhitePromotion  || result == BlackPromotion ||
          result == WhiteNonPromotion || result == BlackNonPromotion)) currentMoveString[4] = NULLCHAR;
@@ -339,7 +338,7 @@ extern void CopyBoard P((Board to, Board from));
 [A-L][0-9][xX:-]?[A-L][0-9]      {
     /*
      * Simple algebraic move, in capitals
-     * [HGM] Engine moves are received in this format, with lower-case promoChar!
+     * [HGM] Some Xiangqi engines use this format ('ICCS notation'). So no promotions!
      */
     int skip = 0;
     ChessMove result;
@@ -375,21 +374,10 @@ extern void CopyBoard P((Board to, Board from));
                           currentMoveString[2] - AAA,
                          currentMoveString[4]);
 
-    if (currentMoveString[4] == NULLCHAR &&
-        (result == WhitePromotion  || result == BlackPromotion)) {
-        if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
-            currentMoveString[4] = PieceToChar(BlackFerz);
-        else if(gameInfo.variant == VariantGreat)
-            currentMoveString[4] = PieceToChar(BlackMan);
-        else
-            currentMoveString[4] = PieceToChar(BlackQueen);
-       currentMoveString[5] = NULLCHAR;
-    }
-
     return (int) result;
 }
 
-[a-l][0-9]((=?\(?[A-Za-z]\)?)|=)?       {
+[a-l][0-9]((=?\(?[A-Za-z]\)?)|[=^])?       {
     /*
      * Pawn move, possibly with promotion
      */
@@ -416,10 +404,6 @@ extern void CopyBoard P((Board to, Board from));
        cl.ftIn <  BOARD_LEFT     )
       return ImpossibleMove;
 
-    if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)
-      return IllegalMove;
-
-
     Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
@@ -471,9 +455,6 @@ extern void CopyBoard P((Board to, Board from));
        cl.ftIn <  BOARD_LEFT     )
       return ImpossibleMove;
 
-    if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)
-      return IllegalMove;
-
     Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
@@ -486,7 +467,7 @@ extern void CopyBoard P((Board to, Board from));
     return (int) cl.kind;
 }
 
-[a-l][xX:]?[a-l][0-9]((=?\(?[A-Z]\)?)|ep|"e.p."|=)? {
+[a-l][xX:]?[a-l][0-9]((=?\(?[A-Z]\)?)|ep|"e.p."|[=^])? {
     /*
      * unambiguously abbreviated Pawn capture, possibly with promotion
      */
@@ -542,8 +523,8 @@ extern void CopyBoard P((Board to, Board from));
        else
           c = currentMoveString[4] = ToLower(yytext[yyleng-1]);
        currentMoveString[5] = NULLCHAR;
-        if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)
-            return IllegalMove;
+        if(c != '=' && c != '^' && CharToPiece(c) == EmptySquare)
+            return ImpossibleMove;
     } else {
        currentMoveString[4] = NULLCHAR;
     }
@@ -556,15 +537,19 @@ extern void CopyBoard P((Board to, Board from));
                           currentMoveString[2] - AAA,
                          currentMoveString[4]);
 
-    if (currentMoveString[4] == NULLCHAR &&
-        (result == WhitePromotion  || result == BlackPromotion)) {
+    if (currentMoveString[4] == NULLCHAR) {
+      if(result == WhitePromotion  || result == BlackPromotion) {
         currentMoveString[4] = PieceToChar(BlackQueen);
        // [HGM] shatranj: take care of variants without Queen
        if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
             currentMoveString[4] = PieceToChar(BlackFerz);
        if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
-       currentMoveString[5] = NULLCHAR;
+       if(gameInfo.variant == VariantShogi)
+            currentMoveString[4] = '^';
+      } else if(result == WhiteNonPromotion  || result == BlackNonPromotion)
+            currentMoveString[4] = '=';
+      currentMoveString[5] = NULLCHAR;
     }
 
     if (result != IllegalMove) return (int) result;
@@ -600,7 +585,7 @@ extern void CopyBoard P((Board to, Board from));
       return (int) IllegalMove;
 }
 
-"+"?[A-Z][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|=)?  {
+"+"?[A-Z][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|[=^])?  {
     /*
      * piece move, possibly ambiguous
      */
@@ -656,7 +641,7 @@ extern void CopyBoard P((Board to, Board from));
     return (int) cl.kind;
 }
 
-"+"?[A-Z][a-l0-9][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|=)?   {
+"+"?[A-Z][a-l0-9][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|[=^])?   {
     /*
      * piece move with rank or file disambiguator
      */

diff --git a/winboard/winboard.c b/winboard/winboard.c
index f818927..2ab9456 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4318,7 +4318,7 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       promoChar = gameInfo.variant == VariantSuper ? PieceToChar(BlackSilver) : PieceToChar(BlackKing);\r
       break;\r
     case PB_Queen:\r
-      promoChar = gameInfo.variant == VariantShogi ? '+' : PieceToChar(BlackQueen);\r
+      promoChar = gameInfo.variant == VariantShogi ? '^' : PieceToChar(BlackQueen);\r
       break;\r
     case PB_Rook:\r
       promoChar = PieceToChar(BlackRook);\r

diff --git a/xboard.c b/xboard.c
index 67992f1..59796c7 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -5431,7 +5431,7 @@ void PromotionCallback(w, client_data, call_data)
     } else if (strcmp(name, _("Knight")) == 0) {
        promoChar = 'n';
     } else if (strcmp(name, _("Promote")) == 0) {
-       promoChar = '+';
+       promoChar = '^';
     } else if (strcmp(name, _("Defer")) == 0) {
        promoChar = '=';
     } else {