summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/onedown/README2
-rw-r--r--Master/texmf-dist/doc/latex/onedown/examples/Bidding.tex16
-rw-r--r--Master/texmf-dist/doc/latex/onedown/examples/Select-Hands.tex56
-rw-r--r--Master/texmf-dist/doc/latex/onedown/examples/bidEW.tex2
-rw-r--r--Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.pdfbin840866 -> 844991 bytes
-rw-r--r--Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.tex1
-rw-r--r--Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.pdfbin208994 -> 210802 bytes
-rw-r--r--Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.tex164
-rw-r--r--Master/texmf-dist/doc/latex/onedown/onedown.pdfbin1001507 -> 1009654 bytes
-rw-r--r--Master/texmf-dist/source/latex/onedown/onedown.dtx411
-rw-r--r--Master/texmf-dist/tex/latex/onedown/onedown.sty124
11 files changed, 458 insertions, 318 deletions
diff --git a/Master/texmf-dist/doc/latex/onedown/README b/Master/texmf-dist/doc/latex/onedown/README
index 02fa85f0ad9..46677fec8a7 100644
--- a/Master/texmf-dist/doc/latex/onedown/README
+++ b/Master/texmf-dist/doc/latex/onedown/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-The OneDown package v1.0 - 2018/05/23
+The OneDown package v1.2 - 2018/10/31
A package to typeset diagrams for the game of bridge
--------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/onedown/examples/Bidding.tex b/Master/texmf-dist/doc/latex/onedown/examples/Bidding.tex
index 36ac601f3d1..18ca0f7c3c8 100644
--- a/Master/texmf-dist/doc/latex/onedown/examples/Bidding.tex
+++ b/Master/texmf-dist/doc/latex/onedown/examples/Bidding.tex
@@ -14,32 +14,38 @@ with |\thinspace|, |\,| or the like.
In the second diagram we use the short form of the non-bid calls, by
calling |\setdefaults{bidlong=off}|.
The alignment is \textbf{t} and we have put \north in the first column.
+Please observe that the change to |bidfirst=N| is made local by the
+surrounding |{...}|
In the third diagram we also use the short form for the table header by
calling the bidding table with the token |!|. The alignment is \textbf{b}.
+
+In the first example we also added an |\alert| and an |\announce|, just to
+show their layout.
\vfill
%
\begin{HBox}{{bidding, alignment and long/short forms}\hfill File: \FileName}
%\gamefont{\smaller\smaller}
A
\begin{bidding}% default= [c]
-1\Cl & 1D & 1H & 1S \\
-1N & X & p & p \\
-R & P \\
+1\Cl\announce & 1D & 1H & 1S\alert \\
+1N & X & p & p \\
+R & P \\
\end{bidding}
B
\\[2\baselineskip]
A
+{
\setdefaults{bidlong=off,bidfirst=N}
\begin{bidding}[t]
1C & 1D & 1H & 1S \\
1N & X & p & p \\
R & P \\
\end{bidding}
-B
+}B
\\[2\baselineskip]
A
-\setdefaults{bidlong=off}
+%\setdefaults{bidlong=off}
\begin{bidding}![b]
1C & 1D & 1H & 1S \\
1N & X & p & p \\
diff --git a/Master/texmf-dist/doc/latex/onedown/examples/Select-Hands.tex b/Master/texmf-dist/doc/latex/onedown/examples/Select-Hands.tex
new file mode 100644
index 00000000000..0b550cee3e7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/onedown/examples/Select-Hands.tex
@@ -0,0 +1,56 @@
+\documentclass[onedown-examples]{subfiles}
+
+\begin{document}
+\vfill
+Both the |\showNS| and |\showEW| have and extra optional parameter that
+controls which of the two hands will be printed and suppresses the other
+hand.
+\vfill
+\begin{HBox}{Select only one hand\hfill File: \FileName}
+\northhand{AK43}{AQJ83}{AJ98}{-}
+\southhand{87}{T5}{QT5}{K98654}
+\easthand{JT6}{764}{K43}{JT32}
+\westhand{Q952}{K92}{762}{AQ7}
+A \showNS(N) \quad B \showNS(S)
+
+C \showEW(E) \quad D \showEW(W)
+
+\end{HBox}
+\vfill
+The same, but here the compass is suppressed, showing only the selected hand
+\vfill
+\begin{HBox}{{Only hand, compass suppressed}\hfill File: \FileName}
+\setdefaults{compshow=off}
+\northhand{AK43}{AQJ83}{AJ98}{-}
+\southhand{87}{T5}{QT5}{K98654}
+\easthand{JT6}{764}{K43}{JT32}
+\westhand{Q952}{K92}{762}{AQ7}
+A \showNS(N) \quad B \showNS(S)
+
+C \showEW(E) \quad D \showEW(W)
+
+\end{HBox}
+
+\begin{HBox}{{Only \North*!-hands}\hfill File: \FileName}
+\newgame
+\setdefaults{compshow=on}
+\northhand{AK43}{AQJ83}{AJ98}{-} \showNS(N)
+\northhand{87}{T5}{QT5}{K98654} \showNS(N)\quad
+\northhand{JT6}{764}{K43}{JT32} \showNS(N)
+\northhand{Q952}{K92}{762}{AQ7} \showNS(N)
+\end{HBox}
+
+\begin{HBox}{{Only \North*!-hands, compass suppressed}\hfill File:
+\FileName}
+\newgame
+\setdefaults{compshow=off}
+\northhand{AK43}{AQJ83}{AJ98}{-} \showNS(N)
+\northhand{87}{T5}{QT5}{K98654} \showNS(N)\quad
+\northhand{JT6}{764}{K43}{JT32} \showNS(N)
+\northhand{Q952}{K92}{762}{AQ7} \showNS(N)
+\end{HBox}
+
+\end{document}
+\endinput
+
+
diff --git a/Master/texmf-dist/doc/latex/onedown/examples/bidEW.tex b/Master/texmf-dist/doc/latex/onedown/examples/bidEW.tex
index f33ed9bb816..e91d8ff5f82 100644
--- a/Master/texmf-dist/doc/latex/onedown/examples/bidEW.tex
+++ b/Master/texmf-dist/doc/latex/onedown/examples/bidEW.tex
@@ -21,7 +21,7 @@ not change its font!
\southhand{AQT95}{A52}{864}{K6}
\easthand{63}{J764}{KQT9}{953}
\westhand{74}{T83}{A7532}{742}
-\setdefaults{bidfirst=S,bidlong=off}
+\setdefaults{bidfirst=S}
\begin{biddingpair}!-(\explainit{splinter}
\explainit{control})
1S & 4D\markit \\
diff --git a/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.pdf b/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.pdf
index c6795a657c1..90495ef5947 100644
--- a/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.pdf
+++ b/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.tex b/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.tex
index ce99862341d..d572b06cd23 100644
--- a/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.tex
+++ b/Master/texmf-dist/doc/latex/onedown/examples/onedown-examples.tex
@@ -155,6 +155,7 @@ to show the code and the output of it side by side.
\SubFile{showNS-warn-II}
\SubFile{showNS-align}
\SubFile{showAll}
+\SubFile{Select-Hands}
\SubFile{Bidding}
\SubFile{bidAll}
\SubFile{bidNS}
diff --git a/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.pdf b/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.pdf
index 0b56837db45..5f6aff9abe3 100644
--- a/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.pdf
+++ b/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.tex b/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.tex
index dfdac3f5060..36fa69fb493 100644
--- a/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.tex
+++ b/Master/texmf-dist/doc/latex/onedown/examples/onedown-ref.tex
@@ -17,28 +17,10 @@
\renewcommand\item[1][\relax]{\olditem\textbf{\bs#1}}
%\def\Item{\olditem[\bs]}
%
-\begin{document}
-\iffalse
-Word1 \onesuitEW{K98}{A65} word2
-%
-\onesuitNE{K}{A65} word3
-%
-\onesuitNS{K98}{A65} word4
-%
-\onesuitNW{K98}{A65} word5
+\definecolor{optbackgr}{named}{lightgray}
+\newcommand\Oarg[1]{\colorbox{optbackgr}{\texttt{#1}}}
-Word1 \onesuitEW!{K98}{A65} word2
-%
-\onesuitNE!{K98}{A65} word3
-%
-\onesuitNS!{K98}{A65} word4
-%
-\onesuitNW!{K98}{A65} word5
-
-Word1 \onesuitAll{K}{A}{QT7}{J432} word2
-%
-\onesuitAll!{K98}{A65}{QT7}{J432} word3
-\fi
+\begin{document}
\larger
\newgeometry{total={150mm, 265mm},left=25mm,top=15mm}
@@ -50,23 +32,25 @@ Here we show all user commands of the package |onedown| in alphabetical
order. If we only show the ouput that a command produces, then this output
is shown directly behind the command on the same line. If a description of
the command is given, then this description starts on a new line. Optional
-parameters of a command (including tokens) appear in brackets
-|[...]|. Output of a tokenized |\macro*!| is shown as:
-\qquad|\macro[*!]: \macro, \macro*, \macro!, \macro*!|\\
+parameters of a command appear in brackets |[...]|, parenthesis |(...)| or
+angles |<...>|. Optional tokens of a command appear with a different
+background color, like \Oarg{*!}. Output of a tokenized |\macro*!| is shown
+as:
+\quad|\macro|\Oarg{*!}|: \macro, \macro*, \macro!, \macro*!|\\
All output is shown for the English language.
\begin{description}[itemsep=-0.3em]
\item[ace]: \ace
-\item[Ace\Q{[*!]}]: \Ace, \Ace*, \Ace!, \Ace*!
+\item[Ace\Oarg{*!}]: \Ace, \Ace*, \Ace!, \Ace*!
\item[alert]: |2\NT\alert| typesets 2\NT\alert and |2\Cl\alert| typesets
2\Cl\alert
\item[all]: \all
-\item[All\Q{[*!]}]: \All, \All*, \All!, \All*!
+\item[All\Oarg{*!}]: \All, \All*, \All!, \All*!
\item[allpass]: \allpass
-\item[Allpass\Q{[*!]}]: \Allpass, \Allpass*, \Allpass!, \Allpass*!
+\item[Allpass\Oarg{*!}]: \Allpass, \Allpass*, \Allpass!, \Allpass*!
\item[announce]: |2\He\announce| typesets 2\He\announce
@@ -77,14 +61,14 @@ description like |\sffamily\bfseries\HUGE| or |\mdseries\slshape\smaller|
or |\sffamily\scalefont{3}|.
\item[board]: \board
-\item[Board\Q{[*!]}]: \Board, \Board*, \Board!, \Board*!
+\item[Board\Oarg{*!}]: \Board, \Board*, \Board!, \Board*!
\item[boardnr\Q{{Nr} }]\\
Calculates (and stores) the dealership and vulnerability if |Nr|
is a number. If it is just a text it is stored to be used instead of a
board number.
-\item[boardtext\Q{[*]}]\\
+\item[boardtext\Oarg{*}]\\
Typesets the value that is stored with |\boardnr|.
The star version writes the text \textbf{\boardtext*} in front of it.
@@ -96,10 +80,10 @@ The star version writes the text \textbf{\boardtext*} in front of it.
Defines the font for the compass.
\item[contract]: \contract
-\item[Contract\Q{[*!]}]: \Contract, \Contract*, \Contract!, \Contract*!
+\item[Contract\Oarg{*!}]: \Contract, \Contract*, \Contract!, \Contract*!
\item[deal]: \deal
-\item[Deal\Q{[*!]}]: \Deal, \Deal*, \Deal!, \Deal*!
+\item[Deal\Oarg{*!}]: \Deal, \Deal*, \Deal!, \Deal*!
\item[dealer\Q{[text]}]\\
Typeset the defined dealer. With the optional
@@ -111,30 +95,30 @@ e.g.\ \mbox{\dealertext[\east]}. With the optional parameter one can define
the |text| to be printed \emph{as is}.
\item[declarer]: \declarer
-\item[Declarer\Q{[*!]}]: \Declarer, \Declarer*, \Declarer!, \Declarer*!
+\item[Declarer\Oarg{*!}]: \Declarer, \Declarer*, \Declarer!, \Declarer*!
\item[Di]: \Di
\item[double]: \double
-\item[Double\Q{[*!]}]: \Double, \Double*, \Double!, \Double*!
+\item[Double\Oarg{*!}]: \Double, \Double*, \Double!, \Double*!
\item[DP]: \DP
-\item[dpts\Q{[*!]}]: \dpts, \dpts*, \dpts!, \dpts*!
+\item[dpts\Oarg{*!}]: \dpts, \dpts*, \dpts!, \dpts*!
\item[east]: \east
-\item[East\Q{[*!]}]: \East, \East*, \East!, \East*!
+\item[East\Oarg{*!}]: \East, \East*, \East!, \East*!
\item[easthand\Q{[h-offset]{Sp}{He}{Di}{Cl}}]\\
Defines the cards for the
\East*!-player. With the optional parameter |h-offset| one can adapt the
(\emph{horizontal}) distance between hand and compass (default
\textbf{0pt}). The 4 mandatory parameters define the cards for the 4 suits.
-To denote the rank \suit{T}, one has to use uppercase letter |T|.
+To denote the rank \suit{T}, one has to use the uppercase letter |T|.
\item[eastwest]: \eastwest
-\item[Eastwest\Q{[*!]}]: \EastWest, \EastWest*, \EastWest!, \EastWest*!
+\item[Eastwest\Oarg{*!}]: \EastWest, \EastWest*, \EastWest!, \EastWest*!
-\item[expertquiz\Q{[*!][comment]{award}}]\\
+\item[expertquiz\Oarg{*!}\Q{[comment]}{award}]\\
Typesets a quiz, showing a
predefined hand and a predefined bidding diagram. The star version centers
the output. The token |!| forces a newline between hand and bidding
@@ -148,15 +132,15 @@ writes \emph{expl} below the bidding diagram in a footnote like way.
Typeset the text below the card diagram.
\item[FSF]: \FSF
-\item[fsforce\Q{[*!]}]: \fsforce, \fsforce*, \fsforce!, \fsforce*!
+\item[fsforce\Oarg{*!}]: \fsforce, \fsforce*, \fsforce!, \fsforce*!
\item[gamefont\Q{{font} }]\\
Defines the font for card diagrams, hands and suits.
\item[GF]: \GF
-\item[gforce\Q{[*!]}]: \gforce, \gforce*, \gforce!, \gforce*!
+\item[gforce\Oarg{*!}]: \gforce, \gforce*, \gforce!, \gforce*!
-\item[hand\Q{[*!-][pos]{Sp}{He}{Di}{Cl}}]\\
+\item[hand\Oarg{*!-}\Q{[pos]{Sp}{He}{Di}{Cl}}]\\
Typesets the cards of 1 single hand,
normally horizontally, left aligned. The star version centers the output.
The token |!| typesets the hand vertically, left aligned. With both |*!|
@@ -165,7 +149,7 @@ the hand is typeset vertically, centered. The optional argument |pos|
The third token |-| suppresses all output, which is then only saved for
later use (in e.g.\ |\expertquiz|). The 4
mandatory parameters define the cards for the 4 suits. To denote the rank
-\suit{T}, one has to use uppercase letter |T|.
+\suit{T}, one has to use the uppercase letter |T|.
\item[handskip\Q{{length description} }]\\
Adds |length| to the distance (default |1em|) between the rightmost hand
@@ -178,16 +162,16 @@ Typeset the text above the card diagram.
\item[He]: \He
-\item[hpts\Q{[*!]}]: \hpts, \hpts*, \hpts!, \hpts*!
+\item[hpts\Oarg{*!}]: \hpts, \hpts*, \hpts!, \hpts*!
\item[jack]: \jack
-\item[Jack\Q{[*!]}]: \Jack. \Jack*, \Jack!, \Jack*!
+\item[Jack\Oarg{*!}]: \Jack. \Jack*, \Jack!, \Jack*!
\item[king]: \king
-\item[King\Q{[*!]}]: \King, \King*, \King!, \King*!
+\item[King\Oarg{*!}]: \King, \King*, \King!, \King*!
\item[lead]: \lead
-\item[Lead\Q{[*!]}]: \Lead, \Lead*, \Lead!, \Lead*!
+\item[Lead\Oarg{*!}]: \Lead, \Lead*, \Lead!, \Lead*!
\item[leftlower\Q{[h-offset]{line1}{line2}{line3}}]
@@ -200,7 +184,7 @@ space between hand and annotation.
Defines the font for annotations in card diagrams.
\item[LP]: \LP
-\item[lpts\Q{[*!]}]: \lpts, \lpts*, \lpts!, \lpts*!
+\item[lpts\Oarg{*!}]: \lpts, \lpts*, \lpts!, \lpts*!
\item[markit]\\
sets a footnote-like marker in a bidding diagram.
@@ -221,56 +205,56 @@ in the bidding diagram.
Resets some stored data
\item[NMF]: \NMF
-\item[nmforce\Q{[*!]}]: \nmforce, \nmforce*, \nmforce!, \nmforce*!
+\item[nmforce\Oarg{*!}]: \nmforce, \nmforce*, \nmforce!, \nmforce*!
\item[none]: \none
-\item[None\Q{[*!]}]: \None, \None*, \None!, \None*!
+\item[None\Oarg{*!}]: \None, \None*, \None!, \None*!
\item[north]: \north
-\item[North\Q{[*!]}]: \North, \North*, \North!, \North*!
+\item[North\Oarg{*!}]: \North, \North*, \North!, \North*!
\item[northhand\Q{[v-offset]{Sp}{He}{Di}{Cl}}]\\
Defines the cards for the
\North*!-player. With the optional parameter |v-offset| one can adapt the
(\emph{vertical}) distance between hand and compass (default \textbf{0pt}).
The 4 mandatory parameters define the cards for the 4 suits. To denote the
-rank \suit{T}, one has to use uppercase letter |T|.
+rank \suit{T}, one has to use the uppercase letter |T|.
\item[northsouth]: \northsouth
-\item[NorthSouth\Q{[*!]}]: \NorthSouth, \NorthSouth*, \NorthSouth!, \NorthSouth*!
+\item[NorthSouth\Oarg{*!}]: \NorthSouth, \NorthSouth*, \NorthSouth!, \NorthSouth*!
-\item[nt\Q{[*!]}]: \nt, \nt*, \nt!, \nt*!
+\item[nt\Oarg{*!}]: \nt, \nt*, \nt!, \nt*!
\item[NT]: \NT
-\item[onesuitAll\Q{[*!]{N}{S}{E}{W}}]\\
+\item[onesuitAll\Oarg{*!}\Q{{N}{S}{E}{W}}]\\
Typesets the cards of 1 suit for all
players. The star version centers the output. The token |!| prints a small
box rather than the compass. The 4 mandatory parameters denote the cards
for the \North*!-, the \South*!-, the \East*!- and the \West*!-player.
-\item[onesuitEW\Q{[*!]{E}{W}}]\\
+\item[onesuitEW\Oarg{*!}\Q{{E}{W}}]\\
Same as |onesuitAll|, but only for the \East*!- and the \West*!-player.
-\item[onesuitNE\Q{[*!]{N}{E}}]\\
+\item[onesuitNE\Oarg{*!}\Q{{N}{E}}]\\
Same as |onesuitAll|, but only for the \North*!- and the \East*!-player.
-\item[onesuitNS\Q{[*!]{N}{S}}]\\
+\item[onesuitNS\Oarg{*!}\Q{{N}{S}}]\\
Same as |onesuitAll|, but only for the \North*!- and the \South*!-player.
-\item[onesuitNW\Q{[*!]{N}{W}}]\\
+\item[onesuitNW\Oarg{*!}\Q{{N}{W}}]\\
Same as |onesuitAll|, but only for the \North*!- and the \West*!-player.
\item[otherfont\Q{{font} }]\\
Defines the font for other items.
\item[pass]: \pass
-\item[Pass\Q{[*!]}]: \Pass, \Pass*, \Pass!, \Pass*!
+\item[Pass\Oarg{*!}]: \Pass, \Pass*, \Pass!, \Pass*!
\item[queen]: \queen
-\item[Queen\Q{[*!]}]: \Queen, \Queen*, \Queen!, \Queen*!
+\item[Queen\Oarg{*!}]: \Queen, \Queen*, \Queen!, \Queen*!
\item[redouble]: \redouble
-\item[Redouble\Q{[*!]}]: \Redouble, \Redouble*, \Redouble!, \Redouble*!
+\item[Redouble\Oarg{*!}]: \Redouble, \Redouble*, \Redouble!, \Redouble*!
\item[resetfonts]\\
Sets all fonts back to their default value.
@@ -281,19 +265,20 @@ Typesets an annotation of 3 lines in the right lower/upper corner of the
card diagram. With the optional parameter one can add some extra horizontal
space between hand and annotation.
-\item[setdefaults\Q{[*]}\string{key1=val1,key2=val2,\ldots\string}]\\
-With the key |bidder|, |compass|, |game|, |legend|, |name| or |other| one
-can set the default font for the respective items. With the key |compline|,
-|compshow|, |compsize| or |compturn| on can set the look of the compass.
-With the key |bidders|
-|bidfirst|, |bidline| or |bidlong| one can fine-tune the bidding diagram.
+\item[setdefaults\Oarg{*}\string{key1=val1,key2=val2,\ldots\string}]\\
+With the keys |bidder|, |compass|, |game|, |legend|, |name| or |other| one
+can set the default font for the respective items. With the keys
+|compline|, |compmid|, |compshow|, |compsize| or |compturn| on can set the
+look of the compass. With the keys |bidders|, |bidfirst|, |bidline| or
+|bidlong| one can fine-tune the bidding diagram. The keys that can be used
+as package options (|colors|, |err| and |warn|) can also be set here.
The star form also calls |\resetfonts| which effectuates any font change
immediately.
\item[SF]: \SF
-\item[sforce\Q{[*!]}]: \sforce, \sforce*, \sforce!, \sforce*!
+\item[sforce\Oarg{*!}]: \sforce, \sforce*, \sforce!, \sforce*!
-\item[showAll\Q{[*+][pos]}]\\
+\item[showAll\Oarg{*+}\Q{[pos]}]\\
Typesets a card diagram with 4 (previously
defined, i.e.\ with |\northhand| etc.) hands. The star version centers the
output. The token |+| adds a bidding table to the diagram, that has to be
@@ -301,27 +286,32 @@ previously defined, i.e.\ with e.g:\\
|\begin{bidding}-|\ldots|\end{bidding}|. The optional parameter |pos|
(default~\textbf{c}) aligns the diagram.
-\item[showEW\Q{[*+][pos]}]\\
-Same as showAll, but for the \East*!- and the \West*!-hand.
-
-\item[showNE\Q{[*+][pos]}]\\
-Same as showAll, but for the \North*!- and the \East*!-hand.
+\DeleteShortVerb{\|}
+\item[showEW\Oarg{*+}\Q{[pos]}(E|W)]\\
+\MakeShortVerb{\|}
+Same as |\showAll|, but for the \East*!- and the \West*!-hand. |\showEW(E)|
+prints only the \East*!-hand
-\item[showNS\Q{[*+][pos]}]\\
-Same as showAll, but for the \North*!- and the \South*!-hand.
+\item[showNE\Oarg{*+}\Q{[pos]}]\\
+Same as |\showAll|, but for the \North*!- and the \East*!-hand.
-\item[showNW\Q{[*+][pos]}]\\
-Same as showAll, but for the \North*!- and the \West*!-hand.
+\DeleteShortVerb{\|}
+\item[showNS\Oarg{*+}\Q{[pos]}(N|S)]\\
+\MakeShortVerb{\|}
+Same as |\showAll|, but for the \North*!- and the \South*!-hand. |\showNS(S)|
+prints only the \South*!-hand
+\item[showNW\Oarg{*+}\Q{[pos]}]\\
+Same as |\showAll|, but for the \North*!- and the \West*!-hand.
\item[south]: \south
-\item[South\Q{[*!]}]: \South, \South*, \South!, \South*!
+\item[South\Oarg{*!}]: \South, \South*, \South!, \South*!
\item[southhand\Q{[v-offset]{Sp}{He}{Di}{Cl}}]\\
Defines the cards for the
\South*!-player. With the optional parameter |v-offset| one can adapt the
(\emph{vertical}) distance between hand and compass (default \textbf{0pt}).
The 4 mandatory parameters define the cards for the 4 suits. To denote the
-rank \suit{T}, one has to use uppercase letter |T|.
+rank \suit{T}, one has to use the uppercase letter |T|.
\item[Sp]: \Sp
@@ -332,10 +322,10 @@ of the cards. The mandatory parameter defines the cards for the suit. To
denote the rank \suit{T}, one has to use the letter |T|.
\item[TP]: \TP
-\item[tpts\Q{[*!]}]: \tpts, \tpts*, \tpts!, \tpts*!
+\item[tpts\Oarg{*!}]: \tpts, \tpts*, \tpts!, \tpts*!
\item[TSF]: \TSF
-\item[tsforce\Q{[*!]}]: \tsforce, \tsforce*, \tsforce!, \tsforce*!
+\item[tsforce\Oarg{*!}]: \tsforce, \tsforce*, \tsforce!, \tsforce*!
\item[vulner\Q{[text]}]\\
Typeset the user-defined vulnerability. With the optional parameter one can
@@ -347,16 +337,16 @@ Typeset the defined value for the |\vulner|, e.g.\
define the |text| to be printed \emph{as is}.
\item[west]: \west
-\item[West\Q{[*!]}]: \West, \West*, \West!, \West*!
+\item[West\Oarg{*!}]: \West, \West*, \West!, \West*!
\item[westhand\Q{[h-offset]{Sp}{He}{Di}{Cl}}]\\
Defines the cards for the
\West*!-player. With the optional parameter |h-offset| one can adapt the
(\emph{horizontal}) distance between hand and compass (default
\textbf{0pt}). The 4 mandatory parameters define the cards for the 4 suits.
-To denote the rank \suit{T}, one has to use uppercase letter |T|.
+To denote the rank \suit{T}, one has to use the uppercase letter |T|.
-\olditem[\string\begin\string{bidding\string}\Q{[*!-][pos](description)}\ldots\string\end\string{bidding\string}]~\\
+\olditem[\string\begin\string{bidding\string}\Oarg{*!-}\Q{[pos](description)}\ldots\string\end\string{bidding\string}]~\\
Typesets a bidding diagram. The star version centers the output. The
token~|!| forces a short form (\North*!) rather than the long form
(\North*) in the table header. The token~|-| suppresses all output, but the
@@ -372,10 +362,10 @@ The command |\setdefaults| has some keys to fine tune the
look of the bidding diagram. If the real world names of the players are
defined (e.g.\ with |\namesNS|, then they also appear in the table header.
-\olditem[\string\begin\string{biddingpair\string}\Q{[*!-][pos](description)}\ldots\string\end\string{biddingpair\string}]~\\
+\olditem[\string\begin\string{biddingpair\string}\Oarg{*!-}\Q{[pos](description)}\ldots\string\end\string{biddingpair\string}]~\\
Same as environment |bidding| but with only 2 columns.
-\olditem[\string\begin\string{play\string}\Q{[*]{lead}[trump]}\ldots\string\end\string{play\string}]~\\
+\olditem[\string\begin\string{play\string}\Oarg{*}\Q{{lead}[trump]}\ldots\string\end\string{play\string}]~\\
Typesets a diagram with the playing tricks. The star version centers the
output. The mandatory parameter defines the player who had the opening
lead. The optional parameter defines the trump suit, the default is \NT.
diff --git a/Master/texmf-dist/doc/latex/onedown/onedown.pdf b/Master/texmf-dist/doc/latex/onedown/onedown.pdf
index 4ae64f6fc5e..deef40a103f 100644
--- a/Master/texmf-dist/doc/latex/onedown/onedown.pdf
+++ b/Master/texmf-dist/doc/latex/onedown/onedown.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/onedown/onedown.dtx b/Master/texmf-dist/source/latex/onedown/onedown.dtx
index d1c53a674cc..bd640cec8c2 100644
--- a/Master/texmf-dist/source/latex/onedown/onedown.dtx
+++ b/Master/texmf-dist/source/latex/onedown/onedown.dtx
@@ -24,7 +24,7 @@
\ProvidesFile{onedown.dtx}
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}[2014/05/01]
-%<package>\def\ODwstyleversion{1.1}\def\ODwstyledate{2018/09/23}
+%<package>\def\ODwstyleversion{1.2}\def\ODwstyledate{2018/10/31}
%<package>\ProvidesPackage{onedown}
%<package> [\ODwstyledate\space v\ODwstyleversion\space
%<package> Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2018]
@@ -37,7 +37,7 @@
%
\usepackage[T1]{fontenc}
\usepackage[german,dutch,french,swedish,english,shorthands=]{babel}
-\usepackage{onedown}[2018/09/23]
+\usepackage{onedown}[2018/10/31]
\usepackage[normalem]{ulem}% for strikeout todos that are done
\usepackage{needspace}% keep contiguous lines on one page
\usepackage[inline]{enumitem}% Control various parameters of lists
@@ -62,20 +62,23 @@
\AtBeginDocument{%
\ifNoColor
- \setdefaults{colors=1}
+ \setdefaults{colors=b+w}
\hypersetup{linkcolor=black,urlcolor=black}
\def\ODwcolor{black}
\definecolor{defbackgr}{rgb}{1,1,1}
+ \definecolor{optbackgr}{named}{lightgray}
\else
\def\ODwcolor{red}
\definecolor{defbackgr}{rgb}{1,1,0.75}
+ \definecolor{optbackgr}{named}{lime}
\fi
}%
%
\newlength\defwidth
%
% We need to typeset optional args without \meta too!
-\newcommand\Oarg[1]{{\ttfamily[}#1{\ttfamily]}}
+%\newcommand\Oarg[1]{{\ttfamily[}#1{\ttfamily]}}
+\newcommand\Oarg[1]{\colorbox{optbackgr}{\textbf{#1}}}
%
\NewDocumentCommand\MacroDef{st+mO{}}{%
% \MacroDef* + {macroname}[args]
@@ -206,8 +209,8 @@
%</driver>
% \fi
%
-% ^^A \CheckSum{3693}
-% \CheckSum{3693}
+% ^^A \CheckSum{3733}
+% \CheckSum{3723}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -235,82 +238,126 @@
%
% ^^A We are onedown now with new versioning!
%
-% \changes{v0.1}{2018/01/28}{Reorganized the bzr versioning. bzr will
-% contain only onedown, the former bidnplay stuff is archived. The ToDo and
-% Known-Bugs lists are cleaned. We are version 0.1 now, trying to keep the
-% bzr version number equal to the changes minor number.}
-%
-% \changes{v0.2}{2018/02/12}{We finally have a List of User Commands. In
-% the compass we can print vulner in red and mark the dealer. We have a
-% hook \cmd{\CompassMid} to write something in the middle of the compass.
-% Added several macros to auto-translate common stuff like 'lead'. Added
-% the danish language. Corrected a bug in \cmd{\dealer} and \cmd{\vulner}.
-% Removed pgf-key 'lang': we now load the needed languages on the fly.
-% Finally we revised the documentation.}
-%
-% \changes{v0.4}{2018/03/09}{Major change in playtricks: the winner is now
-% determined by the cards played, and code is added to check consistency.
-% Dirty coded macros like \cmd{\ODw@symbol} and \cmd{\ODw@(@)Card(s)} are
-% displaced by neat expl3 code. We load necesary dictionaries automatically
-% on the fly and enhanced the colors options. Corrected some minor bugs and
-% reorganized the documentation. One can now generate the documentation
-% without the list of user commands}
-%
-% \changes{v0.5}{2018/03/14}{Associated the names and bidders in a fixed
-% way. Added checks to onesuitNS/EW. Made ODw@OtherFont local where
-% necessary. Redefine columntypes. Made 'T' a code for '10'. Adapted the
-% translate macro to enable both 1H and 1\cmd{\He} etc. Enhanced the
-% documentation.}
-%
-% \changes{v0.6}{2018/03/14}{Made all internal names hidden by adding
-% 'ODw@' to it. Changed \cmd{\ODw@AccTricksN} in \cmd{\ODw@AccTricks}. Some
-% minor adaptions of the documentation}
-%
-% \changes{v0.7}{2018/03/20}{Final edits of the documentation: Consequent
-% use of 'card diagram', 'bidding' diagram and 'play diagram'. Corrected
-% some minor bugs. Changed the name of the 'playtricks' environment into
-% 'play'. Can disable all colors in the manual for monochrome printing.
-% Changed signature of \cmd{\expertquiz} and \cmd{\boardtext}.}
-%
-% \changes{v0.7a}{2018/03/24}{Major change: Removed all \cmd{\bidXX} an
-% \cmd{\bidXXpair} commands. The biddings can now be shown with the
-% \cmd{\showXX+} (with token '+'). The macros \cmd{\hand-} and the bidding
-% environments suppress their output with token '-'}
-%
-% \changes{v0.8}{2018/04/11}{Added package \packname{verbatimbox} to adjust
-% verbatim font easily. Added \cmd{\setdefaults} with keys for fonts,
-% compass and bidding diagram. Made \cmd{\FirstBidCol} internally hidden.
-% Removed \cmd{longcalls}, \cmd{\CompassMid}, added \cmd{compassfont}.
-% Changed the order of the hands in \cmd{\onesuitAll}. Renewed the
-% implementation of the compass and add extra features.}
-%
-% \changes{v0.9}{2018/04/15}{Adapted \cmd{\ODwset} and \cmd{\setdefaults}.
-% Separated key \emph{messages} into keys \emph{warn} and \emph{err}.
-% Adapted \cmd{\ODw@Compass}. Removed legends from \cmd{\showNS}. Added
-% \cmd{\sbox1} to all \cmd{\showXX} macros with a N-hand. Changed
-% ODw@[No]Warnings and ODw@[No]Errors. Corrected some minor bugs and
-% adapted the documentation accordingly.}
-%
-% \changes{v1.0}{2018/05/23}{Adapted the urls, the directories and some
-% filenames to conform to the CTAN-standard and made the bundle ready for
-% upload. Corrected a small bug in \cmd{\ODw@Compass} that was introduced
-% in v0.9. Made all relevant text writing macros in 4 versions with/without
-% tokens * and ^^21. Corrected a sizing/font bug. Added 4 variants of many
-% text macros, onesuit-NE/NW/. Adapted \cmd{\handskip}. Added code to work
-% around a \packname{babel}-\packname{translations} inconsistency w.r.t.
-% norsk/norwegian.}
-%
-% \changes{v1.1}{2018/09/22}{%
-% - Corrected onedown-ref.tex
-% Added the missing rows in lines 419-422.
-% and the explanational text on line 457.
-% - Changed in all ODw+.trsl files:
-% Translation of 'pass!' into 'p' and 'Pass!' into 'P'.
-% - Corrected some typos in ShowAll.tex:
-% \cmd{\contract*} into \cmd{\contract},
-% \cmd{\declarer*} into \cmd{\declarer} and
-% \cmd{\lead*} into \cmd{\lead}.
-% - Removed some illegal chars from changes entries }
+% \changes{v0.1}{2018/01/28}{\\
+% - Reorganized the bzr versioning. bzr will contain only onedown, the
+% former bidnplay stuff is archived. The ToDo and Known-Bugs lists are
+% cleaned. \\
+% - We are version 0.1 now, trying to keep the bzr version number equal to
+% the changes minor number.}
+%
+% \changes{v0.2}{2018/02/12}{\\
+% - We finally have a List of User Commands. \\
+% - In the compass we can print vulner in red and mark the dealer. We have
+% a hook \cmd{\CompassMid} to write something in the middle of the
+% compass.\\
+% - Added several macros to auto-translate common stuff like 'lead' etc.\\
+% - Added the danish language. \\
+% - Corrected a bug in \cmd{\dealer} and \cmd{\vulner}.\\
+% - Removed pgf-key 'lang': we now load the needed languages on the fly.\\
+% - Finally we revised the documentation.}
+%
+% \changes{v0.4}{2018/03/09}{\\
+% - Major change in playtricks: the winner is now determined by the cards
+% played, and code is added to check consistency.\\
+% - Dirty coded macros like \cmd{\ODw@symbol} and \cmd{\ODw@(@)Card(s)} are
+% replaced by neat expl3 code.\\
+% - We load necesary dictionaries automatically on the fly and enhanced the
+% colors options.\\
+% - Corrected some minor bugs and reorganized the documentation. \\
+% - One can now also generate the documentation without the list of user
+% commands}
+%
+% \changes{v0.5}{2018/03/14}{\\
+% - Associated the names and bidders in a fixed way.\\
+% - Added checks to onesuitNS/EW.\\
+% - Made ODw@OtherFont local where necessary.\\
+% - Redefined columntypes.\\
+% - Made 'T' a code for '10'.\\
+% - Adapted the translate macro to enable both 1H and 1\cmd{\He} etc. \\
+% - Enhanced the documentation.}
+%
+% \changes{v0.6}{2018/03/14}{\\
+% - Made all internal names hidden by adding 'ODw@' to it.\\
+% - Changed \cmd{\ODw@AccTricksN} in \cmd{\ODw@AccTricks}.\\
+% - Some minor adaptions of the documentation}
+%
+% \changes{v0.7}{2018/03/20}{\\
+% - Final(?) edits of the documentation: Consequent use of 'card diagram',
+% 'bidding' diagram and 'play diagram'. \\
+% - Corrected some minor bugs. \\
+% - Changed the name of the 'playtricks' environment into 'play'.\\
+% - Can now disable all colors in the manual for monochrome printing.\\
+% - Changed signature of \cmd{\expertquiz} and \cmd{\boardtext}.}
+%
+% \changes{v0.7a}{2018/03/24}{\\
+% - Major change: Removed all \cmd{\bidXX} and \cmd{\bidXXpair} commands.\\
+% - The biddings can now be shown with \cmd{\showXX+} (with token '+').\\
+% - The macros \cmd{\hand-} and the bidding environments suppress their
+% output with token '-'}
+%
+% \changes{v0.8}{2018/04/11}{\\
+% - Added package \packname{verbatimbox} to adjust verbatim font easily.\\
+% - Added \cmd{\setdefaults} with keys for fonts, compass and bidding
+% diagrams.\\
+% - Made \cmd{\FirstBidCol} internally hidden.\\
+% - Removed \cmd{\longcalls}, \cmd{\CompassMid}, added \cmd{\compassfont}.\\
+% - Changed the order of the hands in \cmd{\onesuitAll}.\\
+% - Renewed the implementation of the compass and added extra features.}
+%
+% \changes{v0.9}{2018/04/15}{\\
+% - Adapted \cmd{\ODwset} and \cmd{\setdefaults}.\\
+% - Separated key \emph{messages} into keys \emph{warn} and \emph{err}.\\
+% - Adapted \cmd{\ODw@Compass}. \\
+% - Removed legends from \cmd{\showNS}.\\
+% - Added \cmd{\sbox1} to all \cmd{\showXX} macros with a N-hand.\\
+% - Changed ODw@[No]Warnings and ODw@[No]Errors.\\
+% - Corrected some minor bugs and adapted the documentation accordingly.}
+%
+% \changes{v1.0}{2018/05/23}{\\
+% - Adapted the urls, the directories and some filenames to conform to the
+% CTAN-standard and made the bundle ready for upload. \\
+% - Corrected a small bug in \cmd{\ODw@Compass} that was introduced in
+% v0.9.\\
+% - Made all relevant text-writing macros in 4 versions with/without tokens
+% '*' and '^^21'.\\
+% - Corrected a sizing/font bug.\\
+% - Added 4 variants of many other text-writing macros, onesuit-NE/NW/.\\
+% - Adapted \cmd{\handskip}. \\
+% - Added code to work-around a \packname{babel}-\packname{translations}
+% inconsistency w.r.t. norsk/norwegian.}
+%
+% \changes{v1.1}{2018/09/22}{\\
+% - Corrected onedown-ref.tex\\
+% . Added the missing rows in lines 419-422.\\
+% . and the explanational text on line 457.\\
+% - Changed in all ODw*.trsl files: The translation of 'pass!' into 'p' and
+% 'Pass!' into 'P'.\\
+% - Corrected some typos in ShowAll.tex:\\
+% . \cmd{\contract*} into \cmd{\contract},\\
+% . \cmd{\declarer*} into \cmd{\declarer} and\\
+% . \cmd{\lead*} into \cmd{\lead}.\\
+% - Removed some illegal chars from changes entries.}
+% \changes{v1.2a}{2018/10/10}{\\
+% - Enhanced the documention (both onedown.dtx and onedown-ref.tex: The
+% command tokens are no longer shown as '[*^^21]', but as '*^^21' with a
+% different background color.\\
+% - Added a thinspace ('\cmd{\,}') before all points counts (HCP, LP, DP
+% and TP)\\
+% - Improved \cmd{\alert} by using \cmd{\textasteriskcentered} rather than
+% just a '*'\\
+% - The changes history has a better layout now \\
+% - \cmd{\showNS} and \cmd{\showEW} now can selectively display only the N-
+% or S-hand, resp the E- or W-hand.}
+% \changes{v1.2b}{2018/10/31}{\\
+% - Corrected a bug: Added \cmd{\ODw@monochromefalse} in all
+% initializations of multi colors in \cmd{\ODw@set}\\
+% - Made all relevant setdefaults settings (like bidfirst) non-global\\
+% - Made all \cmd{\ODw@BidderX} and \cmd{\ODw@NameX} non-global\\
+% - Removed '\cmd{\global}' from \cmd{\ODw@CompShow} (false and true),
+% \cmd{\ODw@CompTurn}, \cmd{\ODw@Bidders}, \cmd{\ODw@BidLine} and
+% \cmd{\ODw@LongCalls}\\
+% - In command \cmd{\suit} changed 'JW \cmd{\ODw@GameSize}' into
+% '\cmd{\ODw@GameSize}'}
%
% ^^A Note: ^^21 denotes the exclamation mark (!)
%
@@ -734,8 +781,10 @@ pdflatex --shell-escape onedown.dtx
% giving us \textcolor{black}{black} and \textcolor{red}{red}. Furthermore,
% when we descibe macros, we use a colored frame that also shows the output
% of the commend. Some commands have optional tokens that produce an output
-% that differs from the naked version. The output of tokenized calls in the
-% command overview is shown in parenthesis.
+% that differs from the naked version. These optional tokens appear in a
+% different background color like \Oarg{*!}. If an output of a macro is
+% shown, then the output of tokenized calls is shown in parenthesis to
+% demonstrate the difference.
%
% \subsubsection{The Compass}
%
@@ -960,9 +1009,11 @@ pdflatex --shell-escape onedown.dtx
% \noindent
% \DescribeMacro{\showAll}\MacroDef+{showAll}[\Oarg{*+}\oarg{pos}]
% \par\noindent
-% \DescribeMacro{\showNS}\MacroDef+{showNS}[\Oarg{*+}\oarg{pos}]
+% \DeleteShortVerb{\|}
+% \DescribeMacro{\showNS}\MacroDef+{showNS}[\Oarg{*+}\oarg{pos}\parg{N|S}]
% \par\noindent
-% \DescribeMacro{\showEW}\MacroDef+{showEW}[\Oarg{*+}\oarg{pos}]
+% \DescribeMacro{\showEW}\MacroDef+{showEW}[\Oarg{*+}\oarg{pos}\parg{E|W}]
+% \MakeShortVerb{\|}
% \par\noindent
% \DescribeMacro{\showNE}\MacroDef+{showNE}[\Oarg{*+}\oarg{pos}]
% \par\noindent
@@ -987,6 +1038,10 @@ pdflatex --shell-escape onedown.dtx
% The other commands are similar to |\showAll| but typeset only the hands
% of the players that are represented in the name of the command:
% \NorthSouth*!, \EastWest*!, \North*!--\East*! and \North*!--\West*!.
+%
+% The commands |\showNS| and |\showEW| have an extra optional argument with
+% which selectively only one of the two hands can be displayed. E.g.\
+% |\showNS(S)| will display only the \South*-hand.
% \needspace{6\baselineskip}\noindent
%
% \subsubsection{Showing Card Diagrams with Bidding}\label{PlayCommands}
@@ -2117,12 +2172,8 @@ pdflatex --shell-escape onedown.dtx
% define the suits with a |renewrobustcommand|. So we must |\def| them
% first.
%
-% \changes{v0.6a}{2018/03/15}{In order to test which suit (\cmd{\Cl},\ldots)
-% was encountered in \cmd{\ODw@translate} (see page \pageref{Translate}) we
-% \emph{must} define the suits as a \emph{renewrobustcommand}. So we
-% \cmd{\def}ine them first! The idea was given on LaTeX StackExchange by
-% egreg, see
-% \url{https://tex.stackexchange.com/questions/420257/test-which-macro-is-called-in-tabular/420258#420258}
+% \changes{v0.6a}{2018/03/15}{\\
+% - In order to test which suit (\cmd{\Cl},\ldots) was encountered in \cmd{\ODw@translate} (see page \pageref{Translate}) we \emph{must} define the suits as a \emph{renewrobustcommand}. So we \cmd{\def}ine them first! The idea was given on LaTeX StackExchange by egreg, see \url{https://tex.stackexchange.com/questions/420257/test-which-macro-is-called-in-tabular/420258#420258}
% }
%
% \begin{macrocode}
@@ -2159,6 +2210,7 @@ pdflatex --shell-escape onedown.dtx
%
\ODw@set{%
colors/2/.code={%
+ \ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{black}%
{\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
\renewrobustcmd\Di{\textcolor{red}%
@@ -2173,6 +2225,7 @@ pdflatex --shell-escape onedown.dtx
%
\ODw@set{%
colors/4A/.code={%
+ \ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{green}%
{\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
\renewrobustcmd\Di{\textcolor{orange}%
@@ -2188,6 +2241,7 @@ pdflatex --shell-escape onedown.dtx
%
\ODw@set{%
colors/4B/.code={%
+ \ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{black}%
{\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
\renewrobustcmd\Di{\textcolor{orange}%
@@ -2202,11 +2256,6 @@ pdflatex --shell-escape onedown.dtx
\ODw@set{colors/4b/.code={\pgfkeys{/ODw/colors=4B}}}
% \end{macrocode}
%
-% Set default coloring to black and red
-% \begin{macrocode}
-\ODw@set{colors=2}
-% \end{macrocode}
-%
% \begin{macro}{\nt}
% \begin{macro}{\NT}
% Because some languages use a different symbol for \NT{} (\nt*) we must
@@ -2812,44 +2861,44 @@ pdflatex --shell-escape onedown.dtx
\newcommand\ODw@FirstBidCol[1]{%
\IfEqCase{#1}{%
{N}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@NameI{\ODw@North@Name}%
- \gdef\ODw@NameII{\ODw@East@Name}%
- \gdef\ODw@NameIII{\ODw@South@Name}%
- \gdef\ODw@NameIV{\ODw@West@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@NameI{\ODw@North@Name}%
+ \def\ODw@NameII{\ODw@East@Name}%
+ \def\ODw@NameIII{\ODw@South@Name}%
+ \def\ODw@NameIV{\ODw@West@Name}%
}%
{E}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@NameI{\ODw@East@Name}%
- \gdef\ODw@NameII{\ODw@South@Name}%
- \gdef\ODw@NameIII{\ODw@West@Name}%
- \gdef\ODw@NameIV{\ODw@North@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@NameI{\ODw@East@Name}%
+ \def\ODw@NameII{\ODw@South@Name}%
+ \def\ODw@NameIII{\ODw@West@Name}%
+ \def\ODw@NameIV{\ODw@North@Name}%
}%
{S}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@NameI{\ODw@South@Name}%
- \gdef\ODw@NameII{\ODw@West@Name}%
- \gdef\ODw@NameIII{\ODw@North@Name}%
- \gdef\ODw@NameIV{\ODw@East@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@NameI{\ODw@South@Name}%
+ \def\ODw@NameII{\ODw@West@Name}%
+ \def\ODw@NameIII{\ODw@North@Name}%
+ \def\ODw@NameIV{\ODw@East@Name}%
}%
{W}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@NameI{\ODw@West@Name}%
- \gdef\ODw@NameII{\ODw@North@Name}%
- \gdef\ODw@NameIII{\ODw@East@Name}%
- \gdef\ODw@NameIV{\ODw@South@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@NameI{\ODw@West@Name}%
+ \def\ODw@NameII{\ODw@North@Name}%
+ \def\ODw@NameIII{\ODw@East@Name}%
+ \def\ODw@NameIV{\ODw@South@Name}%
}%
}% IfEqCase
}% ODw@FirstBidCol
@@ -3273,7 +3322,8 @@ pdflatex --shell-escape onedown.dtx
\ODw@ChkNrOfCards{#2}{suit}%
\ODw@ChkSameCards{#2}{#1}%
\bgroup% keep font change local
-%JW \ODw@GameSize%
+%JW
+ \ODw@GameSize%
#1\ODw@Cards{#2}%
\egroup%
\xspace%
@@ -3391,18 +3441,21 @@ pdflatex --shell-escape onedown.dtx
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\showNS}\MacroDef{showNS}[\Oarg{*+}\oarg{pos}]
+% \DeleteShortVerb{\|}
+% \begin{macro}{\showNS}\MacroDef{showNS}[\Oarg{*+}\oarg{pos}\parg{N|S}]
+% \MakeShortVerb{\|}
% Define the diagram, showing the cards for the \NorthSouth*! hands.
%
% \begin{macrocode}
-\NewDocumentCommand\showNS{s t+ O{c}}{%
+\NewDocumentCommand\showNS{s t+ O{c} d()}{%
% \end{macrocode}
-% |showNS* +[pos]|\\
-% | 1 2 3|\\
+% |showNS* +[pos] (N/S)|\\
+% | 1 2 3 4|\\
% |Display the NS diagram, defined by \northhand, etc|\\
% |* Version: Display the diagram centered|\\
% |+ Version: Also display a bidding diagram|\\
% |pos: aligning, default c|\\
+% |N/S: only N-hand (or S-hand) is to be displayed|\\
% \par\noindent
% Description: similar to |\showAll|
% \begin{macrocode}
@@ -3429,17 +3482,21 @@ pdflatex --shell-escape onedown.dtx
\sbox1{\ODw@Compass}%
\sbox0{%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
- & \ODw@Nhand & \\
+% Display the N-hand only with token 'N', or no token at all
+ & \IfNoValueTF{#4}{\ODw@Nhand}{\ifthenelse{\equal{#4}{N}}{\ODw@Nhand}{}} & \\
& \usebox{1} & \\
- & \ODw@Shand & \\
+% Display the S-hand only with token 'S', or no token at all
+ & \IfNoValueTF{#4}{\ODw@Shand}{\ifthenelse{\equal{#4}{S}}{\ODw@Shand}{}} & \\
\end{tabular}%
}% sbox0
\ODw@gsetlength\ODw@Diagram@Width{\wd0}%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
\ODw@ProcessHeader{3}% span 3 columns
- & \ODw@Nhand & \\
+% Display the N-hand only with token 'N', or no token at all
+ & \IfNoValueTF{#4}{\ODw@Nhand}{\ifthenelse{\equal{#4}{N}}{\ODw@Nhand}{}} & \\
& \usebox{1} & \\
- & \ODw@Shand & \\
+% Display the S-hand only with token 'S', or no token at all
+ & \IfNoValueTF{#4}{\ODw@Shand}{\ifthenelse{\equal{#4}{S}}{\ODw@Shand}{}} & \\
\ODw@ProcessFooter{3}% span 3 columns
\end{tabular}%
\IfBooleanTF#2{%
@@ -3454,17 +3511,20 @@ pdflatex --shell-escape onedown.dtx
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\showEW}\MacroDef{showEW}[\Oarg{*+}\oarg{pos}]
+% \DeleteShortVerb{\|}
+% \begin{macro}{\showEW}\MacroDef{showEW}[\Oarg{*+}\oarg{pos}\parg{E|W}]
+% \MakeShortVerb{\|}
% Define the diagram, showing the cards for the \EastWest*! hands.
% \begin{macrocode}
-\NewDocumentCommand\showEW{s t+ O{c}}{%
+\NewDocumentCommand\showEW{s t+ O{c} d()}{%
% \end{macrocode}
-% |showEW* + [pos]|\\
-% | 1 2 3|\\
+% |showEW* + [pos] (E/W)|\\
+% | 1 2 3 4|\\
% |Display the EW diagram, defined by \easthand, etc|\\
% |* Version: Display the diagram centered|\\
% |+ Version: Also display a bidding diagram|\\
% |pos: aligning, default c|\\
+% |E/W: only E-hand (or W-hand) is to be displayed|\\
% \par\noindent
% Description: similar to |\showAll|
% \begin{macrocode}
@@ -3485,14 +3545,22 @@ pdflatex --shell-escape onedown.dtx
\ODw@TestIfEmpty{\ODw@FooterText}{ODw@EmptyFooter}%
\sbox0{%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
- \ODw@Whand & \ODw@Compass & \ODw@Ehand \\
+% Display the W-hand only with token 'W', or no token at all
+ \IfNoValueTF{#4}{\ODw@Whand}{\ifthenelse{\equal{#4}{W}}{\ODw@Whand}{}}
+ & \ODw@Compass &
+% Display the E-hand only with token 'E', or no token at all
+ \IfNoValueTF{#4}{\ODw@Ehand}{\ifthenelse{\equal{#4}{E}}{\ODw@Ehand}{}} \\
\end{tabular}%
}% sbox
\ODw@gsetlength{\ODw@Diagram@Width}{\wd0}%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
\ODw@ProcessHeader{3}% span 3 columns
- & & \\
- \ODw@Whand & \ODw@Compass & \ODw@Ehand \\
+ & & \\
+% Display the W-hand only with token 'W', or no token at all
+ \IfNoValueTF{#4}{\ODw@Whand}{\ifthenelse{\equal{#4}{W}}{\ODw@Whand}{}}
+ & \ODw@Compass &
+% Display the E-hand only with token 'E', or no token at all
+ \IfNoValueTF{#4}{\ODw@Ehand}{\ifthenelse{\equal{#4}{E}}{\ODw@Ehand}{}} \\
\ODw@ProcessFooter{3}% span 3 columns
\end{tabular}%
\IfBooleanTF#2{%
@@ -4230,7 +4298,7 @@ pdflatex --shell-escape onedown.dtx
%
% \begin{macro}{\alert}
% \begin{macrocode}
-\newcommand{\alert}{{}\ensuremath{^\textbf{*}}}
+\newcommand{\alert}{{}\ensuremath{^\textbf{\textasteriskcentered}}}
% \end{macrocode}
% \end{macro}
%
@@ -4665,12 +4733,13 @@ pdflatex --shell-escape onedown.dtx
%
% \begin{environment}{play}\EnvDef{play}[*\marg{Lead}\oarg{Trump}]
% \label{Play}
-% \changes{v0.3}{2018/02/24}{In order to avoid empty columns in environment
-% \texttt{playtricks} we reorganized it. Rather than just 1 table we use 3
-% tables. The middle one typesets the relevant tricks, stored in an
-% \texttt{lrbox}, while generating on the fly a string with the winning
-% tricks. Finally we put the running trick-number in TableI, we 'use'
-% TableII and contruct TableIII from the string with the winning tricks.}
+% \changes{v0.3}{2018/02/24}{\\
+% - In order to avoid empty columns in environment \texttt{playtricks} we
+% reorganized it. Rather than just 1 table we use 3 tables. The middle one
+% typesets the relevant tricks, stored in an \texttt{lrbox}, while
+% generating on the fly a string with the winning tricks. Finally we put
+% the running trick-number in TableI, we 'use' TableII and contruct
+% TableIII from the string with the winning tricks.}
%
% Finally we define environment |play|. It consists primarily of
% these 3 tables, the middle one with the special newcolumntype
@@ -4890,26 +4959,26 @@ pdflatex --shell-escape onedown.dtx
}
% compass
\ODw@set{compshow/.is choice}
- \ODw@set{compshow/off/.code={\global\ODw@CompShowfalse}}
- \ODw@set{compshow/on/.code={\global\ODw@CompShowtrue}}
+ \ODw@set{compshow/off/.code={\ODw@CompShowfalse}}
+ \ODw@set{compshow/on/.code={\ODw@CompShowtrue}}
\ODw@set{compturn/.is choice}
- \ODw@set{compturn/off/.code={\global\ODw@CompTurnfalse}}
- \ODw@set{compturn/on/.code={\global\ODw@CompTurntrue}}
+ \ODw@set{compturn/off/.code={\ODw@CompTurnfalse}}
+ \ODw@set{compturn/on/.code={\ODw@CompTurntrue}}
% bídding
\ODw@set{bidders/.is choice}
- \ODw@set{bidders/off/.code={\global\ODw@Biddersfalse}}
- \ODw@set{bidders/on/.code={\global\ODw@Bidderstrue}}
+ \ODw@set{bidders/off/.code={\ODw@Biddersfalse}}
+ \ODw@set{bidders/on/.code={\ODw@Bidderstrue}}
\ODw@set{bidfirst/.is choice}
\ODw@set{bidfirst/N/.code=\ODw@FirstBidCol{N}}
\ODw@set{bidfirst/E/.code=\ODw@FirstBidCol{E}}
\ODw@set{bidfirst/S/.code=\ODw@FirstBidCol{S}}
\ODw@set{bidfirst/W/.code=\ODw@FirstBidCol{W}}
\ODw@set{bidline/.is choice}
- \ODw@set{bidline/off/.code={\global\ODw@BidLinefalse}}
- \ODw@set{bidline/on/.code={\global\ODw@BidLinetrue}}
+ \ODw@set{bidline/off/.code={\ODw@BidLinefalse}}
+ \ODw@set{bidline/on/.code={\ODw@BidLinetrue}}
\ODw@set{bidlong/.is choice}
- \ODw@set{bidlong/off/.code={\global\ODw@LongCallsfalse}}
- \ODw@set{bidlong/on/.code={\global\ODw@LongCallstrue}}
+ \ODw@set{bidlong/off/.code={\ODw@LongCallsfalse}}
+ \ODw@set{bidlong/on/.code={\ODw@LongCallstrue}}
% synonyms
\ODw@set{compshow/1/.code={\pgfkeys{/ODw/compshow=on}}}
\ODw@set{compshow/true/.code={\pgfkeys{/ODw/compshow=on}}}
@@ -4964,6 +5033,10 @@ pdflatex --shell-escape onedown.dtx
% bidder appears in the first column, draw a |\hline| below the header and
% showing long calls.
%
+% Furthermore defined elsewhere are the keys to control errors |err| and
+% warnings |warn|, as well as the key to control the color e.g. of the
+% symbols |colors|. Refer to section~\ref{Options}
+%
% \begin{macrocode}
\NewDocumentCommand\setdefaults{s m}{%
\pgfkeys{/ODw,#2}%
@@ -5505,7 +5578,7 @@ pdflatex --shell-escape onedown.dtx
\xspace%
}% High Card Points
%
-\def\HCP{\hpts*!}
+\def\HCP{\,\hpts*!}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -5529,7 +5602,7 @@ pdflatex --shell-escape onedown.dtx
\xspace%
}% Length Points
%
-\def\LP{\lpts*!}
+\def\LP{\,\lpts*!}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -5553,7 +5626,7 @@ pdflatex --shell-escape onedown.dtx
\xspace%
}% Distribution Points
%
-\def\DP{\dpts*!}
+\def\DP{\,\dpts*!}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -5577,7 +5650,7 @@ pdflatex --shell-escape onedown.dtx
\xspace%
}% Total Points
%
-\def\TP{\tpts*!}
+\def\TP{\,\tpts*!}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -5722,6 +5795,12 @@ pdflatex --shell-escape onedown.dtx
\setdefaults{name=\mdseries\slshape}
\setdefaults*{other=\bfseries\sffamily}
% \end{macrocode}
+%
+% Set default coloring to black and red
+% \begin{macrocode}
+\setdefaults{colors=b+r}
+% \end{macrocode}
+%
% Set the compass
% \begin{macrocode}
\setdefaults{compshow=on,compturn=off}
diff --git a/Master/texmf-dist/tex/latex/onedown/onedown.sty b/Master/texmf-dist/tex/latex/onedown/onedown.sty
index 258aba07424..ced883f1e67 100644
--- a/Master/texmf-dist/tex/latex/onedown/onedown.sty
+++ b/Master/texmf-dist/tex/latex/onedown/onedown.sty
@@ -21,7 +21,7 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2014/05/01]
-\def\ODwstyleversion{1.1}\def\ODwstyledate{2018/09/23}
+\def\ODwstyleversion{1.2}\def\ODwstyledate{2018/10/31}
\ProvidesPackage{onedown}
[\ODwstyledate\space v\ODwstyleversion\space
Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2018]
@@ -172,6 +172,7 @@
\ODw@set{colors/b+w/.code={\pgfkeys{/ODw/colors=1}}}
\ODw@set{%
colors/2/.code={%
+ \ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{black}%
{\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
\renewrobustcmd\Di{\textcolor{red}%
@@ -185,6 +186,7 @@
\ODw@set{colors/b+r/.code={\pgfkeys{/ODw/colors=2}}}
\ODw@set{%
colors/4A/.code={%
+ \ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{green}%
{\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
\renewrobustcmd\Di{\textcolor{orange}%
@@ -199,6 +201,7 @@
\ODw@set{colors/4a/.code={\pgfkeys{/ODw/colors=4A}}}
\ODw@set{%
colors/4B/.code={%
+ \ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{black}%
{\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
\renewrobustcmd\Di{\textcolor{orange}%
@@ -211,7 +214,6 @@
}
\ODw@set{colors/fourB/.code={\pgfkeys{/ODw/colors=4B}}}
\ODw@set{colors/4b/.code={\pgfkeys{/ODw/colors=4B}}}
-\ODw@set{colors=2}
\NewDocumentCommand\nt{s t!}{%
\bgroup%
\ODw@OtherFont%
@@ -552,44 +554,44 @@
\newcommand\ODw@FirstBidCol[1]{%
\IfEqCase{#1}{%
{N}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@NameI{\ODw@North@Name}%
- \gdef\ODw@NameII{\ODw@East@Name}%
- \gdef\ODw@NameIII{\ODw@South@Name}%
- \gdef\ODw@NameIV{\ODw@West@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@NameI{\ODw@North@Name}%
+ \def\ODw@NameII{\ODw@East@Name}%
+ \def\ODw@NameIII{\ODw@South@Name}%
+ \def\ODw@NameIV{\ODw@West@Name}%
}%
{E}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@NameI{\ODw@East@Name}%
- \gdef\ODw@NameII{\ODw@South@Name}%
- \gdef\ODw@NameIII{\ODw@West@Name}%
- \gdef\ODw@NameIV{\ODw@North@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@NameI{\ODw@East@Name}%
+ \def\ODw@NameII{\ODw@South@Name}%
+ \def\ODw@NameIII{\ODw@West@Name}%
+ \def\ODw@NameIV{\ODw@North@Name}%
}%
{S}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@NameI{\ODw@South@Name}%
- \gdef\ODw@NameII{\ODw@West@Name}%
- \gdef\ODw@NameIII{\ODw@North@Name}%
- \gdef\ODw@NameIV{\ODw@East@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@NameI{\ODw@South@Name}%
+ \def\ODw@NameII{\ODw@West@Name}%
+ \def\ODw@NameIII{\ODw@North@Name}%
+ \def\ODw@NameIV{\ODw@East@Name}%
}%
{W}{%
- \gdef\ODw@BidderI{\@ifstar{\ODw@West*}{\ODw@W*}}%
- \gdef\ODw@BidderII{\@ifstar{\ODw@North*}{\ODw@N*}}%
- \gdef\ODw@BidderIII{\@ifstar{\ODw@East*}{\ODw@E*}}%
- \gdef\ODw@BidderIV{\@ifstar{\ODw@South*}{\ODw@S*}}%
- \gdef\ODw@NameI{\ODw@West@Name}%
- \gdef\ODw@NameII{\ODw@North@Name}%
- \gdef\ODw@NameIII{\ODw@East@Name}%
- \gdef\ODw@NameIV{\ODw@South@Name}%
+ \def\ODw@BidderI{\@ifstar{\ODw@West*}{\ODw@W*}}%
+ \def\ODw@BidderII{\@ifstar{\ODw@North*}{\ODw@N*}}%
+ \def\ODw@BidderIII{\@ifstar{\ODw@East*}{\ODw@E*}}%
+ \def\ODw@BidderIV{\@ifstar{\ODw@South*}{\ODw@S*}}%
+ \def\ODw@NameI{\ODw@West@Name}%
+ \def\ODw@NameII{\ODw@North@Name}%
+ \def\ODw@NameIII{\ODw@East@Name}%
+ \def\ODw@NameIV{\ODw@South@Name}%
}%
}% IfEqCase
}% ODw@FirstBidCol
@@ -775,6 +777,7 @@
\ODw@ChkNrOfCards{#2}{suit}%
\ODw@ChkSameCards{#2}{#1}%
\bgroup% keep font change local
+ \ODw@GameSize%
#1\ODw@Cards{#2}%
\egroup%
\xspace%
@@ -837,7 +840,7 @@
\egroup%
\IfBooleanTF#1{\end{center}}{}%
}% showAll
-\NewDocumentCommand\showNS{s t+ O{c}}{%
+\NewDocumentCommand\showNS{s t+ O{c} d()}{%
\gdef\ODw@Spades{\ODw@NSpades\ODw@SSpades}%
\gdef\ODw@Hearts{\ODw@NHearts\ODw@SHearts}%
\gdef\ODw@Diamonds{\ODw@NDiamonds\ODw@SDiamonds}%
@@ -856,17 +859,17 @@
\sbox1{\ODw@Compass}%
\sbox0{%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
- & \ODw@Nhand & \\
+ & \IfNoValueTF{#4}{\ODw@Nhand}{\ifthenelse{\equal{#4}{N}}{\ODw@Nhand}{}} & \\
& \usebox{1} & \\
- & \ODw@Shand & \\
+ & \IfNoValueTF{#4}{\ODw@Shand}{\ifthenelse{\equal{#4}{S}}{\ODw@Shand}{}} & \\
\end{tabular}%
}% sbox0
\ODw@gsetlength\ODw@Diagram@Width{\wd0}%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
\ODw@ProcessHeader{3}% span 3 columns
- & \ODw@Nhand & \\
+ & \IfNoValueTF{#4}{\ODw@Nhand}{\ifthenelse{\equal{#4}{N}}{\ODw@Nhand}{}} & \\
& \usebox{1} & \\
- & \ODw@Shand & \\
+ & \IfNoValueTF{#4}{\ODw@Shand}{\ifthenelse{\equal{#4}{S}}{\ODw@Shand}{}} & \\
\ODw@ProcessFooter{3}% span 3 columns
\end{tabular}%
\IfBooleanTF#2{%
@@ -878,7 +881,7 @@
\egroup%
\IfBooleanTF#1{\end{center}}{}%
}% showNS
-\NewDocumentCommand\showEW{s t+ O{c}}{%
+\NewDocumentCommand\showEW{s t+ O{c} d()}{%
\gdef\ODw@Spades{\ODw@ESpades\ODw@WSpades}%
\gdef\ODw@Hearts{\ODw@EHearts\ODw@WHearts}%
\gdef\ODw@Diamonds{\ODw@EDiamonds\ODw@WDiamonds}%
@@ -895,14 +898,18 @@
\ODw@TestIfEmpty{\ODw@FooterText}{ODw@EmptyFooter}%
\sbox0{%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
- \ODw@Whand & \ODw@Compass & \ODw@Ehand \\
+ \IfNoValueTF{#4}{\ODw@Whand}{\ifthenelse{\equal{#4}{W}}{\ODw@Whand}{}}
+ & \ODw@Compass &
+ \IfNoValueTF{#4}{\ODw@Ehand}{\ifthenelse{\equal{#4}{E}}{\ODw@Ehand}{}} \\
\end{tabular}%
}% sbox
\ODw@gsetlength{\ODw@Diagram@Width}{\wd0}%
\begin{tabular}[#3]{@{}r@{}c@{}l@{}}%
\ODw@ProcessHeader{3}% span 3 columns
- & & \\
- \ODw@Whand & \ODw@Compass & \ODw@Ehand \\
+ & & \\
+ \IfNoValueTF{#4}{\ODw@Whand}{\ifthenelse{\equal{#4}{W}}{\ODw@Whand}{}}
+ & \ODw@Compass &
+ \IfNoValueTF{#4}{\ODw@Ehand}{\ifthenelse{\equal{#4}{E}}{\ODw@Ehand}{}} \\
\ODw@ProcessFooter{3}% span 3 columns
\end{tabular}%
\IfBooleanTF#2{%
@@ -1292,7 +1299,7 @@
\fi%
:\,#1%
}
-\newcommand{\alert}{{}\ensuremath{^\textbf{*}}}
+\newcommand{\alert}{{}\ensuremath{^\textbf{\textasteriskcentered}}}
\newcommand{\announce}{{}\ensuremath{^\textbf{\smaller A}}}
\newcommand\markit{%
\stepcounter{ODw@Nr}%
@@ -1655,25 +1662,25 @@
compsize/.store in = \ODw@CompSize,
}
\ODw@set{compshow/.is choice}
- \ODw@set{compshow/off/.code={\global\ODw@CompShowfalse}}
- \ODw@set{compshow/on/.code={\global\ODw@CompShowtrue}}
+ \ODw@set{compshow/off/.code={\ODw@CompShowfalse}}
+ \ODw@set{compshow/on/.code={\ODw@CompShowtrue}}
\ODw@set{compturn/.is choice}
- \ODw@set{compturn/off/.code={\global\ODw@CompTurnfalse}}
- \ODw@set{compturn/on/.code={\global\ODw@CompTurntrue}}
+ \ODw@set{compturn/off/.code={\ODw@CompTurnfalse}}
+ \ODw@set{compturn/on/.code={\ODw@CompTurntrue}}
\ODw@set{bidders/.is choice}
- \ODw@set{bidders/off/.code={\global\ODw@Biddersfalse}}
- \ODw@set{bidders/on/.code={\global\ODw@Bidderstrue}}
+ \ODw@set{bidders/off/.code={\ODw@Biddersfalse}}
+ \ODw@set{bidders/on/.code={\ODw@Bidderstrue}}
\ODw@set{bidfirst/.is choice}
\ODw@set{bidfirst/N/.code=\ODw@FirstBidCol{N}}
\ODw@set{bidfirst/E/.code=\ODw@FirstBidCol{E}}
\ODw@set{bidfirst/S/.code=\ODw@FirstBidCol{S}}
\ODw@set{bidfirst/W/.code=\ODw@FirstBidCol{W}}
\ODw@set{bidline/.is choice}
- \ODw@set{bidline/off/.code={\global\ODw@BidLinefalse}}
- \ODw@set{bidline/on/.code={\global\ODw@BidLinetrue}}
+ \ODw@set{bidline/off/.code={\ODw@BidLinefalse}}
+ \ODw@set{bidline/on/.code={\ODw@BidLinetrue}}
\ODw@set{bidlong/.is choice}
- \ODw@set{bidlong/off/.code={\global\ODw@LongCallsfalse}}
- \ODw@set{bidlong/on/.code={\global\ODw@LongCallstrue}}
+ \ODw@set{bidlong/off/.code={\ODw@LongCallsfalse}}
+ \ODw@set{bidlong/on/.code={\ODw@LongCallstrue}}
\ODw@set{compshow/1/.code={\pgfkeys{/ODw/compshow=on}}}
\ODw@set{compshow/true/.code={\pgfkeys{/ODw/compshow=on}}}
\ODw@set{compturn/1/.code={\pgfkeys{/ODw/compturn=on}}}
@@ -2015,7 +2022,7 @@
\egroup%
\xspace%
}% High Card Points
-\def\HCP{\hpts*!}
+\def\HCP{\,\hpts*!}
\NewDocumentCommand{\lpts}{s t!}{%
\bgroup%
\ODw@OtherFont%
@@ -2031,7 +2038,7 @@
\egroup%
\xspace%
}% Length Points
-\def\LP{\lpts*!}
+\def\LP{\,\lpts*!}
\NewDocumentCommand{\dpts}{s t!}{%
\bgroup%
\ODw@OtherFont%
@@ -2047,7 +2054,7 @@
\egroup%
\xspace%
}% Distribution Points
-\def\DP{\dpts*!}
+\def\DP{\,\dpts*!}
\NewDocumentCommand{\tpts}{s t!}{%
\bgroup%
\ODw@OtherFont%
@@ -2063,7 +2070,7 @@
\egroup%
\xspace%
}% Total Points
-\def\TP{\tpts*!}
+\def\TP{\,\tpts*!}
\NewDocumentCommand{\gforce}{s t!}{%
\bgroup%
\ODw@OtherFont%
@@ -2151,6 +2158,7 @@
\setdefaults{legend=\mdseries\rmfamily}
\setdefaults{name=\mdseries\slshape}
\setdefaults*{other=\bfseries\sffamily}
+\setdefaults{colors=b+r}
\setdefaults{compshow=on,compturn=off}
\setdefaults{bidfirst=W,bidders=on,bidlong=on}
\AtBeginDocument{%
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 17:55:15 +0000