updated command-return lines

2 files changed, 91 insertions, 85 deletions

diff --git a/DefaultKeyBinding.dict b/DefaultKeyBinding.dict
index 7879968..b767138 100644
--- a/DefaultKeyBinding.dict
+++ b/DefaultKeyBinding.dict
@@ -1,4 +1,9 @@
 {
+	// @ = Command
+	// ~ = Option
+	// ^ = Control
+	// $ = Shift (when used on non-alpha characters, otherwise, just capitalize them)
+	
 	// copy character before cursor
 	"~z" = (moveLeftAndModifySelection:, copy:, moveRight:);
 	// repeat character before cursor
@@ -158,9 +163,10 @@
 	// modify selection down
 	"@~$\Uf701" = (selectParagraph:, moveParagraphForwardAndModifySelection:);
 	
-	// TextMate Command-Return (I wish this worked in some form, but it doesn't seem to)
-	// "@\U000A" = (moveToEndOfParagraph:, insertNewline:);
-	// "@$\U000A" = (moveToBeginningOfParagraph:, moveLeft:, insertNewline:);
+	// TextMate Command-Return (jump to end of graf and insert new line)
+	"@\U000D" = (moveToEndOfParagraph:, insertNewline:);
+	// Jump to line before graf and insert new line
+	"@$\U000D" = (moveToBeginningOfParagraph:, moveLeft:, insertNewline:);
 
 	// Forward delete to end of paragraph
 	"@\Uf728" = deleteToEndOfParagraph:;
diff --git a/readme.md b/readme.md
index 2db8567..ff8c8e7 100644
--- a/readme.md
+++ b/readme.md
@@ -30,150 +30,150 @@ DefaultKeyBindings.dict file (`~/Library/KeyBindings/DefaultKeyBindings.dict`) f
 <tbody>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;z</td>
+	<td style="text-align:center;">Opt-z</td>
 	<td style="text-align:left;">copy character before cursor</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;r</td>
+	<td style="text-align:center;">Opt-r</td>
 	<td style="text-align:left;">repeat character before cursor</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;t</td>
+	<td style="text-align:center;">Opt-t</td>
 	<td style="text-align:left;">transpose characters</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;+</td>
+	<td style="text-align:center;">Opt-+</td>
 	<td style="text-align:left;">uppercase word</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;-</td>
+	<td style="text-align:center;">Opt--</td>
 	<td style="text-align:left;">lowercase word</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;.</td>
+	<td style="text-align:center;">Opt-.</td>
 	<td style="text-align:left;">capitalize word</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^w</td>
+	<td style="text-align:center;">Ctrl-w</td>
 	<td style="text-align:left;">delete word before cursor</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;w</td>
+	<td style="text-align:center;">Opt-w</td>
 	<td style="text-align:left;">select word</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;f</td>
+	<td style="text-align:center;">Opt-f</td>
 	<td style="text-align:left;">cut word (fold)</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;g</td>
+	<td style="text-align:center;">Opt-g</td>
 	<td style="text-align:left;">copy word (grab)</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;h</td>
+	<td style="text-align:center;">Opt-h</td>
 	<td style="text-align:left;">paste word (hit)</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;l</td>
+	<td style="text-align:center;">Opt-l</td>
 	<td style="text-align:left;">select entire line/paragraph</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;s</td>
+	<td style="text-align:center;">Opt-s</td>
 	<td style="text-align:left;">select from beginning of paragrah to last character</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;d</td>
+	<td style="text-align:center;">Opt-d</td>
 	<td style="text-align:left;">delete line/paragraph</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;y</td>
+	<td style="text-align:center;">Opt-y</td>
 	<td style="text-align:left;">copy paragraph</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;x</td>
+	<td style="text-align:center;">Opt-x</td>
 	<td style="text-align:left;">cut paragraph</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;p</td>
+	<td style="text-align:center;">Opt-p</td>
 	<td style="text-align:left;">paste paragraph below</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;&#x21E7;P</td>
+	<td style="text-align:center;">Opt-Shift-P</td>
 	<td style="text-align:left;">paste paragraph above</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x21E7;A</td>
+	<td style="text-align:center;">Ctrl-Shift-A</td>
 	<td style="text-align:left;">select to beginning of paragraph and copy</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x21E7;E</td>
+	<td style="text-align:center;">Ctrl-Shift-E</td>
 	<td style="text-align:left;">select to end of paragraph and copy</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;q</td>
+	<td style="text-align:center;">Opt-q</td>
 	<td style="text-align:left;">cut to beginning of paragraph</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;k</td>
+	<td style="text-align:center;">Opt-k</td>
 	<td style="text-align:left;">cut to end of paragraph</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;,</td>
+	<td style="text-align:center;">Opt-,</td>
 	<td style="text-align:left;">move paragraph up a line, inserting blank space after</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;&#x2420;</td>
+	<td style="text-align:center;">Opt-␠</td>
 	<td style="text-align:left;">move paragraph to end of document</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;o</td>
+	<td style="text-align:center;">Opt-o</td>
 	<td style="text-align:left;">blank line after current</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;&#x21E7;O</td>
+	<td style="text-align:center;">Opt-Shift-O</td>
 	<td style="text-align:left;">blank line before current</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2318;&#x2325;/</td>
-	<td style="text-align:left;">comment with &#8220;//&#8221;</td>
+	<td style="text-align:center;">Cmd-Opt-/</td>
+	<td style="text-align:left;">comment with “//”</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2318;&#x2325;3</td>
-	<td style="text-align:left;">comment with &#8220;#&#8221;</td>
+	<td style="text-align:center;">Cmd-Opt-3</td>
+	<td style="text-align:left;">comment with “#”</td>
 </tr>
 </tbody>
 </table>
 
 
 <table>
-<caption id="markdown-specificshortcutsx2318w"> Markdown-specific shortcuts (^&#x2318;W) </caption>
+<caption id="markdown-specificshortcutsx2318w"> Markdown-specific shortcuts (Ctrl-Cmd-W) </caption>
 <colgroup>
 <col style="text-align:center;"/>
 <col style="text-align:center;"/>
@@ -191,81 +191,81 @@ DefaultKeyBindings.dict file (`~/Library/KeyBindings/DefaultKeyBindings.dict`) f
 <tbody>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2318;&#x2325;b</td>
+	<td style="text-align:center;">Cmd-Opt-b</td>
 	<td style="text-align:left;">bold selection</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2318;&#x2325;i</td>
+	<td style="text-align:center;">Cmd-Opt-i</td>
 	<td style="text-align:left;">italicize selection</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
-	<td style="text-align:center;">&#x23CE;</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
+	<td style="text-align:center;">Return</td>
 	<td style="text-align:left;">force Return</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
-	<td style="text-align:center;">&#x21E5;</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
+	<td style="text-align:center;">⇥</td>
 	<td style="text-align:left;">force Tab</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
-	<td style="text-align:center;">1&#8211;4</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
+	<td style="text-align:center;">1–4</td>
 	<td style="text-align:left;"># Headlines</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">l,t</td>
-	<td style="text-align:left;">link text <code>&quot;[selected text](                            | )&quot;</code></td>
+	<td style="text-align:left;">link text <code>"[selected text](|)"</code></td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">l,c</td>
-	<td style="text-align:left;">clipboard link <code>&quot;[                                      | selected text](clipboard contents)&quot;</code></td>
+	<td style="text-align:left;">clipboard link <code>"[|selected text](clipboard contents)"</code></td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">i,t</td>
-	<td style="text-align:left;">image, selection as alt <code>&quot;![selected text](             | )&quot;</code></td>
+	<td style="text-align:left;">image, selection as alt <code>"![selected text](|)"</code></td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">i,c</td>
-	<td style="text-align:left;">clipboard image <code>&quot;![                                    | selected text](clipboard contents)&quot;</code></td>
+	<td style="text-align:left;">clipboard image <code>"![|selected text](clipboard contents)"</code></td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">:,t</td>
 	<td style="text-align:left;">create a reference from selected text</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">:,c</td>
 	<td style="text-align:left;">create a reference from selected text, clipboard as url</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">[</td>
 	<td style="text-align:left;">insert reference link</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">+|-|*</td>
 	<td style="text-align:left;">lists</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
-	<td style="text-align:center;">=,&#x2325;&#x21E7;L</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
+	<td style="text-align:center;">=,Opt-Shift-L</td>
 	<td style="text-align:left;">new list item after current</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">e</td>
 	<td style="text-align:left;">entity</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;w</td>
+	<td style="text-align:center;">Ctrl-Cmd-w</td>
 	<td style="text-align:center;">=,/</td>
 	<td style="text-align:left;">http://</td>
 </tr>
@@ -274,7 +274,7 @@ DefaultKeyBindings.dict file (`~/Library/KeyBindings/DefaultKeyBindings.dict`) f
 
 
 <table>
-<caption id="surroundx2318s"> Surround (^&#x2318;s) </caption>
+<caption id="surroundx2318s"> Surround (Ctrl-Cmd-s) </caption>
 <colgroup>
 <col style="text-align:center;"/>
 <col style="text-align:center;"/>
@@ -291,58 +291,58 @@ DefaultKeyBindings.dict file (`~/Library/KeyBindings/DefaultKeyBindings.dict`) f
 
 <tbody>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">(</td>
 	<td style="text-align:left;">wrap () with spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">)</td>
 	<td style="text-align:left;">wrap () no spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">[</td>
 	<td style="text-align:left;">wrap [] with spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">]</td>
 	<td style="text-align:left;">wrap [] no spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">{</td>
 	<td style="text-align:left;">wrap {} with spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">}</td>
 	<td style="text-align:left;">wrap {} no spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">&lt;</td>
 	<td style="text-align:left;">wrap &lt;&gt; with spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">&gt;</td>
 	<td style="text-align:left;">wrap &lt;&gt; no spaces</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
-	<td style="text-align:center;">&#8217;</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
+	<td style="text-align:center;">’</td>
 	<td style="text-align:left;">wrap single quotes</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
 	<td style="text-align:center;">`</td>
 	<td style="text-align:left;">wrap backticks</td>
 </tr>
 <tr>
-	<td style="text-align:center;">^&#x2318;s</td>
-	<td style="text-align:center;">&quot;</td>
+	<td style="text-align:center;">Ctrl-Cmd-s</td>
+	<td style="text-align:center;">"</td>
 	<td style="text-align:left;">wrap double quote</td>
 </tr>
 </tbody>
@@ -368,47 +368,47 @@ DefaultKeyBindings.dict file (`~/Library/KeyBindings/DefaultKeyBindings.dict`) f
 <tbody>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x2318;k</td>
+	<td style="text-align:center;">Ctrl-Cmd-k</td>
 	<td style="text-align:left;">move line up</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x2318;j</td>
+	<td style="text-align:center;">Ctrl-Cmd-j</td>
 	<td style="text-align:left;">move line down</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x2318;l</td>
+	<td style="text-align:center;">Ctrl-Cmd-l</td>
 	<td style="text-align:left;">indent line</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x2318;h</td>
+	<td style="text-align:center;">Ctrl-Cmd-h</td>
 	<td style="text-align:left;">outdent line (all the way)</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x2325;k</td>
+	<td style="text-align:center;">Ctrl-Opt-k</td>
 	<td style="text-align:left;">copy line and paste above</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">^&#x2325;j</td>
+	<td style="text-align:center;">Ctrl-Opt-j</td>
 	<td style="text-align:left;">copy line and paste below</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2318;&#x2325;&#xA71B;</td>
+	<td style="text-align:center;">Cmd-Opt-Up</td>
 	<td style="text-align:left;">modify selection up</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2318;&#x2325;&#xA71C;</td>
+	<td style="text-align:center;">Cmd-Opt-Down</td>
 	<td style="text-align:left;">modify selection down</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2318;&#x2421;</td>
+	<td style="text-align:center;">Cmd-Del</td>
 	<td style="text-align:left;">Forward delete to end of paragraph</td>
 </tr>
 </tbody>
@@ -444,22 +444,22 @@ DefaultKeyBindings.dict file (`~/Library/KeyBindings/DefaultKeyBindings.dict`) f
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;PgUp</td>
+	<td style="text-align:center;">Opt-PgUp</td>
 	<td style="text-align:left;">Scroll up</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;PgDown</td>
+	<td style="text-align:center;">Opt-PgDown</td>
 	<td style="text-align:left;">Scroll Down</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;1</td>
+	<td style="text-align:center;">Opt-1</td>
 	<td style="text-align:left;">bookmark</td>
 </tr>
 <tr>
 	<td style="text-align:center;"></td>
-	<td style="text-align:center;">&#x2325;2</td>
+	<td style="text-align:center;">Opt-2</td>
 	<td style="text-align:left;">jump to bookmark</td>
 </tr>
 </tbody>