Apply FS #6702: More Sokoban Improvements.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13731 a1c6a512-1295-4272-9138-f99709370657

11 files changed, 57 insertions, 26 deletions

diff --git a/manual/plugins/images/ss-sokoban-112x64x1.png b/manual/plugins/images/ss-sokoban-112x64x1.png
index c0fa584d0c..c0bb499ded 100644
--- a/manual/plugins/images/ss-sokoban-112x64x1.png
+++ b/manual/plugins/images/ss-sokoban-112x64x1.png
diff --git a/manual/plugins/images/ss-sokoban-128x128x16.png b/manual/plugins/images/ss-sokoban-128x128x16.png
index fc45da89c9..2655b6c426 100644
--- a/manual/plugins/images/ss-sokoban-128x128x16.png
+++ b/manual/plugins/images/ss-sokoban-128x128x16.png
diff --git a/manual/plugins/images/ss-sokoban-138x110x2.png b/manual/plugins/images/ss-sokoban-138x110x2.png
index a824ab0561..f6e077eee5 100644
--- a/manual/plugins/images/ss-sokoban-138x110x2.png
+++ b/manual/plugins/images/ss-sokoban-138x110x2.png
diff --git a/manual/plugins/images/ss-sokoban-160x128x16.png b/manual/plugins/images/ss-sokoban-160x128x16.png
index b267cf70b6..53761aca5b 100644
--- a/manual/plugins/images/ss-sokoban-160x128x16.png
+++ b/manual/plugins/images/ss-sokoban-160x128x16.png
diff --git a/manual/plugins/images/ss-sokoban-160x128x2.png b/manual/plugins/images/ss-sokoban-160x128x2.png
index 8cd23bdadb..6f3833da73 100644
--- a/manual/plugins/images/ss-sokoban-160x128x2.png
+++ b/manual/plugins/images/ss-sokoban-160x128x2.png
diff --git a/manual/plugins/images/ss-sokoban-176x132x16.png b/manual/plugins/images/ss-sokoban-176x132x16.png
index e176a81059..0602220414 100644
--- a/manual/plugins/images/ss-sokoban-176x132x16.png
+++ b/manual/plugins/images/ss-sokoban-176x132x16.png
diff --git a/manual/plugins/images/ss-sokoban-176x220x16.png b/manual/plugins/images/ss-sokoban-176x220x16.png
index 157499dbec..7251d244c5 100644
--- a/manual/plugins/images/ss-sokoban-176x220x16.png
+++ b/manual/plugins/images/ss-sokoban-176x220x16.png
diff --git a/manual/plugins/images/ss-sokoban-220x176x16.png b/manual/plugins/images/ss-sokoban-220x176x16.png
index 554fcf7798..afef9c6806 100644
--- a/manual/plugins/images/ss-sokoban-220x176x16.png
+++ b/manual/plugins/images/ss-sokoban-220x176x16.png
diff --git a/manual/plugins/images/ss-sokoban-240x320x16.png b/manual/plugins/images/ss-sokoban-240x320x16.png
index 5abc7d04e9..aded2fb1da 100644
--- a/manual/plugins/images/ss-sokoban-240x320x16.png
+++ b/manual/plugins/images/ss-sokoban-240x320x16.png
diff --git a/manual/plugins/images/ss-sokoban-320x240x16.png b/manual/plugins/images/ss-sokoban-320x240x16.png
index 816e5de680..7f6fc472fe 100644
--- a/manual/plugins/images/ss-sokoban-320x240x16.png
+++ b/manual/plugins/images/ss-sokoban-320x240x16.png
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 755c4e8295..246eceda51 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -5,44 +5,75 @@ The object of the game is to push boxes into their correct position in a
 crowded warehouse with a minimal number of pushes and moves. The boxes
 can only be pushed, never pulled, and only one can be pushed at a time.
 
+Sokoban may be used as a viewer for viewing saved solutions and playing
+external level sets with the \fname{.sok} extension. Level sets should be in
+the standard Sokoban text format or RLE (Run Length Encoded). For more
+information about the level format, see
+\url{http://sokobano.de/wiki/index.php?title=Level_format}
+
 \begin{table}
 \begin{btnmap}{}{}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD}
     {\ButtonUp, \ButtonDown,}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
     & Move the ``sokoban'' up, down, left or right\\
-\opt{RECORDER_PAD}{\ButtonFOne}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,SANSA_E200_PAD}{\ButtonPower}
+    & Menu \\
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonOn}
+\opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonLeft}
-\opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonDown}
-\opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
-    & Back to previous level \\
-\opt{RECORDER_PAD}{\ButtonFTwo}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD}{\ButtonSelect}
+\opt{IRIVER_H10_PAD}{\ButtonRew}
+    & Undo last movement \\
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonPlay}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
-\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
+\opt{IAUDIO_X5_PAD}{n/a}
 \opt{IRIVER_H10_PAD}{\ButtonFF}
-    & Restart level \\
-\opt{RECORDER_PAD}{\ButtonFThree}
+\opt{GIGABEAT_PAD}{\ButtonA}
+\opt{SANSA_E200_PAD}{\ButtonRec}
+    & Redo previously undone move \\
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFOne}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
+\opt{IAUDIO_X5_PAD}{\ButtonRec}
+\opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
+\opt{GIGABEAT_PAD}{\ButtonVolDown}
+\opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
+    & Back to previous level \\
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFTwo}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonRight}
-\opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{n/a}
+\opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
+\opt{GIGABEAT_PAD}{\ButtonMenu}
+\opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonRight}
+    & Restart level \\
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFThree}
+\opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay}
 \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
+\opt{GIGABEAT_PAD}{\ButtonVolUp}
+\opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonUp}
     & Go to next level \\
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-\opt{IRIVER_H10_PAD}{\ButtonRew}
-\opt{SANSA_E200_PAD}{\ButtonUp}
-    & Undo last movement \\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
-\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
-    & Exit sokoban \\
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD}
+    {\ButtonUp/\ButtonDown,}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay,}
+\opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown,}
+    & Increase/decrease solution playback speed
 \end{btnmap}
 \end{table}
+
+Some places where can you can find level sets:
+\begin{itemize}
+\item \url{http://www.sourcecode.se/sokoban/levels.php}
+\item \url{http://sokobano.de/en/levels.php}
+\end{itemize}