0d2e398

chords-mods.edn deleted (view file)

No content changes.

chords.edn modified (view file)

@@ -1,4 +1,4 @@-{:version "v28.0"+{:version "v28.2"  :banks {:prefixes "#+"          :initials "TSPWHR&"          :vowels "AOIU^"@@ -317,6 +317,6 @@  :prefixes {"#" "{-|}"             "+" "{^}"             "#+" "{^-|}"} ; Javelin allows this syntax, plover seemingly does not.- :suffixes {"e" "e"-            "s" "s"-            "es" "es"}}+ :suffixes {"e" "{^}e"+            "s" "{^}s"+            "es" "{^}es"}}

generate-mods.clj modified (view file)

@@ -28,7 +28,7 @@    "¸" "cedilla"    "¢" "cent"    ":" "colon"-   " " "space"+   "{^ ^}" "space"    "," "comma"    "©" "copyright"    "¤" "currency"@@ -130,7 +130,8 @@             "LPK" "?"             "RPKS" "+"             ; Unfortunately, Plover does not see the vision-            ;"LRPKF" "€" "^LRPKF" "£"+            ; Will have to implement these separately+            #_["LRPKF" "€" "^LRPKF" "£"]             "PF" "-"             "KS" "_"             "LRPK" "%"@@ -138,7 +139,7 @@             "LRK" "("             "LK" "<"             "LRP" "[" "^LRP" "{"-            "" " "+            "" "{^ ^}"             "RPK" ")"             "KF" ">"             "PFS" "]"@@ -146,7 +147,7 @@             }    :shortcuts {"LS" "tab"                "RK" "backspace" "^RK" "delete"-               "RF" "enter"+               "RF" "return"                "LPF" "escape"}})  (def vowel-chords@@ -263,13 +264,9 @@ (def numbers-dict   (->map     (let [{:keys [starter left right F-starter F-keys]} numbers]-      [(for [[number-chord number] (merge left right) ; maps are merged into one+      [(for [[number-chord number] (merge left right)              [mod-chord combo] vowel-chords]-         [-          (str starter mod-chord number-chord) (str "{^}" (apply-mods number combo))-          ;(str starter chord left-chord) (apply-mods (symbol-name left-number) combo)-          ;(str "+" starter chord left-chord) (str "{^}" (apply-mods (symbol-name left-number) combo))-          ])+         [(str starter mod-chord number-chord) (str "{^}" (apply-mods number combo))])        (for [[f-chord f-key] F-keys              [mod-chord combo] (assoc vowel-chords "-" [])]          [(str F-starter mod-chord f-chord) (apply-mods f-key combo)])@@ -285,8 +282,7 @@           (str "+" starter left-chord right-chord "e") (str "{^}" left-number right-number "00")            (str starter "^" left-chord right-chord "e") (str "{}" left-number right-number "000")-          (str "+" starter "^" left-chord right-chord "e") (str "{^}" left-number right-number "000")-          ])])))+          (str "+" starter "^" left-chord right-chord "e") (str "{^}" left-number right-number "000")])])))   (def movement-starter "PWH")@@ -304,8 +300,7 @@   (->map     [(for [[mod-chord combo] (assoc vowel-chords "-" [])            [chord movement] movement-chords]-       [(str movement-starter mod-chord chord) (apply-mods movement combo)]-       )]))+       [(str movement-starter mod-chord chord) (apply-mods movement combo)])]))  (def fingerspelling-starter "TWR") (def letters@@ -345,8 +340,8 @@            [chord letter] letters]        [(str fingerspelling-starter mod-chord chord) (apply-mods letter combo)])      (for [[chord letter] letters]-       [(str fingerspelling-starter "-" chord) (str "{^}" letter)-        (str "#" fingerspelling-starter "-" chord) (str "{^}{-|}" letter)])]))+       [(str fingerspelling-starter "-" chord) (str "{}" letter)+        (str "#" fingerspelling-starter "-" chord) (str "{}{-|}" letter)])]))  (def mods-dict (merge symbols-dict fingerspelling-dict numbers-dict movement-dict)) 

pinchord-chords-v28.1.json deleted (view file)

@@ -1 +0,0 @@-{"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.0"}\ No newline at end of file

pinchord-chords-v28.2.json added (view file)

@@ -0,0 +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

pinchord-javelin-dictionary-v28.2.yaml renamed from pinchord-javelin-dictionary-v28.1.yaml (view file)

@@ -1,4 +1,4 @@-name: Pinchord Base v28.0+name: Pinchord Base v28.2 maximumOutlineLength: 1 starters: - {stroke: '#+', definition: '{^}{-|}', mask: '#+'}@@ -256,7 +256,6 @@ - {stroke: SWH, data: z, order: 2, avoidMask: TPR&} - {stroke: PHR, data: pl, order: 2, avoidMask: TSW&} - {stroke: -RP, data: rp, order: 4, avoidMask: -LKFST*}-- {stroke: es, data: es, order: 5, avoidMask: ''} - {stroke: TW, data: tw, order: 2, avoidMask: SPHR&} - {stroke: SW, data: sw, order: 2, avoidMask: TPHR&} - {stroke: WR, data: wr, order: 2, avoidMask: TSPH&}@@ -278,6 +277,7 @@ - {stroke: '#+', data: '{^-|}', order: 1, avoidMask: ''} - {stroke: PR, data: pr, order: 2, avoidMask: TSWH&} - {stroke: SH, data: sh, order: 2, avoidMask: TPWR&}+- {stroke: es, data: '{^}es', order: 5, avoidMask: ''} - {stroke: AU, data: au, order: 3, avoidMask: OI^} - {stroke: -F, data: f, order: 4, avoidMask: -LRPKST*} - {stroke: HR, data: l, order: 2, avoidMask: TSPW&}@@ -291,18 +291,18 @@ - {stroke: -L, data: l, order: 4, avoidMask: -RPKFST*} - {stroke: -S, data: s, order: 4, avoidMask: -LRPKFT*} - {stroke: SR, data: v, order: 2, avoidMask: TPWH&}+- {stroke: e, data: '{^}e', order: 5, avoidMask: s} - {stroke: P, data: p, order: 2, avoidMask: TSWHR&} - {stroke: '#', data: '{-|}', order: 1, avoidMask: +} - {stroke: R, data: r, order: 2, avoidMask: TSPWH&} - {stroke: S, data: s, order: 2, avoidMask: TPWHR&}-- {stroke: s, data: s, order: 5, avoidMask: e}+- {stroke: s, data: '{^}s', order: 5, avoidMask: e} - {stroke: T, data: t, order: 2, avoidMask: SPWHR&} - {stroke: U, data: u, order: 3, avoidMask: AOI^} - {stroke: I, data: i, order: 3, avoidMask: AOU^} - {stroke: H, data: h, order: 2, avoidMask: TSPWR&} - {stroke: W, data: w, order: 2, avoidMask: TSPHR&} - {stroke: +, data: '{^}', order: 1, avoidMask: '#'}-- {stroke: e, data: e, order: 5, avoidMask: s} - {stroke: ^, data: y, order: 3, avoidMask: AOIU} - {stroke: O, data: o, order: 3, avoidMask: AIU^} - {stroke: A, data: a, order: 3, avoidMask: OIU^}

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

File renamed without changes.

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

File renamed without changes.

plover_pinchord/dictionaries/pinchord-mods-v28.1.json deleted (view file)

@@ -1 +0,0 @@

Show all 3 lines

plover_pinchord/dictionaries/pinchord-mods-v28.2.json added (view file)

@@ -0,0 +1 @@

Show all 3 lines

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

File renamed without changes.

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

@@ -305,9 +305,9 @@                    "LPFS": "lz",                    "LRPKFT*": "ncky",                    "LFST": "lth"},-        "suffixes": {"e": "e",-                     "s": "s",-                     "es": "es"},+        "suffixes": {"e": "{^}e",+                     "s": "{^}s",+                     "es": "{^}es"},         "prefixes": {"+": "{^}",                      "#": "{-|}",                      "#+": "{^}{-|}",

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.1.json", "pinchord-mods-v28.1.json", "pinchord-v28.1.py")+DEFAULT_DICTIONARIES = ("user.json", "pinchord-v28.2.json", "pinchord-mods-v28.2.json", "pinchord-v28.2.py")  KEYMAPS = {   "Keyboard": {