Add REPLACING WITH YANKED TEXT and INCREMENTING/DECREMTING

Also some consistency issues
 - redundant/dated comment in JOINING LINES
 - spacing around slashes
 - etc.

1 files changed, 119 insertions, 75 deletions

diff --git a/runtime/tutor.txt b/runtime/tutor.txt
index 760251e1..20c103b3 100644
--- a/runtime/tutor.txt
+++ b/runtime/tutor.txt
@@ -620,7 +620,7 @@ _________________________________________________________________
 
  Type f<ch> to select up to and including (find) a character.
  Type t<ch> to do the same, but not including (till) a character.
- Type uppercase F/T to do the same backwards.
+ Type uppercase F / T to do the same backwards.
 
  1. Move the cursor to the line below marked -->. Place the
     cursor on the first dash.
@@ -663,7 +663,7 @@ _________________________________________________________________
 =================================================================
 
  Type . to repeat the last insert command.
- Type A-. to repeat the f/t selection.
+ Type A-. to repeat the last f / t selection.
 
  1. Move the cursor to the line below marked -->.
  2. Make a change, insertion or appendage and repeat it with . .
@@ -685,12 +685,12 @@ _________________________________________________________________
 =================================================================
 
  * Type f / F to extend selection up to & including a character.
-  * Type t / T to extend selection until a character.
+   * Type t / T to extend selection until a character.
 
  * Type r to replace selected characters.
 
  * Type . to repeat the last insertion.
-  * Type A-. to repeat the last f / t selection.
+   * Type A-. to repeat the last f / t selection.
 
 
 
@@ -703,7 +703,117 @@ _________________________________________________________________
 
 
 =================================================================
-=                     7.1 CHANGING CASE                         =
+=                  7.1 REPLACE WITH YANKED TEXT                 =
+=================================================================
+
+ Type R to replace the selection with previously yanked text.
+
+ 1. Move the cursor to the line below marked -->.
+ 2. Type w to select "watermelons" and then y to yank it.
+ 3. Select "oranges" with w.
+ 4. Type R to replace "oranges" with "watermelons"
+
+
+ --> I like watermelons because oranges are refreshing.
+     I like watermelons because watermelons are refreshing.
+
+
+
+
+
+
+
+
+=================================================================
+=                       7.2 JOINING LINES                       =
+=================================================================
+
+ Type J to join together lines in selection.
+
+ 1. Move the cursor to the line below marked -->.
+ 2. Type x four times or 4x to select all four lines.
+ 3. Type J to join the lines together.
+
+ --> This sentence
+is spilling over
+onto other
+lines.
+
+     This sentence is spilling over onto other lines.
+
+
+
+
+
+
+=================================================================
+=                      7.3 INDENTING LINES                      =
+=================================================================
+
+ Type > to indent a line and < to outdent it.
+
+ 1. Move the cursor to the line below marked -->.
+ 2. Move down to the second line and type > to indent it.
+ 3. Move to the third line and type < to outdent it.
+
+ --> These lines
+    are indented
+         very poorly.
+
+     These lines
+     are indented
+     much better.
+
+
+
+
+
+=================================================================
+=               7.4 INCREMENTING AND DECREMENTING               =
+=================================================================
+
+ Type C-a to increment the number under selection.
+ Type C-x to decrement the number under selection.
+
+ 1. Move the cursor to the third line below marked -->.
+ 2. Type C-a to increment the second point marked 2.
+ 3. Repeat for the point marked 3.
+ 4. Move to the last point and type C-x to decrement the 6.
+
+ --> 1) First point.
+ --> 2) Added point.
+ --> 2) Next point.
+ --> 3) Another point.
+ --> 6) Last point.
+
+ Note: If there isn't a number under the selection the cursor
+       will jump to the next number in the line and act on it.
+
+
+=================================================================
+=                        CHAPTER 7 RECAP                        =
+=================================================================
+
+ * Type R to replace the selection with yanked text.
+
+ * Type J to join lines in selection.
+
+ * Type < and > to indent / outdent lines.
+
+ * Type C-a to increment the selected number.
+   * Type C-x to decrement the selected number.
+
+
+
+
+
+
+
+
+
+
+=================================================================
+=                     8.1 CHANGING CASE                         =
 =================================================================
 
  Type ~ to switch the case of all selected letters.
@@ -725,7 +835,7 @@ _________________________________________________________________
  --> THIS sentence should ALL BE IN uppercase!
 
 =================================================================
-=                          7.2 MACROS                           =
+=                          8.2 MACROS                           =
 =================================================================
 
  Macros are a way to record a set of actions you want to repeat.
@@ -747,7 +857,7 @@ _________________________________________________________________
      This sentence doesn't have it's first and last word.
 
 =================================================================
-=                        CHAPTER 7 RECAP                        =
+=                        CHAPTER 8 RECAP                        =
 =================================================================
 
  * Type ~ to alternate case of selected letters.
@@ -769,7 +879,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                    8.1 USING THE JUMPLIST                     =
+=                    9.1 USING THE JUMPLIST                     =
 =================================================================
 
  Helix can keep track of "jumps" which are big movements, like
@@ -791,7 +901,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                        CHAPTER 8 RECAP                        =
+=                        CHAPTER 9 RECAP                        =
 =================================================================
 
  * Type C-s to save position to the jumplist.
@@ -813,71 +923,5 @@ _________________________________________________________________
 
 
 =================================================================
-=                       9.1 JOINING LINES                       =
-=================================================================
-
- Type J to join together lines in selection.
-
- 1. Move the cursor to the line below marked -->.
- 2. Type x four times or 4x to select all four lines.
- 3. Type J to join the lines together.
-
- --> This sentence
-is spilling over
-onto other
-lines.
-     This sentence is spilling over onto other lines.
-
- Note: J works on all lines in selection, so typing xxx or 3x to
-       select the lines and then a single J will work the same.
-
-
-
-
-=================================================================
-=                      9.2 INDENTING LINES                      =
-=================================================================
-
- Type > to indent a line and < to outdent it.
-
- 1. Move the cursor to the line below marked -->.
- 2. Move down to the second line and type > to indent it.
- 3. Move to the third line and type < to outdent it.
-
- --> These lines
-    are indented
-         very poorly.
-
-     These lines
-     are indented
-     much better.
-
-
-
-
-
-=================================================================
-=                        CHAPTER 9 RECAP                        =
-=================================================================
-
- * Type J to join lines within selection.
-
- * Type > and < to indent and outdent selected lines.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=================================================================
  This tutorial is still a work-in-progress.
  More sections are planned.