2f71d9c

generate-mods.clj modified (view file)

@@ -147,9 +147,9 @@             }    :shortcuts {"RK" "backspace" "^RK" "delete"                "LPF" "escape"}-   :mod-shortcuts {"RF" {:no-mods "{^}\\n"+   :mod-shortcuts {"RF" {:no-mods "{^}\n"                          :with-mods "return"}-                   "LS" {:no-mods "{^}\\t"+                   "LS" {:no-mods "{^}\t"                          :with-mods "tab"}}})  (def vowel-chords@@ -185,7 +185,7 @@ (defn rep [n s]   (apply str (repeat n s))) -(def symbols-dict+(def plover-symbols-dict   (->map     (let [{:keys [starter chords shortcuts mod-shortcuts]} symbols]       [(for [[mod symbol] chords@@ -232,6 +232,11 @@           (str starter "-" mod "T*e") (str "{}" (rep 4 symbol) "=")           (str "+" starter "-" mod "T*e") (str "{^}" (rep 4 symbol) "=")])]))) +; Javelin requires \t and \n to be escaped, where plover doesn't.+(def javelin-symbols-dict (update-vals plover-symbols-dict+                                       #(str/escape % {\newline "\\n"+                                                       \tab "\\t"})))+ (def numbers   {:starter "TPWHR"    :left {"R" "1"@@ -378,6 +383,7 @@         (str "#+" fingerspelling-starter "-" chord) (str "{^}{-|}" letter)         ])])) -(def mods-dict (merge symbols-dict fingerspelling-dict numbers-dict movement-dict))+(def version (:version (edn/read-string (slurp "chords.edn")))) -(spit "pinchord-mods.json" (json/generate-string mods-dict))+(spit (str "pinchord-mods-javelin-" version ".json") (json/generate-string (merge javelin-symbols-dict fingerspelling-dict numbers-dict movement-dict)))+(spit (str "pinchord-mods-plover-" version ".json")  (json/generate-string (merge plover-symbols-dict  fingerspelling-dict numbers-dict movement-dict)))

pinchord-mods-javelin-v30.0.json added (view file)

@@ -0,0 +1 @@

Show all 3 lines

plover_pinchord/dictionaries/pinchord-mods-plover-v30.0.json added (view file)

@@ -0,0 +1 @@

Show all 3 lines

plover_pinchord/dictionaries/pinchord-mods-v30.0.json deleted (view file)

@@ -1 +0,0 @@

Show all 3 lines

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