22860c9

generate-mods.clj modified (view file)

@@ -188,10 +188,16 @@     (let [{:keys [starter chords shortcuts]} symbols]       [(for [[mod symbol] chords              [chord combo] vowel-chords]-         [(str starter chord mod) (str "{^}" (apply-mods (symbol-name symbol) combo))])+         [+          (str starter chord mod) (str "{^}" (apply-mods (symbol-name symbol) combo))+          (str "+" starter chord mod) (str "{^}" (apply-mods (symbol-name symbol) combo))+          ])        (for [[mod shortcut] shortcuts              [chord combo] (assoc vowel-chords "-" [])]-         [(str starter chord mod) (apply-mods shortcut combo)])+         [+          (str starter chord mod) (apply-mods shortcut combo)+          (str "+" starter chord mod) (apply-mods shortcut combo)+          ])        (for [[mod symbol] chords]          [           ; the 4 combos of T* with and without e@@ -229,7 +235,8 @@           "LRK" "0"           "LRP" "0"           "RPK" "0"-          "LPK" "0"}+          "LPK" "0"+          "" ""}    :right {"S" "1"            "S*" "2"            "*" "3"@@ -242,7 +249,8 @@            "FST" "0"            "FS*" "0"            "ST*" "0"-           "FT*" "0"}+           "FT*" "0"+           "" ""}    :F-starter "TPWHR&"    :F-keys {"R"    "F1"  "S"    "F1"             "RK"   "F2"  "S*"   "F2"@@ -266,10 +274,16 @@     (let [{:keys [starter left right F-starter F-keys]} numbers]       [(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 mod-chord number-chord) (str "{^}" (apply-mods 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)])+         [+          (str F-starter mod-chord f-chord) (apply-mods f-key combo)+          (str "+" F-starter mod-chord f-chord) (apply-mods f-key combo)+          ])        (for [[left-chord left-number] left              [right-chord right-number] right]          [(str starter left-chord right-chord) (str "{}" left-number right-number)@@ -300,7 +314,10 @@   (->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)+        (str "+" movement-starter mod-chord chord) (apply-mods movement combo)+        ])]))  (def fingerspelling-starter "TWR") (def letters@@ -338,10 +355,17 @@   (->map     [(for [[mod-chord combo] vowel-chords            [chord letter] letters]-       [(str fingerspelling-starter mod-chord chord) (apply-mods letter combo)])+       [+        (str fingerspelling-starter mod-chord chord) (apply-mods letter combo)+        (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)+        (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.4.json renamed from pinchord-chords-v28.3.2.json (view file)

File renamed without changes.

pinchord-javelin-dictionary-v28.4.yaml renamed from pinchord-javelin-dictionary-v28.3.2.yaml (view file)

File renamed without changes.

pinchord-javelin-system-v28.4.yaml renamed from pinchord-javelin-system-v28.3.2.yaml (view file)

File renamed without changes.

pinchord-starboard-layout-v28.4.javelin-layout renamed from pinchord-starboard-layout-v28.3.2.javelin-layout (view file)

File renamed without changes.

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

@@ -1 +0,0 @@

Show all 3 lines

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

@@ -0,0 +1 @@

Show all 3 lines

plover_pinchord/dictionaries/pinchord-v28.4.json renamed from plover_pinchord/dictionaries/pinchord-v28.3.1.json (view file)

File renamed without changes.

plover_pinchord/dictionaries/pinchord-v28.4.py renamed from plover_pinchord/dictionaries/pinchord-v28.3.1.py (view file)

File renamed without changes.

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.3.1.json", "pinchord-mods-v28.3.1.json", "pinchord-v28.3.1.py")+DEFAULT_DICTIONARIES = ("user.json", "pinchord-v28.4.json", "pinchord-mods-v28.4.json", "pinchord-v28.4.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.3.1+version = v28.4 description = Chorded Keyboard Layout long_description = file:plover-description.md long_description_content_type = text/markdown