4 files changed, 8 insertions, 32 deletions

diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index f1d6ccca16..1ce4eef7c9 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -3,7 +3,7 @@
 
 \input{appendix/file_formats.tex}
 
-\opt{lcd_bitmap}{\input{appendix/album_art_info.tex}}
+\input{appendix/album_art_info.tex}
 
 \input{appendix/wps_tags.tex}
 
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 74607b4507..117d6f90fe 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -64,9 +64,7 @@
     bidir limit     & 0 to 200          & \% screen\\
     scroll paginated & on, off & N/A\\
     hold\_lr\_for\_scroll\_in\_list & on, off & N/A\\
-    \opt{lcd_bitmap}{
-      show path in browser & off, current directory, full path & N/A\\
-    }
+    show path in browser & off, current directory, full path & N/A\\
     contrast        & 0 to 63           & N/A\\
     backlight timeout
                     & off, on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30,
@@ -167,7 +165,6 @@
       list\_accel\_wait        & 1 to 10  & s\\
     }
 %
-    \opt{swcodec}{
       replaygain type
                     & track, album, track shuffle, off
                                         & N/A\\
@@ -232,7 +229,6 @@
       keyclick repeats & on, off        & N/A\\
       dircache      & on, off           & N/A\\
       tagcache\_ram & on, off           & N/A\\
-    }%
 
     \opt{touchpad}{
       \opt{GIGABEAT_PAD}{
@@ -244,7 +240,6 @@
       }
     }%
 
-    \opt{lcd_bitmap}{
       peak meter release
                     & 1 to 126          & ?\\
        peak meter hold
@@ -284,12 +279,8 @@
       show icons    & on, off           & N/A\\
       iconset       & /path/filename.bmp & N/A\\
       viewers iconset & /path/filename.bmp & N/A\\
-    }%
 
-    \opt{swcodec}{% This doesn't depend on swcodec but using a \nopt here
-                  % causes ondiosp not to build for mysterious reasons.
       backdrop      & /path/filename.bmp    & N/A\\
-    }%
 
     \opt{lcd_color}{
       foreground colour & 000000 to FFFFFF   & RRGGBB\\
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index bfba184ade..4d64cf6bc6 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -6,18 +6,14 @@
   & \textbf{Action when selected}}{}{}
 \includegraphics[width=0.37cm]{appendix/images/icon-directory.png} 
   & Directory & \emph{none} & Enter the directory \tabularnewline
-\opt{swcodec}{
   \includegraphics[width=0.37cm]{appendix/images/icon-audio-file.png} 
   & Audio file & \emph{various}\newline%
   (see \ref{ref:Supportedaudioformats})%
   % do NOT use \reference{} here as that will break the table.
   & Start playing the file and show the WPS\tabularnewline
-}
   & Bookmark & \fname{.bmark} & Display all bookmarks for an audio file\tabularnewline
-\opt{lcd_bitmap}{
   & Game of Life & \fname{.cells} & Show the configuration with the
      ``Rocklife'' plugin\tabularnewline
-}
 \includegraphics[width=0.37cm]{appendix/images/icon-config.png} 
   & Configuration File & \fname{.cfg} & Load the settings file\tabularnewline
 \includegraphics[width=0.37cm]{appendix/images/icon-chip8.png} 
@@ -62,10 +58,8 @@
   \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & \fname{.mi4} & Load the new firmware with ROLO \tabularnewline
 }
-\opt{swcodec}{
  \includegraphics[width=0.37cm]{appendix/images/icon-movie-file.png}
  & Video & \fname{.mpg}, \fname{.mpeg}, \fname{.mpv}, \fname{.m2v} & Play the MPEG1/2 video \tabularnewline
-}
 \includegraphics[width=0.37cm]{appendix/images/icon-rock.png} 
   & Plugin & \fname{.rock} & Start the plugin\tabularnewline
 \opt{sansaAMS}{
@@ -79,7 +73,6 @@
   & While Playing Screen & \fname{.wps} & Load the new WPS display configuration\tabularnewline
 \end{rbtabular}
 
-\opt{swcodec}{
   \chapter{Audio and metadata formats}
   \section{\label{ref:Supportedaudioformats}Supported audio formats}
   \subsection{Lossy Codecs}
@@ -375,4 +368,3 @@
               to 90 bytes.
     }
     \end{enumerate}
-}
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 1a0661c008..70fef71015 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -159,11 +159,10 @@ or \config{\%D(2)}), produce the information for the next file to be played.
 \section{Playlist/Song Info}
   \begin{tagmap}
     \config{\%pb} & Progress Bar.
-    \opt{lcd_bitmap}{
-           This will replace the entire line with a progress bar.
-           You can set the position, width and height of the progressbar
-           (in pixels) and load a custom image for it:
-           \config{\%pb(x,y,[width],[height],image.bmp)}} \\
+       This will replace the entire line with a progress bar.
+       You can set the position, width and height of the progressbar
+       (in pixels) and load a custom image for it:
+       \config{\%pb(x,y,[width],[height],image.bmp)} \\
     \config{\%px} & Percentage played in song\\
     \config{\%pc} & Current time in song\\
     \config{\%pe} & Total number of playlist entries\\
@@ -181,8 +180,8 @@ or \config{\%D(2)}), produce the information for the next file to be played.
     \config{\%pv} & Current volume (in dB). Can also be used in a conditional:
            \config{\%?pv<Mute|\ldots|0 dB|Above 0 dB>}\newline
            Mute is 0\% volume, \ldots is the values between Mute and max, 0 dB is max volume, and Above 0 dB is amplified volume
-         \opt{lcd_bitmap}{This can also be used like \%pb to provide a continuous scale:
-         \config{\%pv(x,y,[width],[height],image.bmp)}} \\
+         This can also be used like \%pb to provide a continuous scale:
+         \config{\%pv(x,y,[width],[height],image.bmp)} \\
     \config{\%pS} & Track is starting. An optional number gives how many seconds
          the tag remains true for after the start of the track. The default is
          10 seconds if no number is specified.
@@ -227,20 +226,16 @@ or \config{\%D(2)}), produce the information for the next file to be played.
     \config{\%ra} & Autoscore for the song\\
   \end{tagmap}
 
-\opt{swcodec}{
 \section{Sound (DSP) settings}
   \begin{tagmap}
     \config{\%Sp} & Current playback pitch \\
-  \opt{swcodec}{
     \config{\%xf} & Crossfade setting, in the order: Off, Auto Skip, Man Skip,
            Shuffle, Shuffle and Man Skip, Always\\
     \config{\%rg} & ReplayGain value in use (x.y~dB). If used as a conditional,
            Replaygain type in use: \config{\%?rg<Off|Track%
            |Album|TrackShuffle|AlbumShuffle%
            |No tag>}\\
-  }
   \end{tagmap}
-}
 
 \section{Hold}
     \begin{tagmap}
@@ -360,13 +355,11 @@ Examples:
 \end{enumerate}
 
 
-\opt{lcd_bitmap}{
 \section{\label{ref:wps_images}Images}
   \begin{tagmap}
     \config{\%X(filename.bmp)}
         & Load and set a backdrop image for the WPS.
           This image must be exactly the same size as your LCD.\\
-    }%
     \config{\%x(n,filename[,x,y])}
         & Load and display an image\newline
           \config{n}: image ID for later referencing in \config{\%xd}\newline