\bind "M-m f" "math-insert \frac"
\bind "M-m s" "math-insert \sqrt"
-\bind "M-m e" "math-insert ^"
-\bind "M-m x" "math-insert _"
+\bind "M-m e" "math-superscript"
+\bind "M-m x" "math-subscript"
+
\bind "M-m u" "math-insert \sum"
\bind "M-m i" "math-insert \int"
\bind "M-m m" "math-mode"
\bind "M-m d" "math-display"
-\bind "M-m g" "math-greek"
-\bind "M-m S-G" "math-greek-toggle"
#\bind "M-m o" "math-insert \oint"
\bind "M-m p" "math-insert \partial"
\bind "M-m r" "math-insert \root"
\bind "M-m n" "math-number"
\bind "M-m S-N" "math-nonumber"
\bind "M-m 8" "math-insert \infty"
-\bind "M-m v" "accent-vector"
-
-\bind "M-m o 1" "math-macro-arg 1"
-\bind "M-m o 2" "math-macro-arg 2"
-\bind "M-m o 3" "math-macro-arg 3"
-\bind "M-m o 4" "math-macro-arg 4"
-\bind "M-m o 5" "math-macro-arg 5"
-\bind "M-m o 6" "math-macro-arg 6"
-\bind "M-m o 7" "math-macro-arg 7"
-\bind "M-m o 8" "math-macro-arg 8"
-\bind "M-m o 9" "math-macro-arg 9"
+\bind "M-m o 1" "self-insert \#1"
+\bind "M-m o 2" "self-insert \#2"
+\bind "M-m o 3" "self-insert \#3"
+\bind "M-m o 4" "self-insert \#4"
+\bind "M-m o 5" "self-insert \#5"
+\bind "M-m o 6" "self-insert \#6"
+\bind "M-m o 7" "self-insert \#7"
+\bind "M-m o 8" "self-insert \#8"
+\bind "M-m o 9" "self-insert \#9"
+
+\bind "M-m t n" "math-mutate none"
\bind "M-m t t" "math-mutate dump"
\bind "M-m t a" "math-mutate align"
-\bind "M-m t i" "math-mutate inline"
-\bind "M-m t d" "math-mutate display"
+\bind "M-m t i" "math-mutate simple"
+\bind "M-m t d" "math-mutate equation"
\bind "M-m t e" "math-mutate eqnarray"
+\bind "M-m t m" "math-mutate multline"
\bind "M-m c i" "math-column-insert"
\bind "M-m c d" "math-column-delete"
\bind "M-m a h c" "math-halign center"
\bind "M-m a h r" "math-halign right"
+# Decoration accents
+
# The accent-circumflex is 'h' for 'hat', which is what most math
# folks call it verbally.
+\bind "M-m ~S-quotedbl" "math-insert \ddot"
+\bind "M-m h" "math-insert \hat"
+\bind "M-m ~S-backslash" "math-insert \grave"
+\bind "M-m ~S-slash" "math-insert \acute"
+\bind "M-m ~S-ampersand" "math-insert \tilde"
+\bind "M-m ~S-minus" "math-insert \bar"
+\bind "M-m ~S-period" "math-insert \dot"
+\bind "M-m S-V" "math-insert \check"
+\bind "M-m S-U" "math-insert \breve"
+\bind "M-m v" "math-insert \vec"
+\bind "M-m ~S-underscore" "math-insert \underbar"
+
\bind "M-m b" "math-insert \overline"
-\bind "M-m h" "accent-circumflex"
-\bind "M-m ~S-period" "accent-dot"
-\bind "M-m ~S-asciitilde" "accent-tilde"
\bind "M-m ~S-apostrophe" "math-insert \prime"
-\bind "M-m ~S-quotedbl" "accent-umlaut"
-
# These do pairs of: () {} [] <> ||
\bind "Escape" "escape"
\bind "C-Tab" "tab-insert"
\bind "M-m space" "math-space"
-\bind "M-m S-G" "command-sequence math-mode ; math-greek-toggle ; "
+\bind "M-m S-G" "math-greek-toggle"
+
+# This should be handled properly by some "get the next key" method
+
+\bind "M-m g a" "math-insert \alpha"
+\bind "M-m g b" "math-insert \beta"
+\bind "M-m g c" "math-insert \chi"
+\bind "M-m g d" "math-insert \delta"
+\bind "M-m g e" "math-insert \epsilon"
+\bind "M-m g f" "math-insert \phi"
+\bind "M-m g g" "math-insert \gamma"
+\bind "M-m g h" "math-insert \eta"
+\bind "M-m g i" "math-insert \iota"
+\bind "M-m g j" "math-insert \varphi"
+\bind "M-m g k" "math-insert \kappa"
+\bind "M-m g l" "math-insert \lambda"
+\bind "M-m g m" "math-insert \mu"
+\bind "M-m g n" "math-insert \nu"
+\bind "M-m g o" "math-insert \omega"
+\bind "M-m g p" "math-insert \pi"
+\bind "M-m g q" "math-insert \vartheta"
+\bind "M-m g r" "math-insert \rho"
+\bind "M-m g s" "math-insert \sigma"
+\bind "M-m g t" "math-insert \tau"
+\bind "M-m g u" "math-insert \upsilon"
+\bind "M-m g v" "math-insert \theta"
+\bind "M-m g w" "math-insert \omega"
+\bind "M-m g x" "math-insert \xi"
+\bind "M-m g y" "math-insert \psi"
+\bind "M-m g z" "math-insert \zeta"
+
+\bind "M-m g S-D" "math-insert \Delta"
+\bind "M-m g S-E" "math-insert \varepsilon"
+\bind "M-m g S-F" "math-insert \Phi"
+\bind "M-m g S-G" "math-insert \Gamma"
+\bind "M-m g S-I" "math-insert \iota"
+\bind "M-m g S-J" "math-insert \epsilon"
+\bind "M-m g S-O" "math-insert \Omega"
+\bind "M-m g S-P" "math-insert \Pi"
+\bind "M-m g S-Q" "math-insert \vartheta"
+\bind "M-m g S-R" "math-insert \varrho"
+\bind "M-m g S-S" "math-insert \Sigma"
+\bind "M-m g S-T" "math-insert \varsigma"
+\bind "M-m g S-U" "math-insert \Upsilon"
+\bind "M-m g S-V" "math-insert \Theta"
+\bind "M-m g S-W" "math-insert \Omega"
+\bind "M-m g S-X" "math-insert \Xi"
+\bind "M-m g S-Y" "math-insert \Varphi"