X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=pgntags.c;h=9833d1069db16c680eff7ff4b9aa4f79bffd8901;hb=refs%2Fheads%2Fv4.9.x;hp=2d9cfb862c266951b89e21004fec32b321b7598f;hpb=40269944bc042aced158ae854027ef3a80344fb3;p=xboard.git

diff --git a/pgntags.c b/pgntags.c
index 2d9cfb8..2321837 100644
--- a/pgntags.c
+++ b/pgntags.c
@@ -1,7 +1,8 @@
 /*
  * pgntags.c -- Functions to manage PGN tags
  *
- * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -114,11 +115,16 @@ ParsePGNTag (char *tag, GameInfo *gameInfo)
 	success = TRUE;
     } else if (StrCaseCmp(name, "Variant") == 0) {
         /* xboard-defined extension */
+        int oldVariant = gameInfo->variant;
+	success = StrSavePtr(value, &gameInfo->variantName) != NULL;
+        if(*value && strcmp(value, engineVariant)) // keep current engine-defined variant if it matches
+            gameInfo->variant = StringToVariant(value);
+        if(oldVariant != VariantNormal) safeStrCpy(engineVariant, value, MSG_SIZ);
+    } else if (StrCaseCmp(name, "VariantFamily") == 0) {
+        /* xboard-defined extension */
         gameInfo->variant = StringToVariant(value);
-	success = TRUE;
     } else if (StrCaseCmp(name, "VariantMen") == 0) {
-        /* for now ignore this tag, as we have no method yet */
-        /* for assigning the pieces to XBoard pictograms     */
+        success = LoadPieceDesc(value);
     } else if (StrCaseCmp(name, PGN_OUT_OF_BOOK) == 0) {
         /* [AS] Out of book annotation */
         success = StrSavePtr(value, &gameInfo->outOfBook) != NULL;
@@ -161,8 +167,15 @@ PrintPGNTags (FILE *fp, GameInfo *gameInfo)
 	fprintf(fp, "[BlackElo \"%d\"]\n", gameInfo->blackRating);
     if (gameInfo->timeControl)
 	fprintf(fp, "[TimeControl \"%s\"]\n", gameInfo->timeControl);
-    if (gameInfo->variant != VariantNormal)
+    if (gameInfo->variant != VariantNormal) {
+	char c = *engineVariant;
         fprintf(fp, "[Variant \"%s\"]\n", VariantName(gameInfo->variant));
+	if(c) {
+	    *engineVariant = NULLCHAR;
+	    fprintf(fp, "[VariantFamily \"%s\"]\n", VariantName(gameInfo->variant));
+            *engineVariant = c;
+        }
+    }
     if (*(p = CollectPieceDescriptors()))
         fprintf(fp, "[VariantMen \"%s\"]\n", p);
     if (gameInfo->extraTags)
@@ -191,7 +204,7 @@ PGNTags (GameInfo *gameInfo)
     if (gameInfo->whiteRating >= 0) len += 40;
     if (gameInfo->blackRating >= 0) len += 40;
     if (gameInfo->timeControl) len += strlen(gameInfo->timeControl) + 20;
-    if (gameInfo->variant != VariantNormal) len += 50;
+    if (gameInfo->variant != VariantNormal) len += strlen(engineVariant) + 150;
     if (gameInfo->extraTags) len += strlen(gameInfo->extraTags);
 
     buf = malloc(len);
@@ -212,8 +225,15 @@ PGNTags (GameInfo *gameInfo)
 	p += sprintf(p, "[BlackElo \"%d\"]\n", gameInfo->blackRating);
     if (gameInfo->timeControl)
 	p += sprintf(p, "[TimeControl \"%s\"]\n", gameInfo->timeControl);
-    if (gameInfo->variant != VariantNormal)
-        p += sprintf(p, "[Variant \"%s\"]\n", VariantName(gameInfo->variant));
+    if (gameInfo->variant != VariantNormal) {
+	char c = *engineVariant;
+	p += sprintf(p, "[Variant \"%s\"]\n", VariantName(gameInfo->variant));
+	if(c) {
+	    *engineVariant = NULLCHAR;
+	    p += sprintf(p, "[VariantFamily \"%s\"]\n", VariantName(gameInfo->variant));
+            *engineVariant = c;
+        }
+    }
     if (gameInfo->extraTags)
 	strcpy(p, gameInfo->extraTags);
     return buf;