547708b

plover_pinchord/dictionaries/pinchord-v26.0.json renamed from plover_pinchord/dictionaries/pinchord-v25.0.3.json (view file)

File renamed without changes.

plover_pinchord/dictionaries/pinchord-v26.0.py renamed from plover_pinchord/dictionaries/pinchord-v25.0.3.py (view file)

@@ -4,6 +4,7 @@ ## Longest valid outline, Pinchord only needs one stroke outlines :) LONGEST_KEY = 1 +## TODO move this into the dict, or just wait until chords.edn is the dictionary format? BANKS = ["prefixes", "initials", "vowels", "finals", "suffixes"]  ## Specified by 'chords.edn' (https://grahp.dev/pinchord.git/chords.edn)@@ -12,12 +13,7 @@     "prefixes": {         "+": "{^}",         "#": "{-|}",-        "#+": "{^}{-|}",-        "#+": "{^}{-|}",-        "_": "{^}_",-        "_+": "{^}-",-        "#_": "{^}_{-|}",-        "#_+": "{^}-{-|}",+        "#+": "{^-|}",         "": "{}",     }, @@ -38,9 +34,12 @@         "PWHR": "bl",         "SPWHR": "cl",         "TS": "st",+        "TS&": "ts",+        "TSH": "sth",         "SPR": "spr",         "SHR&": "shr",         "HR": "l",+        "HR&": "ll",         "WH": "wh",         "TW": "tw",         "S": "s",@@ -57,8 +56,10 @@         "SWR": "y",         "TSPWH": "gh",         "R": "r",+        "R&": "rh",         "SWHR": "squ",         "TSR": "str",+        "TSR&": "tz",         "TWHR": "j",         "SH": "sh",         "PH": "m",@@ -87,6 +88,7 @@         "SP": "sp",         "TSPH": "sn",         "TPH": "n",+        "TPH&": "mn",         "TPW": "d",         "PW": "b",     },@@ -114,10 +116,10 @@        "I": "i",        "I^": "eu",        "^": "y",-       "OIU": "oe",+       "OIU": "eo",+       "OIU^": "oe",        "AOU^": "iu",        "OI": "oi",-       "OIU^": "eo",        "U^": "ue",        "AI": "ai",        "-": "{^}",@@ -310,11 +312,13 @@     },      "suffixes": {-        "E": "e",-    },+        "e": "e",+        "s": "e",+        "es": "es",+    } } -BANK_SPLITTING_REGEX = r"(_?#?\+?)(T?S?P?W?H?R?&?)(A?O?I?U?\^?\-?)(L?R?P?K?F?S?T?\*?)(E?)"+BANK_SPLITTING_REGEX = r"(#?\+?)(T?S?P?W?H?R?&?)(A?O?I?U?\^?\-?)(L?R?P?K?F?S?T?\*?)(e?s?)"  EMTPY_TRANSLATION = "" 

plover_pinchord/system.py modified (view file)

@@ -1,27 +1,28 @@ from plover.system.english_stenotype import *  KEYS = (-  "#-", "_-", "+-",+  "#-", "+-",   "T-", "S-", "P-", "W-", "H-", "R-", "&-",   "A", "O", "I", "U", "^",   "-L", "-R", "-P", "-K", "-F", "-S", "-T", "-*",-  "-E",+  "-e", "-s" )  IMPLICIT_HYPHEN_KEYS = ("A", "O", "I", "U", "^")-SUFFIX_KEYS = ("-E",)+# You know I still don't really know what this does...+SUFFIX_KEYS = ("-e", "-s") NUMBERS = {} NUMBER_KEY = None FERAL_NUMBER_KEY = False UNDO_STROKE_STENO = "-LR"  DICTIONARIES_ROOT = "asset:plover_pinchord:dictionaries"-DEFAULT_DICTIONARIES = ("user.json", "pinchord-v25.0.3.json", "pinchord-v25.0.3.py")+DEFAULT_DICTIONARIES = ("user.json", "pinchord-v26.0.json", "pinchord-v26.0.py")  KEYMAPS = {   "Keyboard": {     "#-": ("q"),-    "_-": ("Tab"), # Can't use caps lock :/+    "s-": ("Tab"), # Can't use caps lock :/     "+-": ("a"),     "T-": ("w"),     "S-": ("s"),@@ -43,7 +44,7 @@     "-S": ("l"),     "-T": ("p"),     "-*": (";"),-    "-E": ("[", "'"),+    "-s": ("[", "'"),     "arpeggiate": "space",     "no-op": ("]", "Delete", "End", "Page_Down", "Return", "z", "x", "b", ",", ".", "/")   }

setup.cfg modified (view file)

@@ -1,6 +1,6 @@ [metadata] name = Pinchord-version = v25.0.3+version = v26.0 description = Chorded Typing System long_description = file:plover-description.md long_description_content_type = text/markdown