Patch #4945 from Mark Bright. Tab-removal by me. Only include the fm section for targets with tuner. Adapt tables to keymacros/tabularx.

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

1 files changed, 159 insertions, 84 deletions

diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index f529d1da3f..95f8897978 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -11,46 +11,42 @@ The two settings menus are covered in detail starting on page \pageref{ref:confi
 Navigating through the menu:
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{
   \begin{center}
-    \begin{tabular}{@{}ll@{}}\toprule
+    \begin{tabularx}{\textwidth}{lX}\toprule
       \textbf{Key} & \textbf{Action} \\\midrule
       \opt{IPOD_4G_PAD}{\ButtonScrollFwd}
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp} & Moves up in the menu. \\
-                                    & Inside a setting, increases the value or\\
-                                    & chooses next option \\
+      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp} 
+      & Moves up in the menu. Inside a setting, increases the value or chooses next option \\
       %
       \opt{IPOD_4G_PAD}{\ButtonScrollBack}
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown} & Moves down in the menu. \\
-                                    & Inside a setting, decreases the value or \\
-                                    & chooses previous option \\
+      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown} 
+      & Moves down in the menu. Inside a setting, decreases the value or chooses previous option \\
       %
       \opt{RECORDER_PAD}{\ButtonPlay/\ButtonRight}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect/\ButtonRight}
-      \opt{ONDIO_PAD,IPOD_4G_PAD}{\ButtonRight} & Selects option \\
+      \opt{ONDIO_PAD,IPOD_4G_PAD}{\ButtonRight} 
+      & Selects option \\
       %
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff/\ButtonLeft}
-      \opt{IAUDIO_X5_PAD,ONDIO_PAD,IPOD_4G_PAD}{\ButtonLeft} & Exits menu, setting or moves to parent menu\\
+      \opt{IAUDIO_X5_PAD,ONDIO_PAD,IPOD_4G_PAD}{\ButtonLeft} 
+      & Exits menu, setting or moves to parent menu\\
       \bottomrule
-    \end{tabular}
+    \end{tabularx}
   \end{center}
 }
 \opt{PLAYER_PAD}{
   \begin{center}
-    \begin{tabular}{@{}ll@{}}\toprule
+    \begin{tabularx}{\textwidth}{lX}\toprule
       \textbf{Key} & \textbf{Action} \\\midrule
       %
-      \ButtonLeft  & Selects previous option in the menu. \\
-                   & Inside an setting, decreases the value or \\
-                   & chooses previous option \\
+      \ButtonLeft  & Selects previous option in the menu. Inside an setting, decreases the value or chooses previous option \\
       %
-      \ButtonRight & Selects next option in the menu. \\
-                   & Inside an setting increases the value or \\
-                   & chooses next option \\
+      \ButtonRight & Selects next option in the menu. Inside an setting increases the value or chooses next option \\
       %
       \ButtonPlay  & Selects item \\
       %
       \ButtonStop  & Exit menu, setting or moves to parent menu. \\
       \bottomrule
-    \end{tabular}
+    \end{tabularx}
   \end{center}
 }
 
@@ -64,29 +60,27 @@ Navigating through the menu:
   
   \begin{table}[h!]
     \begin{center}
-      \begin{tabular}{@{}ll@{}}\toprule
+      \begin{tabularx}{\textwidth}{lX}\toprule
         \textbf{Button} & \textbf{Function} \\\midrule
         \ButtonLeft & Decreases Gain \\
         %
         \ButtonRight & Increases Gain \\
-               %
+        %
         \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-        \opt{ONDIO_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{FixMe:} & Starts recording.  \\
-                                                          & While recording, button closes the current file and opens a new one.\\
-                                                          & (while recording) Pauses / restarts recording \\
-               %
+        \opt{ONDIO_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{FixMe} & Starts recording.  \\
+        & While recording: button closes the current file and opens a new one.\\
+        %
         \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} 
-        \opt{ONDIO_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{FixMe:} & Exits Recording Screen.\\
-                                                          & (while recording) Stop recording \\
+        \opt{ONDIO_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{FixMe} & Exits Recording Screen.\\
+        & While recording: Stop recording \\
         %
         \opt{RECORDER_PAD}{\ButtonFOne}
         \opt{ONDIO_PAD}{\ButtonMenu}
-        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{Hold \ButtonSelect} & Opens Recording Settings screen (see below) \\
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{Hold \ButtonSelect} 
+        & Opens Recording Settings screen (see below) \\
         %
         \opt{RECORDER_PAD}{
-          \ButtonFTwo & Quick menu for recording settings. \\
-                      & A quick press will leave the screen up (press {\ButtonFTwo} again to exit),\\
-                      & while holding it will close the screen when you release it. \\
+          \ButtonFTwo & Quick menu for recording settings. A quick press will leave the screen up (press {\ButtonFTwo} again to exit),while holding it will close the screen when you release it. \\
         }
         %
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{
@@ -95,11 +89,11 @@ Navigating through the menu:
         %
         \opt{RECORDER_PAD}{
           \ButtonFThree & Quick menu for source setting. \\
-                        & Quick/hold works as for {\ButtonFTwo}. \\
-                        & (while recording) Start a new recording file \\
+          & Quick/hold works as for {\ButtonFTwo}. \\
+          & While recording: Start a new recording file \\
         }
         \bottomrule
-      \end{tabular}
+      \end{tabularx}
     \end{center}
   \end{table}
   
@@ -108,34 +102,34 @@ Navigating through the menu:
   \opt{MASCODEC}{
     \begin{itemize}
     \item \textbf{Quality}
-      Choose the quality here (0 to 7). Default is 5, best quality is 7, smallest file size is 0.  This setting effects how much your sound sample will be compressed.  Higher quality settings result in larger MP3 files.
+      Choose the quality here (0 to 7). Default is 5, best quality is 7, smallest file size is 0. This setting effects how much your sound sample will be compressed. Higher quality settings result in larger MP3 files.
       
       The quality setting is just a way of selecting an average bit rate, or number of  bits per second, for a recording.  When  this setting is lowered, recordings are compressed more (meaning worse sound quality), and the average bitrate changes as follows.
     \end{itemize}
     
     \begin{table}[h!]
       \begin{center}
-        \begin{tabular}{@{}ll@{}}\toprule
+        \begin{tabularx}{\textwidth}{lX}\toprule
           \textbf{Frequency} & \textbf{Bitrate}  (Kbit/s) {}- quality 0{}-{\textgreater}7 \\\midrule
-          44100Hz stereo: & 75, 80, 90, 100, 120, 140, 160, 170 \\
-          22050Hz stereo & 39, 41, 45, 50, 60, 80, 110, 130 \\
-          44100Hz mono & 65, 68, 73, 80, 90, 105, 125, 140 \\
-          22050Hz mono & 35, 38, 40, 45, 50, 60, 75, 90 \\\bottomrule
-        \end{tabular}
+          44100Hz stereo        & 75, 80, 90, 100, 120, 140, 160, 170 \\
+          22050Hz stereo        & 39, 41, 45, 50,  60,  80,  110, 130 \\
+          44100Hz mono          & 65, 68, 73, 80,  90,  105, 125, 140 \\
+          22050Hz mono          & 35, 38, 40, 45,  50,  60,  75,  90 \\\bottomrule
+        \end{tabularx}
       \end{center}
     \end{table}
   }
   \begin{itemize}
   \item \textbf{Frequency} 
-    Choose the recording frequency (sample rate) {}- 48kHz, 44.1kHz, 32kHz (MPEG version 1), and 24kHz, 22.05kHz, 16kHz (MPEG version 2) are available.  Higher sample rates use up more disk space, but give better sound quality.  This setting determines which frequency range can accurately be reproduced during playback. Lower frequencies produce smaller files, for two reasons. The amount of data to be compressed is smaller and the data is easier to compress, since higher frequencies are not present. \opt{MASCODEC}{The frequency setting also determines which version of the MPEG standard sound is recorded using.}
+    Choose the recording frequency (sample rate) {}- 48kHz, 44.1kHz, 32kHz (MPEG version 1), and 24kHz, 22.05kHz, 16kHz (MPEG version 2) are available. Higher sample rates use up more disk space, but give better sound quality.  This setting determines which frequency range can accurately be reproduced during playback. Lower frequencies produce smaller files, for two reasons. The amount of data to be compressed is smaller and the data is easier to compress, since higher frequencies are not present. \opt{MASCODEC}{The frequency setting also determines which version of the MPEG standard sound is recorded using.}
     
   \item \textbf{Source}
-    Choose the source of the recording.  This can be microphone, line in, or SPDIF (digital). For recording from the radio on the FM recorder, see page \pageref{ref:FMradio}.
+    Choose the source of the recording. This can be microphone, line in, or SPDIF (digital). \opt{CONFIG_TUNER}{For recording from the radio on the FM recorder, see page \pageref{ref:FMradio}.}
     
     Note: you cannot change the sample rate for digital recordings.
     
   \item \textbf{Channels}
-    This allows you to select mono or stereo recording.  Please note that for mono recording, only the left channel is recorded.  Mono recordings are usually somewhat smaller than stereo.
+    This allows you to select mono or stereo recording. Please note that for mono recording, only the left channel is recorded.  Mono recordings are usually somewhat smaller than stereo.
     
   \item \textbf{Independent Frames}
     The independent frames option tells the \dap to encode with the bit reservoir disabled, so the frames are independent of each other. This makes a file easier to edit.
@@ -154,54 +148,133 @@ Navigating through the menu:
   \item \textbf{Directory}
     Allows changing the location where the recorded files are saved.\\
     
-  \item \textbf{Show recording screen on startup}       If set to yes, the \dap\ will start up with the while recording screen showing\\
+  \item \textbf{Show recording screen on startup}
+    If set to yes, the \dap\ will start up with the while recording screen showing\\
     Options: Yes, No\\
     
-  \item \textbf{Clipping Light} Causes the backlight to flash on when clipping has been detected\\
+  \item \textbf{Clipping Light}
+    Causes the backlight to flash on when clipping has been detected\\
     Options: Off, Remote unit only,Main and remote unit, Main unit only\\
     
   \end{itemize}
 }
 
-\section{\label{ref:FMradio}FM Radio}
-\screenshot{main_menu/images/ss-fm-radio-screen-112x64x1.png}{The fm-radio screen}{}
-This menu option switches to the radio screen. 
-
-The keys are:
-
-\begin{table}[h!]
-  \begin{center}
-    \begin{tabular}{@{}lc@{}}\toprule
-      \textbf{Button} & \textbf{Function} \\\midrule
-      LEFT, RIGHT & Change frequency in 0.1 MHz steps. \\
-      & For automatic station seek, \\
-      & hold LEFT/RIGHT for a little longer. \\
-      UP, DOWN & Change volume \\
-      PLAY & \textbf{(EXPERIMENTAL)} freezes all screen updates.\\
-      & May enhance radio reception in some cases. \\
-      ON & Leave the radio screen with the radio playing \\
-      OFF & Back to main menu \\\bottomrule
-    \end{tabular}
-  \end{center}
-\end{table}
-The FM radio has the ability to record and to remember station frequency settings (presets).
-
-\begin{itemize}
+        
+\opt{CONFIG_TUNER}{
+  \section{\label{ref:FMradio}FM Radio \opt{ondio}{ - OndioFM Only}}  
+  \screenshot{main_menu/images/ss-fm-radio-screen-112x64x1.png}{The FM radio screen}{}
   
-\item \textbf{Saving a preset}
-  You can save your favourite stations in the 32 presets. Press F1 to go to the menu, then select ``Save preset''. Enter the name (maximum number of characters is 32).
-  
-\item \textbf{Selecting a preset}
-  Press F2 to go to the preset list. Use UP and DOWN to move the cursor and then press PLAY to select. Use LEFT to leave the preset without selecting anything.
+  \opt{recorderv2fm,ondio}{
+    This menu option switches to the radio screen.
+    
+    The keys are:
+    \begin{table}[h!]
+      \begin{center}
+        \begin{tabularx}{\textwidth}{lX}\toprule
+          \textbf{Button}   & \textbf{Function} \\\midrule
+          \ButtonLeft, \ButtonRight 
+          & Change frequency in 0.1 MHz steps.\\
+          & For automatic station seek, hold \ButtonLeft/\ButtonRight\ for a little longer. \\
+          %
+          \ButtonUp, \ButtonDown    
+          & Change volume \\
+          %
+          \opt{RECORDER_PAD}{
+            \ButtonPlay             & \textbf{(EXPERIMENTAL)}\\
+            & freezes all screen updates.May enhance radio reception in some cases.\\
+            %
+          }
+          \opt{RECORDER_PAD}{\ButtonOn}\opt{ONDIO_PAD}{FixMe}
+          & Leave the radio screen with the radio playing \\
+          %
+          \ButtonOff                & Back to main menu \\\bottomrule
+        \end{tabularx}
+      \end{center}
+    \end{table}
+  }
   
-\item \textbf{Removing a preset}
-  Press F1 to go to the menu, then select ``Remove preset''.
+  \opt{h1xx,h300,x5}{
+    This menu option switches to the radio screen.
+    
+    The keys are:
+    \begin{table}[h!]
+      \begin{center}
+        \begin{tabularx}{\textwidth}{lX}\toprule
+          \textbf{Button} & \textbf{Function} \\\midrule
+          \ButtonLeft, \ButtonRight & Change frequency in 0.1 MHz steps. \\
+          Hold \ButtonLeft, \ButtonRight 
+          & Seeks to next station or preset\\
+          %
+          \ButtonUp, \ButtonDown 
+          & Change volume \\
+          %
+          \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+          \opt{IAUDIO_X5_PAD}{FixMe}
+          & Mutes radio playback \\
+          %
+          \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonOn}
+          \opt{IAUDIO_X5_PAD}{FixMe}
+          & Switches between SCAN and PRESET mode.\\
+          %
+          \ButtonSelect             & Opens a list of radio presets. You can view all the presets that you have, and switch to the station.\\
+          Hold \ButtonSelect & Displays the FM radio settings menu.\\
+          %
+          \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+          \opt{IAUDIO_X5_PAD}{FixMe}
+          %
+          & Keeps radio playing and returns to the main menu. You can then press OFF/STOP to browse the file tree while listening to the radio\\
+          %
+          \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+          \opt{IAUDIO_X5_PAD}{FixMe}
+          & Stops the radio and returns to main menu \\\bottomrule
+        \end{tabularx}
+      \end{center}
+    \end{table}
+  }
   
-\item \textbf{Recording}
-  Press F3 to start recording the currently playing station. Press OFF to stop recording. Press PLAY again to seamlessly start recording to a new file. The settings for the recording can be changed in the F1 menu before starting the recording. See page \pageref{ref:Recordingsettings} for details of recording settings.
+  The FM radio has the ability \opt{HAVE_RECORDING}{to record and to} remember station frequency settings (presets).
   
-  Note: The radio will turn off when playing an MP3.
-\end{itemize}
+  \begin{itemize}
+    
+  \item \textbf{Saving a preset}\\
+    Up to 32 of your favourite stations can be saved as presets. 
+    Press
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    to go to the menu, then select 
+    \opt{recorderv2fm,ondio}{``Save preset''.}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{``Add preset''}
+    Enter the name (maximum number of characters is 32). 
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Press \ButtonOn\ to save.}
+    \opt{IAUDIO_X5_PAD}{Press FixMe to save.}
+    
+  \item \textbf{Selecting a preset}\\
+    \opt{ONDIO_PAD,RECORDER_PAD}
+        {         
+          Press \opt{RECORDER_PAD}{\ButtonFTwo}\opt{ONDIO_PAD}{(FixMe)} to go to the preset list. Use \ButtonUp\ and \ButtonDown\ to move the cursor and then press \opt{RECORDER_PAD}{\ButtonPlay}\opt{ONDIO_PAD}{(Insert Correct Key)} to select. Use \ButtonLeft\ to leave the preset without selecting anything.
+        }
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+            {
+              Press \ButtonSelect\ to go to the preset list. Use \ButtonUp\ and \ButtonDown\ to move the cursor and then press \ButtonSelect\ to select. Use \ButtonLeft\ to leave the preset without selecting anything.
+            }
+            
+          \item \textbf{Removing a preset}\\
+            \opt{ONDIO_PAD,RECORDER_PAD}{
+              Press \opt{RECORDER_PAD}{\ButtonFOne}\opt{ONDIO_PAD}{(Insert Correct Key)} to go to the menu, then select ``Remove preset''.
+            }
+            \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{
+              Press \ButtonSelect\ to go to the preset list. Use \ButtonUp\ and \ButtonDown\ to move the cursor and then Hold \ButtonSelect\ on the preset to that you wish to remove, then select "Remove preset."
+            }
+            
+            \opt{RECORDER_PAD}{
+            \item \textbf{Recording}\\
+              Press \ButtonFThree\ to start recording the currently playing station. Press \ButtonOff\ to stop recording. Press \ButtonPlay\ again to seamlessly start recording to a new file. The settings for the recording can be changed in the \ButtonFOne\ menu before starting the recording. See page \pageref{ref:Recordingsettings} for details of recording settings.
+            }
+            
+            Note: The radio will turn off when playing an MP3.
+  \end{itemize}
+}
 
 \section{\label{ref:Bookmarkconfig}\label{ref:Bookmarkmenu}Bookmarks}
 The bookmarks menu allows you to create and manage bookmark files.
@@ -243,8 +316,8 @@ With this option you can load and run various plugins that have been written for
 A detailed description of the different plugins begins on page \pageref{ref:Part5}.
 
 \section{\label{ref:Info}Info}
-This option shows MP3 ram buffer size, battery voltage level and estimated time remaining, disk total space and disk free space.
-On players use the MINUS and PLUS keys to step through several pages of information.
+This option shows MP3 RAM buffer size, battery voltage level and estimated time remaining, disk total space and disk free space.
+\opt{player}{On players use the MINUS and PLUS keys to step through several pages of information.}
 
 \begin{itemize}
   
@@ -260,5 +333,7 @@ On players use the MINUS and PLUS keys to step through several pages of informat
   This submenu is intended to be used only by Rockbox developers. It shows hardware, disk, battery status and a lot of other information.  It is not recommended that users access this menu unless instructed to do so in the course of fixing a problem with Rockbox.  In particular the ``Dump ROM Contents'', ``View/clear RTC RAM'' and ``Screenshot'' and ``Sound test'' functions should be treated with care.
 \end{itemize}
 
-\section{Shutdown (Player)}
-This menu option saves the Rockbox configuration and turns off the hard drive before shutting down the machine. For maximum safety this procedure is recommended when turning off the Jukebox. (There is a very small risk of hard disk corruption otherwise.) See page \pageref{ref:Safeshutdown} for more details.
\ No newline at end of file
+\opt{player}{
+  \section{Shutdown (Player)}
+  This menu option saves the Rockbox configuration and turns off the hard drive before shutting down the machine. For maximum safety this procedure is recommended when turning off the Jukebox. (There is a very small risk of hard disk corruption otherwise.) See page \pageref{ref:Safeshutdown} for more details.
+}