1 files changed, 62 insertions, 68 deletions

diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 2b80c3e2ce..4777379f19 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -14,30 +14,28 @@ them can be started from \setting{Browse Plugins} in the \setting{Main Menu}.\\
 
 Viewer plugins get started automatically by opening an associated file (i.e.
 text files%
-\opt{lcd_bitmap}{, chip8 games}%
-), or from the \setting{Open with} option on the \setting{Context Menu}.
+, chip8 games), or from the \setting{Open with} option on the \setting{Context Menu}.
 
 \section{Games}
-\opt{lcd_bitmap}
-    {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator},
-    Frotz in \reference{ref:Frotz},
-    \opt{iriverh100,iaudiom5,lcd_color}
-    {Rockboy in \reference{ref:Rockboy}}
-    and ZXBox in \reference{ref:ZXBox}.}
+  See also the Chip{}-8 emulator in \reference{ref:Chip8emulator},
+  Frotz in \reference{ref:Frotz},
+  \opt{iriverh100,iaudiom5,lcd_color}
+  {Rockboy in \reference{ref:Rockboy}}
+  and ZXBox in \reference{ref:ZXBox}.
 
-\opt{lcd_bitmap}{\input{plugins/2048.tex}}
+\input{plugins/2048.tex}
 
-\opt{lcd_bitmap}{\input{plugins/blackjack.tex}}
+\input{plugins/blackjack.tex}
 
 \opt{large_plugin_buffer}{\input{plugins/boomshine.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/brickmania.tex}}
+\input{plugins/brickmania.tex}
 
-\opt{lcd_bitmap}{\input{plugins/bubbles.tex}}
+\input{plugins/bubbles.tex}
 
-\opt{lcd_bitmap}{\input{plugins/chessbox.tex}}
+\input{plugins/chessbox.tex}
 
-\opt{lcd_bitmap}{\input{plugins/chopper.tex}}
+\input{plugins/chopper.tex}
 
 \opt{lcd_color}{\input{plugins/clix.tex}}
 
@@ -51,103 +49,103 @@ text files%
 
 {\input{plugins/flipit.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/goban.tex}}
+\input{plugins/goban.tex}
 
 \opt{lcd_non-mono}{\nopt{iriverh10_5gb,ipodmini1g,c200,c200v2,mpiohd200,clipzip,samsungyh820}{
   \input{plugins/invadrox.tex}}}
 
 {\input{plugins/jackpot.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/jewels.tex}}
+\input{plugins/jewels.tex}
 
-\opt{lcd_bitmap}{\input{plugins/maze.tex}}
+\input{plugins/maze.tex}
 
-\opt{lcd_bitmap}{\input{plugins/mazezam.tex}}
+\input{plugins/mazezam.tex}
 
-\opt{lcd_bitmap}{\input{plugins/minesweeper.tex}}
+\input{plugins/minesweeper.tex}
 
 \opt{iriverh100,iaudiom5,lcd_color}{\nopt{c200,c200v2}{\input{plugins/pacbox.tex}}}
 
-\opt{lcd_bitmap}{\input{plugins/pegbox.tex}}
+\input{plugins/pegbox.tex}
 
 \opt{lcd_color}{\opt{large_plugin_buffer}{\input{plugins/pixelpainter.tex}}}
 
-\opt{lcd_bitmap}{\input{plugins/pong.tex}}
+\input{plugins/pong.tex}
 
 \opt{lcd_color}{\nopt{lowmem,iaudiox5,iriverh300}{\input{plugins/quake.tex}}}
 
-\opt{lcd_bitmap}{\input{plugins/reversi.tex}}
+\input{plugins/reversi.tex}
 
-\opt{lcd_bitmap}{\input{plugins/robotfindskitten.tex}}
+\input{plugins/robotfindskitten.tex}
 
 {\input{plugins/rockblox.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/rockblox1d.tex}}
+\input{plugins/rockblox1d.tex}
 
-\opt{lcd_bitmap}{\input{plugins/sgt-puzzles.tex}}
+\input{plugins/sgt-puzzles.tex}
 
-\opt{lcd_bitmap}{\input{plugins/sliding.tex}}
+\input{plugins/sliding.tex}
 
-\opt{lcd_bitmap}{\input{plugins/snake.tex}}
+\input{plugins/snake.tex}
 
-\opt{lcd_bitmap}{\input{plugins/snake2.tex}}
+\input{plugins/snake2.tex}
 
-\opt{lcd_bitmap}{\input{plugins/sokoban.tex}}
+\input{plugins/sokoban.tex}
 
-\opt{lcd_bitmap}{\input{plugins/solitaire.tex}}
+\input{plugins/solitaire.tex}
 
-\opt{lcd_bitmap}{\input{plugins/spacerocks.tex}}
+\input{plugins/spacerocks.tex}
 
-\opt{lcd_bitmap}{\input{plugins/star.tex}}
+\input{plugins/star.tex}
 
-\opt{lcd_bitmap}{\input{plugins/sudoku.tex}}
+\input{plugins/sudoku.tex}
 
 \opt{lcd_non-mono}{\nopt{iriverh10_5gb,ipodmini1g,c200,c200v2,mpiohd200,clipzip,samsungyh820}{
   \input{plugins/superdom.tex}}}
 
 \opt{lcd_color}{\nopt{lowmem,iaudiox5,iriverh300}{\input{plugins/wolf3d.tex}}}
 
-\opt{lcd_bitmap}{\input{plugins/wormlet.tex}}
+\input{plugins/wormlet.tex}
 
-\opt{lcd_bitmap}{\input{plugins/xobox.tex}}
+\input{plugins/xobox.tex}
 
 \opt{lcd_color}{\input{plugins/xworld.tex}}
 
 \section{Demos}
 
-\opt{lcd_bitmap}{\input{plugins/bounce.tex}}
+\input{plugins/bounce.tex}
 
 {\input{plugins/credits.tex}}
 
 {\input{plugins/cube.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/demystify.tex}}
+\input{plugins/demystify.tex}
 
-\opt{swcodec}{\input{plugins/fft.tex}}
+\input{plugins/fft.tex}
 
-\opt{lcd_bitmap}{\input{plugins/fire.tex}}
+\input{plugins/fire.tex}
 
-\opt{lcd_bitmap}{\input{plugins/fractals.tex}}
+\input{plugins/fractals.tex}
 
 {\input{plugins/logo.tex}}
 
-\opt{lcd_bitmap}{\nopt{xduoox3,clip,clipplus}{\input{plugins/matrix.tex}}}
+\nopt{xduoox3,clip,clipplus}{\input{plugins/matrix.tex}}
 
 {\input{plugins/mosaic.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/oscilloscope.tex}}
+\input{plugins/oscilloscope.tex}
 
-\opt{tagcache}{\opt{lcd_bitmap}{\input{plugins/pictureflow.tex}}}
+\opt{tagcache}{\input{plugins/pictureflow.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/plasma.tex}}
+\input{plugins/plasma.tex}
 
-\opt{lcd_bitmap}{\input{plugins/rocklife.tex}}
+\input{plugins/rocklife.tex}
 
 {\input{plugins/snow.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/starfield.tex}}
+\input{plugins/starfield.tex}
 
-\opt{lcd_bitmap}{\input{plugins/vumeter.tex}}
+\input{plugins/vumeter.tex}
 
 \section{\label{ref:Viewersplugins}Viewers}
 
@@ -168,7 +166,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
     Frotz                 & \fname{.z1} to \fname{.z8}       &   \\
     Image Viewer          & \fname{.bmp, .jpg, .jpeg, .png\opt{lcd_color}{, .ppm}}  &   \\
     Lua scripting language& \fname{.lua}                     &   \\
-    \opt{swcodec}{\nopt{lowmem}{
+    \nopt{lowmem}{
         Midiplay          & \fname{.mid, .midi}              &   \\
         Mikmod            & \fname{.669, .amf, .asy, .dsm,}  &   \\
                           & \fname{.far, .gdm, imf, .it,}    &  \\
@@ -176,13 +174,9 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
                           & \fname{.s3m, .stm, .stx, .ult,}  &  \\
                           & \fname{.uni, .umx, .xm}         &   \\
         MPEG Player       & \fname{.mpg, .mpeg, .mpv, .m2v}  &   \\
-    }}
-    \opt{swcodec}{
-        MP3 Encoder       & \fname{.wav}                     & x \\
     }
-    \opt{lcd_bitmap}{
+        MP3 Encoder       & \fname{.wav}                     & x \\
         Rockboy       & \fname{.gb, .gbc}                &   \\
-    }
     Search                & \fname{.m3u, .m3u8}              & x \\
     Shopping list         & \fname{.shopper}                 &   \\
     Sort                  & \fname{.*}                       & x \\
@@ -196,31 +190,31 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/winshortcuts.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/chip8emulator.tex}}
+\input{plugins/chip8emulator.tex}
 
-\opt{lcd_bitmap}{\input{plugins/frotz.tex}}
+\input{plugins/frotz.tex}
 
-\opt{lcd_bitmap}{\input{plugins/imageviewer.tex}}
+\input{plugins/imageviewer.tex}
 
 \opt{large_plugin_buffer}{\input{plugins/lua.tex}}
 
-\opt{swcodec}{\nopt{lowmem}{\input{plugins/midiplay.tex}}}
-\opt{swcodec}{\nopt{lowmem}{\input{plugins/mikmod.tex}}}
+\nopt{lowmem}{\input{plugins/midiplay.tex}}
+\nopt{lowmem}{\input{plugins/mikmod.tex}}
 
-\opt{lcd_bitmap}{\opt{swcodec}{\nopt{lowmem}{\input{plugins/mpegplayer.tex}}}}
+\nopt{lowmem}{\input{plugins/mpegplayer.tex}}
 
-\opt{swcodec}{\input{plugins/mp3_encoder.tex}}
+\input{plugins/mp3_encoder.tex}
 
 \opt{iriverh300,iriverh100,SANSA_FUZE_PAD,SANSA_E200_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
     ,IPOD_1G2G_PAD,SAMSUNG_YPR0_PAD}{
   \input{plugins/pdbox.tex}}
 
-\opt{lcd_bitmap}{\nopt{%
+\nopt{%
   ipod1g2g,ipod3g,ipod4g,ipodmini% horizontal pixelformat not implemented
   ,iaudiom3,mpiohd200, % vertical interleaved pixelformat not implemented
   ,mrobe100% lcd size/depth not implemented
   }{
-  \input{plugins/rockboy.tex}}}
+  \input{plugins/rockboy.tex}}
 
 {\input{plugins/search.tex}}
 
@@ -236,7 +230,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/vbrfix.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/zxbox.tex}}
+\input{plugins/zxbox.tex}
 
 \section{Applications}
 
@@ -244,7 +238,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/batterybenchmark.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/calculator.tex}}
+\input{plugins/calculator.tex}
 
 \opt{rtc}{\input{plugins/calendar.tex}}
 
@@ -260,7 +254,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \opt{HAVE_BACKLIGHT}{\input{plugins/lamp.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/lrcplayer.tex}}
+\input{plugins/lrcplayer.tex}
 
 {\input{plugins/main_menu_config.tex}}
 
@@ -270,9 +264,9 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/otp.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/periodic_table.tex}}
+\input{plugins/periodic_table.tex}
 
-\opt{swcodec}{\opt{recording_mic}{\input{plugins/pitch_detector.tex}}}
+\opt{recording_mic}{\input{plugins/pitch_detector.tex}}
 
 {\input{plugins/random_folder_advance_config.tex}}
 
@@ -284,4 +278,4 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/stopwatch.tex}}
 
-\opt{lcd_bitmap}{\input{plugins/text_editor.tex}}
+\input{plugins/text_editor.tex}