42241dc

CONTRIBUTING.md modified (view file)

@@ -6,4 +6,4 @@  You can email me (https://grahp.dev/contact), or find me on the Pinchord Discord (https://discord.gg/64eccde3jN) -See also https://grahp.dev/pinchord-development+See https://grahp.dev/contributing.

chords.edn modified (view file)

@@ -1,4 +1,4 @@-{:version "v26.0"+{:version "v27.0"  :banks {:prefixes "#+"          :initials "TSPWHR&"          :vowels "AOIU^"@@ -118,7 +118,6 @@           "LKFS" "lsh"           "LRKFS" "nsh"           "RKFS" "rsh"-          "PST" "w"           "L" "l"           "LR" "rl"           "LR*" "rly"

pinchord-chords-v27.0.json renamed from pinchord-chords-v26.0.json (view file)

@@ -1 +1 @@-{"initials":{"":"{^}","T":"t","TSP&":"sk","TS&":"ts","TP":"f","TSWR":"kr","THR":"thr","TPR":"fr","HR&":"ll","PWR":"br","TSPR":"scr","TSWH":"kn","TWH":"thw","SHR&":"shr","TP&":"ph","PWHR":"bl","TPH&":"mn","TPR&":"phr","SPWHR":"cl","TS":"st","SW&":"sv","SPR":"spr","SWHR":"squ","HR":"l","WH":"wh","TW":"tw","S":"s","SR":"v","TPWR":"dr","TSH":"sth","H":"h","PR":"pr","TSPWR":"gr","SHR":"sl","TSR&":"tz","SW":"sw","SWH":"z","TSPWH":"gh","TSPR&":"skr","R":"r","TPWH":"x","TSR":"str","TWHR":"j","SH":"sh","PH":"m","TSP":"sc","TR":"tr","P":"p","SH&":"sch","TPHR":"fl","TPHR&":"phl","TH":"th","WR":"wr","SPWR":"cr","SPH":"sm","TSW":"k","SR&":"vr","SPHR":"spl","TSPWHR":"gl","SWR":"y","TSWHR":"kl","SPW":"c","WHR&":"q","PHR":"pl","SPWH":"ch","TSPW":"g","W":"w","R&":"rh","SP":"sp","TSPH":"sn","TPH":"n","TPW":"d","WHR":"qu","PW":"b"},"suffix":{},"prefixes":{"#":"{-|}","+":"{^}","#+":"{^-|}"},"suffixes":{"e":"e","s":"s","es":"es"},"banks":{"prefixes":"#+","initials":"TSPWHR&","vowels":"AOIU^","finals":"LRPKFST*","suffixes":"es"},"vowels":{"OU":"ou","AU":"au","AOI":"ei","AU^":"ua","IU":"e","AOU^":"iu","IU^":"ee","AIU":"ea","AO^":"ao","O^":"oo","A^":"aa","U^":"ue","I^":"eu","AOU":"ui","OI^":"io","U":"u","AI^":"ia","O":"o","AO":"oa","A":"a","AIU^":"ae","I":"i","OIU^":"oe","OIU":"eo","AOI^":"ie","OI":"oi","^":"y","AI":"ai"},"finals":{"-LPFT*":"lly","-LRF*":"fn","-PFS":"z","-RPFT":"ry","-RPKFST":"rcy","-PKF*":"dd","-PKST":"ct","-LT*":"ttl","-LFT":"lft","-LK":"lk","-KFS*":"gh","-LKS*":"lsk","-LRPKF":"nd","-LPKFS*":"gl","-LKST":"lxt","-RT*":"rty","-FT":"ft","-PF":"n","-LRPKFS*":"gn","-PKF":"d","-KFS":"sh","-K":"k","-LRKST":"nxt","-PKT":"hp","-RPKFT*":"rcky","-RKS*":"rsk","-P*":"pp","-LPS":"lm","-R*":"rr","-RP":"rp","-LRPKFT*":"ncky","-LPF":"ln","-LRPKFS":"ng","-RPKS":"rc","-LRPF":"nn","-RPT":"rpt","-LPFT":"ly","-RPS":"rm","-RPK":"rb","-LRKST*":"nj","-LRKS":"nx","-RF":"rf","-PF*":"w","-LRPKS":"nc","-LRPFT*":"nny","-F":"f","-LST":"lst","-PKFST":"cy","-RPKFS*":"dg","-RK*":"rck","-PKFS":"g","-RPKS*":"rsc","-LRT":"nt","-RFST":"rth","-LRK":"nk","-LKS":"lx","-LRPKST":"nct","-PKFT*":"cky","-LRK*":"nck","-LK*":"lck","-RPKFS":"rg","-RKF":"rch","-LPKS*":"lsc","-LKF":"lch","-PFT":"y","-KS":"x","-LRPT":"npt","-RPFS":"rz","-LPKFT*":"lcky","-LPK*":"bl","-S":"s","-P":"p","-LRPK":"mb","-LKST*":"lj","-LRPKFT":"nky","-RK":"rk","-LRST":"nst","-PFS*":"zz","-LKFS":"lsh","-RPF":"rn","-PS*":"sp","-RKST":"rxt","-LRKFT":"ntch","-LPKF*":"ndl","-LF":"lf","-K*":"ck","-ST*":"ts","-RPFT*":"nly","-LRPFT":"ny","-PKT*":"ph","-LPKF":"ld","-RKFS":"rsh","-RKST*":"rj","-F*":"ff","-KT":"kt","-FST":"th","-LRPF*":"wn","-LRPFS":"nz","-LRF":"nf","-L*":"ll","-RST":"rst","-PT":"pt","-LPKFST":"lcy","-LRPKS*":"nsc","-S*":"ss","-T":"t","-PS":"m","-KFT":"tch","-LS":"ls","-LR*":"rly","-LPKS":"lc","-LRKS*":"nsk","-RPKF":"rd","-PKFT":"ky","-LPF*":"wl","-LRKT":"nkt","-LRFT":"nft","-RKT":"rkt","-LRFST":"nth","-RPF*":"rw","-LPKFS":"lg","-LKT":"lkt","-LRFS":"nv","-RPKST":"rct","-RPKFT":"rky","-PST":"w","-LFST*":"lfth","-LP":"lp","-LRKF":"nch","-LRP":"mp","-LFST":"lth","-LRPKFST":"ncy","-T*":"tt","-LKFT":"ltch","-LT":"lt","-LRS":"ns","-RFS":"rv","-ST":"st","-KFST*":"ght","-LP*":"pl","-R":"r","-RPKF*":"rld","-LPKFT":"lky","-RKS":"rx","-PKFST*":"sy","-RKFT":"rtch","-LRPS":"mn","-LRPK*":"bbl","-LRKFS":"nsh","-LPT":"lpt","-FS*":"vv","-RFST*":"rmth","-KST":"xt","-KT*":"h","-FS":"v","-LFS":"lv","-LPKST":"lct","-PFT*":"yy","-PKS*":"sc","-KF":"ch","-KST*":"j","-LPK":"lb","-LRPKF*":"ddl","-PKS":"c","-RS":"rs","-PK":"b","-LPFS":"lz","-RFT":"rft","-LR":"rl","-KS*":"sk","-L":"l","-RT":"rt","-PKFS*":"gg"},"keys":"#+TSPWHR&AOIU^LRPKFST*es","version":"v26.0"}\ No newline at end of file+{"initials":{"":"{^}","T":"t","TSP&":"sk","TS&":"ts","TP":"f","TSWR":"kr","THR":"thr","TPR":"fr","HR&":"ll","PWR":"br","TSPR":"scr","TSWH":"kn","TWH":"thw","SHR&":"shr","TP&":"ph","PWHR":"bl","TPH&":"mn","TPR&":"phr","SPWHR":"cl","TS":"st","SW&":"sv","SPR":"spr","SWHR":"squ","HR":"l","WH":"wh","TW":"tw","S":"s","SR":"v","TPWR":"dr","TSH":"sth","H":"h","PR":"pr","TSPWR":"gr","SHR":"sl","TSR&":"tz","SW":"sw","SWH":"z","TSPWH":"gh","TSPR&":"skr","R":"r","TPWH":"x","TSR":"str","TWHR":"j","SH":"sh","PH":"m","TSP":"sc","TR":"tr","P":"p","SH&":"sch","TPHR":"fl","TPHR&":"phl","TH":"th","WR":"wr","SPWR":"cr","SPH":"sm","TSW":"k","SR&":"vr","SPHR":"spl","TSPWHR":"gl","SWR":"y","TSWHR":"kl","SPW":"c","WHR&":"q","PHR":"pl","SPWH":"ch","TSPW":"g","W":"w","R&":"rh","SP":"sp","TSPH":"sn","TPH":"n","TPW":"d","WHR":"qu","PW":"b"},"suffix":{},"prefixes":{"#":"{-|}","+":"{^}","#+":"{^-|}"},"suffixes":{"e":"e","s":"s","es":"es"},"banks":{"prefixes":"#+","initials":"TSPWHR&","vowels":"AOIU^","finals":"LRPKFST*","suffixes":"es"},"vowels":{"OU":"ou","AU":"au","AOI":"ei","AU^":"ua","IU":"e","AOU^":"iu","IU^":"ee","AIU":"ea","AO^":"ao","O^":"oo","A^":"aa","U^":"ue","I^":"eu","AOU":"ui","OI^":"io","U":"u","AI^":"ia","O":"o","AO":"oa","A":"a","AIU^":"ae","I":"i","OIU^":"oe","OIU":"eo","AOI^":"ie","OI":"oi","^":"y","AI":"ai"},"finals":{"-LPFT*":"lly","-LRF*":"fn","-PFS":"z","-RPFT":"ry","-RPKFST":"rcy","-PKF*":"dd","-PKST":"ct","-LT*":"ttl","-LFT":"lft","-LK":"lk","-KFS*":"gh","-LKS*":"lsk","-LRPKF":"nd","-LPKFS*":"gl","-LKST":"lxt","-RT*":"rty","-FT":"ft","-PF":"n","-LRPKFS*":"gn","-PKF":"d","-KFS":"sh","-K":"k","-LRKST":"nxt","-PKT":"hp","-RPKFT*":"rcky","-RKS*":"rsk","-P*":"pp","-LPS":"lm","-R*":"rr","-RP":"rp","-LRPKFT*":"ncky","-LPF":"ln","-LRPKFS":"ng","-RPKS":"rc","-LRPF":"nn","-RPT":"rpt","-LPFT":"ly","-RPS":"rm","-RPK":"rb","-LRKST*":"nj","-LRKS":"nx","-RF":"rf","-PF*":"w","-LRPKS":"nc","-LRPFT*":"nny","-F":"f","-LST":"lst","-PKFST":"cy","-RPKFS*":"dg","-RK*":"rck","-PKFS":"g","-RPKS*":"rsc","-LRT":"nt","-RFST":"rth","-LRK":"nk","-LKS":"lx","-LRPKST":"nct","-PKFT*":"cky","-LRK*":"nck","-LK*":"lck","-RPKFS":"rg","-RKF":"rch","-LPKS*":"lsc","-LKF":"lch","-PFT":"y","-KS":"x","-LRPT":"npt","-RPFS":"rz","-LPKFT*":"lcky","-LPK*":"bl","-S":"s","-P":"p","-LRPK":"mb","-LKST*":"lj","-LRPKFT":"nky","-RK":"rk","-LRST":"nst","-PFS*":"zz","-LKFS":"lsh","-RPF":"rn","-PS*":"sp","-RKST":"rxt","-LRKFT":"ntch","-LPKF*":"ndl","-LF":"lf","-K*":"ck","-ST*":"ts","-RPFT*":"nly","-LRPFT":"ny","-PKT*":"ph","-LPKF":"ld","-RKFS":"rsh","-RKST*":"rj","-F*":"ff","-KT":"kt","-FST":"th","-LRPF*":"wn","-LRPFS":"nz","-LRF":"nf","-L*":"ll","-RST":"rst","-PT":"pt","-LPKFST":"lcy","-LRPKS*":"nsc","-S*":"ss","-T":"t","-PS":"m","-KFT":"tch","-LS":"ls","-LR*":"rly","-LPKS":"lc","-LRKS*":"nsk","-RPKF":"rd","-PKFT":"ky","-LPF*":"wl","-LRKT":"nkt","-LRFT":"nft","-RKT":"rkt","-LRFST":"nth","-RPF*":"rw","-LPKFS":"lg","-LKT":"lkt","-LRFS":"nv","-RPKST":"rct","-RPKFT":"rky","-LFST*":"lfth","-LP":"lp","-LRKF":"nch","-LRP":"mp","-LFST":"lth","-LRPKFST":"ncy","-T*":"tt","-LKFT":"ltch","-LT":"lt","-LRS":"ns","-RFS":"rv","-ST":"st","-KFST*":"ght","-LP*":"pl","-R":"r","-RPKF*":"rld","-LPKFT":"lky","-RKS":"rx","-PKFST*":"sy","-RKFT":"rtch","-LRPS":"mn","-LRPK*":"bbl","-LRKFS":"nsh","-LPT":"lpt","-FS*":"vv","-RFST*":"rmth","-KST":"xt","-KT*":"h","-FS":"v","-LFS":"lv","-LPKST":"lct","-PFT*":"yy","-PKS*":"sc","-KF":"ch","-KST*":"j","-LPK":"lb","-LRPKF*":"ddl","-PKS":"c","-RS":"rs","-PK":"b","-LPFS":"lz","-RFT":"rft","-LR":"rl","-KS*":"sk","-L":"l","-RT":"rt","-PKFS*":"gg"},"keys":"#+TSPWHR&AOIU^LRPKFST*es","version":"v27.0"}\ No newline at end of file

pinchord-javelin-dictionary-v27.0.yaml renamed from pinchord-javelin-dictionary-v26.0.yaml (view file)

@@ -1,4 +1,4 @@-name: Pinchord Base v26.0+name: Pinchord Base v27.0 maximumOutlineLength: 1 starters: - {stroke: '#+', definition: '{^}{-|}', mask: '#+'}@@ -127,7 +127,6 @@ - {stroke: -RPT, data: rpt, order: 4, avoidMask: -LKFS*} - {stroke: -LP*, data: pl, order: 4, avoidMask: -RKFST} - {stroke: TPR&, data: phr, order: 2, avoidMask: SWH}-- {stroke: -PST, data: w, order: 4, avoidMask: -LRKF*} - {stroke: SPWR, data: cr, order: 2, avoidMask: TH&} - {stroke: SWHR, data: squ, order: 2, avoidMask: TP&} - {stroke: -LPS, data: lm, order: 4, avoidMask: -RKFT*}

pinchord-javelin-system-v27.0.yaml renamed from pinchord-javelin-system-v26.0.yaml (view file)

File renamed without changes.

pinchord-starboard-layout-v27.0.javelin-layout renamed from pinchord-starboard-layout-v26.0.javelin-layout (view file)

File renamed without changes.

plover_pinchord/dictionaries/pinchord-v27.0.json renamed from plover_pinchord/dictionaries/pinchord-v26.0.1.json (view file)

File renamed without changes.

plover_pinchord/dictionaries/pinchord-v27.0.py renamed from plover_pinchord/dictionaries/pinchord-v26.0.1.py (view file)

@@ -135,7 +135,6 @@         "LKFS": "lsh",         "LRKFS": "nsh",         "RKFS": "rsh",-        "PST": "w",         "L": "l",         "LR": "rl",         "LR*": "rly",@@ -325,6 +324,8 @@ def banks(stroke):     match = re.match(BANK_SPLITTING_REGEX, stroke)     if match:+        ## Due to javelin limitations I think making these banks extensible would be tricky, actually+        ## The regex definitely should be though.         prefix, initials, vowels, finals, suffixes = match.groups()         return {"prefixes": prefix, "initials": initials, "vowels": vowels, "finals": finals, "suffixes": suffixes}     else:

plover_pinchord/system.py modified (view file)

@@ -17,7 +17,7 @@ UNDO_STROKE_STENO = "-LR"  DICTIONARIES_ROOT = "asset:plover_pinchord:dictionaries"-DEFAULT_DICTIONARIES = ("user.json", "pinchord-v26.0.1.json", "pinchord-v26.0.1.py")+DEFAULT_DICTIONARIES = ("user.json", "pinchord-v27.0.json", "pinchord-v27.0.py")  KEYMAPS = {   "Keyboard": {@@ -47,5 +47,32 @@     "-e": ("[", "'"),     "arpeggiate": "space",     "no-op": ("]", "Delete", "End", "Page_Down", "Return", "z", "x", "b", ",", ".", "/")+  },+  "Gemini PR": {+    "#-": ("S1-"),+    "+-": ("S2-"),+    "T-": ("T-"),+    "S-": ("K-"),+    "P-": ("P-"),+    "W-": ("W-"),+    "H-": ("H-"),+    "R-": ("R-"),+    "&-": ("*1", "*2"),+    "A": ("A-"),+    "O": ("O-"),+    "I": ("-E"),+    "U": ("-U"),+    "^": ("*3", "*4"),+    "-L": ("-F"),+    "-R": ("-R"),+    "-P": ("-P"),+    "-K": ("-B"),+    "-F": ("-L"),+    "-S": ("-G"),+    "-T": ("-T"),+    "-*": ("-S"),+    "-e": ("-D", "-Z")+    # No -s because gemini pr doesn't have enough keys by default+    # Harri says Plover HID might fix this eventually though?   } }

setup.cfg modified (view file)

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