summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-02-10 23:13:43 +0000
committerKarl Berry <karl@freefriends.org>2013-02-10 23:13:43 +0000
commitae0f31de2f0c0c1bc9e1474c406d7ee94bf5edbc (patch)
treeeb65218aebfea4bb7bbaf0d76a6dfeded729f838 /Master
parent4bce3b94bd04b49c445367eb9d2428d691d41adb (diff)
battleship, replacing navygame (10feb13)
git-svn-id: svn://tug.org/texlive/trunk@29075 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/battleship/CHANGES4
-rw-r--r--Master/texmf-dist/doc/latex/battleship/INSTALL15
-rw-r--r--Master/texmf-dist/doc/latex/battleship/README7
-rw-r--r--Master/texmf-dist/doc/latex/battleship/battleship.pdfbin0 -> 82204 bytes
-rw-r--r--Master/texmf-dist/doc/latex/battleship/battleship.tex468
-rw-r--r--Master/texmf-dist/doc/latex/battleship/manifest.txt18
-rw-r--r--Master/texmf-dist/tex/latex/battleship/battleship.sty285
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check4
-rw-r--r--Master/tlpkg/tlpsrc/battleship.tlpsrc0
-rw-r--r--Master/tlpkg/tlpsrc/collection-games.tlpsrc2
10 files changed, 800 insertions, 3 deletions
diff --git a/Master/texmf-dist/doc/latex/battleship/CHANGES b/Master/texmf-dist/doc/latex/battleship/CHANGES
new file mode 100644
index 00000000000..2befa86e7c1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/battleship/CHANGES
@@ -0,0 +1,4 @@
+-- battleship bundle --
+
+2013/02/09 IPO of battleship on CTAN
+
diff --git a/Master/texmf-dist/doc/latex/battleship/INSTALL b/Master/texmf-dist/doc/latex/battleship/INSTALL
new file mode 100644
index 00000000000..1d76dedd50d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/battleship/INSTALL
@@ -0,0 +1,15 @@
+ battleship.sty -- INSTALL
+=============================
+
+All the files ending with .sty have to be installed where TeX can
+find them. Please refer to your TeX distribution's manual for how
+to install additional packages.
+
+According to the TeX Directory Standard (TDS), the files should be
+installed in your local texmf/ tree as follows:
+
+-- *.sty -> localtexmf/tex/latex/battleship/
+-- *.pdf -> localtexmf/doc/latex/battleship/
+-- *.tex -> localtexmf/doc/latex/battleship/
+
+Don't forget to update your FNDB (Filename database). (see: manual) \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/battleship/README b/Master/texmf-dist/doc/latex/battleship/README
new file mode 100644
index 00000000000..2cb5783ce36
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/battleship/README
@@ -0,0 +1,7 @@
+A LaTeX style file for typesetting Battleship logic puzzles
+(aka Bimaru, Marinespiel, Batalla Naval, ...).
+You have to find the positions of ships in a grid.
+Numbers next to the grid reveal the number
+of ship segments in the respective columns and rows.
+
+License: LPPL
diff --git a/Master/texmf-dist/doc/latex/battleship/battleship.pdf b/Master/texmf-dist/doc/latex/battleship/battleship.pdf
new file mode 100644
index 00000000000..74dca35d93f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/battleship/battleship.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/battleship/battleship.tex b/Master/texmf-dist/doc/latex/battleship/battleship.tex
new file mode 100644
index 00000000000..5a804676563
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/battleship/battleship.tex
@@ -0,0 +1,468 @@
+\documentclass[a4paper]{ltxdoc}%
+\usepackage[english]{babel}%
+\usepackage[latin1]{inputenc}%
+\usepackage[T1]{fontenc}%
+\usepackage{textcomp}%
+\usepackage{lmodern}%
+\usepackage{bera}%
+\usepackage{microtype}%
+\usepackage{ltxdocext}%
+\usepackage{listings}
+\usepackage{marginnote}%
+\usepackage[svgnames,rgb]{xcolor}%
+\usepackage[automark,nouppercase]{scrpage2}
+\usepackage[width=4cm,shipcolor=Teal,scale=0.66,fontsize=large,
+sbindent=0.6cm,sbwidth=3.4cm]{battleship}%
+\usepackage{hyperref}
+%
+\makeatletter
+\setlength{\headheight}{1.1\baselineskip}%
+%
+\hypersetup{colorlinks=true,urlcolor=NavyBlue,linkcolor=NavyBlue,citecolor=CornflowerBlue,naturalnames=true,hypertexnames=false}%
+\lstset{language=[LaTeX]TeX,numbers=left,numberstyle=\tiny,basicstyle=\ttfamily\small,frame=single,backgroundcolor=\color{LightGoldenrodYellow},keywordstyle=\color{Blue},emph={mathstyle,style}, emphstyle=\color{Tomato},emph={[2]rows,columns,width,shipcolor,fontsize,scale,sbindent,sbwidth,sbshipscale},emphstyle={[2]\color{SeaGreen}},morekeywords={battleship,ship,shipH,shipV,shipbox,Ship,ShipC,ShipL,ShipR,ShipB,ShipT,[,]}}
+\renewcommand{\maketitle}%
+{%
+ \thispagestyle{empty}%
+ \pagecolor{Ivory}%
+ \begin{titlepage}%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \node[yshift=-2cm] at (current page.north west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle%
+ (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=-4cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\RaggedRight\Huge\sffamily\textbf{\@title}}};%
+ \draw[anchor=west,yshift=-6cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\huge\sffamily\textbf{\@fileversion}}};%
+ \draw[anchor=west,yshift=-9cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\RaggedRight\huge\sffamily\textbf{\@subtitle}}};%
+ \draw[anchor=west,yshift=-13cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\includegraphics[height=5cm]{battleship.png}};%
+ \draw[anchor=west,yshift=-17cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\huge\sffamily\textbf{\@date}}};%
+ \draw[anchor=west,yshift=-20cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\Large\sffamily{\@authorline\\\textbf{\@author}}}};%
+ \end{tikzpicture}%
+ };%
+ \node[yshift=0cm] at (current page.south west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=NavyBlue,color=NavyBlue,yshift=6cm,xshift=2cm] (0,0) rectangle (0.2cm,19cm);%
+ \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=1cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\large\sffamily{\@refline}}};%
+ \end{tikzpicture}%
+ };%
+ \end{tikzpicture}%
+ \end{titlepage}%
+ \pagecolor{white}%
+}%
+%
+\newcommand*{\@tikzhead}[1]%
+{%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \node[yshift=-2cm] at (current page.north west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=1cm,xshift=1.5cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\LARGE\sffamily\textbf{\@title}}};%
+ \node[anchor=east,xshift=.9\paperwidth,rectangle,%
+ rounded corners=15pt,inner sep=11pt,fill=NavyBlue]%
+ {\color{white}\textsc{#1}};%
+ \end{tikzpicture}%
+ };%
+ \end{tikzpicture}%
+}%
+\clearscrheadings%
+\ihead{\@tikzhead{\headmark}}%
+\cfoot{\upshape\thepage}%
+\pagestyle{scrheadings}%
+%
+%\newcommand*{\headline}[1]{\@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}%
+\newcommand*{\Headline}[1]{\@mkboth{#1}{#1}}%
+%
+\renewcommand{\headfont}{\normalfont\mdseries\scshape}
+%
+\gdef\@subtitle{}%
+\providecommand*{\Subtitle}[1]{\gdef\@subtitle{#1}}%
+\gdef\@fileversion{}%
+\providecommand*{\Fileversion}[1]{\gdef\@fileversion{#1}}%
+\gdef\@author{}%
+\providecommand*{\Author}[1]{\gdef\@author{#1}}%
+\gdef\@authorline{Package author:}%
+\providecommand*{\Authorline}[1]{\gdef\@authorline{#1}}%
+\gdef\@refline{}%
+\providecommand*{\Refline}[1]{\gdef\@refline{#1}}%
+\gdef\and{\unskip{}, }%
+\newcommand\doubledash{-\kern0.5pt-}
+\def\enoteformat{\rightskip\z@ \leftskip\z@ \parindent=1em\leavevmode\llap{\makeenmark}}
+\makeatother
+%
+\def\filename{battleship.sty}%
+\def\XeLaTeX{Xe\LaTeX}%
+%
+\makeatletter%
+\renewcommand\tableofcontents%
+{%
+ %\section*{\contentsname}%
+ \@mkboth{%
+ \MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
+ \@starttoc{toc}%
+}%
+%
+\newcommand\styleoption{\name@idx{style option}}%
+\newcommand\stylename{\name@idx{document style}}%
+\def\name@idx#1#2{%
+ {\ttfamily#2}%
+ \index{#2\space#1=\string\ttt{#2}\space#1}\index{#1>#2=\string\ttt{#2}}%
+}%
+\newcommand*\margcs[1]{\marginnote{\raggedleft\scriptsize #1}}%
+\newcommand*\package[1]{\texttt{#1}\index{#1=\string\ttt{#1}}}%
+\newcommand*\mco[1]{\mbox{\LANGLE\itshape#1\RANGLE}\index{#1, class option value}\index{class option value>#1}}%
+%
+\renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.2em}{2.3em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{2.4em}{3.7em}}
+\makeatother
+%
+\setlength\parindent{0pt}%
+\hypersetup{pdfauthor={Josef Kleber},pdftitle={A style file for typesetting navy games},pdfsubject={Documentation for LaTeX style \filename}}%
+%
+\begin{document}
+\title{\filename}%
+\Subtitle{A style file for typesetting Battleship logic puzzles}%
+\author{Josef Kleber}
+\Fileversion{v1.0}
+\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/battleship/}{\texttt{https://bitbucket.org/kleberj/battleship/}}}
+\maketitle
+
+\tableofcontents
+\clearpage
+
+\section{The puzzle}
+
+Try to find the positions of the ships listed below the puzzle. The numbers on the side of the puzzle reveals how many ship segments can be found in the rows and columns. All remaining fields indicate 'water'. Consider the following rules: The ships are arranged horizontally and vertically. No ship touches another ship at any point, not even diagonally. Here's a little self-explanatory example:
+
+\begin{center}
+\begin{battleship}
+\ship{4}{5}{\ShipR}
+\shipH{3,2,2,1,3}
+\shipV{3,1,4,0,3}
+\shipbox{3,3,2,2,1}
+\end{battleship}
+\hspace{1.2cm}
+\begin{battleship}
+\ship{1}{5}{\Ship}
+\ship{2}{3}{\ShipC}
+\ship{5}{2}{\ShipC}
+\ship{5}{1}{\ShipB}
+\ship{5}{3}{\ShipT}
+\ship{1}{1}{\ShipL}
+\ship{1}{3}{\ShipL}
+\ship{3}{5}{\ShipL}
+\ship{2}{1}{\ShipR}
+\ship{3}{3}{\ShipR}
+\ship{4}{5}{\ShipR}
+\shipH{3,2,2,1,3}
+\shipV{3,1,4,0,3}
+\end{battleship}
+\end{center}
+\begin{lstlisting}
+\begin{battleship}
+\ship{4}{5}{\ShipR}
+\shipH{3,2,2,1,3}
+\shipV{3,1,4,0,3}
+\shipbox{3,3,2,2,1}
+\end{battleship}
+\hspace{1.2cm}
+\begin{battleship}
+\ship{1}{5}{\Ship}
+\ship{2}{3}{\ShipC}
+\ship{5}{2}{\ShipC}
+\ship{5}{1}{\ShipB}
+\ship{5}{3}{\ShipT}
+\ship{1}{1}{\ShipL}
+\ship{1}{3}{\ShipL}
+\ship{3}{5}{\ShipL}
+\ship{2}{1}{\ShipR}
+\ship{3}{3}{\ShipR}
+\ship{4}{5}{\ShipR}
+\shipH{3,2,2,1,3}
+\shipV{3,1,4,0,3}
+\end{battleship}
+\end{lstlisting}
+\clearpage
+\section{Options}
+\subsection[\texttt{rows}]{\styleoption{rows} (\underline{\texttt{5}})}
+With the option \styleoption{rows}, you can define the number of rows in the grid.
+\subsection[\texttt{columns}]{\styleoption{columns} (\underline{\texttt{5}})}
+With the option \styleoption{columns}, you can specify the number of columns in the grid
+\subsection[\texttt{shipcolor}]{\styleoption{shipcolor} (\underline{\texttt{green}})}
+With the option \styleoption{shipcolor}, you can set the color of the ship segments.
+\subsection[\texttt{width}]{\styleoption{width} (\underline{\texttt{6cm}})}
+With the option \styleoption{width}, you can set the width of the minipage, in which the grid is typeset.
+\subsection[\texttt{scale}]{\styleoption{scale} (\underline{\texttt{1}})}
+With the option \styleoption{scale}, you can scale the size of the grid in the minipage.
+\subsection[\texttt{fontsize}]{\styleoption{fontsize} (\underline{\texttt{Large}})}
+With the option \styleoption{fontsize}, you can specify the size of the numbers next to the grid. Here, the usual LaTeX sizes are used. Possible values: \texttt{tiny}, \texttt{scriptsize}, \texttt{footnotesize}, \texttt{small}, \texttt{normalsize}, \texttt{large}, \underline{\texttt{Large}}, \texttt{LARGE}, \texttt{huge}, \texttt{Huge})
+\subsection[\texttt{sbindent}]{\styleoption{sbindent} (\underline{\texttt{0.75cm}})}
+With the option \styleoption{sbindent}, you can define the indent of the ship box below the grid.
+\subsection[\texttt{sbwidth}]{\styleoption{sbwidth} (\underline{\texttt{5.15cm}})}
+With the option \styleoption{sbwidth}, you can specify the width of the minipage, in which the ships are typeset.
+\subsection[\texttt{sbshipscale}]{\styleoption{sbshipscale} (\underline{\texttt{1}})}
+With the option \styleoption{sbshipscale}, you can scale the size of the ships in the ship box.
+\section{Environments}
+\subsection{\texttt{battleship}}
+The \env{battleship} environment\marginnote{\hbadness=10000\RaggedLeft\scriptsize\envb{battleship}\oarg{options}\\\dots\\\enve{battleship}} is the central core of the style file. With the optional argument of the environment, you can reset the options with local scope. Here, a blank grid is created that you can fill with ships using other commands.
+\section{Commands}
+\subsection{\texttt{ship}}
+The command \cs{ship}\margcs{\cmd\ship\{\marg{column}\}\{\marg{row}\}\\\{\marg{ship segment}\}} is used for the placement of ship segments in the grid. In the mandatory argument \marg{ship segment}, you can use the following commands:
+
+\begin{center}
+\begin{tabular}{lccl}
+\cs{Ship} & \scalebox{.5}{\Ship} & \scalebox{.5}{\ShipC} & \cs{ShipC} \\
+\cs{ShipL} & \scalebox{.5}{\ShipL} & \scalebox{.5}{\ShipR} & \cs{ShipR} \\
+\cs{ShipB} & \scalebox{.5}{\ShipB} & \scalebox{.5}{\ShipT} & \cs{ShipT} \\
+\end{tabular}
+\end{center}
+\subsection{\texttt{shipH}}
+The command \cs{shipH}\margcs{\cmd\shipH\{\marg{csv list}\}} typesets the horizontal numbers above the grid. It expects a comma-separated list as an argument.
+\subsection{\texttt{shipV}}
+The command \cs{shipV}\margcs{\cmd\shipV\{\marg{csv list}\}} typesets the vertical numbers beside the grid. It also expects a comma separated list.
+\subsection{\texttt{shipbox}}
+The command \cs{shipbox}\margcs{\cmd\shipbox\{\marg{csv list}\}} defines the number and size of the ships, which are typeset under the grid.
+\clearpage
+\section{Puzzles}
+\begin{center}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{11}{6}{\Ship}
+\shipH{4,0,2,2,4,0,0,0,3,3,3}
+\shipV{4,2,0,4,2,1,5,3}
+\shipbox{3,3,3,2,2,2,2,1,1,1,1}
+\end{battleship}
+\hspace{1cm}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{10}{6}{\ShipC}
+\shipH{4,0,0,0,5,0,5,1,2,3,2}
+\shipV{2,3,6,2,2,1,4,2}
+\shipbox{3,3,3,3,2,2,2,1,1,1,1}
+\end{battleship}
+\end{center}
+
+\begin{center}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{1}{6}{\Ship}
+\shipH{1,0,4,1,2,0,0,6,0,1,6}
+\shipV{2,5,0,2,4,4,0,4}
+\shipbox{3,3,3,2,2,2,2,1,1,1,1}
+\end{battleship}
+\hspace{1cm}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{6}{6}{\ShipC}
+\shipH{1,1,2,3,2,4,3,3,4,1,1}
+\shipV{4,3,2,2,6,1,5,2}
+\shipbox{4,4,3,3,3,2,2,2,1,1}
+\end{battleship}
+\end{center}
+
+\begin{center}
+\begin{battleship}[width=11cm,rows=13,columns=24,scale=0.43,sbindent=0.4cm,sbwidth=10.5cm,fontsize=normalsize]
+\ship{9}{9}{\ShipL}
+\ship{22}{3}{\ShipL}
+\ship{23}{1}{\ShipL}
+\ship{16}{8}{\ShipR}
+\ship{21}{11}{\ShipR}
+\ship{6}{5}{\ShipC}
+\ship{8}{2}{\ShipC}
+\ship{18}{12}{\ShipC}
+\ship{19}{7}{\ShipC}
+\ship{1}{10}{\ShipB}
+\ship{2}{4}{\ShipT}
+\shipH{4,5,7,1,1,1,7,5,1,1,2,2,1,2,1,1,1,5,3,2,1,1,2,2}
+\shipV{4,2,6,1,8,4,3,6,6,4,6,1,8}
+\shipbox{6,5,4,4,4,4,4,4,3,3,3,3,2,2,2,2,1,1,1,1}
+\end{battleship}
+\end{center}
+\clearpage
+\section{Solutions}
+\begin{center}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{1}{2}{\Ship}
+\ship{1}{5}{\Ship}
+\ship{11}{6}{\Ship}
+\ship{11}{8}{\Ship}
+\ship{3}{1}{\ShipL}
+\ship{3}{7}{\ShipL}
+\ship{9}{4}{\ShipL}
+\ship{5}{1}{\ShipR}
+\ship{5}{7}{\ShipR}
+\ship{11}{4}{\ShipR}
+\ship{4}{1}{\ShipC}
+\ship{4}{7}{\ShipC}
+\ship{10}{4}{\ShipC}
+\ship{1}{7}{\ShipB}
+\ship{5}{4}{\ShipB}
+\ship{9}{7}{\ShipB}
+\ship{10}{1}{\ShipB}
+\ship{1}{8}{\ShipT}
+\ship{5}{5}{\ShipT}
+\ship{9}{8}{\ShipT}
+\ship{10}{2}{\ShipT}
+\shipH{4,0,2,2,4,0,0,0,3,3,3}
+\shipV{4,2,0,4,2,1,5,3}
+\end{battleship}
+\hspace{1cm}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{1}{7}{\Ship}
+\ship{7}{1}{\Ship}
+\ship{7}{5}{\Ship}
+\ship{9}{1}{\Ship}
+\ship{7}{3}{\ShipL}
+\ship{9}{3}{\ShipR}
+\ship{1}{3}{\ShipC}
+\ship{5}{3}{\ShipC}
+\ship{8}{3}{\ShipC}
+\ship{10}{6}{\ShipC}
+\ship{1}{2}{\ShipB}
+\ship{5}{2}{\ShipB}
+\ship{5}{7}{\ShipB}
+\ship{7}{7}{\ShipB}
+\ship{10}{5}{\ShipB}
+\ship{11}{2}{\ShipB}
+\ship{1}{4}{\ShipT}
+\ship{5}{4}{\ShipT}
+\ship{5}{8}{\ShipT}
+\ship{7}{8}{\ShipT}
+\ship{10}{7}{\ShipT}
+\ship{11}{3}{\ShipT}
+\shipH{4,0,0,0,5,0,5,1,2,3,2}
+\shipV{2,3,6,2,2,1,4,2}
+\end{battleship}
+\end{center}
+
+\begin{center}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{1}{6}{\Ship}
+\ship{5}{5}{\Ship}
+\ship{3}{8}{\Ship}
+\ship{8}{8}{\Ship}
+\ship{3}{2}{\ShipL}
+\ship{10}{8}{\ShipL}
+\ship{5}{2}{\ShipR}
+\ship{11}{8}{\ShipR}
+\ship{4}{2}{\ShipC}
+\ship{8}{5}{\ShipC}
+\ship{11}{5}{\ShipC}
+\ship{3}{5}{\ShipB}
+\ship{8}{1}{\ShipB}
+\ship{8}{4}{\ShipB}
+\ship{11}{1}{\ShipB}
+\ship{11}{4}{\ShipB}
+\ship{3}{6}{\ShipT}
+\ship{8}{2}{\ShipT}
+\ship{8}{6}{\ShipT}
+\ship{11}{2}{\ShipT}
+\ship{11}{6}{\ShipT}
+\shipH{1,0,4,1,2,0,0,6,0,1,6}
+\shipV{2,5,0,2,4,4,0,4}
+\end{battleship}
+\hspace{1cm}
+\begin{battleship}[width=5cm,rows=8,columns=11,scale=0.41,sbindent=0.5cm,sbwidth=4.5cm,fontsize=normalsize]
+\ship{1}{4}{\Ship}
+\ship{3}{1}{\Ship}
+\ship{2}{7}{\ShipL}
+\ship{8}{5}{\ShipL}
+\ship{4}{7}{\ShipR}
+\ship{11}{5}{\ShipR}
+\ship{3}{7}{\ShipC}
+\ship{6}{6}{\ShipC}
+\ship{6}{7}{\ShipC}
+\ship{7}{2}{\ShipC}
+\ship{9}{2}{\ShipC}
+\ship{9}{5}{\ShipC}
+\ship{10}{5}{\ShipC}
+\ship{4}{4}{\ShipB}
+\ship{5}{1}{\ShipB}
+\ship{6}{5}{\ShipB}
+\ship{7}{1}{\ShipB}
+\ship{9}{1}{\ShipB}
+\ship{8}{7}{\ShipB}
+\ship{4}{5}{\ShipT}
+\ship{5}{2}{\ShipT}
+\ship{6}{8}{\ShipT}
+\ship{7}{3}{\ShipT}
+\ship{9}{3}{\ShipT}
+\ship{8}{8}{\ShipT}
+\shipH{1,1,2,3,2,4,3,3,4,1,1}
+\shipV{4,3,2,2,6,1,5,2}
+\end{battleship}
+\end{center}
+
+\begin{center}
+\begin{battleship}[width=11cm,rows=13,columns=24,scale=0.43,sbindent=0.4cm,sbwidth=10.5cm,fontsize=normalsize]
+\ship{1}{6}{\Ship}
+\ship{18}{3}{\Ship}
+\ship{17}{6}{\Ship}
+\ship{20}{13}{\Ship}
+\ship{1}{13}{\ShipL}
+\ship{5}{5}{\ShipL}
+\ship{7}{13}{\ShipL}
+\ship{9}{9}{\ShipL}
+\ship{11}{5}{\ShipL}
+\ship{14}{8}{\ShipL}
+\ship{20}{11}{\ShipL}
+\ship{22}{3}{\ShipL}
+\ship{23}{1}{\ShipL}
+\ship{4}{13}{\ShipR}
+\ship{8}{5}{\ShipR}
+\ship{8}{13}{\ShipR}
+\ship{12}{9}{\ShipR}
+\ship{14}{5}{\ShipR}
+\ship{16}{8}{\ShipR}
+\ship{21}{11}{\ShipR}
+\ship{24}{3}{\ShipR}
+\ship{24}{1}{\ShipR}
+\ship{2}{13}{\ShipC}
+\ship{3}{13}{\ShipC}
+\ship{2}{2}{\ShipC}
+\ship{2}{3}{\ShipC}
+\ship{3}{7}{\ShipC}
+\ship{3}{8}{\ShipC}
+\ship{3}{9}{\ShipC}
+\ship{3}{10}{\ShipC}
+\ship{6}{5}{\ShipC}
+\ship{7}{5}{\ShipC}
+\ship{8}{2}{\ShipC}
+\ship{7}{8}{\ShipC}
+\ship{7}{9}{\ShipC}
+\ship{7}{10}{\ShipC}
+\ship{11}{9}{\ShipC}
+\ship{10}{9}{\ShipC}
+\ship{12}{5}{\ShipC}
+\ship{13}{5}{\ShipC}
+\ship{15}{8}{\ShipC}
+\ship{18}{11}{\ShipC}
+\ship{18}{12}{\ShipC}
+\ship{19}{7}{\ShipC}
+\ship{23}{3}{\ShipC}
+\ship{1}{10}{\ShipB}
+\ship{2}{1}{\ShipB}
+\ship{3}{6}{\ShipB}
+\ship{7}{7}{\ShipB}
+\ship{8}{1}{\ShipB}
+\ship{18}{10}{\ShipB}
+\ship{19}{6}{\ShipB}
+\ship{1}{11}{\ShipT}
+\ship{2}{4}{\ShipT}
+\ship{3}{11}{\ShipT}
+\ship{7}{11}{\ShipT}
+\ship{8}{3}{\ShipT}
+\ship{18}{13}{\ShipT}
+\ship{19}{8}{\ShipT}
+\shipH{4,5,7,1,1,1,7,5,1,1,2,2,1,2,1,1,1,5,3,2,1,1,2,2}
+\shipV{4,2,6,1,8,4,3,6,6,4,6,1,8}
+\end{battleship}
+\end{center}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/battleship/manifest.txt b/Master/texmf-dist/doc/latex/battleship/manifest.txt
new file mode 100644
index 00000000000..a9506e78d60
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/battleship/manifest.txt
@@ -0,0 +1,18 @@
+This work consists of the following files:
+
+
+-- Styles --
+
+battleship.sty
+
+-- Documentation --
+
+battleship.pdf
+battleship.tex
+
+-- Misc. Files --
+
+README
+manifest.txt
+INSTALL
+CHANGES \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/battleship/battleship.sty b/Master/texmf-dist/tex/latex/battleship/battleship.sty
new file mode 100644
index 00000000000..2d279912e8a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/battleship/battleship.sty
@@ -0,0 +1,285 @@
+%%
+%% Copyright (C) 2013 by:
+%% Josef Kleber
+%% <josef.kleber@gmx.de>
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX version
+%% 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "author-maintained".
+%%
+%% The Current Maintainer of this work is Josef Kleber.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+% for more infos see:
+% http://en.wikipedia.org/wiki/Battleship_%28puzzle%29
+% http://de.wikipedia.org/wiki/Bimaru
+%
+\ProvidesPackage{battleship}[2013/02/08 battleship.sty v1.0 - Josef Kleber (C) 2013]%
+%
+\RequirePackage{xkeyval}%
+\RequirePackage{ifthen}%
+\RequirePackage{ragged2e}%
+\RequirePackage{tikz}%
+\RequirePackage{etoolbox}%
+%
+% options
+\newcommand*\BS@width{6cm}%
+\newcommand*\BS@fontsize\Large%
+\newcommand*\BS@rows{5}%
+\newcommand*\BS@columns{5}%
+\newcommand*\BS@scale{1}%
+\newcommand*\BS@shipcolor{green}%
+\newcommand*\BS@SB@indent{0.75cm}%
+\newcommand*\BS@SB@width{5.15cm}%
+\newcommand*\BS@SB@shipboxscale{1}%
+%
+\newcounter{BS@rows}%
+\newcounter{BS@columns}%
+\newcounter{BS@shipH}%
+\newcounter{BS@shipV}%
+%
+\setcounter{BS@rows}{\BS@rows}%
+\setcounter{BS@columns}{\BS@columns}%
+\stepcounter{BS@rows}%
+\stepcounter{BS@columns}%
+%
+\define@key{battleship.sty}{rows}[5]%
+{%
+ \renewcommand*\BS@rows{#1}%
+}%
+%
+\define@key{battleship.sty}{columns}[5]%
+{%
+ \renewcommand*\BS@columns{#1}%
+}%
+%
+\define@key{battleship.sty}{shipcolor}[green]%
+{%
+ \renewcommand*\BS@shipcolor{#1}%
+}%
+%
+\define@key{battleship.sty}{scale}[1]%
+{%
+ \renewcommand*\BS@scale{#1}%
+}%
+%
+\define@choicekey*{battleship.sty}{fontsize}[\BS@fontsize\nr]{tiny,scriptsize,footnotesize,small,normalsize,large,Large,LARGE,huge,Huge}[Large]%
+{%
+ \ifcase\nr\relax
+ \renewcommand*\BS@fontsize{\tiny}%
+ \or%
+ \renewcommand*\BS@fontsize{\scriptsize}%
+ \or%
+ \renewcommand*\BS@fontsize{\footnotesize}%
+ \or%
+ \renewcommand*\BS@fontsize{\small}%
+ \or%
+ \renewcommand*\BS@fontsize{\normalsize}%
+ \or%
+ \renewcommand*\BS@fontsize{\large}%
+ \or%
+ \renewcommand*\BS@fontsize{\Large}%
+ \or%
+ \renewcommand*\BS@fontsize{\LARGE}%
+ \or%
+ \renewcommand*\BS@fontsize{\huge}%
+ \or%
+ \renewcommand*\BS@fontsize{\Huge}%
+ \fi%
+}%
+%
+\define@key{battleship.sty}{width}[6cm]%
+{%
+ \renewcommand*\BS@width{#1}%
+}%
+%
+\define@key{battleship.sty}{sbindent}[0.75cm]%
+{%
+ \renewcommand*\BS@SB@indent{#1}%
+}%
+%
+\define@key{battleship.sty}{sbwidth}[5.15cm]%
+{%
+ \renewcommand*\BS@SB@width{#1}%
+}%
+%
+\define@key{battleship.sty}{sbshipscale}[1]%
+{%
+ \renewcommand*\BS@SB@shipboxscale{#1}%
+}%
+%
+\define@key{battleship}{rows}%
+{%
+ \renewcommand*\BS@rows{#1}%
+}%
+%
+\define@key{battleship}{columns}%
+{%
+ \renewcommand*\BS@columns{#1}%
+}%
+%
+\define@key{battleship}{shipcolor}%
+{%
+ \renewcommand*\BS@shipcolor{#1}%
+}%
+%
+\define@key{battleship}{scale}%
+{%
+ \renewcommand*\BS@scale{#1}%
+}%
+%
+\define@choicekey*{battleship}{fontsize}[\BS@fontsize\nr]{tiny,scriptsize,footnotesize,small,normalsize,large,Large,LARGE,huge,Huge}[Large]%
+{%
+ \ifcase\nr\relax
+ \renewcommand*\BS@fontsize{\tiny}%
+ \or%
+ \renewcommand*\BS@fontsize{\scriptsize}%
+ \or%
+ \renewcommand*\BS@fontsize{\footnotesize}%
+ \or%
+ \renewcommand*\BS@fontsize{\small}%
+ \or%
+ \renewcommand*\BS@fontsize{\normalsize}%
+ \or%
+ \renewcommand*\BS@fontsize{\large}%
+ \or%
+ \renewcommand*\BS@fontsize{\Large}%
+ \or%
+ \renewcommand*\BS@fontsize{\LARGE}%
+ \or%
+ \renewcommand*\BS@fontsize{\huge}%
+ \or%
+ \renewcommand*\BS@fontsize{\Huge}%
+ \fi%
+}%
+%
+\define@key{battleship}{width}%
+{%
+ \renewcommand*\BS@width{#1}%
+}%
+%
+\define@key{battleship}{sbindent}%
+{%
+ \renewcommand*\BS@SB@indent{#1}%
+}%
+%
+\define@key{battleship}{sbwidth}%
+{%
+ \renewcommand*\BS@SB@width{#1}%
+}%
+%
+\define@key{battleship}{sbshipscale}%
+{%
+ \renewcommand*\BS@SB@shipboxscale{#1}%
+}%
+%
+\ExecuteOptionsX{rows,columns,width,fontsize,shipcolor,scale,sbindent,sbwidth,sbshipscale}%
+%
+\ProcessOptionsX\relax%
+%
+\newcommand*\BS@Pfive{.5}%
+\gdef\BS@shipbox{}%
+%
+\newcommand*\Ship{\tikz[scale=\BS@scale]\draw[scale=.36,fill=\BS@shipcolor] (0,0) circle (1);}%
+\newcommand*\ShipC{\tikz[scale=\BS@scale]\draw[scale=.36,fill=\BS@shipcolor] (0,0)--(0,2)--(2,2)--(2,0)--cycle;}%
+\newcommand*\ShipT{\tikz[scale=\BS@scale]\draw[scale=.36,fill=\BS@shipcolor](2,1)--(2,0)--(0,0)--(0,1) arc (180:0:1);}%
+\newcommand*\ShipB{\tikz[scale=\BS@scale]\draw[scale=.36,fill=\BS@shipcolor](2,1)--(2,2)--(0,2)--(0,1) arc (180:360:1);}%
+\newcommand*\ShipL{\tikz[scale=\BS@scale]\draw[scale=.36,fill=\BS@shipcolor](1,2)--(2,2)--(2,0)--(1,0) arc (270:90:1);}%
+\newcommand*\ShipR{\tikz[scale=\BS@scale]\draw[scale=.36,fill=\BS@shipcolor](1,2)--(0,2)--(0,0)--(1,0) arc (270:450:1);}%
+% versions for \shipbox without second scale
+\newcommand*\@Ship{\tikz\draw[scale=.144,fill=\BS@shipcolor] (0,0) circle (1);}%
+\newcommand*\@ShipC{\tikz\draw[scale=.144,fill=\BS@shipcolor] (0,0)--(0,2)--(2,2)--(2,0)--cycle;}%
+\newcommand*\@ShipT{\tikz\draw[scale=.144,fill=\BS@shipcolor](2,1)--(2,0)--(0,0)--(0,1) arc (180:0:1);}%
+\newcommand*\@ShipB{\tikz\draw[scale=.144,fill=\BS@shipcolor](2,1)--(2,2)--(0,2)--(0,1) arc (180:360:1);}%
+\newcommand*\@ShipL{\tikz\draw[scale=.144,fill=\BS@shipcolor](1,2)--(2,2)--(2,0)--(1,0) arc (270:90:1);}%
+\newcommand*\@ShipR{\tikz\draw[scale=.144,fill=\BS@shipcolor](1,2)--(0,2)--(0,0)--(1,0) arc (270:450:1);}%
+%
+\newcommand*\BS@shipparts[3]%
+{%
+ \node at (#1\BS@Pfive,#2\BS@Pfive){\BS@fontsize#3};%
+}%
+%
+\newcommand*\BS@printpartsH[1]%
+{%
+ \stepcounter{BS@shipH}%
+ \BS@shipparts{\arabic{BS@shipH}}{\arabic{BS@shipV}}{#1}%
+}%
+%
+\newcommand*\BS@printpartsV[1]%
+{%
+ \stepcounter{BS@shipV}%
+ \BS@shipparts{\arabic{BS@shipH}}{\arabic{BS@shipV}}{#1}%
+}%
+%
+\newcommand*\BS@printship[1]%
+{%
+ \ifthenelse{\equal{#1}{1}}{\scalebox{\BS@SB@shipboxscale}{\@Ship}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{2}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{3}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{4}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{5}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{6}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{7}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{8}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{9}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+ \ifthenelse{\equal{#1}{10}}{\scalebox{\BS@SB@shipboxscale}{\@ShipL\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipC\,\@ShipR}\space\allowbreak}{}%
+}%
+%
+\newcommand*\BS@printshipbox[1]%
+{% \expandafters needed because csv list is stored in macro
+ \expandafter\forcsvlist\expandafter\BS@printship\expandafter{#1}
+}%
+%
+\newcommand*\shipH[1]%
+{%
+ \setcounter{BS@shipV}{\value{BS@rows}}%
+ \setcounter{BS@shipH}{0}%
+ \forcsvlist\BS@printpartsH{#1}%
+}%
+%
+\newcommand*\shipV[1]%
+{%
+ \setcounter{BS@shipV}{0}%
+ \setcounter{BS@shipH}{0}%
+ \forcsvlist\BS@printpartsV{#1}%
+}%
+%
+\newcommand*\ship[3]%
+{%
+ \node at (#1\BS@Pfive,#2\BS@Pfive){#3};%
+}%
+%
+\newcommand*\shipbox[2][]%
+{%
+ \setkeys{shipbox}{#1}%
+ \gdef\BS@shipbox{#2}%
+}%
+%
+\newenvironment{battleship}[1][]%
+{%
+ \setkeys{battleship}{#1}%
+ \shipbox{}% clear shipbox
+ \setcounter{BS@rows}{\BS@rows}%
+ \setcounter{BS@columns}{\BS@columns}%
+ \stepcounter{BS@rows}%
+ \stepcounter{BS@columns}%
+ \begin{minipage}[t]{\BS@width}%
+ \begin{tikzpicture}[scale=\BS@scale]%
+ \draw[step=1cm] (1,1) grid (\value{BS@columns},\value{BS@rows});%
+}%
+{%
+ \end{tikzpicture}%
+ \par\hbadness=10000\medskip\noindent\hspace{\BS@SB@indent}\begin{minipage}{\BS@SB@width}{\hbadness=10000\RaggedRight\BS@printshipbox{\BS@shipbox}}\end{minipage}%
+ \end{minipage}
+}%
+%
+\endinput% \ No newline at end of file
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 7ffaf213030..7f2516631a1 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -49,7 +49,7 @@ my @TLP_working = qw(
auto-pst-pdf autoarea automata autonum avantgar
b1encoding babel babelbib background backnaur bangtex
barcodes bardiag barr bartel-chess-fonts bashful baskervald
- basque-book basque-date
+ basque-book basque-date battleship
bbcard bbding bbm bbm-macros bbold bbold-type1 bchart bclogo
beamer beamer2thesis beamer-FUBerlin beamer-tut-pt
beameraudience beamerposter
@@ -292,7 +292,7 @@ my @TLP_working = qw(
musixtex musixtex-fonts musuos muthesis
mversion mwcls mwe mxedruli
mychemistry mycv mylatexformat
- nag nameauth namespc natbib nath nature navigator navygame ncclatex ncctools
+ nag nameauth namespc natbib nath nature navigator ncclatex ncctools
nddiss needspace nestquot
newcommand newfile newlfm newsletr newspaper newtx newunicodechar newvbtm
newverbs nextpage
diff --git a/Master/tlpkg/tlpsrc/battleship.tlpsrc b/Master/tlpkg/tlpsrc/battleship.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/battleship.tlpsrc
diff --git a/Master/tlpkg/tlpsrc/collection-games.tlpsrc b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
index c976addc69e..4916e92993f 100644
--- a/Master/tlpkg/tlpsrc/collection-games.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
@@ -1,6 +1,7 @@
category Collection
shortdesc Games typesetting
longdesc Setups for typesetting various games, including chess.
+depend battleship
depend bartel-chess-fonts
depend chess
depend chess-problem-diagrams
@@ -13,7 +14,6 @@ depend gamebook
depend go
depend hanoi
depend hexgame
-depend navygame
depend othello
depend othelloboard
depend psgo