mirror of
https://github.com/tonsky/FiraCode.git
synced 2024-10-05 17:17:34 +03:00
Disable ligatures in |--| (closes #713)
This commit is contained in:
parent
375a449b4c
commit
707ba48fc3
File diff suppressed because one or more lines are too long
@ -92,6 +92,13 @@
|
|||||||
(str " ignore sub less' less less asterisk;\n"
|
(str " ignore sub less' less less asterisk;\n"
|
||||||
" ignore sub less' less less plus;\n"
|
" ignore sub less' less less plus;\n"
|
||||||
" ignore sub less' less less dollar;\n")
|
" ignore sub less' less less dollar;\n")
|
||||||
|
|
||||||
|
;; 713 |-|
|
||||||
|
["bar" "hyphen"]
|
||||||
|
" ignore sub bar' hyphen bar;\n"
|
||||||
|
|
||||||
|
["hyphen" "bar"]
|
||||||
|
" ignore sub bar hyphen' bar;\n"
|
||||||
})
|
})
|
||||||
|
|
||||||
(def skip-ignores? #{
|
(def skip-ignores? #{
|
||||||
@ -160,6 +167,12 @@
|
|||||||
(str "### start of generated calt\n" calt "\n### end of generated calt\n"))]
|
(str "### start of generated calt\n" calt "\n### end of generated calt\n"))]
|
||||||
(assoc-in font [:features idx :code] code')))
|
(assoc-in font [:features idx :code] code')))
|
||||||
|
|
||||||
|
(defn compare-ligas [l1 l2]
|
||||||
|
(cond
|
||||||
|
(> (count l1) (count l2)) -1
|
||||||
|
(< (count l1) (count l2)) 1
|
||||||
|
:else (compare l1 l2)))
|
||||||
|
|
||||||
(defn -main [& args]
|
(defn -main [& args]
|
||||||
(let [file (or (first args) "FiraCode.glyphs")
|
(let [file (or (first args) "FiraCode.glyphs")
|
||||||
_ (println "Parsing" file "...")
|
_ (println "Parsing" file "...")
|
||||||
@ -169,7 +182,7 @@
|
|||||||
:when (str/ends-with? name ".liga")
|
:when (str/ends-with? name ".liga")
|
||||||
:let [[_ liga] (re-matches #"([a-z_]+)\.liga" name)]]
|
:let [[_ liga] (re-matches #"([a-z_]+)\.liga" name)]]
|
||||||
(str/split liga #"_")) ;; [ ["dash" "greater" "greater"] ... ]
|
(str/split liga #"_")) ;; [ ["dash" "greater" "greater"] ... ]
|
||||||
calt (->> ligas (remove manual?) (sort-by count) (reverse) (map liga->rule) (str/join "\n\n"))
|
calt (->> ligas (remove manual?) (sort compare-ligas) (map liga->rule) (str/join "\n\n"))
|
||||||
font' (replace-calt font calt)]
|
font' (replace-calt font calt)]
|
||||||
|
|
||||||
(println "Saving" file "...")
|
(println "Saving" file "...")
|
||||||
@ -183,4 +196,5 @@
|
|||||||
(str/join ", ")))
|
(str/join ", ")))
|
||||||
(println)))
|
(println)))
|
||||||
|
|
||||||
;; (-main)
|
(-main)
|
||||||
|
|
||||||
|
4
deps.edn
4
deps.edn
@ -1,4 +1,4 @@
|
|||||||
{:paths ["clojure"]
|
{:paths ["clojure"]
|
||||||
:deps {org.clojure/clojure {:mvn/version "1.10.1"}
|
:deps {org.clojure/clojure {:mvn/version "1.10.1"}
|
||||||
org.flatland/ordered {:mvn/version "1.5.6"}
|
org.flatland/ordered {:mvn/version "1.5.7"}
|
||||||
fipp/fipp {:mvn/version "0.6.12"}}}
|
fipp/fipp {:mvn/version "0.6.18"}}}
|
||||||
|
Loading…
Reference in New Issue
Block a user