X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=parser.c;h=13caa9f4270949dadff6208cb2534d5fedb0a2d7;hb=ba12e63149a003b88b8525d6eb50d48539c660b6;hp=4acdfaea71456c13c86558c71a50e33ea486d9c5;hpb=4d42db95528089b0a3af8828893524cea281627e;p=xboard.git

diff --git a/parser.c b/parser.c
index 4acdfae..13caa9f 100644
--- a/parser.c
+++ b/parser.c
@@ -143,11 +143,11 @@ unsigned char kanjiTab[] = {
   'S', 0213, 0342, 0, 
   'R', 0224, 0362, 0, 
   'B', 0212, 0160, 0,
-  'N', 0225, 0340, 0, 
+  'N', 0214, 0152, 0, 
   'L', 0215, 0201, 0, 
-  'P', 0214, 0152, 0, 
-  'r', 0224, 0156, 0, 
-  'b', 0227, 0264, 0, 
+  'P', 0225, 0340, 0, 
+  'r', 0227, 0264, 0, 
+  'b', 0224, 0156, 0, 
   'p', 0202, 0306, 0, 
   'r', 0227, 0263, 0, 
   '+', 0220, 0254, 0, 
@@ -418,7 +418,10 @@ NextUnit (char **p)
 	if(**p == '+') (*p)++, promoted++;
 	if(**p >= 'a' && **p <= 'z' && (*p)[1]== '@') piece =*(*p)++ + 'A' - 'a'; else
 	if(**p >= 'A' && **p <= 'Z') {
+	     static char s[] = SUFFIXES;
+	     char *q;
 	     piece = *(*p)++; // Note we could test for 2-byte non-ascii names here
+	     if(q = strchr(s, **p)) (*p)++, piece += 64*(q - s + 1);
 	     if(**p == '/') slash = *(*p)++;
 	}
         while(n < 4) {
@@ -489,7 +492,7 @@ NextUnit (char **p)
 	    else if(toY >= BOARD_HEIGHT || toY < 0)   return ImpossibleMove; // vert off-board to-square
 	    if(toX < BOARD_LEFT || toX >= BOARD_RGHT) return ImpossibleMove;
 	    if(piece) {
-		cl.pieceIn = CharToPiece(wom ? piece : ToLower(piece));
+		cl.pieceIn = CharToPiece(wom ? piece : piece + 'a' - 'A');
 		if(cl.pieceIn == EmptySquare) return ImpossibleMove; // non-existent piece
 		if(promoted) cl.pieceIn = (ChessSquare) (CHUPROMOTED cl.pieceIn);
 	    } else cl.pieceIn = EmptySquare;