X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=parser.c;h=91c8edd4c4e9d28da3ca3bc365732a9ea19660e7;hb=4011e8678d85310eedf19fd00aa5d96a9a60770a;hp=496fef15150e5f4ff2cf2d01028aea2da9b9163b;hpb=91ffed004017bba4c9e3a7179d45d4c77a992ca3;p=xboard.git

diff --git a/parser.c b/parser.c
index 496fef1..91c8edd 100644
--- a/parser.c
+++ b/parser.c
@@ -1,7 +1,7 @@
 /*
  * parser.c --
  *
- * Copyright 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -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;