1 files changed, 30 insertions, 19 deletions

diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index 95e0a240e9..422a13463d 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -8,37 +8,48 @@ available maths functions on the right hand side.
 
 \begin{table}
 \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {Direction keys}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollFwd,
-        \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollUp, \ButtonScrollDown}
+    \ButtonLeft{} / \ButtonRight{} /
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{SANSA_E200_PAD}{/}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     & Move around the keypad\\
+    %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
-    & Press a button on the keypad\\
-    \opt{RECORDER_PAD}{\ButtonFOne & Delete last entered digit or clear after
-        calculation\\}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec & Delete
-        last entered digit or clear after calculation\\}
-    \opt{IRIVER_H10_PAD}{\ButtonRew & Delete last entered digit or clear after calculation\\}
-    \opt{GIGABEAT_PAD}{\ButtonA & Delete last entered digit or clear after calculation\\}
-    \opt{MROBE100_PAD}{\ButtonDisplay & Delete last entered digit or clear after calculation\\}
+    & Select a button\\
     %
+    \nopt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{
+        \opt{RECORDER_PAD}{\ButtonFOne}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+            ,SANSA_C200_PAD}{\ButtonRec}
+        \opt{IRIVER_H10_PAD}{\ButtonRew}
+        \opt{GIGABEAT_PAD}{\ButtonA}
+        \opt{MROBE100_PAD}{\ButtonDisplay}
+        & Delete last entered digit or clear after calculation\\
+        %
+    }
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
+        \opt{RECORDER_PAD}{\ButtonFTwo}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+        & Cycle through the 4 basic operators\\
+        %
+    }
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
     \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     & Calculate\\
+    %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     & Quit\\
 \end{btnmap}
 \end{table}