chessboard (2may14)

git-svn-id: svn://tug.org/texlive/trunk@33801 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 111 insertions, 105 deletions

diff --git a/Master/texmf-dist/doc/latex/chessboard/README b/Master/texmf-dist/doc/latex/chessboard/README
index b5aa514ecb5..46bc3b2dc62 100644
--- a/Master/texmf-dist/doc/latex/chessboard/README
+++ b/Master/texmf-dist/doc/latex/chessboard/README
@@ -1,7 +1,9 @@
 chessboard --- A package to print chessboards
-Version 1.5 Ulrike Fischer 2007
+Version 1.7 Ulrike Fischer 2014
 
 CHANGES
+1.7: chessboard no longer loads amssymb (to avoid clashes)
+1.6: Corrected some bugs. Added textfont key for text style.
 1.5: Corrected some bugs.
      Added key getpiecelists.
      Adapted the package to xskak.
@@ -26,9 +28,13 @@ CONTENTS AND INSTALLATION
 - chessboard-scr.dtx
 - chessboard.ins
 - chessboard.pdf
+- chessboard.sty
+- chessboard-keys-main.sty
+- chessboard-keys-pgf.sty
+- chessboard-pgf.sty
 
-Run TeX/LaTeX on chessboard.ins to unpack the dtx.
-Put the four extracted files in tex/latex/chessboard/.
+Move the four .sty  in <texmf>/tex/latex/chessboard/. You can regenerate the .sty by runing
+TeX/LaTeX on chessboard.ins to unpack the dtx.
 
 The dtx-file doesn't contain any documentation.
 So running LaTeX on it makes no sense!
@@ -48,11 +54,13 @@ hide pieces and fields, color the boards and put various marks on the board.
 It has a lot of options to place pieces on the board. Using exotic pieces e.g. for
 fairy chess is possible.
 It can be used together with the newest version (1.4) of the skak package
-which you can find at CTAN and together with xskak. 
+which you can find at CTAN and together with xskak.
 
 
 REQUIREMENTS
 chessboard uses some primitives of e\TeX. It needs a recent version
-of chessfss and xkeyval. It also needs the packages xifthen,
-pgfcore and pgfbaseshapes (from the pgf bundle),
-and pst-node (from pstricks).
+of chessfss and xkeyval. It also needs the packages xifthen, tikz, pgfcore and pgfbaseshapes (from the pgf bundle),
+and - if run with latex - pst-node (from pstricks).
+
+LICENSE
+This material is subject to the LaTeX Project Public License.
diff --git a/Master/texmf-dist/source/latex/chessboard/chessboard-src.dtx b/Master/texmf-dist/source/latex/chessboard/chessboard-src.dtx
index 06bccdebce2..c6ab35135b1 100644
--- a/Master/texmf-dist/source/latex/chessboard/chessboard-src.dtx
+++ b/Master/texmf-dist/source/latex/chessboard/chessboard-src.dtx
@@ -1,9 +1,14 @@
-%<*main>
-\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{chessboard}[2007/12/20 v1.5 print chessboards]
+%<*chessboard>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{chessboard}[2014/05/01 version v1.7 print chessboards]
+%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
+
 %1.4: Changed to restore style key
 %1.5: corrected values for mover key (w/b instead of w/s)
-
+%1.6: corrected bug in \board@do@getpiecelists (def instead of xdef)
+% 14.3.2011: added \normallineskip=1pt\relax\normallineskiplimit=0pt\relax
+%            (default latex values).
+%            to avoid bad spacing in amsart.cls (see tex.stackexchange discussion)
 \DeclareOption{skaknew}{}%
 \ProcessOptions
 
@@ -22,16 +27,16 @@
 
 \RequirePackage{chessfss}[2006/03/31]
 
-% Change in 1.4.
-%\PackageWarning{chessboard}{When used together with xkeyval 2.5f, the style key will not work!}
 
 \RequirePackage{xkeyval}%
 \RequirePackage{xifthen}%
 \RequirePackage{ifpdf}%
-\RequirePackage{pgfcore, pgfbaseshapes}%
+\RequirePackage{tikz}%
+\usepgfmodule{shapes}
 \ifpdf\else
 \RequirePackage{pst-node}%
-\fi \RequirePackage{amssymb}
+\fi
+
 %%%%%%%
 %% naming conventions
 %%%%%%%
@@ -303,7 +308,7 @@
 
 %% getting the list of fields where pieces resides
 %% added 2007-12-11, version 1.5.
-%% the piecelists are stored in cb<english! char of piece>list
+%% the piecelists are stored in cblist<english! char of piece>
 
 \newcommand\board@do@getpiecelists{%
  \setcounter{cnt@board@file}{\board@val@minfilenum}%
@@ -312,8 +317,8 @@
  \csname board@\board@val@game @piececharlist\endcsname}%
  \@for\board@temp@piecechar:=\board@temp@curlist
   \do {%
-   \expandafter\def\csname cblist\board@temp@piecechar\endcsname{}%
-   \expandafter\def\csname board@temp@\board@temp@piecechar @comma\endcsname{}}%
+   \expandafter\xdef\csname cblist\board@temp@piecechar\endcsname{}%
+   \expandafter\xdef\csname board@temp@\board@temp@piecechar @comma\endcsname{}}%
  \xdef\cblistempty{}%
  \def\board@temp@empty@comma{}%
  \whiledo
@@ -506,7 +511,7 @@
       \csname board@val@lang\board@val@curlang @\board@temp@char\endcsname}%
   \else
     \PackageError{chessboard}%
-      {Char #1 unknown in input language  \board@val@curlang!}%
+      {Char #1 unknown in input language \board@val@curlang!}%
       {You either misspelled the char for the piece or forgot to define it for the current language}%
   \fi
   \@namedef{board@the@piece@\board@temp@curpiece @white}{%
@@ -562,7 +567,7 @@
    \addtocounter{cnt@board@rank}{-1}}}%
 
 %%%%%%
-%% Scanning a FEN to set the fields
+%% Scanning a FEN (only the first part) to set the fields
 %%%%%%
 
 \def\@usenone@until@nil#1\@nil{}%
@@ -794,17 +799,18 @@
 
 \cbDefineMoverStyle%
     {square}
-    {$\square$}
-    {$\square$}
-    {$\blacksquare$}
-    {$\blacksquare$}
+    {\tikz \draw[color=black] (0,0) rectangle (0.65em,0.65em);}
+    {\tikz \draw[color=black] (0,0) rectangle (0.65em,0.65em);}
+    {\tikz \fill[color=black] (0,0) rectangle (0.65em,0.65em);}
+    {\tikz \fill[color=black] (0,0) rectangle (0.65em,0.65em);}
 
 \cbDefineMoverStyle%
-    {triangle}
-    {$\triangledown$}
-    {$\vartriangle$}
-    {$\blacktriangledown$}
-    {$\blacktriangle$}
+ {triangle}
+ {\tikz \draw[color=black] (0.6ex,0pt)--(0,1.25ex)--(1.2ex,1.25ex) --cycle;}
+ {\tikz \draw[color=black] (0.6ex,1.25ex)--(0,0)--(1.2ex,0) --cycle;}
+ {\tikz \fill[color=black] (0.6ex,0pt)--(0,1.25ex)--(1.2ex,1.25ex) --cycle;}
+ {\tikz \fill[color=black] (0.6ex,1.25ex)--(0,0)--(1.2ex,0) --cycle;}
+
 
 \cbDefineMoverStyle%
  %#1: optional, can be used for checks
@@ -1044,6 +1050,7 @@
 
 \newcommand\chessboard[1][]{%
  \begingroup
+  \normallineskip=1pt\relax\normallineskiplimit=0pt\relax%14.3.2011
   \savekeys[UFCB]{locset}{\global{psset},\global{psskak},\global{inverse}}%
 %%% Initialisation
 %% combine the the global keys and the keys in argument
@@ -1187,7 +1194,7 @@
      \csname board@val@moverstyle@\board@val@moverstyle\endcsname
     \else
      \PackageWarning{chessboard}%
-      {Moverstyle \board@val@moverstyle\  is not defined, I will use
+      {Moverstyle '\board@val@moverstyle'  is not defined, I will use
        type square instead}%
      \board@val@moverstyle@square
     \fi
@@ -1420,9 +1427,11 @@
 \def\currentfontcolors{\board@val@fontcolorstack}
 \setkeys*[UFCB]{glofill}{language=english,trimtocolor=false,trimarea=\board,trim,usepgf=all,pgfstyle=none}%
 \board@do@setsinglekeys*[UFCB]{locfill}{language=english}%
-%</main>
-%<*pgf>
-\ProvidesFile{chessboard-pgf.sty}[2007/12/20 pgf code for chessboard v1.5]
+
+%</chessboard>
+%<*chessboard-pgf>
+\ProvidesFile{chessboard-pgf.sty}[2014/05/01 version v1.7 pgf code for chessboard.sty]
+%%$Date: 2011/01/11 14:07:20 $$Version: 3d9f59c743f1 $
 
 \newcommand\board@pgf@extrabackground{}%
 \newcommand\board@pgf@extramarkground{}%
@@ -1909,7 +1918,6 @@
 
 %new 1.5.
 \newcommand\board@pgf@curvemove[2][]{
- %\begin{pgfscope}
  \setkeys[UFCB]{bez}{#1}%
  \pgfsetlinewidth{\board@pgf@linewidth}%
  \pgfsetarrowsend{\board@pgf@arrow}%
@@ -1928,7 +1936,6 @@
                {\pgfpointxy{0}{\board@val@pgfsign*\board@val@bezyii}}}%
   {\pgfpoint{\len@board@tempy}{0cm}}%
  \pgfusepath{stroke}%
-%\end{pgfscope}
 }
 
 \cbDefinePgfMoveStyle{curvemove}{%
@@ -2537,10 +2544,11 @@
       {\pgfpoint{0pt}{\board@pgf@padding}}}%
     \pgfusepath{stroke}}%
 
-%</pgf>
-%<*keysmain>
-\ProvidesFile{chessboard-keys-main.sty}[2007/12/20 key definitions
-for chessboard.sty v1.5 ]
+
+%</chessboard-pgf>
+%<*chessboard-keys-main>
+\ProvidesFile{chessboard-keys-main.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
 
 %%file=Linie=column=vertikal=al_f_abetisch= a-h
 %%rank=Reihe=row=horizontal=numbe_r_=1-8
@@ -3416,7 +3424,8 @@ for chessboard.sty v1.5 ]
 
 \define@key[UFCB]{locfill}{addfontcolors}[true]{% D
   \toks@=\expandafter{\board@val@fontcolorstack}%
-  \board@do@l@addto@macro\board@val@boardfontcolors{\the\toks@}}
+  \edef\@@next{\noexpand\board@do@l@addto@macro\noexpand\board@val@boardfontcolors{\the\toks@}}%
+  \@@next}
 
 \define@key[UFCB]{glofill}{setfontcolors}[true]{% D
     \board@do@l@addto@macro\board@val@savedkeylist{,setfontcolors=#1}{}}%
@@ -3823,13 +3832,6 @@ for chessboard.sty v1.5 ]
 \define@key[UFCB]{glofill}{addfen}{% D
     \board@do@l@addto@macro\board@val@savedkeylist{,addfen=#1}}%
 
-%\define@key[UFCB]{locfill}{usefen}{%
-%   \edef\board@temp@curfen{\csname chessgame.#1\endcsname}%
-%   \board@do@setsinglekeys*[UFCB]{locfill}{language=english, addfen=\board@temp@curfen, language=\board@val@savelang}}%
-%
-%\define@key[UFCB]{glofill}{usefen}{%
-%    \board@do@l@addto@macro\board@val@savedkeylist{,usefen=#1}}%
-
 %%% other name for usefen
 \define@key[UFCB]{locfill}{restorefen}{% D
    \edef\board@temp@curfen{\csname chessgame.#1\endcsname}%
@@ -3849,7 +3851,6 @@ for chessboard.sty v1.5 ]
 %% rest of fen
 %%%%
 
-%\define@choicekey*[UFCB]{locfill}{mover}[\board@val@mover]{w,b}{} %D
 \define@key[UFCB]{locfill}{mover}{\def\board@val@mover{#1}} %D %changed 02.08.2007 to allow commands as input
 \define@key[UFCB]{locfill}{castling}{\def\board@val@castling{#1}} %D
 \define@key[UFCB]{locfill}{enpassant}{\def\board@val@enpassant{#1}} %D
@@ -4067,12 +4068,12 @@ for chessboard.sty v1.5 ]
 
 \define@key[UFCB]{gloinit}{game}{%
   \board@do@l@addto@macro\board@val@savedkeylist{,game=#1}{}}%
-%</keysmain>
-%<*keyspgf>
 
-\ProvidesFile{chessboard-keys-pgf.sty}[2007/12/20 key definitions for
-chessboard.sty v1.5]
 
+%</chessboard-keys-main>
+%<*chessboard-keys-pgf>
+\ProvidesFile{chessboard-keys-pgf.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+%%$Date: 2011/03/17 13:42:38 $$Version: e7ec1b100ede $
 
 %% new 1.5.: style keys for curvemove
 \define@key[UFCB]{bez}{x1}{\def\board@val@bezxi{#1}}
@@ -4986,8 +4987,6 @@ chessboard.sty v1.5]
 
 %% obsolete key,
 \define@choicekey[UFCB]{locfill}{applycolor}[\@tempval\@tempnr]{all,none,white,black}{% D
- \PackageWarning{chessboard}{The behaviour of applycolor has changed
-                             \MessageBreak Please read the documentation!}%
  \ifcase\@tempnr\relax
   \board@do@setsinglekeys*[UFCB]{locfill}{trimtocolor=false}%
  \or
@@ -5125,4 +5124,5 @@ chessboard.sty v1.5]
 \define@key[UFCB]{glofill}{pgfborder}[\printarea]{% %D
     \board@do@l@addto@macro\board@val@savedkeylist{,pgfborder=#1}}%
 
-%</keyspgf>
+
+%</chessboard-keys-pgf>
diff --git a/Master/texmf-dist/source/latex/chessboard/chessboard.ins b/Master/texmf-dist/source/latex/chessboard/chessboard.ins
index 0d58f3eda04..7a2b97d40e0 100644
--- a/Master/texmf-dist/source/latex/chessboard/chessboard.ins
+++ b/Master/texmf-dist/source/latex/chessboard/chessboard.ins
@@ -9,7 +9,7 @@
 %%  but WITHOUT ANY WARRANTY; without even the implied warranty of
 %%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 %%
-%% Copyright 2006 Ulrike Fischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
 %% -------------------------------------------
 %
 %
@@ -49,7 +49,7 @@
 \declarepreamble\UFpreamble
 
 chessboard: a package to print chessboards
-Copyright 2006 UlrikeFischer (skak@nililand.de)
+Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
 -------------------------------------------
 
 This file can be redistributed and/or modified under the terms of
@@ -60,18 +60,14 @@ License, or (at your option) any later version.
 For error reports see documentation.
 \endpreamble
 
-
 %% File generation:
-\usedir{tex/latex/chessboard}
 \generate{%
  \usepreamble\UFpreamble
- %% style
- \file{chessboard.sty}{\from{chessboard-src.dtx}{main}}
- \file{chessboard-pgf.sty}{\from{chessboard-src.dtx}{pgf}}
- \file{chessboard-keys-pgf.sty}{\from{chessboard-src.dtx}{keyspgf}}
- \file{chessboard-keys-main.sty}{\from{chessboard-src.dtx}{keysmain}}
+ \file{chessboard.sty}{\from{chessboard-src.dtx}{chessboard}}
+ \file{chessboard-pgf.sty}{\from{chessboard-src.dtx}{chessboard-pgf}}
+ \file{chessboard-keys-main.sty}{\from{chessboard-src.dtx}{chessboard-keys-main}}
+ \file{chessboard-keys-pgf.sty}{\from{chessboard-src.dtx}{chessboard-keys-pgf}}
 }
-
 \endbatchfile
 %%
-%% end of file `scrclass.ins'
+%%end of file chessboard.ins
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-main.sty b/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-main.sty
index ce890281ce8..91a047fd10d 100644
--- a/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-main.sty
+++ b/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-main.sty
@@ -4,10 +4,10 @@
 %%
 %% The original source files were:
 %%
-%% chessboard-src.dtx  (with options: `keysmain')
+%% chessboard-src.dtx  (with options: `chessboard-keys-main')
 %% 
 %% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
 %% -------------------------------------------
 %% 
 %% This file can be redistributed and/or modified under the terms of
@@ -16,8 +16,8 @@
 %% License, or (at your option) any later version.
 %% 
 %% For error reports see documentation.
-\ProvidesFile{chessboard-keys-main.sty}[2007/12/20 key definitions
-for chessboard.sty v1.5 ]
+\ProvidesFile{chessboard-keys-main.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
 
 %%file=Linie=column=vertikal=al_f_abetisch= a-h
 %%rank=Reihe=row=horizontal=numbe_r_=1-8
@@ -892,7 +892,8 @@ for chessboard.sty v1.5 ]
 
 \define@key[UFCB]{locfill}{addfontcolors}[true]{% D
   \toks@=\expandafter{\board@val@fontcolorstack}%
-  \board@do@l@addto@macro\board@val@boardfontcolors{\the\toks@}}
+  \edef\@@next{\noexpand\board@do@l@addto@macro\noexpand\board@val@boardfontcolors{\the\toks@}}%
+  \@@next}
 
 \define@key[UFCB]{glofill}{setfontcolors}[true]{% D
     \board@do@l@addto@macro\board@val@savedkeylist{,setfontcolors=#1}{}}%
@@ -1298,7 +1299,6 @@ for chessboard.sty v1.5 ]
 \define@key[UFCB]{glofill}{addfen}{% D
     \board@do@l@addto@macro\board@val@savedkeylist{,addfen=#1}}%
 
-
 %%% other name for usefen
 \define@key[UFCB]{locfill}{restorefen}{% D
    \edef\board@temp@curfen{\csname chessgame.#1\endcsname}%
@@ -1534,6 +1534,7 @@ for chessboard.sty v1.5 ]
 
 \define@key[UFCB]{gloinit}{game}{%
   \board@do@l@addto@macro\board@val@savedkeylist{,game=#1}{}}%
+
 \endinput
 %%
 %% End of file `chessboard-keys-main.sty'.
diff --git a/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-pgf.sty b/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-pgf.sty
index 5f5eff25d91..d6d8c7a1623 100644
--- a/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-pgf.sty
+++ b/Master/texmf-dist/tex/latex/chessboard/chessboard-keys-pgf.sty
@@ -4,10 +4,10 @@
 %%
 %% The original source files were:
 %%
-%% chessboard-src.dtx  (with options: `keyspgf')
+%% chessboard-src.dtx  (with options: `chessboard-keys-pgf')
 %% 
 %% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
 %% -------------------------------------------
 %% 
 %% This file can be redistributed and/or modified under the terms of
@@ -16,9 +16,8 @@
 %% License, or (at your option) any later version.
 %% 
 %% For error reports see documentation.
-
-\ProvidesFile{chessboard-keys-pgf.sty}[2007/12/20 key definitions for
-chessboard.sty v1.5]
+\ProvidesFile{chessboard-keys-pgf.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+%%$Date: 2011/03/17 13:42:38 $$Version: e7ec1b100ede $
 
 %% new 1.5.: style keys for curvemove
 \define@key[UFCB]{bez}{x1}{\def\board@val@bezxi{#1}}
@@ -928,8 +927,6 @@ chessboard.sty v1.5]
 
 %% obsolete key,
 \define@choicekey[UFCB]{locfill}{applycolor}[\@tempval\@tempnr]{all,none,white,black}{% D
- \PackageWarning{chessboard}{The behaviour of applycolor has changed
-                             \MessageBreak Please read the documentation!}%
  \ifcase\@tempnr\relax
   \board@do@setsinglekeys*[UFCB]{locfill}{trimtocolor=false}%
  \or
diff --git a/Master/texmf-dist/tex/latex/chessboard/chessboard-pgf.sty b/Master/texmf-dist/tex/latex/chessboard/chessboard-pgf.sty
index 7878e3517cf..b06623e9bcd 100644
--- a/Master/texmf-dist/tex/latex/chessboard/chessboard-pgf.sty
+++ b/Master/texmf-dist/tex/latex/chessboard/chessboard-pgf.sty
@@ -4,10 +4,10 @@
 %%
 %% The original source files were:
 %%
-%% chessboard-src.dtx  (with options: `pgf')
+%% chessboard-src.dtx  (with options: `chessboard-pgf')
 %% 
 %% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
 %% -------------------------------------------
 %% 
 %% This file can be redistributed and/or modified under the terms of
@@ -16,7 +16,8 @@
 %% License, or (at your option) any later version.
 %% 
 %% For error reports see documentation.
-\ProvidesFile{chessboard-pgf.sty}[2007/12/20 pgf code for chessboard v1.5]
+\ProvidesFile{chessboard-pgf.sty}[2014/05/01 version v1.7 pgf code for chessboard.sty]
+%%$Date: 2011/01/11 14:07:20 $$Version: 3d9f59c743f1 $
 
 \newcommand\board@pgf@extrabackground{}%
 \newcommand\board@pgf@extramarkground{}%
@@ -499,7 +500,6 @@
    \pgfusepath{stroke}}%
 
 \newcommand\board@pgf@curvemove[2][]{
- %\begin{pgfscope}
  \setkeys[UFCB]{bez}{#1}%
  \pgfsetlinewidth{\board@pgf@linewidth}%
  \pgfsetarrowsend{\board@pgf@arrow}%
diff --git a/Master/texmf-dist/tex/latex/chessboard/chessboard.sty b/Master/texmf-dist/tex/latex/chessboard/chessboard.sty
index c1e29f44f15..5bd00fcdfb0 100644
--- a/Master/texmf-dist/tex/latex/chessboard/chessboard.sty
+++ b/Master/texmf-dist/tex/latex/chessboard/chessboard.sty
@@ -4,10 +4,10 @@
 %%
 %% The original source files were:
 %%
-%% chessboard-src.dtx  (with options: `main')
+%% chessboard-src.dtx  (with options: `chessboard')
 %% 
 %% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
 %% -------------------------------------------
 %% 
 %% This file can be redistributed and/or modified under the terms of
@@ -16,8 +16,9 @@
 %% License, or (at your option) any later version.
 %% 
 %% For error reports see documentation.
-\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{chessboard}[2007/12/20 v1.5 print chessboards]
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{chessboard}[2014/05/01 version v1.7 print chessboards]
+%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
 
 \DeclareOption{skaknew}{}%
 \ProcessOptions
@@ -37,14 +38,15 @@
 
 \RequirePackage{chessfss}[2006/03/31]
 
-
 \RequirePackage{xkeyval}%
 \RequirePackage{xifthen}%
 \RequirePackage{ifpdf}%
-\RequirePackage{pgfcore, pgfbaseshapes}%
+\RequirePackage{tikz}%
+\usepgfmodule{shapes}
 \ifpdf\else
 \RequirePackage{pst-node}%
-\fi \RequirePackage{amssymb}
+\fi
+
 %%%%%%%
 %% naming conventions
 %%%%%%%
@@ -315,7 +317,7 @@
 
 %% getting the list of fields where pieces resides
 %% added 2007-12-11, version 1.5.
-%% the piecelists are stored in cb<english! char of piece>list
+%% the piecelists are stored in cblist<english! char of piece>
 
 \newcommand\board@do@getpiecelists{%
  \setcounter{cnt@board@file}{\board@val@minfilenum}%
@@ -324,8 +326,8 @@
  \csname board@\board@val@game @piececharlist\endcsname}%
  \@for\board@temp@piecechar:=\board@temp@curlist
   \do {%
-   \expandafter\def\csname cblist\board@temp@piecechar\endcsname{}%
-   \expandafter\def\csname board@temp@\board@temp@piecechar @comma\endcsname{}}%
+   \expandafter\xdef\csname cblist\board@temp@piecechar\endcsname{}%
+   \expandafter\xdef\csname board@temp@\board@temp@piecechar @comma\endcsname{}}%
  \xdef\cblistempty{}%
  \def\board@temp@empty@comma{}%
  \whiledo
@@ -516,7 +518,7 @@
       \csname board@val@lang\board@val@curlang @\board@temp@char\endcsname}%
   \else
     \PackageError{chessboard}%
-      {Char #1 unknown in input language  \board@val@curlang!}%
+      {Char #1 unknown in input language \board@val@curlang!}%
       {You either misspelled the char for the piece or forgot to define it for the current language}%
   \fi
   \@namedef{board@the@piece@\board@temp@curpiece @white}{%
@@ -572,7 +574,7 @@
    \addtocounter{cnt@board@rank}{-1}}}%
 
 %%%%%%
-%% Scanning a FEN to set the fields
+%% Scanning a FEN (only the first part) to set the fields
 %%%%%%
 
 \def\@usenone@until@nil#1\@nil{}%
@@ -804,17 +806,17 @@
 
 \cbDefineMoverStyle%
     {square}
-    {$\square$}
-    {$\square$}
-    {$\blacksquare$}
-    {$\blacksquare$}
+    {\tikz \draw[color=black] (0,0) rectangle (0.65em,0.65em);}
+    {\tikz \draw[color=black] (0,0) rectangle (0.65em,0.65em);}
+    {\tikz \fill[color=black] (0,0) rectangle (0.65em,0.65em);}
+    {\tikz \fill[color=black] (0,0) rectangle (0.65em,0.65em);}
 
 \cbDefineMoverStyle%
-    {triangle}
-    {$\triangledown$}
-    {$\vartriangle$}
-    {$\blacktriangledown$}
-    {$\blacktriangle$}
+ {triangle}
+ {\tikz \draw[color=black] (0.6ex,0pt)--(0,1.25ex)--(1.2ex,1.25ex) --cycle;}
+ {\tikz \draw[color=black] (0.6ex,1.25ex)--(0,0)--(1.2ex,0) --cycle;}
+ {\tikz \fill[color=black] (0.6ex,0pt)--(0,1.25ex)--(1.2ex,1.25ex) --cycle;}
+ {\tikz \fill[color=black] (0.6ex,1.25ex)--(0,0)--(1.2ex,0) --cycle;}
 
 \cbDefineMoverStyle%
  %#1: optional, can be used for checks
@@ -1054,6 +1056,7 @@
 
 \newcommand\chessboard[1][]{%
  \begingroup
+  \normallineskip=1pt\relax\normallineskiplimit=0pt\relax%14.3.2011
   \savekeys[UFCB]{locset}{\global{psset},\global{psskak},\global{inverse}}%
 %%% Initialisation
 %% combine the the global keys and the keys in argument
@@ -1197,7 +1200,7 @@
      \csname board@val@moverstyle@\board@val@moverstyle\endcsname
     \else
      \PackageWarning{chessboard}%
-      {Moverstyle \board@val@moverstyle\  is not defined, I will use
+      {Moverstyle '\board@val@moverstyle'  is not defined, I will use
        type square instead}%
      \board@val@moverstyle@square
     \fi
@@ -1430,6 +1433,7 @@
 \def\currentfontcolors{\board@val@fontcolorstack}
 \setkeys*[UFCB]{glofill}{language=english,trimtocolor=false,trimarea=\board,trim,usepgf=all,pgfstyle=none}%
 \board@do@setsinglekeys*[UFCB]{locfill}{language=english}%
+
 \endinput
 %%
 %% End of file `chessboard.sty'.