Merge pull request #184 from psoukie:feat--improve-detection

Feat--improve-detection
psoukie · Apr 27, 2024 · edb3abe · edb3abe
2 parents 1965ec1 + 4c923e8
commit edb3abe
Show file tree

Hide file tree

Showing 39 changed files with 794 additions and 230 deletions.
diff --git a/_tests/bare.cfg b/_tests/bare.cfg
diff --git a/_tests/bare.set b/_tests/bare.set
@@ -7,3 +7,4 @@ bare__first.out
 bare__first_test.out
 bare__raw-typing.out
 bare__test.out
+bare__interrupts.out
diff --git a/_tests/bare__b.out b/_tests/bare__b.out
@@ -1,5 +1,7 @@
 ~h
 ~t
+{Backspace 2}
+{Text}the
 ~Space
 ~t
 ~h

diff --git a/_tests/bare__c.out b/_tests/bare__c.out
@@ -12,15 +12,13 @@
 ~e
 ~n
 ~Space
-*Hint*
 ~p
 ~s
 ~b
 ~l
 ~+/
 {Backspace 5}
-{Text}possible
-+/
+{Text}possible?
 ~j
 ~w
 ~Space

diff --git a/_tests/bare__chording.out b/_tests/bare__chording.out
@@ -10,7 +10,6 @@
 ~e
 ~w
 ~.
-*Hint*
 ~i
 ~s
 {Backspace 2}
@@ -27,7 +26,6 @@
 ~e
 ~r
 ~+/
-*Hint*
 ~Enter
 ~+m
 ~a

diff --git a/_tests/bare__first_test.out b/_tests/bare__first_test.out
@@ -13,20 +13,15 @@
 ~r
 ~m
 ~.
-{Backspace 4}
-{Text}from
-.
 ~f
 ~r
 ~m
 ~Space
 {Backspace 4}
-{Text}from
-
+{Text}from 
 ~f
 ~r
 ~m
 ~.
 {Backspace 4}
-{Text}from
-.
+{Text}from.
diff --git a/_tests/bare__interrupts.out b/_tests/bare__interrupts.out
@@ -0,0 +1,40 @@
+*Interrupt*
+~e
+~s
+~u
+{Backspace 3}
+{Text}this
+*Interrupt*
+~f
+~r
+~m
+~Space
+*Interrupt*
+*Interrupt*
+~,
+~Space
+~t
+~e
+~s
+~t
+*Interrupt*
+*Interrupt*
+~.
+~n
+{Backspace 2}
+{Text}ing
+~r
+~o
+{Backspace 2}
+{Text}or
+~t
+~e
+~s
+~t
+~g
+*Interrupt*
+~.
+~n
+{Backspace 2}
+{Text}ing
+~.
diff --git a/_tests/chords-en-dvorak-230110.txt → _tests/chords-en-dvorak.txt b/_tests/chords-en-dvorak-230110.txt → _tests/chords-en-dvorak.txt
@@ -8,10 +8,10 @@ Note that the category headings are for orientation only. For extended character
 
 See https://github.com/psoukie/zipchord for details.
 
+
 Articles
 --------
 th	the
-*t	working
  a	a
  an	an
 
@@ -83,7 +83,7 @@ wa	was
 er	were
 be	be
 av	have
-hv .n	having
+av .n	having
 az	has
 ad	had
 nt	not
@@ -161,13 +161,13 @@ wy	way
 yr	year
 bk	back
 dy	day
-dy 1	Monday
-dy 2	Tuesday
-dy 3	Wednesday
-dy 4	Thursday
-dy 5	Friday
-dy 6	Saturday
-dy 7	Sunday
+1 dy	Monday
+2 dy	Tuesday
+3 dy	Wednesday
+4 dy	Thursday
+5 dy	Friday
+6 dy	Saturday
+7 dy	Sunday
 qn	question
 sc	second
 eug	thing
@@ -177,31 +177,24 @@ dt	different
 eou	though
 thu	through
 sr	sorry
- 1	Monday
- 2	Tuesday
- 3	Wednesday
- 4	Thursday
- 5	Friday
- 6	Saturday
- 7	Sunday
 mv	move
 dir	direction
 nx	next
 sam	same
 tp	top
 mon	month
-mon 1	January
-mon 2	February
-mon 3	March
-mon 4	April
-mon 5	May
-mon 6	June
-mon 7	July
-mon 8	August
-mon 9	September
-mon 1 0	October
-mon 1 1	November
-mon 1 2	December
+1 mon	January
+2 mon	February
+3 mon	March
+4 mon	April
+5 mon	May
+6 mon	June
+7 mon	July
+8 mon	August
+9 mon	September
+1 0 mon	October
+1 1 mon	November
+1 2 mon	December
 
 Prefixes
 --------
@@ -223,5 +216,30 @@ Suffixes
 .t	~tion
 .l	~ly
 
+Infixes
+-------
+.c	~.com~
+.o	~.org~
+
+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
 -----------
+*t	working
+blp	~-bleeping-~
diff --git a/_tests/default.cfg b/_tests/default.cfg
diff --git a/_tests/default.set b/_tests/default.set
@@ -6,3 +6,5 @@ default__first_test.out
 default__raw-typing.out
 default__test.out
 default__chording.out
+default__infix.out
+default__interrupts.out
diff --git a/_tests/default__a.out b/_tests/default__a.out
@@ -35,7 +35,7 @@
 {Space}
 ~+/
 {Backspace 2}
-+/
+{Text}?
 {Space}
 *Interrupt*
 *Interrupt*

diff --git a/_tests/default__b.out b/_tests/default__b.out
@@ -1,6 +1,10 @@
 ~h
 ~t
+{Backspace 2}
+{Text}the
+{Space}
 ~Space
+{Backspace}
 ~t
 ~h
 ~e

diff --git a/_tests/default__c.out b/_tests/default__c.out
@@ -21,8 +21,7 @@
 ~l
 ~+/
 {Backspace 5}
-{Text}possible
-+/
+{Text}possible?
 {Space}
 ~j
 ~w
@@ -34,7 +33,7 @@
 {Space}
 ~+/
 {Backspace 2}
-+/
+{Text}?
 {Space}
 ~r
 ~j
@@ -53,5 +52,5 @@
 {Space}
 ~+/
 {Backspace 2}
-+/
+{Text}?
 {Space}
diff --git a/_tests/default__first.out b/_tests/default__first.out
@@ -88,11 +88,11 @@
 {Space}
 ~.
 {Backspace 2}
-.
+{Text}.
 {Space}
 ~.
 {Backspace 2}
-.
+{Text}.
 {Space}
 ~+b
 ~u
@@ -102,11 +102,11 @@
 {Space}
 ~.
 {Backspace 2}
-.
+{Text}.
 {Space}
 ~.
 {Backspace 2}
-.
+{Text}.
 {Space}
 ~Space
 {Backspace}

diff --git a/_tests/default__first_test.out b/_tests/default__first_test.out
@@ -15,21 +15,18 @@
 ~m
 ~.
 {Backspace 4}
-{Text}from
-.
+{Text}from.
 {Space}
 ~f
 ~r
 ~m
 ~Space
 {Backspace 4}
-{Text}From
-
+{Text}From 
 ~f
 ~r
 ~m
 ~.
 {Backspace 4}
-{Text}from
-.
+{Text}from.
 {Space}
diff --git a/_tests/default__infix.out b/_tests/default__infix.out
@@ -0,0 +1,31 @@
+*Interrupt*
+~u
+~r
+~l
+~Space
+~.
+{Backspace 2}
+{Text}.~
+~c
+~o
+~m
+~Space
+~u
+~n
+~b
+~e
+~p
+~l
+~b
+{Backspace 3}
+{Text}-bleeping-~
+~l
+~i
+~e
+~v
+~a
+~b
+~l
+~e
+~+1
+{Space}
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,15 +12,13 @@ @@
     ~e
     ~n
     ~Space
-    *Hint*
     ~p
     ~s
     ~b
     ~l
     ~+/
     {Backspace 5}
-    {Text}possible
-    +/
+    {Text}possible?
     ~j
     ~w
     ~Space
@@ Expand Down @@