mirror of
https://github.com/tonsky/FiraCode.git
synced 2024-10-05 17:17:34 +03:00
Removed ..= (closes #757)
This commit is contained in:
parent
7e59299dd7
commit
436e4f6307
@ -48,12 +48,13 @@ All notable changes to this project will be documented in this file.
|
|||||||
- U+2387 Alternative Key Symbol `⎇`
|
- U+2387 Alternative Key Symbol `⎇`
|
||||||
- U+238B Broken Circle with Northwest Arrow (Escape) `⎋`
|
- U+238B Broken Circle with Northwest Arrow (Escape) `⎋`
|
||||||
- U+23CF Eject symbol `⏏`
|
- U+23CF Eject symbol `⏏`
|
||||||
- Added Coq logical and ` /\ ` and logical or ` \/ ` ligatures, U+2227 `∧` and U+2228 `∨` [#738]
|
- Added Coq logical and ` /\ ` and logical or ` \/ ` ligatures, U+2227 `∧` and U+2228 `∨` [#191] [#488] [#738] [#810]
|
||||||
- Added SystemVerilog `|->` `|=>` and `<-|` `<=|` for symmetry [#695]
|
- Added SystemVerilog `|->` `|=>` and `<-|` `<=|` for symmetry [#695]
|
||||||
- Added Forces `||-` ligature and U+22A2..U+22AF `⊢ ⊣ ⊤ ⊥ ⊦ ⊧ ⊨ ⊩ ⊪ ⊫ ⊬ ⊭ ⊮ ⊯` [#709]
|
- Added Forces `||-` ligature and U+22A2..U+22AF `⊢ ⊣ ⊤ ⊥ ⊦ ⊧ ⊨ ⊩ ⊪ ⊫ ⊬ ⊭ ⊮ ⊯` [#709]
|
||||||
- Tuned `fl` and `fi` pairs [#795]
|
- Tuned `fl` and `fi` pairs [#795]
|
||||||
- Disabled ligatures after regexp lookahead/lookbehinds `(?<=<` `(?<=>` `(?<==>` `(?<=|` `(?<==` `(?=:=` `(?=!=` `(?==` `(?===` `(?==>` `(?=>` `(?=>>` `(?=<<` `(?=/=` `(?!!` `(?!!.` `(?!=` `(?!==` `(?<!!` `(?<!!.` `(?<!=` `(?<!==` `(?<!--` [#578]
|
- Disabled ligatures after regexp lookahead/lookbehinds `(?<=<` `(?<=>` `(?<==>` `(?<=|` `(?<==` `(?=:=` `(?=!=` `(?==` `(?===` `(?==>` `(?=>` `(?=>>` `(?=<<` `(?=/=` `(?!!` `(?!!.` `(?!=` `(?!==` `(?<!!` `(?<!!.` `(?<!=` `(?<!==` `(?<!--` [#578]
|
||||||
- Alternative lowercase `r` (ss01) and ampersand `&` (ss03)
|
- Alternative lowercase `r` (ss01) and ampersand `&` (ss03)
|
||||||
|
- Removed ..= [#757]
|
||||||
|
|
||||||
#### 1.207 (April 6, 2019)
|
#### 1.207 (April 6, 2019)
|
||||||
|
|
||||||
|
181
FiraCode.glyphs
181
FiraCode.glyphs
File diff suppressed because one or more lines are too long
@ -53,7 +53,11 @@
|
|||||||
:else res))))
|
:else res))))
|
||||||
|
|
||||||
(defn expect [c]
|
(defn expect [c]
|
||||||
(assert (= c (current-char)) (str "Expected '" c "', found " (current-char) " at " @*pos)))
|
(assert (= c (current-char))
|
||||||
|
(str "Expected '" c
|
||||||
|
"', found " (current-char)
|
||||||
|
" at " @*pos
|
||||||
|
" around here:\n" (subs @*str (max 0 (- @*pos 100)) (min (count @*str) (+ @*pos 100))))))
|
||||||
|
|
||||||
(defn parse-map! []
|
(defn parse-map! []
|
||||||
(skip-ws!)
|
(skip-ws!)
|
||||||
@ -111,8 +115,16 @@
|
|||||||
(str \" (str/replace form escape-re escapes) \"))
|
(str \" (str/replace form escape-re escapes) \"))
|
||||||
(keyword? form) (name form)
|
(keyword? form) (name form)
|
||||||
(number? form) (str form)
|
(number? form) (str form)
|
||||||
|
(instance? clojure.lang.MapEntry form)
|
||||||
|
(str
|
||||||
|
(serialize (key form))
|
||||||
|
" = "
|
||||||
|
(if (= ".appVersion" (key form)) ;; https://github.com/googlefonts/glyphsLib/issues/209
|
||||||
|
(str \" (val form) \")
|
||||||
|
(serialize (val form)))
|
||||||
|
";")
|
||||||
(sequential? form) (str "(\n" (str/join ",\n" (map serialize form)) "\n)")
|
(sequential? form) (str "(\n" (str/join ",\n" (map serialize form)) "\n)")
|
||||||
(map? form) (str "{\n" (str/join "\n" (for [[k v] form] (str (serialize k) " = " (serialize v) ";"))) "\n}")))
|
(map? form) (str "{\n" (str/join "\n" (map serialize form)) "\n}")))
|
||||||
|
|
||||||
; (-> (slurp "FiraCode.glyphs") parse serialize (->> (spit "FiraCode_saved.glyphs")))
|
; (-> (slurp "FiraCode.glyphs") parse serialize (->> (spit "FiraCode_saved.glyphs")))
|
||||||
|
|
||||||
|
@ -193,6 +193,7 @@
|
|||||||
ligas (for [g (:glyphs font)
|
ligas (for [g (:glyphs font)
|
||||||
:let [name (:glyphname g)]
|
:let [name (:glyphname g)]
|
||||||
:when (str/ends-with? name ".liga")
|
:when (str/ends-with? name ".liga")
|
||||||
|
:when (not= "0" (:export g))
|
||||||
: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 compare-ligas) (map liga->rule) (str/join "\n\n"))
|
calt (->> ligas (remove manual?) (sort compare-ligas) (map liga->rule) (str/join "\n\n"))
|
||||||
|
Loading…
Reference in New Issue
Block a user