X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=410488b921bcd3ec0789e6862bf867a096197130;hb=9f1ba14a6895d33e1721a100c29996ed5b5e6d75;hp=4c9390e6ead079cc5d77c78b1c07d0c3b2f781dd;hpb=36068bf366e116bd742f5e3d4f524358efc62fff;p=xboard.git

diff --git a/backend.c b/backend.c
index 4c9390e..410488b 100644
--- a/backend.c
+++ b/backend.c
@@ -8340,6 +8340,7 @@ ParseGameHistory(game)
 		if (q != NULL) *q = NULLCHAR;
 		p++;
 	    }
+	    while(q = strchr(p, '\n')) *q = ' '; // [HGM] crush linefeeds in result message
 	    gameInfo.resultDetails = StrSave(p);
 	    continue;
 	}
@@ -9606,7 +9607,7 @@ AutoPlayGameLoop()
 	  return;
 	if (matchMode || appData.timeDelay == 0)
 	  continue;
-	if (appData.timeDelay < 0 || gameMode == AnalyzeFile)
+	if (appData.timeDelay < 0)
 	  return;
 	StartLoadGameTimer((long)(1000.0 * appData.timeDelay));
 	break;
@@ -9623,10 +9624,18 @@ AutoPlayOneMove()
       fprintf(debugFP, "AutoPlayOneMove(): current %d\n", currentMove);
     }
 
-    if (gameMode != PlayFromGameFile)
+    if (gameMode != PlayFromGameFile && gameMode != AnalyzeFile)
       return FALSE;
 
+    if (gameMode == AnalyzeFile && currentMove > backwardMostMove) {
+      pvInfoList[currentMove].depth = programStats.depth;
+      pvInfoList[currentMove].score = programStats.score;
+      pvInfoList[currentMove].time  = 0;
+      if(currentMove < forwardMostMove) AppendComment(currentMove+1, lastPV[0], 2);
+    }
+
     if (currentMove >= forwardMostMove) {
+      if(gameMode == AnalyzeFile) { ExitAnalyzeMode(); SendToProgram("force\n", &first); }
       gameMode = EditGame;
       ModeHighlight();
 
@@ -9759,6 +9768,7 @@ LoadGameOneMove(readAhead)
 	    if (q != NULL) *q = NULLCHAR;
 	    p++;
 	}
+	while(q = strchr(p, '\n')) *q = ' '; // [HGM] crush linefeeds in result message
 	GameEnds(moveType, p, GE_FILE);
 	done = TRUE;
 	if (cmailMsgLoaded) {
@@ -11631,7 +11641,7 @@ void
 EditTagsEvent()
 {
     char *tags = PGNTags(&gameInfo);
-    EditTagsPopUp(tags);
+    EditTagsPopUp(tags, NULL);
     free(tags);
 }
 
@@ -13287,7 +13297,13 @@ ReplaceComment(index, text)
      char *text;
 {
     int len;
+    char *p;
+    float score;
 
+    if(index && sscanf(text, "%f/%d", &score, &len) == 2 && 
+       pvInfoList[index-1].depth == len &&
+       fabs(pvInfoList[index-1].score - score*100.) < 0.5 &&
+       (p = strchr(text, '\n'))) text = p; // [HGM] strip off first line with PV info, if any
     while (*text == '\n') text++;
     len = strlen(text);
     while (len > 0 && text[len - 1] == '\n') len--;
@@ -13361,24 +13377,24 @@ if(appData.debugMode) fprintf(debugFP, "Append: in='%s' %d\n", text, addBraces);
 	safeStrCpy(commentList[index], old, oldlen + len + 6);
 	free(old);
 	// [HGM] braces: join "{A\n}\n" + "{\nB}" as "{A\nB\n}"
-	if(commentList[index][oldlen-1] == '}' && (text[0] == '{' || addBraces)) {
-	  if(addBraces) addBraces = FALSE; else { text++; len--; }
+	if(commentList[index][oldlen-1] == '}' && (text[0] == '{' || addBraces == TRUE)) {
+	  if(addBraces == TRUE) addBraces = FALSE; else { text++; len--; }
 	  while (*text == '\n') { text++; len--; }
 	  commentList[index][--oldlen] = NULLCHAR;
       }
-	if(addBraces) strcat(commentList[index], "\n{\n");
+	if(addBraces) strcat(commentList[index], addBraces == 2 ? "\n(" : "\n{\n");
 	else          strcat(commentList[index], "\n");
 	strcat(commentList[index], text);
-	if(addBraces) strcat(commentList[index], "\n}\n");
+	if(addBraces) strcat(commentList[index], addBraces == 2 ? ")\n" : "\n}\n");
 	else          strcat(commentList[index], "\n");
     } else {
 	commentList[index] = (char *) malloc(len + 6); // perhaps wastes 4...
 	if(addBraces)
-	  safeStrCpy(commentList[index], "{\n", 3);
+	  safeStrCpy(commentList[index], addBraces == 2 ? "(" : "{\n", 3);
 	else commentList[index][0] = NULLCHAR;
 	strcat(commentList[index], text);
-	strcat(commentList[index], "\n");
-	if(addBraces) strcat(commentList[index], "}\n");
+	strcat(commentList[index], addBraces == 2 ? ")\n" : "\n");
+	if(addBraces == TRUE) strcat(commentList[index], "}\n");
     }
 }
 
@@ -13397,7 +13413,7 @@ static char * FindStr( char * text, char * sub_text )
 /* [HGM] PV time: and then remove it, to prevent it appearing twice */
 char *GetInfoFromComment( int index, char * text )
 {
-    char * sep = text;
+    char * sep = text, *p;
 
     if( text != NULL && index > 0 ) {
         int score = 0;
@@ -13435,11 +13451,20 @@ char *GetInfoFromComment( int index, char * text )
                 return text;
             }
 
+            p = text;
+            if(p[1] == '(') { // comment starts with PV
+               p = strchr(p, ')'); // locate end of PV
+               if(p == NULL || sep < p+5) return text;
+               // at this point we have something like "{(.*) +0.23/6 ..."
+               p = text; while(*++p != ')') p[-1] = *p; p[-1] = ')';
+               *p = '\n'; while(*p == ' ' || *p == '\n') p++; *--p = '{';
+               // we now moved the brace to behind the PV: "(.*) {+0.23/6 ..."
+            }
             time = -1; sec = -1; deci = -1;
-            if( sscanf( text+1, "%d.%d/%d %d:%d", &score, &score_lo, &depth, &time, &sec ) != 5 &&
-		sscanf( text+1, "%d.%d/%d %d.%d", &score, &score_lo, &depth, &time, &deci ) != 5 &&
-                sscanf( text+1, "%d.%d/%d %d", &score, &score_lo, &depth, &time ) != 4 &&
-                sscanf( text+1, "%d.%d/%d", &score, &score_lo, &depth ) != 3   ) {
+            if( sscanf( p+1, "%d.%d/%d %d:%d", &score, &score_lo, &depth, &time, &sec ) != 5 &&
+		sscanf( p+1, "%d.%d/%d %d.%d", &score, &score_lo, &depth, &time, &deci ) != 5 &&
+                sscanf( p+1, "%d.%d/%d %d", &score, &score_lo, &depth, &time ) != 4 &&
+                sscanf( p+1, "%d.%d/%d", &score, &score_lo, &depth ) != 3   ) {
                 return text;
             }
 
@@ -13455,7 +13480,7 @@ char *GetInfoFromComment( int index, char * text )
             /* [HGM] PV time: now locate end of PV info */
             while( *++sep >= '0' && *sep <= '9'); // strip depth
             if(time >= 0)
-            while( *++sep >= '0' && *sep <= '9'); // strip time
+            while( *++sep >= '0' && *sep <= '9' || *sep == '\n'); // strip time
             if(sec >= 0)
             while( *++sep >= '0' && *sep <= '9'); // strip seconds
             if(deci >= 0)
@@ -13475,6 +13500,7 @@ char *GetInfoFromComment( int index, char * text )
         pvInfoList[index-1].score = score;
         pvInfoList[index-1].time  = 10*time; // centi-sec
         if(*sep == '}') *sep = 0; else *--sep = '{';
+        if(p != text) { while(*p++ = *sep++); sep = text; } // squeeze out space between PV and comment, and return both
     }
     return sep;
 }