519000d

chords.edn modified (view file)

@@ -1,4 +1,4 @@-{:version "v28.2"+{:version "v28.3"  :banks {:prefixes "#+"          :initials "TSPWHR&"          :vowels "AOIU^"

generate-dictionary.clj modified (view file)

@@ -20,6 +20,42 @@ (defn mask [s1 s2]   (apply str (remove (set s1) s2))) +  (defn abbreviate+    "Javelin entries can only be 6 characters long!"+    [s]+    (if (> (count s) 6)+      (let [new-s (-> s+                      (str/replace #"TSPW" "G")+                      (str/replace #"PKS" "C")+                      (str/replace #"PKFS" "G")+                      (str/replace #"KFS" "SH")+                      (str/replace #"LR" "N"))]+        (if (> (count new-s) 6)+          (throw (ex-info "Too long!" {:s s :new-s new-s}))+          new-s))+      s))++  (defn all-chords [s]+    (if (empty? s)+      #{""}+      (let [rest-combos (all-chords (rest s))]+        (set (concat+               rest-combos+               (map #(str (first s) %) rest-combos))))))++  (defn abbreviate-long-chords [s]+    (update-vals s abbreviate))++  (defn with-gaps-filled [bank chords]+    (let [s (remove (bank chords) (all-chords (bank (:banks chords))))]+      (merge (bank chords) (abbreviate-long-chords (zipmap s s)))))++(defn ^:private new-value [chords]+  (assoc (select-keys chords sections)+         :initials (with-gaps-filled :initials chords)+         :vowels   (with-gaps-filled :vowels chords)+         :finals   (with-gaps-filled :finals chords)))+ ; TODO make this make all chords that aren't in chords.edn map to themself :D (let [chords (-> (edn/read-string (slurp "chords.edn"))                  (update :finals finalize)@@ -30,6 +66,7 @@             :starters [{:stroke "#+" :definition "{^}{-|}" :mask "#+"}                        {:stroke "" :definition "{}" :mask ""}]             :letters (->> (reduce (fn [acc [bank entries]]+                                    ; TODO if the bank has no keys, map it to itself?                                     (if-let [bank-keys (banks bank)]                                       (into acc (mapv (fn [[stroke translation]]                                                         {:stroke stroke :data translation :order (priority bank)@@ -40,8 +77,10 @@                                       (into acc (mapv (fn [[stroke translation]]                                                         {:stroke stroke :data translation :order (priority bank)})                                                       entries))))-                                  #{} (select-keys chords sections))+                                  ; TODO fill in here+                                  #{} (new-value chords))                           (sort-by (comp - count :stroke))+                          ; Use this if you want finals to suppress space by default :)                           #_(cons {:stroke "-" :data "{^}" :order (priority :finals)}))}       dict-path (str "pinchord-javelin-dictionary-" (:version chords) ".yaml")       json-chords-path (str "pinchord-chords-" (:version chords) ".json")]

pinchord-chords-v28.3.json renamed from pinchord-chords-v28.2.json (view file)

@@ -1 +1 @@-{"initials":{"":"{^}","WH&":"hw","T":"t","TSP&":"sk","TS&":"ts","TSPHR":"scl","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&":"chl","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","SPWR&":"chr","PH":"m","TSP":"sc","TR":"tr","P":"p","SH&":"sch","TPHR":"fl","TPHR&":"phl","TH":"th","WR":"wr","SP&":"sph","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","-LFT*":"ltion","-KFS":"sh","-K":"k","-LRKST":"nxt","-PKT":"hp","-RPKFT*":"rcky","-RKS*":"rsk","-P*":"pp","-LPS":"lm","-R*":"rr","-RFT*":"stion","-LF*":"fl","-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","-LRFST*":"ndth","-RPKFS*":"dg","-RK*":"rck","-PKFS":"g","-RPKS*":"rsc","-LRT":"nt","-RFST":"rth","-LRK":"nk","-LKS":"lx","-LRKFT*":"nction","-RKFT*":"stian","-LRPKST":"nct","-PKFT*":"cky","-LRK*":"nck","-LKT*":"lkt","-LK*":"lck","-RPKFS":"rg","-RKF":"rch","-LPKS*":"lsc","-RKT*":"rkt","-LKF":"lch","-PFT":"y","-KS":"x","-LRPT":"npt","-LRKF*":"nsion","-RPFS":"rz","-LPKFT*":"lcky","-LPK*":"bl","-S":"s","-P":"p","-LRPK":"mb","-LKST*":"lj","-LRPKFT":"nky","-RK":"rk","-LRFT*":"ntion","-LKFT*":"sion","-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*":"ph","-LRKT*":"nkt","-LPKF":"ld","-RKFS":"rsh","-RKST*":"rj","-F*":"ff","-KT":"h","-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","-FST*":"fth","-LRKT":"hn","-LRFT":"nft","-RKT":"hr","-LRFST":"nth","-RPF*":"rw","-LPKFS":"lg","-LKT":"hl","-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","-LRP*":"mpl","-KFST*":"ght","-LP*":"pl","-R":"r","-RPKF*":"rld","-LPKFT":"lky","-RKS":"rx","-PKFST*":"sy","-FT*":"tion","-RKFT":"rtch","-LRPS":"mn","-LRPK*":"bbl","-LRKFS":"nsh","-LPT":"lpt","-FS*":"vv","-RFST*":"rmth","-KST":"xt","-KT*":"kt","-FS":"v","-LFS":"lv","-LPKST":"lct","-PFT*":"yy","-PKS*":"sc","-KF":"ch","-KFT*":"ction","-KST*":"j","-LPK":"lb","-LRPS*":"gm","-LRPKF*":"ddl","-PKS":"c","-RS":"rs","-PK":"b","-LPFS":"lz","-RFT":"rft","-LR":"rl","-KS*":"sk","-L":"l","-RT":"rt","-PKFS*":"gg","-KF*":"q"},"keys":"#+TSPWHR&AOIU^LRPKFST*es","version":"v28.2"}\ No newline at end of file+{"initials":{"":"{^}","WH&":"hw","T":"t","TSP&":"sk","TS&":"ts","TSPHR":"scl","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&":"chl","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","SPWR&":"chr","PH":"m","TSP":"sc","TR":"tr","P":"p","SH&":"sch","TPHR":"fl","TPHR&":"phl","TH":"th","WR":"wr","SP&":"sph","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","-LFT*":"ltion","-KFS":"sh","-K":"k","-LRKST":"nxt","-PKT":"hp","-RPKFT*":"rcky","-RKS*":"rsk","-P*":"pp","-LPS":"lm","-R*":"rr","-RFT*":"stion","-LF*":"fl","-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","-LRFST*":"ndth","-RPKFS*":"dg","-RK*":"rck","-PKFS":"g","-RPKS*":"rsc","-LRT":"nt","-RFST":"rth","-LRK":"nk","-LKS":"lx","-LRKFT*":"nction","-RKFT*":"stian","-LRPKST":"nct","-PKFT*":"cky","-LRK*":"nck","-LKT*":"lkt","-LK*":"lck","-RPKFS":"rg","-RKF":"rch","-LPKS*":"lsc","-RKT*":"rkt","-LKF":"lch","-PFT":"y","-KS":"x","-LRPT":"npt","-LRKF*":"nsion","-RPFS":"rz","-LPKFT*":"lcky","-LPK*":"bl","-S":"s","-P":"p","-LRPK":"mb","-LKST*":"lj","-LRPKFT":"nky","-RK":"rk","-LRFT*":"ntion","-LKFT*":"sion","-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*":"ph","-LRKT*":"nkt","-LPKF":"ld","-RKFS":"rsh","-RKST*":"rj","-F*":"ff","-KT":"h","-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","-FST*":"fth","-LRKT":"hn","-LRFT":"nft","-RKT":"hr","-LRFST":"nth","-RPF*":"rw","-LPKFS":"lg","-LKT":"hl","-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","-LRP*":"mpl","-KFST*":"ght","-LP*":"pl","-R":"r","-RPKF*":"rld","-LPKFT":"lky","-RKS":"rx","-PKFST*":"sy","-FT*":"tion","-RKFT":"rtch","-LRPS":"mn","-LRPK*":"bbl","-LRKFS":"nsh","-LPT":"lpt","-FS*":"vv","-RFST*":"rmth","-KST":"xt","-KT*":"kt","-FS":"v","-LFS":"lv","-LPKST":"lct","-PFT*":"yy","-PKS*":"sc","-KF":"ch","-KFT*":"ction","-KST*":"j","-LPK":"lb","-LRPS*":"gm","-LRPKF*":"ddl","-PKS":"c","-RS":"rs","-PK":"b","-LPFS":"lz","-RFT":"rft","-LR":"rl","-KS*":"sk","-L":"l","-RT":"rt","-PKFS*":"gg","-KF*":"q"},"keys":"#+TSPWHR&AOIU^LRPKFST*es","version":"v28.3"}\ No newline at end of file

pinchord-javelin-dictionary-v28.2.yaml deleted (view file)

@@ -1,309 +0,0 @@-name: Pinchord Base v28.2-maximumOutlineLength: 1-starters:-- {stroke: '#+', definition: '{^}{-|}', mask: '#+'}-- {stroke: '', definition: '{}', mask: ''}-letters:-- {stroke: -LRPKFST, data: ncy, order: 4, avoidMask: -*}-- {stroke: -LRPKFT*, data: ncky, order: 4, avoidMask: -S}-- {stroke: -LRPKFS*, data: gn, order: 4, avoidMask: -T}-- {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: -LPKFST, data: lcy, order: 4, avoidMask: -R*}-- {stroke: -LRPKF*, data: ddl, order: 4, avoidMask: -ST}-- {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: -LRPKFS, data: ng, order: 4, avoidMask: -T*}-- {stroke: -LRKST*, data: nj, order: 4, avoidMask: -PF}-- {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: -RPKFT*, data: rcky, order: 4, avoidMask: -LS}-- {stroke: -LRPKS*, data: nsc, order: 4, avoidMask: -FT}-- {stroke: -LRPK*, data: bbl, order: 4, avoidMask: -FST}-- {stroke: -LRKST, data: nxt, order: 4, avoidMask: -PF*}-- {stroke: -RFST*, data: rmth, order: 4, avoidMask: -LPK}-- {stroke: -RPKS*, data: rsc, order: 4, avoidMask: -LFT}-- {stroke: -LFST*, data: lfth, order: 4, avoidMask: -RPK}-- {stroke: -LPKF*, data: ndl, order: 4, avoidMask: -RST}-- {stroke: -LPFT*, data: lly, order: 4, avoidMask: -RKS}-- {stroke: -RPKF*, data: rld, order: 4, avoidMask: -LST}-- {stroke: -RKST*, data: rj, order: 4, avoidMask: -LPF}-- {stroke: -RPKFT, data: rky, order: 4, avoidMask: -LS*}-- {stroke: -LRKF*, data: nsion, order: 4, avoidMask: -PST}-- {stroke: -LRPS*, data: gm, order: 4, avoidMask: -KFT}-- {stroke: -LRPKS, data: nc, order: 4, avoidMask: -FT*}-- {stroke: -PKFS*, data: gg, order: 4, avoidMask: -LRT}-- {stroke: -LRPFS, data: nz, order: 4, avoidMask: -KT*}-- {stroke: -LPKST, data: lct, order: 4, avoidMask: -RF*}-- {stroke: -RPKFS, data: rg, order: 4, avoidMask: -LT*}-- {stroke: -RPFT*, data: rry, order: 4, avoidMask: -LKS}-- {stroke: -LRPFT, data: ny, order: 4, avoidMask: -KS*}-- {stroke: -PKFT*, data: cky, order: 4, avoidMask: -LRS}-- {stroke: -PKFST, data: cy, order: 4, avoidMask: -LR*}-- {stroke: -KFST*, data: ght, order: 4, avoidMask: -LRP}-- {stroke: -LRKFS, data: nsh, order: 4, avoidMask: -PT*}-- {stroke: -LPKS*, data: lsc, order: 4, avoidMask: -RFT}-- {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: -LRKFT, data: ntch, order: 4, avoidMask: -PS*}-- {stroke: -RPKST, data: rct, order: 4, avoidMask: -LF*}-- {stroke: -LPKFS, data: lg, order: 4, avoidMask: -RT*}-- {stroke: -LRKS*, data: nsk, order: 4, avoidMask: -PFT}-- {stroke: SPWHR&, data: chl, order: 2, avoidMask: T}-- {stroke: -RKFT*, data: stian, order: 4, avoidMask: -LPS}-- {stroke: TSPWHR, data: gl, order: 2, avoidMask: '&'}-- {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: -LRPKF, data: nd, order: 4, avoidMask: -ST*}-- {stroke: -LKFT*, data: sion, order: 4, avoidMask: -RPS}-- {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: -LPKF, data: ld, order: 4, avoidMask: -RST*}-- {stroke: -PFT*, data: yy, order: 4, avoidMask: -LRKS}-- {stroke: -LKFT, data: ltch, order: 4, avoidMask: -RPS*}-- {stroke: TSPWR, data: gr, order: 2, avoidMask: H&}-- {stroke: -LRKT, data: hn, order: 4, avoidMask: -PFS*}-- {stroke: -RKFS, data: rsh, order: 4, avoidMask: -LPT*}-- {stroke: -LRPS, data: mn, order: 4, avoidMask: -KFT*}-- {stroke: -KST*, data: j, order: 4, avoidMask: -LRPF}-- {stroke: -LRK*, data: nck, order: 4, avoidMask: -PFST}-- {stroke: -LPFT, data: ly, order: 4, avoidMask: -RKS*}-- {stroke: -RKS*, data: rsk, order: 4, avoidMask: -LPFT}-- {stroke: -PKS*, data: sc, order: 4, avoidMask: -LRFT}-- {stroke: SPWHR, data: cl, order: 2, avoidMask: T&}-- {stroke: TSPWH, data: gh, order: 2, avoidMask: R&}-- {stroke: -LPF*, data: wl, order: 4, avoidMask: -RKST}-- {stroke: -LFST, data: lth, order: 4, avoidMask: -RPK*}-- {stroke: -PFS*, data: zz, order: 4, avoidMask: -LRKT}-- {stroke: -PKFS, data: g, order: 4, avoidMask: -LRT*}-- {stroke: -RFT*, data: stion, order: 4, avoidMask: -LPKS}-- {stroke: -FST*, data: fth, order: 4, avoidMask: -LRPK}-- {stroke: -RPFS, data: rz, order: 4, avoidMask: -LKT*}-- {stroke: TSWHR, data: kl, order: 2, avoidMask: P&}-- {stroke: -RKT*, data: rkt, order: 4, avoidMask: -LPFS}-- {stroke: SPWR&, data: chr, order: 2, avoidMask: TH}-- {stroke: TSPHR, data: scl, order: 2, avoidMask: W&}-- {stroke: -PKF*, data: dd, order: 4, avoidMask: -LRST}-- {stroke: -PKST, data: ct, order: 4, avoidMask: -LRF*}-- {stroke: -LRKF, data: nch, order: 4, avoidMask: -PST*}-- {stroke: -LRP*, data: mpl, order: 4, avoidMask: -KFST}-- {stroke: -LKST, data: lxt, order: 4, avoidMask: -RPF*}-- {stroke: -KFS*, data: gh, order: 4, avoidMask: -LRPT}

Show all 310 lines

pinchord-javelin-dictionary-v28.3.yaml added (view file)

@@ -0,0 +1,618 @@+name: Pinchord Base v28.3+maximumOutlineLength: 1+starters:+- {stroke: '#+', definition: '{^}{-|}', mask: '#+'}+- {stroke: '', definition: '{}', mask: ''}+letters:+- {stroke: -LRPKFST, data: ncy, order: 4, avoidMask: -*}+- {stroke: -LRPKFT*, data: ncky, order: 4, avoidMask: -S}+- {stroke: -LRPKFS*, data: gn, order: 4, avoidMask: -T}+- {stroke: LRPKFST*, data: NGT*, order: 4, avoidMask: '-'}+- {stroke: -RPKFST, data: rcy, order: 4, avoidMask: -L*}+- {stroke: RPKFST*, data: RGT*, order: 4, avoidMask: -L}+- {stroke: LRPKFS*, data: NG*, order: 4, avoidMask: -T}+- {stroke: LRKFST*, data: NSHT*, order: 4, avoidMask: -P}+- {stroke: LRPKFT*, data: NPKFT*, order: 4, avoidMask: -S}+- {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: -LPKFST, data: lcy, order: 4, avoidMask: -R*}+- {stroke: -LRPKF*, data: ddl, order: 4, avoidMask: -ST}+- {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: TSPWHR&, data: GHR&, order: 2, avoidMask: ''}+- {stroke: -LRPKFS, data: ng, order: 4, avoidMask: -T*}+- {stroke: LRPKFST, data: NGT, order: 4, avoidMask: -*}+- {stroke: -LRKST*, data: nj, order: 4, avoidMask: -PF}+- {stroke: LRPFST*, data: NPFST*, order: 4, avoidMask: -K}+- {stroke: LPKFST*, data: LGT*, order: 4, avoidMask: -R}+- {stroke: LRPKST*, data: NCT*, order: 4, avoidMask: -F}+- {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: -RPKFT*, data: rcky, order: 4, avoidMask: -LS}+- {stroke: -LRPKS*, data: nsc, order: 4, avoidMask: -FT}+- {stroke: TSPHR&, data: TSPHR&, order: 2, avoidMask: W}+- {stroke: LPKST*, data: LPKST*, order: 4, avoidMask: -RF}+- {stroke: LRPFST, data: LRPFST, order: 4, avoidMask: -K*}+- {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: LRPST*, data: LRPST*, order: 4, avoidMask: -KF}+- {stroke: -RFST*, data: rmth, order: 4, avoidMask: -LPK}+- {stroke: -RPKS*, data: rsc, order: 4, avoidMask: -LFT}+- {stroke: LRKST*, data: LRKST*, order: 4, avoidMask: -PF}+- {stroke: -LFST*, data: lfth, order: 4, avoidMask: -RPK}+- {stroke: LPFST*, data: LPFST*, order: 4, avoidMask: -RK}+- {stroke: -LPKF*, data: ndl, order: 4, avoidMask: -RST}+- {stroke: LRPFT*, data: LRPFT*, order: 4, avoidMask: -KS}+- {stroke: -LPFT*, data: lly, order: 4, avoidMask: -RKS}+- {stroke: -RPKF*, data: rld, order: 4, avoidMask: -LST}+- {stroke: -RKST*, data: rj, order: 4, avoidMask: -LPF}+- {stroke: RPKST*, data: RPKST*, order: 4, avoidMask: -LF}+- {stroke: -RPKFT, data: rky, order: 4, avoidMask: -LS*}+- {stroke: LRPKS*, data: LRPKS*, order: 4, avoidMask: -FT}+- {stroke: LRPFS*, data: LRPFS*, order: 4, avoidMask: -KT}+- {stroke: -LRKF*, data: nsion, order: 4, avoidMask: -PST}+- {stroke: -LRPS*, data: gm, order: 4, avoidMask: -KFT}+- {stroke: LPKFS*, data: LPKFS*, order: 4, avoidMask: -RT}+- {stroke: -LRPKS, data: nc, order: 4, avoidMask: -FT*}+- {stroke: LRFST*, data: LRFST*, order: 4, avoidMask: -PK}+- {stroke: LKFST*, data: LKFST*, order: 4, avoidMask: -RP}+- {stroke: -PKFS*, data: gg, order: 4, avoidMask: -LRT}+- {stroke: -LRPFS, data: nz, order: 4, avoidMask: -KT*}+- {stroke: -LPKST, data: lct, order: 4, avoidMask: -RF*}+- {stroke: -RPKFS, data: rg, order: 4, avoidMask: -LT*}+- {stroke: -RPFT*, data: rry, order: 4, avoidMask: -LKS}+- {stroke: -LRPFT, data: ny, order: 4, avoidMask: -KS*}+- {stroke: LPKFT*, data: LPKFT*, order: 4, avoidMask: -RS}+- {stroke: -PKFT*, data: cky, order: 4, avoidMask: -LRS}+- {stroke: TSWHR&, data: TSWHR&, order: 2, avoidMask: P}+- {stroke: LRKFT*, data: LRKFT*, order: 4, avoidMask: -PS}+- {stroke: RPKFT*, data: RPKFT*, order: 4, avoidMask: -LS}+- {stroke: -PKFST, data: cy, order: 4, avoidMask: -LR*}+- {stroke: LRPKF*, data: LRPKF*, order: 4, avoidMask: -ST}+- {stroke: TSPWR&, data: TSPWR&, order: 2, avoidMask: H}+- {stroke: LRPKFS, data: LRPKFS, order: 4, avoidMask: -T*}+- {stroke: LRPKT*, data: LRPKT*, order: 4, avoidMask: -FS}+- {stroke: TSPWH&, data: TSPWH&, order: 2, avoidMask: R}+- {stroke: -KFST*, data: ght, order: 4, avoidMask: -LRP}+- {stroke: LRPKFT, data: LRPKFT, order: 4, avoidMask: -S*}+- {stroke: -LRKFS, data: nsh, order: 4, avoidMask: -PT*}+- {stroke: LRKFST, data: LRKFST, order: 4, avoidMask: -P*}+- {stroke: -LPKS*, data: lsc, order: 4, avoidMask: -RFT}+- {stroke: LPKFST, data: LPKFST, order: 4, avoidMask: -R*}+- {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: -LRKFT, data: ntch, order: 4, avoidMask: -PS*}+- {stroke: LRPKST, data: LRPKST, order: 4, avoidMask: -F*}+- {stroke: -RPKST, data: rct, order: 4, avoidMask: -LF*}+- {stroke: RPKFS*, data: RPKFS*, order: 4, avoidMask: -LT}+- {stroke: RKFST*, data: RKFST*, order: 4, avoidMask: -LP}+- {stroke: -LPKFS, data: lg, order: 4, avoidMask: -RT*}+- {stroke: -LRKS*, data: nsk, order: 4, avoidMask: -PFT}+- {stroke: SPWHR&, data: chl, order: 2, avoidMask: T}+- {stroke: -RKFT*, data: stian, order: 4, avoidMask: -LPS}+- {stroke: TSPWHR, data: gl, order: 2, avoidMask: '&'}+- {stroke: -LKST*, data: lj, order: 4, avoidMask: -RPF}

Show all 619 lines

pinchord-javelin-system-v28.3.yaml renamed from pinchord-javelin-system-v28.2.yaml (view file)

File renamed without changes.

pinchord-starboard-layout-v28.3.javelin-layout renamed from pinchord-starboard-layout-v28.2.javelin-layout (view file)

File renamed without changes.

plover_pinchord/dictionaries/pinchord-mods-v28.3.json renamed from plover_pinchord/dictionaries/pinchord-mods-v28.2.json (view file)

File renamed without changes.

plover_pinchord/dictionaries/pinchord-v28.3.json renamed from plover_pinchord/dictionaries/pinchord-v28.2.json (view file)

File renamed without changes.

plover_pinchord/dictionaries/pinchord-v28.3.py renamed from plover_pinchord/dictionaries/pinchord-v28.2.py (view file)

@@ -332,7 +332,7 @@     translation = ""     for bank in BANKS:         keys = stroke_banks.get(bank) or ""-        translation += DICT[bank].get(keys, "")+        translation += DICT[bank].get(keys, keys)     return translation  def lookup_stroke(stroke):

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-v28.2.json", "pinchord-mods-v28.2.json", "pinchord-v28.2.py")+DEFAULT_DICTIONARIES = ("user.json", "pinchord-v28.3.json", "pinchord-mods-v28.3.json", "pinchord-v28.3.py")  KEYMAPS = {   # If anyone knows the rest of these you should send them to me :p

setup.cfg modified (view file)

@@ -1,6 +1,6 @@ [metadata] name = Pinchord-version = v28.1+version = v28.3 description = Chorded Keyboard Layout long_description = file:plover-description.md long_description_content_type = text/markdown