From 3cd00530289c760381e43afe4c1d8a34429867e7 Mon Sep 17 00:00:00 2001
From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Wed, 9 Mar 2016 09:44:45 +0100
Subject: [PATCH] Deprecate -defaultPathEGTB option

The value of the -defaultPathEGTB option is now automatically cleared
at startup, after appending it as "nalimov:" format to -egtFormats.
We also no longer preconfigure a (dummy) value for -defaultPathEGTB,
but instead one for -egtFormats, (which will show up in the EGT path
field of the Common Engine Settings dialog now -defaultPathEGTB is
empty) to serve as an example for the syntax of -egtFormats.
---
 args.h      |    5 +++++
 xboard.conf |    4 ++--
 xboard.texi |    3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/args.h b/args.h
index 56d9916..dc2680a 100644
--- a/args.h
+++ b/args.h
@@ -1463,6 +1463,11 @@ InitAppData(char *lpCmdLine)
     } else appData.timeIncrement = -1;
   }
   if(appData.movesPerSession <= 0) appData.movesPerSession = MOVES_PER_SESSION; // mps <= 0 is invalid in any case
+  if(*appData.defaultPathEGTB) { // append value of deprecated -defaultPathEGTB to -egtFormats
+    snprintf(buf, MAX_ARG_LEN, "%s%snalimov:%s", appData.egtFormats, (*appData.egtFormats ?"," : ""), appData.defaultPathEGTB);
+    ASSIGN(appData.egtFormats, buf);
+    ASSIGN(appData.defaultPathEGTB, "");
+  }
 
   /* Open startup dialog if needed */
   if ((!appData.noChessProgram && !chessProgram && !appData.icsActive) ||
diff --git a/xboard.conf b/xboard.conf
index 2cc1429..8e4fe92 100644
--- a/xboard.conf
+++ b/xboard.conf
@@ -82,8 +82,8 @@
 -niceEngines 0
 -polyglotDir ""
 -adapterCommand 'polyglot -noini -ec "%fcp" -ed "%fd" -uci NalimovCache=%defaultCacheSizeEGTB -pg ShowTbHits=true'
--defaultPathEGTB "/egtb"
--egtFormats ""
+-defaultPathEGTB ""
+-egtFormats "syzygy:/EGT/Syzygy,scorpio:/EGT/bitbases"
 -testClaims true
 -checkMates true
 -materialDraws true
diff --git a/xboard.texi b/xboard.texi
index f65b597..0436372 100644
--- a/xboard.texi
+++ b/xboard.texi
@@ -1111,6 +1111,9 @@ that SMP engines can use.
 The shifted @kbd{Alt+U} key is a keyboard equivalent.
 Older XBoard/WinBoard engines might not respond to these settings,
 but UCI engines always should.
+The @samp{EGT path} field corresponds to the setting of the
+@code{egtFormats} option to specify where to find tablebases
+of various flavors. See the description of this option for the required syntax.
 
 It is also possible to specify a GUI opening book here, i.e. an opening
 book that XBoard consults for any position a playing engine gets in.
-- 
1.7.0.4