logicpuzzle (10may13)

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

5 files changed, 277 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/logicpuzzle/CHANGES b/Master/texmf-dist/doc/latex/logicpuzzle/CHANGES
index e7f8c73ac65..f7d7db3a565 100644
--- a/Master/texmf-dist/doc/latex/logicpuzzle/CHANGES
+++ b/Master/texmf-dist/doc/latex/logicpuzzle/CHANGES
@@ -1,3 +1,15 @@
+==  Logicpuzzle bundel (v2.1)  ==
+
+07/05/2013  reduced package counters -> LP@rows, LP@columns [jk]
+  
+06/05/2013  updated lpsmag for v2.0+ [jk]
+
+06/05/2013  added schatzsuche environment and \kakurocolumn, \Diamond [jk]
+
+05/05/2013  added kakuro environment and \kakurorow, \KKR, \Black [jk]
+
+04/05/2013  added tentsandtrees environment and \Tree, \Tent [jk]
+
 ==  Logicpuzzle bundel (v2.0)  ==
 
 30/04/2013  moved package contents to logicpuzzle.sty [jk]
diff --git a/Master/texmf-dist/doc/latex/logicpuzzle/README b/Master/texmf-dist/doc/latex/logicpuzzle/README
index 93678e66b2f..3873439b30b 100644
--- a/Master/texmf-dist/doc/latex/logicpuzzle/README
+++ b/Master/texmf-dist/doc/latex/logicpuzzle/README
@@ -7,29 +7,32 @@ puzzles. At the moment the following puzzles are supported:
 * Chaos Sudoku
 * Hakyuu (aka Seismic, Ripple Effect, ...)
 * Hitori
+* Kakuro
 * Kendoku (aka Mathdoku, Calcudoku, Basic, MiniPlu, Ken Ken,
                Square Wisdom, Sukendo, Caldoku, ...)
 * Killer Sudoku (aka Samunapure, Sum Number Place, Sumdoku,
                      Gebietssummen, ...)
 * Laser Beam (aka Laserstrahl, ...)
-* Minesweeper (aka Minensuche, ...) 
+* Minesweeper (aka Minensuche, ...)
+* Schatzsuche
 * Skyline (aka Skycrapers, Wolkenkratzer, Hochhäuser, ...)
   incl. Skyline Sudoku and Skyline Sudoku (N*N) variants
 * Slitherlink (aka Fences, Number Line, Dotty Dilemma,
                Sli-Lin, Takegaki, Great Wall of China,
                Loop the Loop, Rundweg, Gartenzaun, ...) 
 * Sudoku
+* Tents and Trees (aka Zeltlager, Zeltplatz, Camping, ...)
 * Tunnel
 
 License: LPPL
 
-Changes in v2.0:
+Changes in v2.1:
 
-- added support for Minesweeper puzzle
+- added support for Kakuro puzzle
   https://bitbucket.org/kleberj/logicpuzzle/wiki/Minesweeper
 
-- added support for Tunnel puzzle
-  https://bitbucket.org/kleberj/logicpuzzle/wiki/Tunnel
+- added support for Schatzsuche puzzle
+  https://bitbucket.org/kleberj/logicpuzzle/wiki/Schatzsuche
 
-- moved package contents to logicpuzzle.sty and lpenv.sty
-  merged docs into logicpuzzle.pdf
\ No newline at end of file
+- added support for Tents and Trees puzzle
+  https://bitbucket.org/kleberj/logicpuzzle/wiki/TentsAndTrees
diff --git a/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle.pdf b/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle.pdf
new file mode 100644
index 00000000000..8e8818ff848
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle.pdf
diff --git a/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle/logicpuzzle.tex b/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle.tex
index 47aa95d394e..2adf999008b 100644
--- a/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle/logicpuzzle.tex
+++ b/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle.tex
@@ -20,6 +20,8 @@
 \usepackage{marginnote}%
 \usepackage[svgnames,rgb]{xcolor}%
 \usepackage[automark,nouppercase]{scrpage2}
+\usepackage[tocgraduated]{tocstyle}
+\usetocstyle{KOMAlike}
 \usepackage{logicpuzzle}
 \usepackage{hyperref}
 %
@@ -39,7 +41,7 @@
 \AtBeginDocument{\IfFileExists{qrcode.png}{}{\write18{wget -O qrcode.png http://i.imgur.com/KAunnuS.png}}}%
 \hypersetup{colorlinks=true,urlcolor=NavyBlue,linkcolor=NavyBlue,citecolor=CornflowerBlue,naturalnames=true,hypertexnames=false}%
 \lstset{language=[LaTeX]TeX,numbers=left,numberstyle=\tiny, basicstyle=\ttfamily, aboveskip=\baselineskip, frame=single, backgroundcolor=\color{LightGoldenrodYellow}, keywordstyle=\color{Blue}, 
-emph={ddsudoku, battleship, bokkusu, chaossudoku, hakyuu, hitori, kendoku, killersudoku, laserbeam, skyline, slitherlink, lpsudoku, minesweeper, tunnel,
+emph={ddsudoku, battleship, bokkusu, chaossudoku, hakyuu, hitori, kakuro, kendoku, killersudoku, laserbeam, skyline, slitherlink, lpsudoku, minesweeper, schatzsuche, tentsandtrees, tunnel,
 minipage, tikzpicture, puzzlebackground, puzzleforeground, center, pgfonlayer, left, 
 shape, fill, inner, sep, draw, rounded, corners, thick},
 emphstyle=\color{Tomato}, emph={[2]Wheat, HotPink, GreenYellow, LightBlue, LightSalmon, 
@@ -55,7 +57,8 @@ ddsudokucell, chaossudokucell, hakyuucell, setrow, LP@cvoffset, titleformat, def
 marginnote, tikz, node, placesegment, placeship, shipH, shipV, shipbox, puzzlecounter, color, 
 fillrow, setcolorrow, laserV, laserH, mirrorV, mirrorH, placearrow, placecross, placemirror, 
 laser, skylineT, skylineB, skylineR, skylineL, skylinecell, setbigcell, slitherlinkcell, 
-tunnelH, tunnelV, tube, portal, Mine, ShipR, [, ]}}
+tunnelH, tunnelV, tube, portal, Mine, Diamond, ShipR, kakurosetup, kakurorow, KKR, Black,
+Tent, Tree, definecolor, tentH, tentV, [, ]}}
 \makeatletter
 \renewcommand{\maketitle}%
 {%
@@ -172,11 +175,6 @@ tunnelH, tunnelV, tube, portal, Mine, ShipR, [, ]}}
  \index{#1=\string\meta{#1} optional argument}\index{optional argument>#1=\string\meta{#1}}%
 }%
 %
-%\renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
-\renewcommand*\l@subsection{\@dottedtocline{2}{1.6em}{3.1em}}
-\renewcommand*\l@subsubsection{\@dottedtocline{3}{4.7em}{3.8em}}
-\renewcommand*\l@paragraph{\@dottedtocline{3}{8.5em}{5em}}
-\renewcommand*\l@subparagraph{\@dottedtocline{3}{13.5em}{6em}}
 \renewenvironment{theindex}
                {\if@twocolumn
                   \@restonecolfalse
@@ -356,6 +354,28 @@ tunnelH, tunnelV, tube, portal, Mine, ShipR, [, ]}}
  year                 = {2013},
  }
 
+@misc{bib:ex:schatzsuche,
+ author               = {Josef Kleber},
+ note                 = {\href{https://bitbucket.org/kleberj/logicpuzzle/downloads/example-schatzsuche.pdf}(https://bitbucket.org/kleberj/logicpuzzle/downloads/example-schatzsuche.pdf)},
+ title                = {{Examples \& Solutions (schatzsuche)}},
+ year                 = {2013},
+ }
+
+@misc{bib:ex:kakuro,
+ author               = {Josef Kleber},
+ note                 = {\href{https://bitbucket.org/kleberj/logicpuzzle/downloads/example-kakuro.pdf}(https://bitbucket.org/kleberj/logicpuzzle/downloads/example-kakuro.pdf)},
+ title                = {{Examples \& Solutions (kakuro)}},
+ year                 = {2013},
+ }
+
+@misc{bib:ex:tentsandtrees,
+ author               = {Josef Kleber},
+ note                 = {\href{https://bitbucket.org/kleberj/logicpuzzle/downloads/example-tentsandtrees.pdf}(https://bitbucket.org/kleberj/logicpuzzle/downloads/example-tentsandtrees.pdf)},
+ title                = {{Examples \& Solutions (tentsandtrees)}},
+ year                 = {2013},
+ }
+
+
 \end{filecontents}
 \bibliographystyle{plain}
 \ddsudokusetup{width=4.5cm,scale=0.85}
@@ -364,18 +384,21 @@ tunnelH, tunnelV, tube, portal, Mine, ShipR, [, ]}}
 \chaossudokusetup{width=4.5cm,scale=0.89}
 \hakyuusetup{width=4.5cm,scale=0.89}
 \hitorisetup{width=4.5cm,scale=0.85}
+\kakurosetup{width=4.5cm,scale=0.85}
 \kendokusetup{width=4.5cm,scale=0.89}
 \killersudokusetup{width=4.5cm,scale=0.89}
 \laserbeamsetup{width=4.5cm,scale=0.66,fontsize=normalsize}
 \minesweepersetup{width=4.5cm,scale=0.85}
+\schatzsuchesetup{width=4.5cm,scale=0.85}
 \skylinesetup{width=4.5cm,scale=0.66,fontsize=normalsize}
 \slitherlinksetup{width=4.5cm,scale=0.85}
 \lpsudokusetup{width=4.5cm,scale=0.49,fontsize=small}
+\tentsandtreessetup{width=4.5cm,scale=0.75}
 \tunnelsetup{width=4.5cm,scale=0.75}
 \title{\filename}%
 \Subtitle{A style file for typesetting logic puzzles}%
 \author{Josef Kleber}
-\Fileversion{v2.0}
+\Fileversion{v2.1}
 \Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/logicpuzzle/}{\texttt{https://bitbucket.org/kleberj/logicpuzzle/}}}
 \newsavebox\logo
 \savebox\logo{%
@@ -869,6 +892,71 @@ Black out some cells according to these specifications: In each row and each col
   \optitem{\envoption{cvoffset}}{-23pt}{sets the vertical offset of the counters in the margin.}
 \end{optionlist}
 
+\subsection{Kakuro}
+Enter numbers from 1 to 9 in any order into the blank cells. Here, the given horizontal and vertical sums should result. The zero does not occur. Within a summation, no number can be repeated.
+\subsubsection{Example}
+\definecolor{kakuro}{RGB}{155,206,167}
+\kakurosetup{color=kakuro}
+\begin{center}
+  \begin{kakuro}
+    \framepuzzle
+    \kakurorow{5}{\Black,\KKR{23}{},\KKR{16}{},\KKR{10}{},\Black}
+    \kakurorow{4}{\KKR{}{14},9,1,4,\KKR{3}{}}
+    \kakurorow{3}{\KKR{}{16},6,5,3,2}
+    \kakurorow{2}{\KKR{}{14},8,3,2,1}
+    \kakurorow{1}{\Black,\KKR{}{8},7,1,\Black}
+  \end{kakuro}
+  \hspace{1.5cm}
+  \begin{kakuro}[solution]
+    \framepuzzle
+    \kakurorow{5}{\Black,\KKR{23}{},\KKR{16}{},\KKR{10}{},\Black}
+    \kakurorow{4}{\KKR{}{14},9,1,4,\KKR{3}{}}
+    \kakurorow{3}{\KKR{}{16},6,5,3,2}
+    \kakurorow{2}{\KKR{}{14},8,3,2,1}
+    \kakurorow{1}{\Black,\KKR{}{8},7,1,\Black}
+  \end{kakuro}
+\end{center}
+\begin{lstlisting}
+\definecolor{kakuro}{RGB}{155,206,167}
+\kakurosetup{color=kakuro}
+\begin{center}
+  \begin{kakuro}
+    \framepuzzle
+    \kakurorow{5}{\Black,\KKR{23}{},\KKR{16}{},\KKR{10}{},\Black}
+    \kakurorow{4}{\KKR{}{14},9,1,4,\KKR{3}{}}
+    \kakurorow{3}{\KKR{}{16},6,5,3,2}
+    \kakurorow{2}{\KKR{}{14},8,3,2,1}
+    \kakurorow{1}{\Black,\KKR{}{8},7,1,\Black}
+  \end{kakuro}
+  \hspace{1.5cm}
+  \begin{kakuro}[solution]
+    \framepuzzle
+    \kakurorow{5}{\Black,\KKR{23}{},\KKR{16}{},\KKR{10}{},\Black}
+    \kakurorow{4}{\KKR{}{14},9,1,4,\KKR{3}{}}
+    \kakurorow{3}{\KKR{}{16},6,5,3,2}
+    \kakurorow{2}{\KKR{}{14},8,3,2,1}
+    \kakurorow{1}{\Black,\KKR{}{8},7,1,\Black}
+  \end{kakuro}
+\end{center}
+\end{lstlisting}
+
+\subsubsection{Options}
+\begin{optionlist}
+  \optitem{\envoption{rows}}{5}{defines the number of rows in the grid.}
+  \optitem{\envoption{columns}}{5}{specifies the number of columns in the grid}
+  \optitem{\envoption{width}}{5.1cm}{sets the width of the minipage, in which the grid is typeset.}
+  \optitem{\envoption{scale}}{1}{scales the size of the grid in the minipage.}
+  \optitem{\envoption{fontsize}}{Large}{specifies 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}}
+  \optitem{\envoption{title}}{}{sets the title of a puzzle.}
+  \optitem{\envoption{titleindent}}{0cm}{defines the indent of the title.}
+  \optitem{\envoption{titlewidth}}{5.1cm}{specifies the width of the box the title is set in.}
+  \optitem{\envoption{color}}{green}{specifies the color of the kakuro cells.}
+  \optitem{\envoption{bgcolor}}{}{sets the background color of the grid.}
+  \optitem{\envoption{counterstyle}}{none}{defines the counter style. Predefined styles: none, left, right}
+  \optitem{\envoption{cvoffset}}{-23pt}{sets the vertical offset of the counters in the margin.}
+  \optitem{\envoption{solution}}{false}{You can use the solution also for the puzzle, as the numbers in the cells are only typeset with option \envoption{solution}\texttt{=true}.}
+\end{optionlist}
+
 \subsection{Kendoku}
 Fill the cells with the numbers from 1 to SIZE of the puzzle. In the top left corner of a framed area, you will find the result of the specified arithmetic function, which is applied on the entered numbers. The numbers may occur only once in each row and column. The numbers of an area may not necessarily be different when they are in different rows or columns.
 \subsubsection{Example}
@@ -1262,6 +1350,65 @@ Draw a mine in some cells of the grid. The number in a cell indicates how many o
   \optitem{\envoption{cvoffset}}{-23pt}{sets the vertical offset of the counters in the margin.}
 \end{optionlist}
 
+\subsection{Schatzsuche}
+It's a variant of Minesweeper, just with diamonds instead of mines. Draw a diamond in some cells of the grid. The number in a cell indicates how many of the eight neighboring cells contain a diamond. A numbered cell does not contain a diamond.
+\subsubsection{Example}
+\begin{center}
+  \begin{schatzsuche}
+    \framepuzzle
+    \setrow{5}{{},1}
+    \setrow{4}{{},{},3,3}
+    \setrow{3}{3,{},4,2}
+    \setrow{2}{{},{},{},{},0}
+    \setrow{1}{{},2}
+  \end{schatzsuche}
+  \hspace{1.5cm}
+  \begin{schatzsuche}
+    \framepuzzle
+    \setrow{5}{{},1,{},\Diamond,\Diamond}
+    \setrow{4}{{},\Diamond,3,3,\Diamond}
+    \setrow{3}{3,\Diamond,4,2}
+    \setrow{2}{{},\Diamond,\Diamond,{},0}
+    \setrow{1}{{},2}
+  \end{schatzsuche}
+\end{center}
+\begin{lstlisting}
+\begin{center}
+  \begin{schatzsuche}
+    \framepuzzle
+    \setrow{5}{{},1}
+    \setrow{4}{{},{},3,3}
+    \setrow{3}{3,{},4,2}
+    \setrow{2}{{},{},{},{},0}
+    \setrow{1}{{},2}
+  \end{schatzsuche}
+  \hspace{1.5cm}
+  \begin{schatzsuche}
+    \framepuzzle
+    \setrow{5}{{},1,{},\Diamond,\Diamond}
+    \setrow{4}{{},\Diamond,3,3,\Diamond}
+    \setrow{3}{3,\Diamond,4,2}
+    \setrow{2}{{},\Diamond,\Diamond,{},0}
+    \setrow{1}{{},2}
+  \end{schatzsuche}
+\end{center}
+\end{lstlisting}
+
+\subsubsection{Options}
+\begin{optionlist}
+  \optitem{\envoption{rows}}{5}{defines the number of rows in the grid.}
+  \optitem{\envoption{columns}}{5}{specifies the number of columns in the grid}
+  \optitem{\envoption{width}}{5.1cm}{sets the width of the minipage, in which the grid is typeset.}
+  \optitem{\envoption{scale}}{1}{scales the size of the grid in the minipage.}
+  \optitem{\envoption{fontsize}}{Large}{specifies 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}}
+  \optitem{\envoption{title}}{}{sets the title of a puzzle.}
+  \optitem{\envoption{titleindent}}{0cm}{defines the indent of the title.}
+  \optitem{\envoption{titlewidth}}{5.1cm}{specifies the width of the box the title is set in.}
+  \optitem{\envoption{bgcolor}}{}{sets the background color of the grid.}
+  \optitem{\envoption{counterstyle}}{none}{defines the counter style. Predefined styles: none, left, right}
+  \optitem{\envoption{cvoffset}}{-23pt}{sets the vertical offset of the counters in the margin.}
+\end{optionlist}
+
 \subsection{Skyline}
 There are skyscrapers located in each cell. Try to find out the height of the skyscraper in the respective cell. There are heights of 1 to MAX in every row, every column, and in each of the two diagonals if indicated. Some cells may be empty (parks). The numbers around the grid indicate how many buildings you can see from this position when you look at the skyscraper lineup. Bear in mind that only those skyscrapers are visible which are higher than the ones in front.
 \subsubsection{Example}
@@ -1683,6 +1830,69 @@ This config file will be sourced into the \texttt{lpsmag bash} script and contai
 
 After running \texttt{lpsmag} you will find a \texttt{lpsmag.tex} in your working directory. Just run \texttt{pdflatex lpsmag.tex} twice and you finally get for example this \href{https://bitbucket.org/kleberj/logicpuzzle/downloads/lpsmag.pdf}{\texttt{lpsmag.pdf}}. 
 
+\subsection{Tents and Trees}
+Draw tents in the grid. Next to each tree, a tent must be entered in a horizontally or vertically adjacent cell, which is associated with this tree. The numbers next to the grid indicate the quantity of tents in each row or column. No tent can stand directly next to another one, not even diagonally.
+\subsubsection{Example}
+\begin{center}
+  \begin{tentsandtrees}
+    \framepuzzle
+    \tentH{1,2,1,1,2}
+    \tentV{2,0,2,0,3}
+    \setrow{4}{\Tree,{},\Tree,\Tree,\Tree}
+    \setrow{2}{{},\Tree}
+    \setrow{1}{\Tree,{},{},\Tree}
+  \end{tentsandtrees}
+  \hspace{1.5cm}
+  \begin{tentsandtrees}
+    \framepuzzle
+    \tentH{1,2,1,1,2}
+    \tentV{2,0,2,0,3}
+    \setrow{5}{\Tent,{},\Tent,{},\Tent,}
+    \setrow{4}{\Tree,{},\Tree,\Tree,\Tree}
+    \setrow{3}{{},\Tent,{},\Tent}
+    \setrow{2}{{},\Tree}
+    \setrow{1}{\Tree,\Tent,{},\Tree,\Tent}
+  \end{tentsandtrees}
+\end{center}
+\begin{lstlisting}
+\begin{center}
+  \begin{tentsandtrees}
+    \framepuzzle
+    \tentH{1,2,1,1,2}
+    \tentV{2,0,2,0,3}
+    \setrow{4}{\Tree,{},\Tree,\Tree,\Tree}
+    \setrow{2}{{},\Tree}
+    \setrow{1}{\Tree,{},{},\Tree}
+  \end{tentsandtrees}
+  \hspace{1.5cm}
+  \begin{tentsandtrees}
+    \framepuzzle
+    \tentH{1,2,1,1,2}
+    \tentV{2,0,2,0,3}
+    \setrow{5}{\Tent,{},\Tent,{},\Tent,}
+    \setrow{4}{\Tree,{},\Tree,\Tree,\Tree}
+    \setrow{3}{{},\Tent,{},\Tent}
+    \setrow{2}{{},\Tree}
+    \setrow{1}{\Tree,\Tent,{},\Tree,\Tent}
+  \end{tentsandtrees}
+\end{center}
+\end{lstlisting}
+
+\subsubsection{Options}
+\begin{optionlist}
+  \optitem{\envoption{rows}}{5}{defines the number of rows in the grid.}
+  \optitem{\envoption{columns}}{5}{specifies the number of columns in the grid}
+  \optitem{\envoption{width}}{5.9cm}{sets the width of the minipage, in which the grid is typeset.}
+  \optitem{\envoption{scale}}{1}{scales the size of the grid in the minipage.}
+  \optitem{\envoption{fontsize}}{Large}{specifies 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}}
+  \optitem{\envoption{title}}{}{sets the title of a puzzle.}
+  \optitem{\envoption{titleindent}}{0cm}{defines the indent of the title.}
+  \optitem{\envoption{titlewidth}}{5.9cm}{specifies the width of the box the title is set in.}
+  \optitem{\envoption{bgcolor}}{}{sets the background color of the grid.}
+  \optitem{\envoption{counterstyle}}{none}{defines the counter style. Predefined styles: none, left, right}
+  \optitem{\envoption{cvoffset}}{-23pt}{sets the vertical offset of the counters in the margin.}
+\end{optionlist}
+
 \subsection{Tunnel}
 Determine the course of the tube. Draw the only possible connection. from the beginning to the end. The numbers indicate how many tube segments (including portals) are present in the corresponding rows and columns. The tube is one cell wide, and does not cross or touch itself!
 \subsubsection{Example}
@@ -1772,10 +1982,9 @@ We wrote a package \package{bokkusu.sty} with version number v1.2 and date 2013/
 \ExecuteOptionsX{rows,columns,width,fontsize,scale,color,bgcolor,cvoffset,
                  counterstyle,title,titleindent,titlewidth}%
 \ProcessOptionsX\relax%
-\LP@init@counter{\LP@BK@init@prefix}%
 \end{lstlisting}
 
-We save the package prefix and name in a macro for easy change. Then we define the options for package \package{bokkusu.sty} and the environment \env{bokkusu}, which are executed afterwards to create the macros for the option values. In the end, we need to initialize the package counters.
+We save the package prefix and name in a macro for easy change. Then we define the options for package \package{bokkusu.sty} and the environment \env{bokkusu}, which are executed afterwards to create the macros for the option values.
 
 \begin{lstlisting}
 \let\valueH\LP@bottomrow%
@@ -1804,10 +2013,10 @@ Finally, we define the \env{bokkusu} environment.
   \setkeys{bokkusu}{#1}%
   \LP@set@package{bokkusu}%
   \LP@set@env@prefix{LP@BK}%
-  \setcounter{LP@BK@rows}{\LP@BK@rows}%
-  \setcounter{LP@BK@columns}{\LP@BK@columns}%
-  \stepcounter{LP@BK@rows}%
-  \stepcounter{LP@BK@columns}%
+  \setcounter{LP@rows}{\LP@BK@rows}%
+  \setcounter{LP@columns}{\LP@BK@columns}%
+  \stepcounter{LP@rows}%
+  \stepcounter{LP@columns}%
 \end{lstlisting}
 
 We locally set the environment options and the prefix and name of the current puzzle environment. We need to reset the counters for \envoption{rows} and \envoption{columns}, as they might have been altered. 
@@ -1961,6 +2170,20 @@ With the command \cs{hakyuusetup}\margcs{\cmd\hakyuusetup\{\marg{options}\}} you
 \label{sec:pschitori}
 \subparagraph{\texttt{hitorisetup}}
 With the command \cs{hitorisetup}\margcs{\cmd\hitorisetup\{\marg{options}\}} you can reset the options with global scope.
+\paragraph{Kakuro}
+\label{sec:psckakuro}
+\subparagraph{\texttt{kakurorow}}
+\label{sec:psckakurorow}
+With\margcs{\cmd\kakurorow\{\marg{row}\}\{\marg{csv list}\}} the \cmd\kakurorow\ command, you can set the contents of a kakuro \marg{row}. These may be numbers and the commands \cmd\KKR\ or \cmd\Black.
+\subparagraph{\texttt{kakurocolumn}}
+\label{sec:psckakurocolumn}
+With\margcs{\cmd\kakurocolumn\{\marg{column}\}\{\marg{csv list}\}} the \cmd\kakurocolumn\ command, you can set the contents of a kakuro \marg{column}.
+\subparagraph{\texttt{KKR}}
+With\margcs{\cmd\KKR\{\marg{sumV}\}\{\marg{sumH}\}} the \cmd\KKR\ command, you can set the contents of a kakuro cell.
+\subparagraph{\texttt{Black}}
+The command \cs{Black}\margcs{\cmd\Black} blacks out a cell.
+\subparagraph{\texttt{kakurosetup}}
+With the command \cs{kakurosetup}\margcs{\cmd\kakurosetup\{\marg{options}\}} you can reset the options with global scope.
 \paragraph{Kendoku}
 \label{sec:psckendoku}
 \subparagraph{\texttt{kendokucell}}
@@ -2005,6 +2228,12 @@ With the command \cs{laserbeamsetup}\margcs{\cmd\laserbeamsetup\{\marg{options}\
 The command \cs{Mine}\margcs{\cmd\Mine} draws a mine. It can be used in commands like \cmd\setcell\ [see: \ref{sec:setcell}] or \cmd\setrow\ [see: \ref{sec:setrow}]! 
 \subparagraph{\texttt{minesweepersetup}}
 With the command \cs{minesweepersetup}\margcs{\cmd\minesweepersetup\{\marg{options}\}} you can reset the options with global scope.
+\paragraph{Schatzsuche}
+\label{sec:pscschatzsuche}
+\subparagraph{\texttt{Diamond}}
+The command \cs{Diamond}\margcs{\cmd\Diamond} draws a diamond. It can be used in commands like \cmd\setcell\ [see: \ref{sec:setcell}] or \cmd\setrow\ [see: \ref{sec:setrow}]! 
+\subparagraph{\texttt{schatzsuchesetup}}
+With the command \cs{schatzsuchesetup}\margcs{\cmd\schatzsuchesetup\{\marg{options}\}} you can reset the options with global scope.
 \paragraph{Skyline}
 \label{sec:pscskyline}
 \subparagraph{\texttt{skylineT}}
@@ -2031,6 +2260,18 @@ With the command \cs{slitherlinksetup}\margcs{\cmd\slitherlinksetup\{\marg{optio
 The command \cs{lpsudokucell}\margcs{\cmd\lpsudokucell\{\marg{column}\}\{\marg{row}\}\\\{\marg{number}\}} sets the \marg{number} of the grid cell \marg{column} \marg{row}.
 \subparagraph{\texttt{lpsudokusetup}}
 With the command \cs{lpsudokusetup}\margcs{\cmd\lpsudokusetup\{\marg{options}\}} you can reset the options with global scope.
+\paragraph{Tents and Trees}
+\label{sec:psctentsandtrees}
+\subparagraph{\texttt{tentH}}
+The command \cs{tentH}\margcs{\cmd\tentH\{\marg{csv list}\}} typesets the numbers above the grid indicating how many tents are in the respective column. It expects a comma-separated list as an argument.
+\subparagraph{\texttt{tentV}}
+The command \cs{tentV}\margcs{\cmd\tentV\{\marg{csv list}\}} typesets the numbers left to the grid.
+\subparagraph{\texttt{Tree}}
+The command \cs{Tree}\margcs{\cmd\Tree} draws a tree. It can be used in commands like \cmd\setcell\ [see: \ref{sec:setcell}] or \cmd\setrow\ [see: \ref{sec:setrow}]! The design of the tree is based on \href{http://tex.stackexchange.com/users/3144/alain-matthes}{Alain Matthes}' answer to this \href{http://tex.stackexchange.com/questions/39149/how-can-we-draw-a-christmas-tree-with-decorations-using-tikz}{question} on \TeX.sx.
+\subparagraph{\texttt{Tent}}
+The command \cs{Tent}\margcs{\cmd\Tent} draws a tent. It can be used in commands like \cmd\setcell\ [see: \ref{sec:setcell}] or \cmd\setrow\ [see: \ref{sec:setrow}]!
+\subparagraph{\texttt{tentsandtreessetup}}
+With the command \cs{tentsandtreessetup}\margcs{\cmd\tentsandtreessetup\{\marg{options}\}} you can reset the options with global scope.
 \paragraph{Tunnel}
 \label{sec:psctunnel}
 \subparagraph{\texttt{tunnelH}}
@@ -2193,10 +2434,6 @@ This code snippet defines the option \envoption{rows} for environment \env{battl
 \label{sec:LPdefinechoicekeyfontsize}
 With\margcs{\cmd\LP@define@choicekey@fontsize\\\{\marg{prefix}\}\{\marg{package}\}\{\marg{default}\}} this command, you can define the choice key option \envoption{fontsize} of the environment \marg{package}. Possible keys are: tiny, scriptsize, footnotesize, small, normalsize, large, Large, LARGE, huge, Huge
 
-\subparagraph{\texttt{LP@init@counter}}
-\label{sec:LPinitcounter}
-The command\margcs{\cmd\LP@init@counter\{\marg{prefix}\}} \cmd\LP@init@counter\ defines the counters \marg{prefix}@rows and \marg{prefix}@columns. Furthermore, they are initialized with \textbackslash\marg{prefix}@rows\ and \textbackslash\marg{prefix}@columns\ and steped. 
-
 \paragraph{Drawing grids}
 \subparagraph{\texttt{LP@drawgrid}}
 \label{sec:LPdrawgrid}
diff --git a/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle/logicpuzzle.pdf b/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle/logicpuzzle.pdf
deleted file mode 100644
index 0e77a0f56d3..00000000000
--- a/Master/texmf-dist/doc/latex/logicpuzzle/logicpuzzle/logicpuzzle.pdf
+++ /dev/null