v30.0
Pinchord · pinchord.git · Tickets · Changelog
Branches > v30.0 > c2697f0 > files
Merge branch v30
Commit: c2697f0e835423f6653d2fbd876b6ed021fc8c3d
Parent: 984c899
Parent: 403118e
13 changed files:
chords.edn view file
@@ -1,4 +1,4 @@-{:version "v29.2"+{:version "v30.0" :banks {:prefixes "#+" :initials "TSPWHR&" :vowels "AOIU^"@@ -119,6 +119,7 @@ :finals {"FS" "v" "FS*" "vv" "LFS" "lv"+ "LFS*" "'ve" "LRFS" "nv" "RFS" "rv" "KFS" "sh"@@ -154,6 +155,7 @@ "KFST" "ty" "LKFST" "lty"+ "LKFST*" "y'd" "LRKFST" "nty" "RKFST" "rty" "KFST*" "ght"@@ -166,7 +168,7 @@ "LRF*" "fn" ;; :garfsmie: "RF" "rf" "PFT" "y"- "PFT*" "yy"+ "PFT*" "ption" "LPFT" "ly" "RPFT*" "rry" ; TODO this was wrong update it spooglypop ; -tz@@ -214,10 +216,12 @@ "RK" "rk" "S" "s" "LS" "ls"+ "LS*" "'s" "LRS" "ns" "RS" "rs" "PS" "m" "LPS" "lm"+ "LPS*" "'m" "LRPS" "mn" "LRPS*" "gm" "RPS" "rm"@@ -229,30 +233,38 @@ "T" "t" "LT" "lt" "LRT" "nt"+ "LRT*" "n't" "RT" "rt"+ "RT*" "rnt" "ST" "st" "ST*" "ts" "LST" "lst"+ "LST*" "t's" "LRST" "nst" "RST" "rst" "PT" "pt" "LPT" "lpt"- "LRPT" "npt"+ "LRPT" "mpt" "RPT" "rpt" - "KT*" "kt"+ "PKST*" "kt"+ "LPKST*" "lkt"+ "LRPKST*" "nkt"+ "RPKST*" "rkt"+ "KT" "h"+ "KT*" "hh" "PKT*" "hp" ; :p+ "LPKT*" "'ll"+ "LRPKT*" "'d"+ "RPKT*" "'re" "PKT" "ph" "RPKT" "rph" "LRPKT" "mph" ; is nph a thing? "LPKT" "lph" "LKT" "hl" "LRKT" "hn"- "LKT*" "lkt"- "LRKT*" "nkt" "RKT" "hr"- "RKT*" "rkt" "FT" "ft" "FT*" "tion" "LFT" "lft"@@ -324,10 +336,12 @@ "PKFST*" "sy" "LPKFST" "lcy" "LRPKFST" "ncy"+ "LRPKFST*" "ngth" "RPKFST" "rcy"} :prefixes {"#" "{-|}" "+" "{^}"- "#+" "{^-|}"} ; Javelin allows this syntax, plover seemingly does not.+ ; TODO this isn't even valid syntax so it's clearly not being used at all+ #_["#+" "{^-|}"]} :suffixes {"e" "{^}e"generate-mods.clj view file
@@ -145,10 +145,12 @@ "PFS" "]" "^PFS" "\\}" }- :shortcuts {"LS" "tab" ; \t- "RK" "backspace" "^RK" "delete"- "RF" "return" ; \n- "LPF" "escape"}})+ :shortcuts {"RK" "backspace" "^RK" "delete"+ "LPF" "escape"}+ :mod-shortcuts {"RF" {:no-mods "{^}\\n"+ :with-mods "return"}+ "LS" {:no-mods "{^}\\t"+ :with-mods "tab"}}}) (def vowel-chords {"A" ["control"]@@ -185,7 +187,7 @@ (def symbols-dict (->map- (let [{:keys [starter chords shortcuts]} symbols]+ (let [{:keys [starter chords shortcuts mod-shortcuts]} symbols] [(for [[mod symbol] chords [chord combo] vowel-chords] [@@ -198,6 +200,15 @@ (str starter chord mod) (apply-mods shortcut combo) (str "+" starter chord mod) (apply-mods shortcut combo) ])+ (for [[mod {:keys [no-mods with-mods]}] mod-shortcuts]+ [+ ; TODO need to add repitition for these?+ [(str starter "-" mod) no-mods+ (str "+" starter "-" mod) no-mods]+ (for [[chord combo] vowel-chords]+ [(str starter chord mod) (apply-mods with-mods combo)+ (str "+" starter chord mod) (apply-mods with-mods combo)])+ ]) (for [[mod symbol] chords] [ ; the 4 combos of T* with and without epinchord-chords-v29.2.json view file
@@ -1 +0,0 @@-{"version":"v29.2","banks":{"prefixes":"#+","initials":"TSPWHR&","vowels":"AOIU^","finals":"LRPKFST*","suffixes":"es"},"keys":"#+TSPWHR&AOIU^LRPKFST*es","initials":{"":"{^}","WH&":"hw","T":"t","TWH&":"TWH&","TPWHR&":"TPWHR&","TSP&":"sk","TS&":"ts","TSPHR":"scl","TP":"f","TPWR&":"TPWR&","TSWR":"kr","THR":"thr","TPR":"fr","TSWH&":"TSWH&","HR&":"ll","PWR":"br","TPWHR":"TPWHR","TSWHR&":"TSWHR&","TSPHR&":"TSPHR&","TSPR":"scr","TSWH":"kn","TH&":"TH&","SWHR&":"SWHR&","TWH":"thw","SHR&":"shr","TP&":"ph","PWHR":"bl","TPH&":"mn","W&":"W&","PHR&":"PHR&","TPR&":"phr","SPWHR&":"chl","SPWHR":"cl","PR&":"PR&","TSPH&":"TSPH&","TS":"st","SW&":"sv","SPW&":"SPW&","SPR":"spr","SWHR":"squ","PH&":"PH&","HR":"l","H&":"H&","WH":"wh","TW":"tw","S":"s","SR":"v","TPWR":"dr","TSH":"sth","H":"h","PR":"pr","TSPWR":"gr","T&":"T&","SHR":"sl","TSR&":"tz","SW":"sw","TSPWHR&":"GHR&","SWH&":"SWH&","SWR&":"SWR&","SWH":"z","TSPWH":"gh","TSPR&":"skr","R":"r","TPWH&":"TPWH&","TPWH":"x","TPW&":"TPW&","TWR":"TWR","TSR":"str","TWHR":"j","TWHR&":"TWHR&","SPH&":"schm","TSPW&":"TSPW&","PW&":"PW&","SH":"sh","SPWR&":"chr","TR&":"TR&","PH":"m","TSP":"sc","TR":"tr","TSW&":"TSW&","P&":"P&","&":"&","P":"p","PWH":"PWH","SH&":"sch","TPHR":"fl","SPWH&":"SPWH&","TPHR&":"phl","TH":"th","WR":"wr","SP&":"sph","SPWR":"cr","TSHR&":"TSHR&","TW&":"TW&","WR&":"WR&","SPH":"sm","TSW":"k","SR&":"vr","PWH&":"PWH&","TSH&":"TSH&","SPHR":"spl","TSPWHR":"gl","SWR":"y","SPR&":"SPR&","PWHR&":"PWHR&","TSPWH&":"TSPWH&","TSWHR":"kl","SPW":"c","TSHR":"TSHR","PWR&":"PWR&","WHR&":"q","TSWR&":"TSWR&","PHR":"pl","THR&":"THR&","SPWH":"ch","TSPW":"g","S&":"S&","TSPWR&":"TSPWR&","W":"w","R&":"rh","SP":"sp","TSPH":"sn","TPH":"n","TWR&":"TWR&","SPHR&":"SPHR&","TPW":"d","WHR":"qu","PW":"b"},"vowels":{"":"","OU":"ou","AU":"au","AOI":"ei","AOIU^":"AOIU^","OU^":"uo","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","AOIU":"AOIU","OIU^":"oe","OIU":"eo","AOI^":"ie","OI":"oi","^":"y","AI":"ai"},"finals":{"-LPFT*":"lly","-LRF*":"fn","-PFS":"z","-RPFT":"ry","-RPKFST":"rcy","-LRT*":"LRT*","-PKF*":"dd","-PKST":"ct","-LRPKT":"mph","-LT*":"ttl","-LFT":"lft","-LK":"lk","-KFS*":"gh","-LKS*":"lsk","-LRPKFST*":"NGT*","-LRPKF":"nd","-LPKFS*":"gl","-LKST":"lxt","-RPKST*":"RPKST*","-RT*":"RT*","-FT":"ft","-PF":"n","-LRPKFS*":"gn","-LPST":"LPST","-PKF":"d","-LFT*":"ltion","-KFS":"sh","-K":"k","-LRKST":"nxt","-PKT":"ph","-RPKFT*":"rcky","-RKS*":"rsk","-P*":"pp","-RPKT":"rph","-LPS":"lm","-LPFS*":"LPFS*","-R*":"rr","-RFT*":"stion","-LF*":"fl","-RP":"rp","-LRPKFT*":"ncky","-LPF":"ln","-LRPKFS":"ng","-RPKS":"rc","-LRPF":"nn","-RPT":"rpt","-LPFT":"ly","-LPST*":"LPST*","-LRPKT*":"LRPKT*","-RPS":"rm","-*":"*","-RPK":"rb","-LRKST*":"nj","-LPKT*":"LPKT*","-LRKS":"nx","-RF":"rf","-PF*":"w","-LRPKS":"nc","-LPKST*":"LPKST*","-LRPFT*":"nny","-F":"f","-LST":"lst","-PKFST":"cy","-LRFST*":"ndth","-RPKFS*":"dg","-RS*":"RS*","-RK*":"rck","-PKFS":"g","-RPKS*":"rsc","-":"","-LRT":"nt","-RFST":"rth","-KFST":"ty","-LRK":"nk","-LKS":"lx","-LRKFT*":"nction","-RKFT*":"stian","-LRPKST":"nct","-LPKT":"lph","-PKFT*":"cky","-LRK*":"nck","-LKT*":"lkt","-LK*":"lck","-RPKFS":"rg","-RKF":"rch","-LPKS*":"lsc","-LPT*":"LPT*","-RKT*":"rkt","-LKF":"lch","-PFT":"y","-RKFST*":"RKFST*","-KS":"x","-LRPT":"npt","-LRFS*":"LRFS*","-LRKF*":"nsion","-RPFS":"rz","-LPKFT*":"lcky","-LRPKST*":"NCT*","-LKFST*":"LKFST*","-LPKFST*":"LGT*","-LPK*":"bl","-S":"s","-RPKT*":"RPKT*","-P":"p","-LRPK":"mb","-LRPFS*":"LRPFS*","-RKFS*":"RKFS*","-LKST*":"lj","-LPS*":"LPS*","-PFST":"PFST","-LRPKFT":"nky","-RK":"rk","-LRKFST*":"NSHT*","-LPFST":"LPFST","-LRFT*":"ntion","-LRST*":"LRST*","-RP*":"RP*","-RF*":"RF*","-LKFT*":"sion","-PST*":"PST*","-LRST":"nst","-PFS*":"zz","-LKFS":"lsh","-RPF":"rn","-PS*":"sp","-RKST":"rxt","-LRKFT":"ntch","-LPKF*":"ndl","-LF":"lf","-K*":"ck","-ST*":"ts","-RPFT*":"rry","-LRPFT":"ny","-PKT*":"hp","-LRKT*":"nkt","-LPKF":"ld","-RKF*":"RKF*","-RKFS":"rsh","-RKST*":"rj","-F*":"ff","-LKF*":"LKF*","-KT":"h","-PK*":"PK*","-FST":"th","-LRPF*":"wn","-LRPFS":"nz","-LRF":"nf","-RFS*":"RFS*","-L*":"ll","-RST":"rst","-PT":"pt","-LPKFST":"lcy","-LRPKS*":"nsc","-S*":"ss","-T":"t","-PS":"m","-PFST*":"PFST*","-KFT":"tch","-LS":"ls","-LR*":"rly","-LPKS":"lc","-LRKFST":"nty","-LRKS*":"nsk","-LRS*":"LRS*","-RPKF":"rd","-PKFT":"ky","-LPF*":"wl","-FST*":"fth","-LST*":"LST*","-PKST*":"PKST*","-LRKT":"hn","-LRFT":"nft","-LRPT*":"LRPT*","-RKT":"hr","-LRFST":"nth","-RPF*":"rw","-LPKFS":"lg","-RPST":"RPST","-LKT":"hl","-LRFS":"nv","-RPFST*":"RPFST*","-RPKST":"rct","-RPKFT":"rky","-LRPFST*":"NPFST*","-PST":"PST","-RPFS*":"RPFS*","-LFST*":"lfth","-LP":"lp","-LRKF":"nch","-LRP":"mp","-RPFST":"RPFST","-LFST":"lth","-LRPKFST":"ncy","-LRPFST":"LRPFST","-T*":"tt","-RPT*":"RPT*","-LKFT":"ltch","-LT":"lt","-LRS":"ns","-RFS":"rv","-ST":"st","-LRP*":"mpl","-LRPST":"LRPST","-KFST*":"ght","-LP*":"pl","-R":"r","-RPKF*":"rld","-LRPST*":"LRPST*","-LPKFT":"lky","-RKS":"rx","-PKFST*":"sy","-RPST*":"RPST*","-FT*":"tion","-RKFT":"rtch","-PT*":"PT*","-LRPS":"mn","-LRPK*":"bbl","-LRKFS":"nsh","-RPKFST*":"RGT*","-LFS*":"LFS*","-LKFS*":"LKFS*","-LPT":"lpt","-FS*":"vv","-RFST*":"rmth","-LRKFS*":"LRKFS*","-LPFST*":"LPFST*","-KST":"xt","-KT*":"kt","-FS":"v","-LFS":"lv","-RPK*":"RPK*","-RKFST":"rty","-LPKST":"lct","-PFT*":"yy","-PKS*":"sc","-RPS*":"RPS*","-KF":"ch","-KFT*":"ction","-KST*":"j","-LPK":"lb","-LS*":"LS*","-LRPS*":"gm","-LRPKF*":"ddl","-PKS":"c","-RS":"rs","-PK":"b","-LPFS":"lz","-RFT":"rft","-LR":"rl","-KS*":"sk","-L":"l","-RT":"rt","-PKFS*":"gg","-RST*":"RST*","-KF*":"q","-LKFST":"lty"},"prefixes":{"#":"{-|}","+":"{^}","#+":"{^-|}"},"suffixes":{"-e":"{^}e","-s":"{^}s","-es":"{^}es"}}\ No newline at end of filepinchord-chords-v30.0.json view file
@@ -0,0 +1 @@+{"version":"v30.0","banks":{"prefixes":"#+","initials":"TSPWHR&","vowels":"AOIU^","finals":"LRPKFST*","suffixes":"es"},"keys":"#+TSPWHR&AOIU^LRPKFST*es","initials":{"":"{^}","WH&":"hw","T":"t","TWH&":"TWH&","TPWHR&":"TPWHR&","TSP&":"sk","TS&":"ts","TSPHR":"scl","TP":"f","TPWR&":"TPWR&","TSWR":"kr","THR":"thr","TPR":"fr","TSWH&":"TSWH&","HR&":"ll","PWR":"br","TPWHR":"TPWHR","TSWHR&":"TSWHR&","TSPHR&":"TSPHR&","TSPR":"scr","TSWH":"kn","TH&":"TH&","SWHR&":"SWHR&","TWH":"thw","SHR&":"shr","TP&":"ph","PWHR":"bl","TPH&":"mn","W&":"W&","PHR&":"PHR&","TPR&":"phr","SPWHR&":"chl","SPWHR":"cl","PR&":"PR&","TSPH&":"TSPH&","TS":"st","SW&":"sv","SPW&":"SPW&","SPR":"spr","SWHR":"squ","PH&":"PH&","HR":"l","H&":"H&","WH":"wh","TW":"tw","S":"s","SR":"v","TPWR":"dr","TSH":"sth","H":"h","PR":"pr","TSPWR":"gr","T&":"T&","SHR":"sl","TSR&":"tz","SW":"sw","TSPWHR&":"GHR&","SWH&":"SWH&","SWR&":"SWR&","SWH":"z","TSPWH":"gh","TSPR&":"skr","R":"r","TPWH&":"TPWH&","TPWH":"x","TPW&":"TPW&","TWR":"TWR","TSR":"str","TWHR":"j","TWHR&":"TWHR&","SPH&":"schm","TSPW&":"TSPW&","PW&":"PW&","SH":"sh","SPWR&":"chr","TR&":"TR&","PH":"m","TSP":"sc","TR":"tr","TSW&":"TSW&","P&":"P&","&":"&","P":"p","PWH":"PWH","SH&":"sch","TPHR":"fl","SPWH&":"SPWH&","TPHR&":"phl","TH":"th","WR":"wr","SP&":"sph","SPWR":"cr","TSHR&":"TSHR&","TW&":"TW&","WR&":"WR&","SPH":"sm","TSW":"k","SR&":"vr","PWH&":"PWH&","TSH&":"TSH&","SPHR":"spl","TSPWHR":"gl","SWR":"y","SPR&":"SPR&","PWHR&":"PWHR&","TSPWH&":"TSPWH&","TSWHR":"kl","SPW":"c","TSHR":"TSHR","PWR&":"PWR&","WHR&":"q","TSWR&":"TSWR&","PHR":"pl","THR&":"THR&","SPWH":"ch","TSPW":"g","S&":"S&","TSPWR&":"TSPWR&","W":"w","R&":"rh","SP":"sp","TSPH":"sn","TPH":"n","TWR&":"TWR&","SPHR&":"SPHR&","TPW":"d","WHR":"qu","PW":"b"},"vowels":{"":"","OU":"ou","AU":"au","AOI":"ei","AOIU^":"AOIU^","OU^":"uo","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","AOIU":"AOIU","OIU^":"oe","OIU":"eo","AOI^":"ie","OI":"oi","^":"y","AI":"ai"},"finals":{"-LPFT*":"lly","-LRF*":"fn","-PFS":"z","-RPFT":"ry","-RPKFST":"rcy","-LRT*":"n't","-PKF*":"dd","-PKST":"ct","-LRPKT":"mph","-LT*":"ttl","-LFT":"lft","-LK":"lk","-KFS*":"gh","-LKS*":"lsk","-LRPKFST*":"ngth","-LRPKF":"nd","-LPKFS*":"gl","-LKST":"lxt","-RPKST*":"rkt","-RT*":"rnt","-FT":"ft","-PF":"n","-LRPKFS*":"gn","-LPST":"LPST","-PKF":"d","-LFT*":"ltion","-KFS":"sh","-K":"k","-LRKST":"nxt","-PKT":"ph","-RPKFT*":"rcky","-RKS*":"rsk","-P*":"pp","-RPKT":"rph","-LPS":"lm","-LPFS*":"LPFS*","-R*":"rr","-RFT*":"stion","-LF*":"fl","-RP":"rp","-LRPKFT*":"ncky","-LPF":"ln","-LRPKFS":"ng","-RPKS":"rc","-LRPF":"nn","-RPT":"rpt","-LPFT":"ly","-LPST*":"LPST*","-LRPKT*":"'d","-RPS":"rm","-*":"*","-RPK":"rb","-LRKST*":"nj","-LPKT*":"'ll","-LRKS":"nx","-RF":"rf","-PF*":"w","-LRPKS":"nc","-LPKST*":"lkt","-LRPFT*":"nny","-F":"f","-LST":"lst","-PKFST":"cy","-LRFST*":"ndth","-RPKFS*":"dg","-RS*":"RS*","-RK*":"rck","-PKFS":"g","-RPKS*":"rsc","-":"","-LRT":"nt","-RFST":"rth","-KFST":"ty","-LRK":"nk","-LKS":"lx","-LRKFT*":"nction","-RKFT*":"stian","-LRPKST":"nct","-LPKT":"lph","-PKFT*":"cky","-LRK*":"nck","-LKT*":"LKT*","-LK*":"lck","-RPKFS":"rg","-RKF":"rch","-LPKS*":"lsc","-LPT*":"LPT*","-RKT*":"RKT*","-LKF":"lch","-PFT":"y","-RKFST*":"RKFST*","-KS":"x","-LRPT":"mpt","-LRFS*":"LRFS*","-LRKF*":"nsion","-RPFS":"rz","-LPKFT*":"lcky","-LRPKST*":"nkt","-LKFST*":"y'd","-LPKFST*":"LGT*","-LPK*":"bl","-S":"s","-RPKT*":"'re","-P":"p","-LRPK":"mb","-LRPFS*":"LRPFS*","-RKFS*":"RKFS*","-LKST*":"lj","-LPS*":"'m","-PFST":"PFST","-LRPKFT":"nky","-RK":"rk","-LRKFST*":"NSHT*","-LPFST":"LPFST","-LRFT*":"ntion","-LRST*":"LRST*","-RP*":"RP*","-RF*":"RF*","-LKFT*":"sion","-PST*":"PST*","-LRST":"nst","-PFS*":"zz","-LKFS":"lsh","-RPF":"rn","-PS*":"sp","-RKST":"rxt","-LRKFT":"ntch","-LPKF*":"ndl","-LF":"lf","-K*":"ck","-ST*":"ts","-RPFT*":"rry","-LRPFT":"ny","-PKT*":"hp","-LRKT*":"LRKT*","-LPKF":"ld","-RKF*":"RKF*","-RKFS":"rsh","-RKST*":"rj","-F*":"ff","-LKF*":"LKF*","-KT":"h","-PK*":"PK*","-FST":"th","-LRPF*":"wn","-LRPFS":"nz","-LRF":"nf","-RFS*":"RFS*","-L*":"ll","-RST":"rst","-PT":"pt","-LPKFST":"lcy","-LRPKS*":"nsc","-S*":"ss","-T":"t","-PS":"m","-PFST*":"PFST*","-KFT":"tch","-LS":"ls","-LR*":"rly","-LPKS":"lc","-LRKFST":"nty","-LRKS*":"nsk","-LRS*":"LRS*","-RPKF":"rd","-PKFT":"ky","-LPF*":"wl","-FST*":"fth","-LST*":"t's","-PKST*":"kt","-LRKT":"hn","-LRFT":"nft","-LRPT*":"LRPT*","-RKT":"hr","-LRFST":"nth","-RPF*":"rw","-LPKFS":"lg","-RPST":"RPST","-LKT":"hl","-LRFS":"nv","-RPFST*":"RPFST*","-RPKST":"rct","-RPKFT":"rky","-LRPFST*":"NPFST*","-PST":"PST","-RPFS*":"RPFS*","-LFST*":"lfth","-LP":"lp","-LRKF":"nch","-LRP":"mp","-RPFST":"RPFST","-LFST":"lth","-LRPKFST":"ncy","-LRPFST":"LRPFST","-T*":"tt","-RPT*":"RPT*","-LKFT":"ltch","-LT":"lt","-LRS":"ns","-RFS":"rv","-ST":"st","-LRP*":"mpl","-LRPST":"LRPST","-KFST*":"ght","-LP*":"pl","-R":"r","-RPKF*":"rld","-LRPST*":"LRPST*","-LPKFT":"lky","-RKS":"rx","-PKFST*":"sy","-RPST*":"RPST*","-FT*":"tion","-RKFT":"rtch","-PT*":"PT*","-LRPS":"mn","-LRPK*":"bbl","-LRKFS":"nsh","-RPKFST*":"RGT*","-LFS*":"'ve","-LKFS*":"LKFS*","-LPT":"lpt","-FS*":"vv","-RFST*":"rmth","-LRKFS*":"LRKFS*","-LPFST*":"LPFST*","-KST":"xt","-KT*":"hh","-FS":"v","-LFS":"lv","-RPK*":"RPK*","-RKFST":"rty","-LPKST":"lct","-PFT*":"ption","-PKS*":"sc","-RPS*":"RPS*","-KF":"ch","-KFT*":"ction","-KST*":"j","-LPK":"lb","-LS*":"'s","-LRPS*":"gm","-LRPKF*":"ddl","-PKS":"c","-RS":"rs","-PK":"b","-LPFS":"lz","-RFT":"rft","-LR":"rl","-KS*":"sk","-L":"l","-RT":"rt","-PKFS*":"gg","-RST*":"RST*","-KF*":"q","-LKFST":"lty"},"prefixes":{"#":"{-|}","+":"{^}"},"suffixes":{"-e":"{^}e","-s":"{^}s","-es":"{^}es"}}\ No newline at end of filepinchord-javelin-dictionary-v30.0.yaml pinchord-javelin-dictionary-v29.2.yaml view file
@@ -1,45 +1,45 @@-name: Pinchord Base v29.2+name: Pinchord Base v30.0 maximumOutlineLength: 1 starters: - {stroke: '#+', definition: '{^}{-|}', mask: '#+'} - {stroke: '', definition: '{}', mask: ''} letters:-- {stroke: -LRPKFST*, data: NGT*, order: 4, avoidMask: '-'}+- {stroke: -LRPKFST*, data: ngth, order: 4, avoidMask: '-'} - {stroke: -LRPKFST, data: ncy, order: 4, avoidMask: -*} - {stroke: -LRPKFT*, data: ncky, order: 4, avoidMask: -S} - {stroke: -LRKFST*, data: NSHT*, order: 4, avoidMask: -P}-- {stroke: -LRPKST*, data: NCT*, order: 4, avoidMask: -F} - {stroke: -RPKFST*, data: RGT*, order: 4, avoidMask: -L} - {stroke: -LRPFST*, data: NPFST*, order: 4, avoidMask: -K} - {stroke: -LRPKFS*, data: gn, order: 4, avoidMask: -T} - {stroke: -LPKFST*, data: LGT*, order: 4, avoidMask: -R}+- {stroke: -LRPKST*, data: nkt, order: 4, avoidMask: -F} - {stroke: -RPKFST, data: rcy, order: 4, avoidMask: -L*} - {stroke: -LPKFS*, data: gl, order: 4, avoidMask: -RT} - {stroke: -LRPFT*, data: nny, order: 4, avoidMask: -KS} - {stroke: -RPKFS*, data: dg, order: 4, avoidMask: -LT}-- {stroke: -LPKST*, data: LPKST*, order: 4, avoidMask: -RF} - {stroke: -LRPFS*, data: LRPFS*, order: 4, avoidMask: -KT}+- {stroke: -RPKST*, data: rkt, order: 4, avoidMask: -LF} - {stroke: -LPKFST, data: lcy, order: 4, avoidMask: -R*} - {stroke: -LRPKF*, data: ddl, order: 4, avoidMask: -ST} - {stroke: -LRKFST, data: nty, order: 4, avoidMask: -P*}+- {stroke: -LKFST*, data: y'd, order: 4, avoidMask: -RP}+- {stroke: -LRPKT*, data: '''d', order: 4, avoidMask: -FS} - {stroke: -RPFST*, data: RPFST*, order: 4, avoidMask: -LK} - {stroke: -LRPKFT, data: nky, order: 4, avoidMask: -S*} - {stroke: -LRKFT*, data: nction, order: 4, avoidMask: -PS} - {stroke: -LRFST*, data: ndth, order: 4, avoidMask: -PK}-- {stroke: -LRPKT*, data: LRPKT*, order: 4, avoidMask: -FS} - {stroke: -LRPST*, data: LRPST*, order: 4, avoidMask: -KF} - {stroke: TSPWHR&, data: GHR&, order: 2, avoidMask: ''}-- {stroke: -LKFST*, data: LKFST*, order: 4, avoidMask: -RP} - {stroke: -LRPFST, data: LRPFST, order: 4, avoidMask: -K*} - {stroke: -LRPKFS, data: ng, order: 4, avoidMask: -T*} - {stroke: -RKFST*, data: RKFST*, order: 4, avoidMask: -LP} - {stroke: -LRKFS*, data: LRKFS*, order: 4, avoidMask: -PT} - {stroke: -LRKST*, data: nj, order: 4, avoidMask: -PF}+- {stroke: -LPKST*, data: lkt, order: 4, avoidMask: -RF} - {stroke: -LPFST*, data: LPFST*, order: 4, avoidMask: -RK} - {stroke: -LRPKST, data: nct, order: 4, avoidMask: -F*} - {stroke: -LPKFT*, data: lcky, order: 4, avoidMask: -RS} - {stroke: -PKFST*, data: sy, order: 4, avoidMask: -LR}-- {stroke: -RPKST*, data: RPKST*, order: 4, avoidMask: -LF} - {stroke: -RPKFT*, data: rcky, order: 4, avoidMask: -LS} - {stroke: -LRPKS*, data: nsc, order: 4, avoidMask: -FT} - {stroke: -LPST*, data: LPST*, order: 4, avoidMask: -RKF}@@ -47,7 +47,7 @@ - {stroke: -LRPK*, data: bbl, order: 4, avoidMask: -FST} - {stroke: TPWHR&, data: TPWHR&, order: 2, avoidMask: S} - {stroke: -LRKST, data: nxt, order: 4, avoidMask: -PF*}-- {stroke: -LPKT*, data: LPKT*, order: 4, avoidMask: -RFS}+- {stroke: -LRKT*, data: LRKT*, order: 4, avoidMask: -PFS} - {stroke: -RFST*, data: rmth, order: 4, avoidMask: -LPK} - {stroke: -RPKS*, data: rsc, order: 4, avoidMask: -LFT} - {stroke: -LFST*, data: lfth, order: 4, avoidMask: -RPK}@@ -78,20 +78,21 @@ - {stroke: -RKFST, data: rty, order: 4, avoidMask: -LP*} - {stroke: -LRST*, data: LRST*, order: 4, avoidMask: -PKF} - {stroke: TSPWH&, data: TSPWH&, order: 2, avoidMask: R}+- {stroke: -LPKT*, data: '''ll', order: 4, avoidMask: -RFS} - {stroke: -KFST*, data: ght, order: 4, avoidMask: -LRP} - {stroke: -LRKFS, data: nsh, order: 4, avoidMask: -PT*} - {stroke: -LRPKT, data: mph, order: 4, avoidMask: -FS*}+- {stroke: -RPKT*, data: '''re', order: 4, avoidMask: -LFS} - {stroke: -LPKS*, data: lsc, order: 4, avoidMask: -RFT} - {stroke: -RPFS*, data: RPFS*, order: 4, avoidMask: -LKT}-- {stroke: -LRKT*, data: nkt, order: 4, avoidMask: -PFS} - {stroke: -LRFST, data: nth, order: 4, avoidMask: -PK*} - {stroke: -LPKFT, data: lky, order: 4, avoidMask: -RS*}-- {stroke: -RPKT*, data: RPKT*, order: 4, avoidMask: -LFS} - {stroke: -LRKFT, data: ntch, order: 4, avoidMask: -PS*} - {stroke: -RPKST, data: rct, order: 4, avoidMask: -LF*} - {stroke: -LKFST, data: lty, order: 4, avoidMask: -RP*} - {stroke: -LPKFS, data: lg, order: 4, avoidMask: -RT*} - {stroke: -LRFS*, data: LRFS*, order: 4, avoidMask: -PKT}+- {stroke: -PKST*, data: kt, order: 4, avoidMask: -LRF} - {stroke: -LRKS*, data: nsk, order: 4, avoidMask: -PFT} - {stroke: SPWHR&, data: chl, order: 2, avoidMask: T} - {stroke: -RKFT*, data: stian, order: 4, avoidMask: -LPS}@@ -101,18 +102,18 @@ - {stroke: -LKST*, data: lj, order: 4, avoidMask: -RPF} - {stroke: -LRFT*, data: ntion, order: 4, avoidMask: -PKS} - {stroke: -LRPF*, data: wn, order: 4, avoidMask: -KST}-- {stroke: -PKST*, data: PKST*, order: 4, avoidMask: -LRF} - {stroke: -LRPKF, data: nd, order: 4, avoidMask: -ST*} - {stroke: -RPST*, data: RPST*, order: 4, avoidMask: -LKF} - {stroke: -LKFT*, data: sion, order: 4, avoidMask: -RPS}+- {stroke: -LKT*, data: LKT*, order: 4, avoidMask: -RPFS} - {stroke: TPHR&, data: phl, order: 2, avoidMask: SW} - {stroke: -LRPF, data: nn, order: 4, avoidMask: -KST*} - {stroke: -LRPK, data: mb, order: 4, avoidMask: -FST*} - {stroke: -PKFT, data: ky, order: 4, avoidMask: -LRS*} - {stroke: -RPKT, data: rph, order: 4, avoidMask: -LFS*}pinchord-javelin-system-v30.0.yaml pinchord-javelin-system-v29.2.yaml view file
pinchord-starboard-layout-v30.0.javelin-layout pinchord-starboard-layout-v29.2.javelin-layout view file
plover_pinchord/dictionaries/pinchord-mods-v29.2.json view file
@@ -1 +0,0 @@plover_pinchord/dictionaries/pinchord-mods-v30.0.json view file
@@ -0,0 +1 @@plover_pinchord/dictionaries/pinchord-v30.0.json plover_pinchord/dictionaries/pinchord-v29.2.json view file
plover_pinchord/dictionaries/pinchord-v30.0.py plover_pinchord/dictionaries/pinchord-v29.2.py view file
@@ -132,7 +132,9 @@ "T*": "tt", "LF*": "fl", "LRPKFST": "ncy",+ "LRPKFST*": "ngth", "LPS": "lm",+ "LPS*": "'m", "KFS*": "gh", "LRPKF*": "ddl", "LPKS": "lc",@@ -141,6 +143,7 @@ "PKFS": "g", "LRS": "ns", "RT": "rt",+ "RT*": "rnt", "KS*": "sk", "LPKFST": "lcy", "LR*": "rly",@@ -165,6 +168,9 @@ "RPKT": "rph", "LRPKT": "mph", "PKT*": "hp",+ "LPKT*": "'ll",+ "LRPKT*": "'d",+ "RPKT*": "'re", "F*": "ff", "LRKF*": "nsion", "L": "l",@@ -179,26 +185,28 @@ "LRKFS": "nsh", "PKS": "c", "RKFS": "rsh",- "KT*": "kt", "LRST": "nst", "RKST*": "rj", "LRPFT": "ny", "LS": "ls",+ "LS*": "'s", "KFST": "ty", "LKFST": "lty",+ "LKFST*": "y'd", "LRKFST": "nty", "RKFST": "rty", - "PFT*": "yy",+ "PFT*": "ption", "PS*": "sp", "KT": "h",+ "KT*": "hh", "LT": "lt", "LST": "lst",+ "LST*": "t's", "S*": "ss", "PK": "b", "PT": "pt",- "LRKT*": "nkt", "PKS*": "sc", "PF": "n", "RPK": "rb",@@ -216,7 +224,6 @@ "RPKST": "rct", "LRKF": "nch", "LPKFS": "lg",- "RKT*": "rkt", "LRK": "nk", "LRP*": "mpl", "FT": "ft",@@ -225,7 +232,6 @@ "R": "r", "LRFST": "nth", "F": "f",- "LKT*": "lkt", "LRKFT": "ntch", "FST*": "fth", "RF": "rf",@@ -233,10 +239,12 @@ "LRPK": "mb", "RPFS": "rz", "LRT": "nt",+ "LRT*": "n't", "LP": "lp", "RPKFT": "rky", "LRKFT*": "nction", "LFS": "lv",+ "LFS*": "'ve", "LKFT*": "sion", "KFST*": "ght", "LRPS": "mn",@@ -262,7 +270,7 @@ "LRP": "mp", "LPK": "lb", "LPKFT": "lky",- "LRPT": "npt",+ "LRPT": "mpt", "KFT": "tch", "LRPK*": "bbl", "PKFST*": "sy",@@ -275,6 +283,10 @@ "RFT": "rft",plover_pinchord/system.py view file
@@ -17,7 +17,7 @@ UNDO_STROKE_STENO = "-LR" DICTIONARIES_ROOT = "asset:plover_pinchord:dictionaries"-DEFAULT_DICTIONARIES = ("user.json", "pinchord-v29.2.json", "pinchord-mods-v29.2.json", "pinchord-v29.2.py")+DEFAULT_DICTIONARIES = ("user.json", "pinchord-v30.0.json", "pinchord-mods-v30.0.json", "pinchord-v30.0.py") KEYMAPS = { # If anyone knows the rest of these you should send them to me :psetup.cfg view file
@@ -1,6 +1,6 @@ [metadata] name = plover-pinchord-version = v29.2+version = v30.0 description = Chorded Keyboard Layout long_description = file:plover-description.md long_description_content_type = text/markdown