simplify the inclusion of the front image by using the default file extensions. Fix an opt issue.

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

1 files changed, 17 insertions, 107 deletions

diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index d0f8adb821..0ee3f58355 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -4,102 +4,12 @@
 \subsection{The \daps{} controls}
 
 \begin{center}
-\opt{player}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/player-front.pdf}
-    }
-   {\includegraphics{rockbox_interface/images/player-front.png}}
-  }
-  \opt{recorder}{
-    \ifpdfoutput{
-      \includegraphics[height=8cm]{rockbox_interface/images/recorder-front.pdf}
-    }
-   {\includegraphics{rockbox_interface/images/recorder-front.png}}
-  }
-  \opt{recorderv2fm}{
-     \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/recorderv2fm-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/recorderv2fm-front.png}}
-  }
-  \opt{ondiosp}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ondiosp-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ondiosp-front.png}}
-  }
-  \opt{ondiofm}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ondiofm-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ondiofm-front.png}}
-  }
-  \opt{h1xx}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/h1xx-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/h1xx-front.png}}
-  }
-  \opt{h300}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/h300-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/h300-front.png}}
- }
- \opt{ipodmini}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ipodmini-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ipodmini-front.png}}
- }
- \opt{ipodnano}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ipodnano-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ipodnano-front.png}}
- }
- \opt{ipodvideo}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ipodvideo-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ipodvideo-front.png}}
- }
- \opt{ipodcolor}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ipodcolor-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ipodcolor-front.png}}
- }
- \opt{ipod4g}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ipod4g-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ipod4g-front.png}}
- }
- \opt{ipod3g}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/ipod3g-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/ipod3g-front.png}}
- }
- \opt{x5}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/x5-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/x5-front.png}}
- }
-\opt{h10}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/h10-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/h10-front.png}}
- }
-\opt{h10_5gb}{
-    \ifpdfoutput{
-    \includegraphics[height=8cm]{rockbox_interface/images/h10_5gb-front.pdf}
-    }
-    {\includegraphics{rockbox_interface/images/h10_5gb-front.png}}
- }
+% include the front image. Using \specimg makes this fairly easy,
+% but requires to use the exact value of \specimg in the filename!
+% The extension is selected in the preamble, so no further \ifpdfoutput
+% is necessary.
+\includegraphics[height=8cm]{rockbox_interface/images/\specimg-front}
+
 \end{center}
 
 Throughout this manual, the buttons on the \dap{} are labelled according to the
@@ -200,18 +110,18 @@ picture above. In detail the buttons are described in the following paragraph.
 To turn on and off your Rockbox enabled \dap{} use the following keys:
 \begin{table}
     \begin{btnmap}{}{}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ or \ButtonSelect}
-      \opt{ONDIO_PAD}{\ButtonOff}\opt{RECORDER_PAD,PLAYER_PAD}
-        {Hold \ButtonOn\ for 2{}-3s}
-      \opt{IAUDIO_X5_PAD}{\ButtonPower} 
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonSelect}%
+      \opt{ONDIO_PAD}{\ButtonOff}\opt{RECORDER_PAD,PLAYER_PAD}%
+        {Hold \ButtonOn\ for 2--3s}%
+      \opt{IAUDIO_X5_PAD}{\ButtonPower}%
       & Start Rockbox\\
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonOff}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay}
-      \opt{ONDIO_PAD,recorderv2fm}{Hold \ButtonOff}
-      \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}
-      \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}
-      \opt{IAUDIO_X5_PAD}{Hold \ButtonPower}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonOff}%
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay}%
+      \opt{ONDIO_PAD,recorderv2fm}{Hold \ButtonOff}%
+      \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
+      \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
+      \opt{IAUDIO_X5_PAD}{Hold \ButtonPower}%
       & Shutdown Rockbox\\
     \end{btnmap}
 \end{table}