Merge pull request #190 from psoukie:hotfix--smart-space-removal

Hotfix--smart-space-removal
psoukie · Apr 29, 2024 · 13e6e80 · 13e6e80
2 parents 63ed503 + 1128fd2
commit 13e6e80
Show file tree

Hide file tree

Showing 15 changed files with 315 additions and 57 deletions.
diff --git a/_tests/bare.set b/_tests/bare.set
@@ -8,3 +8,4 @@ bare__first_test.out
 bare__raw-typing.out
 bare__test.out
 bare__interrupts.out
+bare__ss-punct.out
diff --git a/_tests/bare__ss-punct.out b/_tests/bare__ss-punct.out
@@ -0,0 +1,51 @@
+*Interrupt*
+*Interrupt*
+*Interrupt*
+~Enter
+~x
+~.
+~+9
+~Space
+~x
+~.
+~+0
+~Space
+~x
+~.
+~+2
+~Space
+~e
+~u
+~s
+{Backspace 3}
+{Text}this
+~+2
+~Space
+~t
+~h
+~i
+~s
+~+9
+*Hint*
+~Space
+~t
+~h
+~i
+~s
+~.
+*Hint*
+~+9
+~Space
+~s
+~u
+~e
+{Backspace 3}
+{Text}this
+~+9
+~Space
+~e
+~u
+~s
+{Backspace 3}
+{Text}this
+~+0
diff --git a/_tests/chords-en-dvorak.txt b/_tests/chords-en-dvorak.txt
@@ -220,24 +220,15 @@ Infixes
 -------
 .c	~.com~
 .o	~.org~
+ .	~.~	Space+. forces a full stop without smart spaces
+ ,	~,~	Space+. forces a full stop without smart spaces
 
 Punctuation Exceptions
 ----------------------
 These exceptions are used to correct the output when using smart spaces after punctuation.
 
- .	~.~	Space+. forces a full stop without smart spaces
 e . g .	e.g.
 i . e . i.e.
-. 0	~.0~
-. 1	~.1~
-. 2	~.2~
-. 3	~.3~
-. 4	~.4~
-. 5	~.5~
-. 6	~.6~
-. 7	~.7~
-. 8	~.8~
-. 9	~.9~
 
 Newly added
 -----------

diff --git a/_tests/default.set b/_tests/default.set
@@ -8,3 +8,4 @@ default__test.out
 default__chording.out
 default__infix.out
 default__interrupts.out
+default__ss-punct.out
diff --git a/_tests/default__infix.out b/_tests/default__infix.out
@@ -5,7 +5,7 @@
 ~Space
 ~.
 {Backspace 2}
-{Text}.~
+{Text}.
 ~c
 ~o
 ~m
@@ -18,7 +18,7 @@
 ~l
 ~b
 {Backspace 3}
-{Text}-bleeping-~
+{Text}-bleeping-
 ~l
 ~i
 ~e

diff --git a/_tests/default__interrupts.out b/_tests/default__interrupts.out
@@ -13,9 +13,7 @@
 *Interrupt*
 *Interrupt*
 ~,
-{Space}
 ~Space
-{Backspace}
 ~t
 ~e
 ~s

diff --git a/_tests/default__ss-punct.out b/_tests/default__ss-punct.out
@@ -0,0 +1,66 @@
+*Interrupt*
+*Interrupt*
+*Interrupt*
+~Enter
+~x
+~.
+{Space}
+~+9
+~Space
+~x
+~.
+{Space}
+~+0
+{Backspace 2}
+{Text})
+~Space
+~x
+~.
+{Space}
+~+2
+{Backspace 2}
+{Text}@
+~Space
+~e
+~u
+~s
+{Backspace 3}
+{Text}this
+{Space}
+~+2
+{Backspace 2}
+{Text}@
+~Space
+~t
+~h
+~i
+~s
+~+9
+*Hint*
+~Space
+~t
+~h
+~i
+~s
+~.
+*Hint*
+{Space}
+~+9
+~Space
+~s
+~u
+~e
+{Backspace 3}
+{Text}this
+{Space}
+~+9
+~Space
+~e
+~u
+~s
+{Backspace 3}
+{Text}this
+{Space}
+~+0
+{Backspace 2}
+{Text})
diff --git a/_tests/loaded.set b/_tests/loaded.set
@@ -7,3 +7,4 @@ loaded__first.out
 loaded__first_test.out
 loaded__raw-typing.out
 loaded__test.out
+loaded__ss-punct.out
diff --git a/_tests/loaded__ss-punct.out b/_tests/loaded__ss-punct.out
@@ -0,0 +1,68 @@
+*Interrupt*
+*Interrupt*
+*Interrupt*
+~Enter
+~x
+{Backspace}
+{Text}X
+~.
+{Space}
+~+9
+~Space
+~x
+~.
+{Space}
+~+0
+{Backspace 2}
+{Text})
+~Space
+~x
+~.
+{Space}
+~+2
+{Backspace 2}
+{Text}@
+~Space
+~e
+~u
+~s
+{Backspace 3}
+{Text}this
+{Space}
+~+2
+{Backspace 2}
+{Text}@
+~Space
+~t
+~h
+~i
+~s
+~+9
+*Hint*
+~Space
+~t
+~h
+~i
+~s
+~.
+*Hint*
+{Space}
+~+9
+~Space
+~s
+~u
+~e
+{Backspace 3}
+{Text}this
+{Space}
+~+9
+~Space
+~e
+~u
+~s
+{Backspace 3}
+{Text}this
+{Space}
+~+0
+{Backspace 2}
+{Text})
diff --git a/_tests/ss-punct.in b/_tests/ss-punct.in
@@ -0,0 +1,81 @@
+0	*Interrupt*
+109	*Interrupt*
+640	*Interrupt*
+1078	~Enter
+3453	~x
+3578	~x Up
+3922	~.
+4031	~. Up
+4968	~+9
+5062	~+9 Up
+5843	~Space
+5937	~Space Up
+6406	~x
+6531	~x Up
+6906	~.
+7015	~. Up
+7672	~+0
+7750	~+0 Up
+8640	~Space
+8781	~Space Up
+9062	~x
+9187	~x Up
+9562	~.
+9672	~. Up
+10250	~+2
+10359	~+2 Up
+11250	~Space
+11375	~Space Up
+11656	~e
+11687	~u
+11687	~s
+11875	~s Up
+11890	~e Up
+13015	~+2
+13140	~+2 Up
+14406	~Space
+14500	~Space Up
+15093	~t
+15187	~t Up
+15297	~h
+15406	~i
+15422	~h Up
+15531	~s
+15547	~i Up
+15656	~s Up
+16672	~+9
+16781	~+9 Up
+17765	~Space
+17859	~Space Up
+18781	~t
+18890	~t Up
+18906	~h
+19015	~i
+19015	~h Up
+19125	~i Up
+19125	~s
+19250	~s Up
+19437	~.
+19531	~. Up
+20156	~+9
+20265	~+9 Up
+21875	~Space
+22000	~Space Up
+24000	~s
+24000	~u
+24015	~e
+24172	~u Up
+24187	~e Up
+24218	~s Up
+25000	~+9
+25109	~+9 Up
+26672	~Space
+26765	~Space Up
+27093	~e
+27093	~u
+27093	~s
+27250	~u Up
+27265	~s Up
+27281	~e Up
+28031	~+0
+28125	~+0 Up
diff --git a/dictionaries/chords-en-dvorak.txt b/dictionaries/chords-en-dvorak.txt
@@ -223,21 +223,12 @@ Infixes
 
 Punctuation Exceptions
 ----------------------
-These exceptions are used to correct the output when using smart spaces after punctuation.
+These exceptions are used to help with specific output when using smart spaces after punctuation.
 
- .	~.~	Space+. forces a full stop without smart spaces
+ .	~.~	Space+. forces a full stop without a smart spaces
+ ,	~,~	Space+. forces a full stop without a smart spaces
 e . g .	e.g.
 i . e . i.e.
-. 0	~.0~
-. 1	~.1~
-. 2	~.2~
-. 3	~.3~
-. 4	~.4~
-. 5	~.5~
-. 6	~.6~
-. 7	~.7~
-. 8	~.8~
-. 9	~.9~
 
 Newly added
 -----------
diff --git a/dictionaries/chords-en-qwerty.txt b/dictionaries/chords-en-qwerty.txt
@@ -223,21 +223,12 @@ Infixes
 
 Punctuation Exceptions
 ----------------------
-These exceptions are used to correct the output when using smart spaces after punctuation.
+These exceptions are used to help with specific output when using smart spaces after punctuation.
 
- .	~.~	Space+. forces a full stop without smart spaces
+ .	~.~	Space+. forces a full stop without a smart spaces
+ ,	~,~	Space+. forces a full stop without a smart spaces
 e . g .	e.g.
 i . e . i.e.
-. 0	~.0~
-. 1	~.1~
-. 2	~.2~
-. 3	~.3~
-. 4	~.4~
-. 5	~.5~
-. 6	~.6~
-. 7	~.7~
-. 8	~.8~
-. 9	~.9~
 
 Newly added
 -----------
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,9 +13,7 @@ @@
     *Interrupt*
     *Interrupt*
     ~,
-    {Space}
     ~Space
-    {Backspace}
     ~t
     ~e
     ~s
@@ Expand Down @@