int NextUnit P((char **p));
-int kifu = 0;
+int kifu = 0, xqUBB = 0;
char
GetKanji (char **p, int start)
if(q = strchr(s, **p)) (*p)++, piece += 64*(q - s + 1);
if(**p == '/') slash = *(*p)++;
}
+
+ if(xqUBB) { // Xiangqi UBB movelist
+ while(isdigit(**p)) {
+ type[n] = NUMERIC; coord[n++] = *(*p)++ - '0';
+ if(n >= 4) break;
+ }
+ if(n < 4) *p -= n, xqUBB = n = 0; else type[0] = type[2] = ALPHABETIC, coord[1] = 9 - coord[1], coord[3] = 9 - coord[3];
+ }
while(n < 4) {
if(**p >= 'a' && **p < 'x') coord[n] = *(*p)++ - 'a', type[n++] = ALPHABETIC;
else if((i = Number(p)) != BADNUMBER) coord[n] = i, type[n++] = NUMERIC;
*p = oldp;
}
SkipWhite(p);
+ if(Match("DhtmlXQ", p)) { // Xiangqi UBB tags
+ int res = Nothing;
+ if(**p == ']') strcpy(parseStart = yytext, "[Variant \"xiangqi\"]"), res = PGNTag; else
+ if(Match("_movelist", p)) xqUBB = 1; else Scan(']', p);
+ Scan(']', p); // for non-movelist tags this skips to the closing tag (disarming any enclosed kanji)!
+ return res;
+ } else if(Match("/DhtmlXQ", p)) { Scan(']', p); return Nothing; }
if(isdigit(**p) || isalpha(**p)) {
do (*p)++; while(isdigit(**p) || isalpha(**p) || **p == '+' ||
**p == '-' || **p == '=' || **p == '_' || **p == '#');
Match("OO", p) || Match("oo", p) || Match("00", p)) castlingType = 1;
if(castlingType) { //code from old parser, collapsed for both castling types, and streamlined a bit
int rf, ff, rt, ft; ChessSquare king;
- char promo=NULLCHAR;
+ char promo=NULLCHAR, gate = 0;
- if(gameInfo.variant == VariantSChess) promo = PromoSuffix(p);
+ if(gameInfo.variant == VariantSChess) {
+ promo = PromoSuffix(p);
+ if(promo && **p >= 'a' && **p < AAA + BOARD_RGHT) gate = *(*p)++;
+ }
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */
if (appData.debugMode) fprintf(debugFP, "Parser FRC (type=%d) %d %d\n", castlingType, ff, ft);
if(ff == NoRights || ft == NoRights) return ImpossibleMove;
}
+ if(gate) { // gating disambiguator present
+ if(gate != ff + AAA) {
+ int h = ft; ft = ff; ff = h; // reverse for gating at Rook square
+ if(gate != AAA + initialRights[castlingType+(wom?-1:2)]) return ImpossibleMove;
+ }
+ }
sprintf(currentMoveString, "%c%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE,promo);
if (appData.debugMode) fprintf(debugFP, "(%d-type) castling %d %d\n", castlingType, ff, ft);