another enhancement of \screenshot -- filenames should now not include the display size extension anymore. Old behaviour still supported. Minor code policing.

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

38 files changed, 104 insertions, 75 deletions

diff --git a/manual/configure_rockbox/general_settings.tex b/manual/configure_rockbox/general_settings.tex
index 11323d061c..f6d52bafc9 100755
--- a/manual/configure_rockbox/general_settings.tex
+++ b/manual/configure_rockbox/general_settings.tex
@@ -1,3 +1,3 @@
-\screenshot{configure_rockbox/images/ss-general-settings-\genericimg.png}{}{}
+\screenshot{configure_rockbox/images/ss-general-settings}{}{}
 
   
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index f69fc80aaa..c658c6649c 100755
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -1,4 +1,4 @@
-\screenshot{configure_rockbox/images/ss-sound-settings-\genericimg.png}{}{}
+\screenshot{configure_rockbox/images/ss-sound-settings}{}{}
 
 The Sound Settings menu offers a selection of sound properties you may change to customize your listening experience.
 
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 64c2c0f49b..d42ed7bdcb 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -1,7 +1,7 @@
 \chapter{The Main Menu}
 
 \section{Introducing the Main Menu}
-\screenshot{main_menu/images/ss-main-menu-\genericimg.png}{The main menu}{}
+\screenshot{main_menu/images/ss-main-menu}{The main menu}{}
 This is the screen from which the rest of the Rockbox functions can be 
 accessed. It is used for a variety of functions, which are detailed below. 
 All options in Rockbox can be controlled via this menu.
@@ -60,7 +60,7 @@ settings may therefore not be saved unless the \dap\ is shut down safely
 }
 
 \section {Recent Bookmarks}
-\screenshot{main_menu/images/ss-list-bookmarks-\genericimg.png}%
+\screenshot{main_menu/images/ss-list-bookmarks}%
   {The list bookmarks screen}{}
 If the ``save a list of recently created bookmarks'' option is enabled 
 then you can view a list of several recent bookmarks here and select one to 
@@ -86,7 +86,7 @@ starting on page \pageref{ref:configure_rockbox_general}.
       
 \opt{CONFIG_TUNER}{
   \section{\label{ref:FMradio}FM Radio \opt{ondio}{ - OndioFM Only}}  
-  \screenshot{main_menu/images/ss-fm-radio-screen-\genericimg.png}%
+  \screenshot{main_menu/images/ss-fm-radio-screen}%
     {The FM radio screen}{}
   
   \opt{recorderv2fm,ondio}{
@@ -226,7 +226,7 @@ remember station frequency settings (presets).
 \opt{HAVE_RECORDING}{
   \section{\label{ref:Recording}Recording}
   \subsection{\label{ref:Whilerecordingscreen}While Recording Screen}
-  \screenshot{main_menu/images/ss-while-recording-screen-\genericimg.png}%
+  \screenshot{main_menu/images/ss-while-recording-screen}%
     {The while recording screen}{}
   Entering the ``Recording'' option in the Main menu launches the recording 
 application. The screen shows the time elapsed and the size of the file being 
@@ -278,7 +278,7 @@ recorded. A peak meter is present to allow you set Gain correctly.
   \end{table}
   
   \subsection{\label{ref:Recordingsettings}Recording Settings}
-  \screenshot{main_menu/images/ss-recording-settings-\genericimg.png}%
+  \screenshot{main_menu/images/ss-recording-settings}%
     {The recording settings screen}{}
   \opt{MASCODEC}{
     \begin{description}
diff --git a/manual/plugins/battery_test.tex b/manual/plugins/battery_test.tex
index 8754469482..89c9fc8b0c 100644
--- a/manual/plugins/battery_test.tex
+++ b/manual/plugins/battery_test.tex
@@ -1,5 +1,5 @@
 \subsection{Battery\_test}
-\screenshot{plugins/images/ss-battery_test-\genericimg.png}{Battery Test}%
+\screenshot{plugins/images/ss-battery_test}{Battery Test}%
 {img:batterytest}
 
 This plugin simulates normal power drain by spinning up the disk and
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index 179e05bf09..abfb6a3e21 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -1,5 +1,5 @@
 \subsection{Bounce}
-\screenshot{plugins/images/ss-bounce-\genericimg.png}{Bounce}{img:bounce}
+\screenshot{plugins/images/ss-bounce}{Bounce}{img:bounce}
 
 This demo is of the word ``Rockbox'' bouncing across the screen.  There
 is also an analogue clock on the Recorder platform.  (The Ondio does
@@ -27,4 +27,4 @@ respectively
 \item \textbf{Xadd/Yadd:} how fast the code moves on the sine curve on
 each axis
 \item \textbf{Xsane/Ysane:} Changes the appearance of the bouncing.
-\end{itemize}
\ No newline at end of file
+\end{itemize}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index e74cbecc2b..fe777070c8 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -1,5 +1,5 @@
 \subsection{BrickMania}
-\screenshot{plugins/images/ss-brickmania-\genericimg.png}{BrickMania}%
+\screenshot{plugins/images/ss-brickmania}{BrickMania}%
 {img:brickmania}
 BrickMania is a clone of the classic game Breakout. The aim of the game is to
 destroy all the bricks by hitting them with the ball once or more. Sometimes a
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index e7b07c0772..2a0be04c6a 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -1,5 +1,5 @@
 \subsection{Bubbles}
-\screenshot{plugins/images/ss-bubbles-\genericimg.png}{Bubbles}{img:bubbles}
+\screenshot{plugins/images/ss-bubbles}{Bubbles}{img:bubbles}
 The goal of the game is to beat each level as quickly as possible by clearing
 the board of all bubbles. Bubbles are removed from the board when a cluster of
 three of more of the same type is formed. The game is over when any bubbles on
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index badefce35f..26834adf96 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -1,5 +1,5 @@
 \subsection{Chess Clock}
-\screenshot{plugins/images/ss-chess_clock-\genericimg.png}{Chess Clock}%
+\screenshot{plugins/images/ss-chess_clock}{Chess Clock}%
 {img:chessclock}
 
 The chess clock plugin is designed  to
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index 4ee5e2d9e2..0d28702591 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -1,5 +1,5 @@
 \subsection{Chessbox}
-\screenshot{plugins/images/ss-chessbox-\genericimg.png}{Chessbox}{img:chessbox}
+\screenshot{plugins/images/ss-chessbox}{Chessbox}{img:chessbox}
 Chessbox is a chess game with computer AI. The chess engine is a port of GNU Chess 2 by John Stanback.\\
 
 \textbf{Keys}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index 12dbb335d2..9c77bdf242 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -1,5 +1,5 @@
 \subsection{Cube}
-\screenshot{plugins/images/ss-cube-\genericimg.png}{Cube}{img:cube}
+\screenshot{plugins/images/ss-cube}{Cube}{img:cube}
 
 This is a rotating cube screen saver in 3D.
 To see it at full speed, press PLAY and it will run at maximum frame rate. Also you can change the size of the x, y and z axis using  LEFT, RIGHT, UP, DOWN, F1 and F2.
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index c6da680de5..785ad46634 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -1,5 +1,5 @@
 \subsection{Demystify}
-\screenshot{plugins/images/ss-demystify-\genericimg.png}{Demystify}%
+\screenshot{plugins/images/ss-demystify}{Demystify}%
 {img:demystify}
 Demystify is a screen saver like demo.\\
 \begin{table}[ht!]
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index da8e42acbf..ae6b724865 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -1,5 +1,5 @@
 \subsection{Fire}
-\screenshot{plugins/images/ss-fire-\genericimg.png}{Fire}{img:fire}
+\screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
 
 \begin{table}[ht!]
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 548b177087..bec4826a63 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -1,5 +1,5 @@
 \subsection{Flipit}
-\screenshot{plugins/images/ss-flipit-\genericimg.png}{Flipit}{img:flipit}
+\screenshot{plugins/images/ss-flipit}{Flipit}{img:flipit}
 
 Flipping the colour of the token under the cursor also flips the tokens
 above, below, left and right of the cursor.  The aim is to end up with
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index c13a91db36..f14817beb5 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -1,5 +1,5 @@
 \subsection{Jewels}
-\screenshot{plugins/images/ss-jewels-\genericimg.png}{Jewels}{img:jewels}
+\screenshot{plugins/images/ss-jewels}{Jewels}{img:jewels}
 Jewels is a simple yet addicting game which involves swapping pairs of jewels in order to form connected segments of three or more of the same type.
 The goal of the game is to score as many points as possible before running out of available moves. Higher points are awarded to larger combos. The game advances to the next level after every one hundred points and randomly clears several jewels.\\
 \opt{recorder,recorderv2fm}{Use the direction keys to move the cursor, press Play to select a jewel, press down long on Play to show the menu and press Off to cancel.}
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 44338162d3..b7c592116b 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -1,5 +1,5 @@
 \subsection{Mandelbrot}
-\screenshot{plugins/images/ss-mandelbrot-\genericimg.png}{Mandelbrot}%
+\screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}%
 {img:mandelbrot}
 
 This is another demonstration using the grayscale engine.  It draws fractal images from the Mandelbrot set.
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index d165461d63..d08ee3e873 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -1,5 +1,5 @@
 \subsection{Minesweeper}
-\screenshot{plugins/images/ss-minesweeper-\genericimg.png}%
+\screenshot{plugins/images/ss-minesweeper}%
 {Minesweeper plugin}{img:minesweeper}
 
 The classic game of minesweeper.  Use the UP and DOWN keys to select the
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index 0c88aea712..24ae1b8b09 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -1,5 +1,5 @@
 \subsection{Mosaic}
-\screenshot{plugins/images/ss-mosaic-\genericimg.png}{Mosaic}{img:mosaic}
+\screenshot{plugins/images/ss-mosaic}{Mosaic}{img:mosaic}
 
 This simple graphics demo draws a mosaic picture on the screen of the
 Jukebox.  Press STOP to quit.
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 70136ef015..9837a241c6 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -1,6 +1,5 @@
 \subsection{Oscilloscope}
-\screenshot{plugins/images/ss-oscilloscope-\genericimg.png}{Oscilloscope}%
-{img:oscilloscope}
+\screenshot{plugins/images/ss-oscilloscope}{Oscilloscope}{img:oscilloscope}
 
 This demo shows the shape of the sound samples that make up the music
 being played. At faster speed rates, the Jukebox is less responsive
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index be1c67f93e..1ad78389af 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -1,6 +1,6 @@
 \subsection{Pacbox}
 Pacbox is an emulator of the Pacman arcade machine hardware. It is a port of \emph{PIE - Pacman Instructional Emulator} (\url{http://www.ascotti.org/programming/pie/pie.htm}).
-\screenshot{plugins/images/ss-pacbox-\genericimg.png}{Pacbox}{img:pacbox}
+\screenshot{plugins/images/ss-pacbox}{Pacbox}{img:pacbox}
 
 \subsubsection{ROMs}
 To use the emulator to play Pacman, you need a copy of ROMs for "Midway Pacman".
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index f693f0382d..5ea31bcfc8 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -1,5 +1,5 @@
 \subsection{Plasma}
-\screenshot{plugins/images/ss-plasma-\genericimg.png}{Plasma}{img:plasma}
+\screenshot{plugins/images/ss-plasma}{Plasma}{img:plasma}
 Plasma is a demo displaying a 80's style retro plasma effect.
 
 \begin{table}[ht!]
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index a37ac54aa4..ab47c4238f 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -1,6 +1,6 @@
 \subsection{Pong}
-\screenshot{plugins/images/ss-pong-\genericimg.png}{Pong}{img:pong}
-Pong is a simple two player "tennis game". Whenever a player misses the ball the other scores. 
+\screenshot{plugins/images/ss-pong}{Pong}{img:pong}
+Pong is a simple two player ``tennis game''. Whenever a player misses the ball the other scores. 
 
 \begin{table}[ht!]
     \begin{center}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 3e7dbe0d0f..80dab38ad6 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -1,5 +1,5 @@
 \subsection{Rockblox}
-\screenshot{plugins/images/ss-rockblox-\genericimg.png}{Rockblox plugin}%
+\screenshot{plugins/images/ss-rockblox}{Rockblox plugin}%
 {img:rockblox}
 
 This well{}-known game will probably be familiar. The aim of the game is
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index d6f56eb3fa..43cd92312f 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -1,5 +1,5 @@
 \subsection{\label{ref:Rockboy}Rockboy}
-\screenshot{plugins/images/ss-rockboy-\genericimg.png}{Rockboy}{img:rockboy}
+\screenshot{plugins/images/ss-rockboy}{Rockboy}{img:rockboy}
 Rockboy is a Nintendo Game Boy and Game Boy Color emulator for Rockbox based
 on the gnuboy emulator. To start a game open a ROM file saved as .gb or
 .gbc in the file browser.\\
@@ -23,11 +23,11 @@ on the gnuboy emulator. To start a game open a ROM file saved as .gb or
 \begin{itemize}
 \item \textbf{Back to Game}
 Takes you back to the game.
-\item \textbf{Load State...}
+\item \textbf{Load State\ldots}
 Loads a previously saved state.
-\item \textbf{Save State...}
+\item \textbf{Save State\ldots}
 Saves your current state.
-\item \textbf{Options...}
+\item \textbf{Options\ldots}
     \begin{itemize}
     \item \textbf{Frameskip}
     Change frameskip setting to improve speed.
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 94ebbd6164..fea302b02a 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -1,6 +1,5 @@
 \subsection{Sliding Puzzle}
-\screenshot{plugins/images/ss-sliding-\genericimg.png}{Sliding puzzle}%
-{img:slidingpuzzle}
+\screenshot{plugins/images/ss-sliding}{Sliding puzzle}{img:slidingpuzzle}
 
 The classic sliding puzzle game.  Rearrange the pieces so that you can
 see the whole picture.
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index 79ed1537c5..ef3ced09bf 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -1,5 +1,5 @@
 \subsection{Snake}
-\screenshot{plugins/images/ss-snake-\genericimg.png}{Snake}{img:snake}
+\screenshot{plugins/images/ss-snake}{Snake}{fig:snake}
 
 This is the popular snake game. The aim is to grow your snake as large
 as possible by eating the dots that appear on the screen. The game will
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index 7ba7209492..bca622df44 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -1,5 +1,5 @@
 \subsection{Snake 2}
-\screenshot{plugins/images/ss-snake2-\genericimg.png}%
+\screenshot{plugins/images/ss-snake2}%
 {Snake 2 {--} The Snake Strikes Back}{img:snake2}
 
 Another version of the Snake game. Move the snake around, and eat the
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index e465993efc..eeccea439a 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -1,5 +1,4 @@
 \subsection{Snow}
-\screenshot{plugins/images/ss-snow-\genericimg.png}%
-{Have you ever seen snow falling?}{img:snow}
+\screenshot{plugins/images/ss-snow}{Have you ever seen snow falling?}{img:snow}
 This demo replicates snow falling on your screen. If you love winter,
 you will love this demo.  Or maybe not.
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 6191284dff..88c105b74d 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -1,5 +1,5 @@
 \subsection{Sokoban}
-\screenshot{plugins/images/ss-sokoban-\genericimg.png}{Sokoban}{img:sokoban}
+\screenshot{plugins/images/ss-sokoban}{Sokoban}{fig:sokoban}
 
 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
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 8b65d13112..4b572e0459 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -1,9 +1,8 @@
 \subsection{Solitaire}
-\screenshot{plugins/images/ss-solitaire-\genericimg.png}{Klondike solitaire}%
-{img:solitaire}
+\screenshot{plugins/images/ss-solitaire}{Klondike solitaire}{fig:solitaire}
 
 This is the classic Klondike solitaire game
-for Rockbox.  Select \textbf{help }from the game menu to get an
+for Rockbox.  Select \emph{help} from the game menu to get an
 explanation of what the keys do.  Rules for Klondike solitaire are
 available from \url{http://www.solitairecentral.com/rules/klondike.html}.
 
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 21bd484236..736860a1da 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -1,5 +1,5 @@
 \subsection{Star}
-\screenshot{plugins/images/ss-star-\genericimg.png}{Star game}{img:star}
+\screenshot{plugins/images/ss-star}{Star game}{fig:star}
 
 This is a puzzle game.  It is actually a rewrite of Star, a game written
 by CDK designed for the hp48 calculator.
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index b42ab16552..8c3c67dedc 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -1,5 +1,5 @@
 \subsection{Starfield}
-\screenshot{plugins/images/ss-starfield-\genericimg.png}{Starfield}{img:starfield}
+\screenshot{plugins/images/ss-starfield}{Starfield}{fig:starfield}
 Starfield simulation (like the classic screensaver).
 
 \begin{table}[ht!]
@@ -8,11 +8,15 @@ Starfield simulation (like the classic screensaver).
     \textbf{Key} & \textbf{Action}\\\midrule
     Right & Increase number of stars\\
     Left & Decrease number of stars\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
     & Increase speed\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
     & Decrease speed\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
+    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}
+    \opt{ondio}{Off}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Menu}
     & Quit\\\bottomrule
     \end{tabular}
     \end{center}
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 65799e2d6f..c5f555284e 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -1,5 +1,5 @@
 \subsection{Stopwatch}
-\screenshot{plugins/images/ss-stopwatch-\genericimg.png}{Stopwatch}{img:stopwatch}
+\screenshot{plugins/images/ss-stopwatch}{Stopwatch}{fig:stopwatch}
 
 A simple stopwatch program with support for saving times.
 
@@ -8,10 +8,21 @@ A simple stopwatch program with support for saving times.
 \begin{center}
 \begin{tabular}{@{}ll@{}}\toprule
 \textbf{Key} & \textbf{Action}\\\midrule
-\opt{player}{Menu}\opt{recorder,recorderv2fm}{Off}\opt{ondio}{OnOff}\opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano}{Menu} & Quit Plugin \\
-\opt{player,recorder,recorderv2fm}{Play}\opt{ondio}{Right}\opt{h1xx,h300}{Select}\opt{ipodcolor,ipodnano}{Play} & Start / stop \\
-\opt{player}{Stop}\opt{recorder,recorderv2fm,ondio}{Left}\opt{h1xx,h300}{Down}\opt{ipodcolor,ipodnano}{Unknown} & Reset timer \\
-\opt{player,recorder,recorderv2fm}{On}\opt{ondio}{Mode}\opt{h1xx,h300}{Play}\opt{ipodcolor,ipodnano}{Unknown} & Take lap time \\
-\opt{player,h1xx,h300,ipodcolor,ipodnano}{Left/Right}\opt{recorder,recorderv2fm}{Down/Up} & Scroll through lap times \\\bottomrule
+\opt{player}{Menu}\opt{recorder,recorderv2fm}{Off}
+\opt{ondio}{OnOff}\opt{h1xx,h300}{Stop}
+\opt{ipodcolor,ipodnano}{Menu} 
+& Quit Plugin \\
+\opt{player,recorder,recorderv2fm}{Play}\opt{ondio}{Right}
+\opt{h1xx,h300}{Select}\opt{ipodcolor,ipodnano}{Play} 
+& Start / stop \\
+\opt{player}{Stop}\opt{recorder,recorderv2fm,ondio}{Left}
+\opt{h1xx,h300}{Down}\opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
+& Reset timer \\
+\opt{player,recorder,recorderv2fm}{On}\opt{ondio}{Mode}\opt{h1xx,h300}{Play}
+\opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
+& Take lap time \\
+\opt{player,h1xx,h300,ipodcolor,ipodnano}{Left/Right}
+\opt{recorder,recorderv2fm}{Down/Up} 
+& Scroll through lap times \\\bottomrule
 \end{tabular}
 \end{center}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index a81975558d..ab091856e3 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -1,5 +1,5 @@
 \subsection{\label{ref:Sudoku}Sudoku}
-\screenshot{plugins/images/ss-sudoku-\genericimg.png}{Sudoku}{img:sudoku}
+\screenshot{plugins/images/ss-sudoku}{Sudoku}{fig:sudoku}
 To play Sudoku you need sudoku games stored as .ss files (see links below).
 Once you have your .ss file just open it in the normal file browser to start playing.
 You can create and save your own grids under the "New" menu option.
@@ -20,14 +20,20 @@ These are \textbf{NOT} saved when saving the game.
     \begin{tabular}{ll}\toprule
     \textbf{Key} & \textbf{Action}\\\midrule
     Direction keys & Move the cursor\\
-    \opt{recorder,recorderv2fm}{PLAY}\opt{ondio}{MODE (increment once) / MODE+DOWN (toggle repeat)}
-        \opt{h1xx}{SELECT / PLAY}\opt{h300}{NAVI / PLAY}\opt{ipodcolor}{SELECT} & Increment  number under the cursor\\
+    \opt{recorder,recorderv2fm}{PLAY}
+    \opt{ondio}{MODE (increment once) / MODE+DOWN (toggle repeat)}
+    \opt{h1xx}{SELECT / PLAY}\opt{h300}{NAVI / PLAY}
+    \opt{ipodcolor}{SELECT} 
+    & Increment  number under the cursor\\
     \opt{recorder,recorderv2fm}{F1}\opt{ondio}{Long press on MODE}\opt{h1xx,h300}{A-B}
-        \opt{ipodcolor}{MENU} & Open Menu\\
-    \opt{recorder,recorderv2fm}{F2}\opt{ondio}{MODE+LEFT}\opt{h1xx,h300}{RECORD}
-        \opt{ipodcolor}{SELECT+LEFT} & Add / remove number to scratchpad\\
+    \opt{ipodcolor}{MENU} 
+    & Open Menu\\
+    \opt{recorder,recorderv2fm}{F2}\opt{ondio}{MODE+LEFT}
+    \opt{h1xx,h300}{RECORD}\opt{ipodcolor}{SELECT+LEFT} 
+    & Add / remove number to scratchpad\\
     \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}
-        \opt{ipodcolor,ipodnano}{SELECT} & Quit\\\bottomrule
+    \opt{ipodcolor,ipodnano}{SELECT} 
+    & Quit\\\bottomrule
     \end{tabular}
     \end{center}
 \end{table}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 812ee6f8a7..fe07180ecd 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -1,5 +1,5 @@
 \subsection{VU meter}
-\screenshot{plugins/images/ss-vumeter-\genericimg.png}{VU-Meter}{}
+\screenshot{plugins/images/ss-vumeter}{VU-Meter}{}
 
 This is a VU meter, which displays the volume of the left and right
 audio channels. There are 3 types of meter selectable.  The analogue
@@ -13,9 +13,15 @@ and the meter scale can be changed.
 \begin{center}
 \begin{tabular}{@{}ll@{}}\toprule
 \textbf{Key} & \textbf{Action} \\\midrule
-\opt{recorder,recorderv2fm}{OFF}\opt{ondio}{ON/OFF}\opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano}{Unknown} & Save settings and quit \\
-\opt{recorder,recorderv2fm}{ON}\opt{ondio}{MODE}\opt{h1xx,h300}{Play}\opt{ipodcolor,ipodnano}{Unknown} & Help \\
-\opt{recorder,recorderv2fm}{F1}\opt{ondio}{HOLD MODE}\opt{h1xx,h300,ipodcolor,ipodnano}{Unknown} & Settings \\
+\opt{recorder,recorderv2fm}{OFF}\opt{ondio}{ON/OFF}
+\opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano}{Unknown} 
+& Save settings and quit \\
+\opt{recorder,recorderv2fm}{ON}\opt{ondio}{MODE}
+\opt{h1xx,h300}{Play}\opt{ipodcolor,ipodnano}{Unknown} 
+& Help \\
+\opt{recorder,recorderv2fm}{F1}\opt{ondio}{HOLD MODE}
+\opt{h1xx,h300,ipodcolor,ipodnano}{Unknown} 
+& Settings \\
 UP & Raise Volume \\
 DOWN & Lower Volume \\\bottomrule
 \end{tabular}
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index 1784b32962..d007f9ad71 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -1,5 +1,5 @@
 \subsection{Wormlet}
-\screenshot{plugins/images/ss-wormlet-\genericimg.png}{Wormlet game}{img:wormlet}
+\screenshot{plugins/images/ss-wormlet}{Wormlet game}{img:wormlet}
 Wormlet is a \opt{RECORDER_PAD}{multi{}-user }multi{}-worm game on a multi{}-threaded
 multi{}-functional Rockbox console. You navigate a hungry little worm.
 Help your worm to find food and to avoid poisoned argh{}-tiles. The
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index a1384c4dcc..98deac594d 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -1,5 +1,5 @@
 \subsection{Xobox}
-\screenshot{plugins/images/ss-xobox-\genericimg.png}{Xobox}{}
+\screenshot{plugins/images/ss-xobox}{Xobox}{}
 Xobox is a simple clone of the well known arcade game Qix.
 The aim of the game is to section off parts of the arena with your trail in
 order to remove that section from the game. Be careful not to get in the way of
diff --git a/manual/preamble.tex b/manual/preamble.tex
index d26e732a3c..01e31860b5 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -92,9 +92,15 @@
 \newcommand{\screenshot}[3]{
   \begin{figure}[!ht]
     \begin{center}
-      \IfFileExists{#1}{\includegraphics[width=4cm]{#1}}{%
-        \typeout{Missing image: #1}%
-        \color{red}{\textbf{WARNING!} Image not found}}%
+      \IfFileExists{#1-\genericimg.png}
+        {\includegraphics[width=4cm]{#1-\genericimg.png}}
+        {\IfFileExists{#1}
+          {\includegraphics[width=4cm]{#1}
+           \typeout{Warning: deprecated plain image name used}}%
+          {\typeout{Missing image: #1 (\genericimg)}%
+           \color{red}{\textbf{WARNING!} Image not found}%
+          }
+        }
       \if\blank{#3}\else{\label{#3}}\fi\if\blank{#2}\else{%
         \caption{#2}}\fi
     \end{center}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 92040cdc00..9054163e60 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -36,7 +36,7 @@ picture above. To turn on and shutdown your \dap, the following keys are used:
 }
 
 \section{\label{ref:file_browser}File Browser}
-\screenshot{rockbox_interface/images/ss-file-browser-\genericimg.png}{The file browser}{}
+\screenshot{rockbox_interface/images/ss-file-browser}{The file browser}{}
 The file browser helps you navigate through the files on your \dap, entering
 folders and executing the default action on each file. To help us differentiate
 files, each file format is displayed with an icon. You can select which file
@@ -99,7 +99,7 @@ types are displayed (see page \pageref{ref:ShowFiles}).
 }
 
 \subsection{\label{ref:Filemenu}\label{ref:PartIISectionFM}File Menu}
-\screenshot{rockbox_interface/images/ss-file-menu-\genericimg.png}{The file menu}{}
+\screenshot{rockbox_interface/images/ss-file-menu}{The file menu}{}
 
 This menu operates on the file that was selected in the browser. It offers the
 following options:
@@ -137,7 +137,7 @@ following options:
 \end{description}
 
 \subsection{\label{ref:Playlistsubmenu}Playlist Submenu}
-\screenshot{rockbox_interface/images/ss-playlist-menu-\genericimg.png}{The playlist menu}{}
+\screenshot{rockbox_interface/images/ss-playlist-menu}{The playlist menu}{}
 If the playlist submenu is invoked on a directory, it will act on all the files
 within that directory.  If invoked on a playlist it will act on all the files
 in that playlist. Otherwise it acts only on the current file.
@@ -170,7 +170,7 @@ and then play is started.\\
 \note{The dynamic playlist is saved so resume will restore it exactly as before shutdown.}
 
 \subsection{Virtual Keyboard}
-\screenshot{rockbox_interface/images/ss-virtual-keyboard-\genericimg.png}{The virtual keyboard}{}
+\screenshot{rockbox_interface/images/ss-virtual-keyboard}{The virtual keyboard}{}
 This is the virtual keyboard that is used when entering file names in Rockbox.
 
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,RECORDER_PAD,IPOD_4G_PAD}{
@@ -429,7 +429,7 @@ Notes:
 }
 
 \subsection{\label{ref:ID3viewer}ID3 Viewer}
-\screenshot{rockbox_interface/images/ss-id3-viewer-\genericimg.png}{The ID3 viewer}{}
+\screenshot{rockbox_interface/images/ss-id3-viewer}{The ID3 viewer}{}
 This screen is accessible from the WPS screen, and provides a detailed view of
 all the identity information about the current track. This info is known as
 meta data and is stored in audio file formats to keep information on artist,