xq (19sep14)

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

10 files changed, 277 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/fonts/xq/ChangeLog b/Master/texmf-dist/doc/fonts/xq/ChangeLog
new file mode 100644
index 00000000000..776bdec63e8
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/xq/ChangeLog
@@ -0,0 +1,24 @@
+Version 0.4 -- 2014-09
+
+  Functional changes
+     * In move listings, some moves were shown as capturing that were not,
+       some were shown as plain moves, while there were capturing.
+     * Starting point marker at i4 was missing at all board displays.
+     * Listings were aligned rather poorly, slightly better now.
+     * A new language "leibwaechter" derived from "german" but with "L"/"l" for advisors
+
+    Compile bugs-0-3.tex against xq 0.3 to see these bugs in action.
+
+  Documentation and packaging
+     * Improvements to xqexample.tex
+     * Addition of bugs-0-3.tex demonstrating bugs fixed with 0.4
+     * Makefile added (that was used during development)
+     * ChangeLog started
+
+  Changes done by:
+     * Wolfgang Reher <nr997@gmx.de>
+     * Sebastian Pipping <sebastian@pipping.org>
+
+Version 0.3 -- 2006-09
+
+  Latest release by Stephan Weinhold
diff --git a/Master/texmf-dist/doc/fonts/xq/Makefile b/Master/texmf-dist/doc/fonts/xq/Makefile
new file mode 100644
index 00000000000..7592afaa40d
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/xq/Makefile
@@ -0,0 +1,30 @@
+XQ_0_3_STY = /usr/share/texmf-dist/tex/latex/xq/xq.sty
+
+all: xqexample.pdf bugs-0-3.pdf
+
+tmp:
+	mkdir $@
+
+xqexample.pdf: xqexample.tex xq.sty | tmp
+	pdflatex -output-directory tmp $<
+	mv -f tmp/$@ $@
+
+xq-0-3.sty:
+	test -L "${XQ_0_3_STY}" -o -f "${XQ_0_3_STY}"
+	ln -s "${XQ_0_3_STY}" $@
+
+bugs-0-3.pdf: bugs-0-3.tex | tmp xq-0-3.sty
+	for i in 1 2 ; do pdflatex -output-directory tmp $< || exit 1 ; done
+	pdflatex -output-directory tmp $<
+	mv -f tmp/$@ $@
+
+clean:
+	rm -Rf tmp
+	rm -f xqexample.pdf bugs-0-3.pdf xq.zip xq-0-3.sty
+
+dist: all
+	test $$(basename $${PWD}) == xq
+	rm -f xq.zip
+	cd .. && zip -9 xq/xq.zip xq/{xq.sty,xq*.mf,{xqexample,bugs-0-3}.{tex,pdf},ChangeLog,README,Makefile}
+
+.PHONY: all dist clean
diff --git a/Master/texmf-dist/doc/fonts/xq/README b/Master/texmf-dist/doc/fonts/xq/README
index 4a491be6215..284afc11066 100644
--- a/Master/texmf-dist/doc/fonts/xq/README
+++ b/Master/texmf-dist/doc/fonts/xq/README
@@ -1,4 +1,6 @@
-readme for the xq-package, version 0.3
+readme for the xq-package, version 0.4
+
+THIS PACKAGE IS CURRENTLY UNMAINTAINED and LOOKING FOR A NEW MAINTAINER!
 
 
 the xq.sty, is made for writing about chinese chess. Unfortunately, it has become a real 
@@ -10,7 +12,7 @@ xq is under the LaTeX project public license
 
 
 
-The package contains 14 files: 
+The package contains 18 files:
 
 the style file                                           - xq.sty
 
@@ -25,8 +27,13 @@ font file for "normal" sized addsigns                    - xqaddsignsnormal.mf
 font file for "large" sized addsigns                     - xqaddsignslarge.mf
 hint file needed by xqbase, xqwestbase and xqaddsigns    - xqhints.mf
 
+an example file demonstarting bugs of 0.3 fixed by 0.4   - bugs-0-3.tex
+that documented rendered against version 0.3             - bugs-0-3.pdf
+a Makefile used to produces PDF files and xq.zip         - Makefile
 an example file demonstrating the abilities of the style - xqexample.tex
 the example file in pdf format for taking a quick look   - xqexample.pdf
+
+a change log for changes after the release of 0.3        - ChangeLog
 and finally this readme file                             - README 
 
 
@@ -65,4 +72,8 @@ via dvi and ps. After that procedure i always had a clean output in acroread.
 I hope everything works like it should, if not, please let me know...
 
 Stephan Weinhold, 09/2006
-stewei@surfeu.de
+
+
+Changes from 0.3 to 0.4 by
+* Wolfgang Reher <nr997@gmx.de>
+* Sebastian Pipping <sebastian@pipping.org>
diff --git a/Master/texmf-dist/doc/fonts/xq/bugs-0-3.pdf b/Master/texmf-dist/doc/fonts/xq/bugs-0-3.pdf
new file mode 100644
index 00000000000..7d2583c0514
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/xq/bugs-0-3.pdf
diff --git a/Master/texmf-dist/doc/fonts/xq/bugs-0-3.tex b/Master/texmf-dist/doc/fonts/xq/bugs-0-3.tex
new file mode 100644
index 00000000000..4428c0a73c4
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/xq/bugs-0-3.tex
@@ -0,0 +1,142 @@
+% Written by Sebastian Pipping <sebastian@pipping.org>, 2014-09-16
+\documentclass[twocolumn]{article}
+\usepackage[margin=2cm]{geometry}
+\setlength{\columnsep}{1cm}
+\usepackage[hidelinks]{hyperref}
+\usepackage{xq-0-3}
+
+\newcommand{\EM}[1]{\underline{#1}}
+\newcommand{\AUTHORS}[2]{%
+	Reported by: #1\\%
+	Fixed by: #2\\[\baselineskip]%
+}
+
+\begin{document}
+
+\noindent
+This document demonstrates bugs of xq version 0.3 that were fixed in release 0.4.
+
+\tableofcontents
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newpage
+\section{Bug: Red piece already gone}
+\AUTHORS{Wolfgang Reher}{Sebastian Pipping}
+%
+Consider this artifical setup.
+
+\mylanguage english
+\resetboard
+\piece Rc9
+\piece Rc8
+
+\piece rb9
+\piece cb8
+\showboard
+%
+Now for "\texttt{\textbackslash{}move c9d9 b9d9}" Black is capturing
+the Red piece at its new position, output "Rc9-d9 Rb9xd9"
+is expected (and produced by xq 0.3):
+%
+\cb \quad.
+\move c9d9 b9d9
+
+\noindent
+In contrast, with "\texttt{\textbackslash{}move c8e8 b8c8}" black moves to
+where Red just left before, non-capturing output
+"Rc8-e8 \EM{Rb8-c8}" is expected, xq 0.3 yields \EM{Rb8xc8} instead.
+
+\cb \quad.
+\move c8e8 b8c8
+
+\noindent
+The situation after these moves:
+\showboard
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newpage
+\section{Bug: a0 wired to b0}
+\AUTHORS{Wolfgang Reher}{Sebastian Pipping}
+%
+Consider this artifical setup.
+
+\mylanguage english
+\resetboard
+\movecount=0
+\piece Ra9
+\piece Rc0
+\piece rb0
+\piece rd0
+\showboard
+
+\noindent
+Now "\texttt{\textbackslash{}move a9a0 xxxx}" is a non-capturing move so
+"\EM{Ra9-a0}" is expected; xq 0.3 is showing "\EM{Ra9xa0}" since
+it checks b0 for occupation rather than a0:
+
+\cr \quad.
+\move a9a0 xxxx
+
+\noindent
+Next, we move the middle rooks out of the way:
+
+\move xxxx b0b9
+\cr \quad.
+\move c0c9 xxxx
+
+\noindent
+Since b0 is no longer occupied, xq 0.3 renders "\texttt{\textbackslash{}move xxxx d0a0}"
+as "\EM{Rd0-a0}" while "\EM{Rd0xa0}" would be correct:
+
+\cb \quad.
+\move xxxx d0a0
+
+\noindent
+The situation after these moves:
+\showboard
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newpage
+\section{Bug: Bad align in move listing}
+\AUTHORS{Sebastian Pipping}{Sebastian Pipping}
+%
+Consider this artifical setup.
+
+\mylanguage english
+\resetboard
+\movecount=0
+\piece Rc9
+\piece Rf9
+\piece rh9
+\piece ri9
+\showboard
+
+\noindent
+Now the reduced width of some letters (e.g. "f" and "i") results in bad alignment with xq 0.3:
+
+\move c9c5 h9h5
+\cb \quad.
+\move f9f5 i9i5
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newpage
+\section{Bug: Start marker at \texttt{i4} missing}
+\AUTHORS{Wolfgang Reher}{Wolfgang Reher}
+All four board display commands fail to produce start markers at \texttt{i4} in xq 0.3.\\
+
+\resetboard
+\piece Ch4
+
+\noindent
+\texttt{\textbackslash{}showboard}\showboard
+\texttt{\textbackslash{}showwesternboard}\showwesternboard
+\onecolumn
+\texttt{\textbackslash{}showlargeboard}\showlargeboard
+\newpage
+\texttt{\textbackslash{}showlargewesternboard}\showlargewesternboard
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/xq/xqexample.pdf b/Master/texmf-dist/doc/fonts/xq/xqexample.pdf
index fb5f8f6d8d2..6503c3248cf 100644
--- a/Master/texmf-dist/doc/fonts/xq/xqexample.pdf
+++ b/Master/texmf-dist/doc/fonts/xq/xqexample.pdf
diff --git a/Master/texmf-dist/doc/fonts/xq/xqexample.tex b/Master/texmf-dist/doc/fonts/xq/xqexample.tex
index ecf221df1d7..6d8fb8e5e2f 100644
--- a/Master/texmf-dist/doc/fonts/xq/xqexample.tex
+++ b/Master/texmf-dist/doc/fonts/xq/xqexample.tex
@@ -11,7 +11,7 @@
 
 \begin{document}
 
-\texttt{The xq package is made for writing about xiangqi or chinese chess. This file demonstrates what the package can do.}
+\texttt{The xq package is made for writing about Xiangqi or Chinese chess. This file demonstrates what the package can do.}
 
 \mylanguage english
 %i ve tried to enable input of the language typical letters for the different pieces. By now there 
@@ -44,7 +44,7 @@
 \move f1e2 h8e8 
 %note that there is absolutely no check for legal moves - this means, that on the one hand any piece can move to any place, even to the place it comes from and on the other hand a piece moved from/to a place that does not exist on the board will not be shown, selecting an empty square as start square produces an error - so everything has to be correct here
 \bigskip
-\texttt{Moves are input like this: "f1e2 h8e8", the letter for the piece that is moved is generated automatically and also, whether it is a capture or not. The piece letters shown depend on the language, you choose at the beginning of the tex file, in this case it is "english". By now there are letters defined for english, spanish, french, italian, czech, dutch and my mother tongue german. I created a pattern in the style file, where you can add your language typical letters, if the ones already defined do not match your preferences.} \\
+\texttt{Moves are input like this: "\textbackslash{}move f1e2 h8e8". The letter of the piece moved is generated automatically and also, whether it is a capture or not. The piece letters shown depend on the language, you choose at the beginning of the .tex file, in this case it is "english". By now there are letters defined for English, Spanish, French, Italian, Czech, Dutch and my mother tongue: German. I created a pattern in the style file, where you can add your language typical letters, if the ones already defined do not match your preferences.} \\
 \bigskip
 
 \move h1g3 h0g8
@@ -100,7 +100,7 @@ but in the game Red takes the whole defense of Black\dots
 
 \showwesternboard
 
-\texttt{You can also show the board with western pieces.}
+\texttt{You can also show the board with western pieces using \textbackslash{}showwesternboard.}
 \bigskip
 
 \move b9a9 d8d2
@@ -118,12 +118,12 @@ Black resigned the game.
 \newpage
 \newpage
 
-\texttt{Now we start playing from a special position, that is input in the tex file.}
+\texttt{Now we start playing from a special position, that is input in the .tex file.}
 
 \begin{center}
 {\bf{\large{Exercise}}}
 \end{center}
-In the diagram shown below both sides can checkmate the opponent, depending only on who is to move.
+In the diagram shown below, both sides can checkmate the opponent, depending only on who is to move.
 
 \resetboard 
 %makes the board to show an empty one, recommended before setting up a position
@@ -158,8 +158,8 @@ In the diagram shown below both sides can checkmate the opponent, depending only
 
 \showboard
 
-1.\,Red to move checkmates in 3 moves\\
-2.\,Black to move checkmates in 4 moves\\
+1.\,Red to move, checkmates in 3 moves\\
+2.\,Black to move, checkmates in 4 moves\\
 
 \textit{Solution}\\
 
@@ -217,7 +217,7 @@ In the diagram shown below both sides can checkmate the opponent, depending only
 
 \newpage
 
-\texttt{I added a small font with some additional signs, f.e. to demonstrate legal moves of pieces. But by now this is not more than a first draft with only the four extra signs shown in the diagram} 
+\texttt{I added some additional signs to demonstrate legal moves of pieces.\\But for now this is not more than a first draft with only the four extra signs shown in the diagram.}
 
 \resetboard
 
@@ -244,7 +244,7 @@ In the diagram shown below both sides can checkmate the opponent, depending only
 %pieces in running text
 \newpage
 
-\texttt{pieces in running text}
+\texttt{Pieces in running text:}
 \bigskip
 
 \textpiece K \textpiece k 
@@ -272,11 +272,11 @@ the pawns/soldiers
 \onecolumn
 
 \newgame
-\texttt{I also included a large board.}
+\texttt{I also included commands to show large boards: \textbackslash{}showlargeboard and \textbackslash{}showlargewesternboard.}
 \showlargeboard 
 %shows a board in a size fitted to onecolumn on a4paper according to my personal preference. For western pieces input \showlargewesternboard
 
-\texttt{Thats all! Hopefully everything works like it should!}
+\texttt{That's all! Hopefully everything works like it should!}
 
 \end{document}
 
diff --git a/Master/texmf-dist/fonts/tfm/public/xq/xqlarge.tfm b/Master/texmf-dist/fonts/tfm/public/xq/xqlarge.tfm
index f7cd4e089ec..fa3b3e09c0e 100644
--- a/Master/texmf-dist/fonts/tfm/public/xq/xqlarge.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xq/xqlarge.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xq/xqnormal.tfm b/Master/texmf-dist/fonts/tfm/public/xq/xqnormal.tfm
index 9ecc75d17bf..dc6ea25bb01 100644
--- a/Master/texmf-dist/fonts/tfm/public/xq/xqnormal.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xq/xqnormal.tfm
diff --git a/Master/texmf-dist/tex/latex/xq/xq.sty b/Master/texmf-dist/tex/latex/xq/xq.sty
index 5901cb8534d..31319a70249 100644
--- a/Master/texmf-dist/tex/latex/xq/xq.sty
+++ b/Master/texmf-dist/tex/latex/xq/xq.sty
@@ -1,14 +1,20 @@
-%xq.sty, version 0.3
+%xq.sty, version 0.4
 
 %this style is made for writing about xiangqi. I never wrote something like this before so do not expect too much. You can write down games or parts of games and show diagrams of positions (take a look at xqexample.tex). The move display was more or less copied from the one in chess.sty by Piet Tutelaers, the diagrams follow the idea of  Jacques Richer in cchessboard.tex.The boards are available in normal and large size and with chinese or western pieces. If you make any changes in this file, please rename it. If changes are making this style work better (which i guess is rather simple) please share your improvements with me. Thanks in advance.
 
 %Stephan Weinhold 09.2006
-%stewei@surfeu.de
+
+%Post-0.3 changes by:
+%  Wolfgang Reher <nr997@gmx.de>
+%  Sebastian Pipping <sebastian@pipping.org>
+
+
 
 
 
 %define a language for input of positions and piece letters shown in the moveblocks
 \def\german{german}
+\def\leibwaechter{leibwaechter}
 \def\english{english}
 \def\french{french}
 \def\italian{italian}
@@ -54,6 +60,24 @@
 \gdef\blackpawn{s}
 \fi
 
+\ifx\checklangg\leibwaechter
+\gdef\redking{F}
+\gdef\blackking{f}
+\gdef\redchariot{W}
+\gdef\blackchariot{w}
+\gdef\redcannon{K}
+\gdef\blackcannon{k}
+\gdef\redhorse{P}
+\gdef\blackhorse{p}
+\gdef\redelephant{E}
+\gdef\blackelephant{e}
+\gdef\redguard{L}
+\gdef\blackguard{l}
+\gdef\redpawn{S}
+\gdef\blackpawn{s}
+\fi
+
+%% http://www.wxf.org/xq/computer/wxf_notation.html
 \ifx\checklangg\english
 \gdef\redking{K} 
 \gdef\blackking{k}
@@ -281,7 +305,7 @@
    \if\endrr\brseven \ifnum\asevenset=1 \captR=1 \else\captR=0\fi\fi
    \if\endrr\breight \ifnum\aeightset=1 \captR=1 \else\captR=0\fi\fi
    \if\endrr\brnine \ifnum\anineset=1 \captR=1 \else\captR=0\fi\fi
-   \if\endrr\brnull \ifnum\bnullset=1 \captR=1 \else\captR=0\fi\fi\fi
+   \if\endrr\brnull \ifnum\anullset=1 \captR=1 \else\captR=0\fi\fi\fi
 \if\endlr\bli
    \if\endrr\brone \ifnum\boneset=1 \captR=1 \else\captR=0\fi\fi
    \if\endrr\brtwo \ifnum\btwoset=1 \captR=1 \else\captR=0\fi\fi  
@@ -381,7 +405,7 @@
    \if\endrb\brseven \ifnum\asevenset=1 \captB=1 \else\captB=0\fi\fi
    \if\endrb\breight \ifnum\aeightset=1 \captB=1 \else\captB=0\fi\fi
    \if\endrb\brnine \ifnum\anineset=1 \captB=1 \else\captB=0\fi\fi
-   \if\endrb\brnull \ifnum\bnullset=1 \captB=1 \else\captB=0\fi\fi\fi
+   \if\endrb\brnull \ifnum\anullset=1 \captB=1 \else\captB=0\fi\fi\fi
 \if\endlb\bli
    \if\endrb\brone \ifnum\boneset=1 \captB=1 \else\captB=0\fi\fi
    \if\endrb\brtwo \ifnum\btwoset=1 \captB=1 \else\captB=0\fi\fi  
@@ -473,11 +497,33 @@
 
 \ifnum\captR=1 \def\signR{$\times$} \else \def\signR{\hbox{\hspace{0.2mm}--\hspace{0.2mm}}}\fi
 \ifnum\captB=1 \def\signB{$\times$} \else \def\signB{\hbox{\hspace{0.2mm}--\hspace{0.2mm}}}\fi
+
+% Did black take the piece red moved just before?
 \if\endlr\endlb \if\endrr\endrb \def\signB{$\times$} \fi\fi
 
+% Did we assume the place occupied that red actually just freed, by mistake?
+\if\startlr\endlb \if\startrr\endrb \def\signB{\hbox{\hspace{0.2mm}--\hspace{0.2mm}}} \fi\fi
+
+\def\piececolumnwidth{1.2em}
+\def\locationcolumnwidth{1.0em}
+\def\operatorcolumnwidth{0.8em}
+\def\piececolumnalign{c}
+\def\startlocationalign{l}
+\def\endlocationalign{r}
+
 %defines what is actually shown in the move blocks
-\if\startlr\xli \advance\movecount by-1 \def\rply{$\ldots$} \else \def\rply{\npr\startlr\startrr\signR\endlr\endrr}\fi
-\if\startlb\xli \def\bply{ } \else \def\bply{\npb\startlb\startrb\signB\endlb\endrb}\fi
+\if\startlr\xli \advance\movecount by-1 \def\rply{$\ldots$} \else \def\rply{%
+	\makebox[\piececolumnwidth][\piececolumnalign]{\npr}%
+	\makebox[\locationcolumnwidth][\startlocationalign]{\startlr\startrr}%
+	\makebox[\operatorcolumnwidth][c]{\signR}%
+	\makebox[\locationcolumnwidth][\endlocationalign]{\endlr\endrr}%
+}\fi
+\if\startlb\xli \def\bply{ } \else \def\bply{%
+	\makebox[\piececolumnwidth][\piececolumnalign]{\npb}%
+	\makebox[\locationcolumnwidth][\startlocationalign]{\startlb\startrb}%
+	\makebox[\operatorcolumnwidth][c]{\signB}%
+	\makebox[\locationcolumnwidth][\endlocationalign]{\endlb\endrb}%
+}\fi
 
 
 %piece-letters for notation
@@ -22572,7 +22618,7 @@
 \ifnum\hfourset<1% 
 \element{8}{5}{4}\fi
 \ifnum\ifourset<1% 
-\element{9}{5}{5}\fi
+\element{9}{5}{2}\fi
 
 \ifnum\afiveset<1% 
 \element{1}{6}{3}\fi
@@ -23199,7 +23245,7 @@
 \ifnum\hfourset<1% 
 \largeelement{8}{5}{4}\fi
 \ifnum\ifourset<1% 
-\largeelement{9}{5}{5}\fi
+\largeelement{9}{5}{2}\fi
 
 \ifnum\afiveset<1% 
 \largeelement{1}{6}{3}\fi
@@ -23803,7 +23849,7 @@
 \ifnum\hfourset<1% 
 \element{8}{5}{4}\fi
 \ifnum\ifourset<1% 
-\element{9}{5}{5}\fi
+\element{9}{5}{2}\fi
 
 \ifnum\afiveset<1% 
 \element{1}{6}{3}\fi
@@ -24405,7 +24451,7 @@
 \ifnum\hfourset<1% 
 \largeelement{8}{5}{4}\fi
 \ifnum\ifourset<1% 
-\largeelement{9}{5}{5}\fi
+\largeelement{9}{5}{2}\fi
 
 \ifnum\afiveset<1% 
 \largeelement{1}{6}{3}\fi