made fi/fj not ligatures, adjusted top serif of i/j instead #795

CHANGELOG.md

@@ -51,7 +51,7 @@ All notable changes to this project will be documented in this file.
 - Added Coq logical and ` /\ ` and logical or ` \/ ` ligatures, U+2227 `∧` and U+2228 `∨` [#191] [#488] [#738] [#810]
 - Added SystemVerilog `|->` `|=>` and `<-|` `<=|` for symmetry [#695]
 - Added Forces `||-` ligature and U+22A2..U+22AF `⊢ ⊣ ⊤ ⊥ ⊦ ⊧ ⊨ ⊩ ⊪ ⊫ ⊬ ⊭ ⊮ ⊯` [#709]
-- Added `fi` `fj` `fl` `Fl` `Tl` ligatures [#795]
+- Added `fl` `Fl` `Tl` ligatures, adjusted `fi` `fj` pairs [#795]
 - Disabled ligatures after regexp lookahead/lookbehinds `(?<=<` `(?<=>` `(?<==>` `(?<=|` `(?<==` `(?=:=` `(?=!=` `(?==` `(?===` `(?==>` `(?=>` `(?=>>` `(?=<<` `(?=/=` `(?!!` `(?!!.` `(?!=` `(?!==` `(?<!!` `(?<!!.` `(?<!=` `(?<!==` `(?<!--` [#578]
 - Removed `..=` [#757]
 - Alternatives (stylistic sets):

README.md

@@ -8,7 +8,7 @@ Programmers use a lot of symbols, often encoded with several characters. For the
 
 ### Solution
 
-#### [Download v1.207](https://github.com/tonsky/FiraCode/releases/download/1.207/FiraCode_1.207.zip) · [How to install](https://github.com/tonsky/FiraCode/wiki) · [Troubleshooting](https://github.com/tonsky/FiraCode/wiki#troubleshooting) · [News & updates](https://twitter.com/FiraCode)
+#### [Download v.2](https://github.com/tonsky/FiraCode/releases/download/2/FiraCode_2.zip) · [How to install](https://github.com/tonsky/FiraCode/wiki) · [Troubleshooting](https://github.com/tonsky/FiraCode/wiki#troubleshooting) · [News & updates](https://twitter.com/FiraCode)
 
 <a href="https://patreon.com/tonsky" target="_blank"><img src="./fira_code_patreon.png"></a>
 

clojure/regen_calt.clj

@@ -117,6 +117,8 @@
   ["less" "asterisk" "greater"]
   ["less" "plus" "greater"]
   ["less" "dollar" "greater"]
+  ;; #795
+  ["f" "l"] ["F" "l"] ["T" "l"]
 })
 
 ;; DO NOT generate ligature
@@ -135,8 +137,9 @@
     2 (let [[a b] liga]
         (str/replace
           (str "lookup 1_2 {\n"
-               "  ignore sub 1 1' 2;\n"
-               "  ignore sub 1' 2 2;\n"
+               (when-not (skip-ignores? liga)
+                 (str "  ignore sub 1 1' 2;\n"
+                      "  ignore sub 1' 2 2;\n"))
                (gen-ignore-prefixes liga)
                (get ignores liga)
                "  sub LIG 2' by 1_2.liga;\n"
@@ -159,8 +162,9 @@
     4 (let [[a b c d] liga]
         (str/replace
           (str "lookup 1_2_3_4 {\n"
-               "  ignore sub 1 1' 2 3 4;\n"
-               "  ignore sub 1' 2 3 4 4;\n"
+               (when-not (skip-ignores? liga)
+                 (str "  ignore sub 1 1' 2 3 4;\n"
+                      "  ignore sub 1' 2 3 4 4;\n"))
                (gen-ignore-prefixes liga)
                (get ignores liga)
                "  sub LIG LIG LIG 4' by 1_2_3_4.liga;\n"

showcases/showcases.txt

@@ -27,9 +27,34 @@
         -| _|_ |- |= ||=
         #! #= ## ### ####
       #{ #[ ]# #( #? #_ #_(
-         
+
+<-| <=| /\ \/ |-> |=> ||-
+fii fjj fl Fl Tl
          
 a*b a*A B*b A*B *a *A a* A*
 a-b a-A B-b A-B -a -A a- A-
 a+b a+A B+b A+B +a +A a+ A+
-a:b a:A B:b A:B :a :A a: A:
+a:b a:A B:b A:B :a :A a: A:
+
+# Box drawing
+
+╭╌╌╮ ╭┄┄╮ ╭┈┈╮
+╎  ╏ ┆  ┇ ┊  ┋
+╎  ╏ ┆  ┇ ┊  ┋
+╰╍╍╯ ╰┅┅╯ ╰┉┉╯ 
+
+# Unicode
+
+≢ ẞ ᐅ ᐊ ∴ ∵ ⎈ ‖ ∧ ∨ ⊢ ⊣ ⊤ ⊥ ⊦ ⊧ ⊨ ⊩ ⊪ ⊫ ⊬ ⊭ ⊮ ⊯
+⟲⟳ ⟰ ⟱ ⟴ ⟵ ⟶ ⟷ ⟸ ⟹ ⟺ ⟻ ⟼ ⟽ ⟾ ⟿
+↩ ⇞ ⇟ ⇤ ⇥ ⌀ ⌃ ⌄ ⌅ ⌆ ⌘ ⌤ ⌥ ⎇ ⎋ ⏏
+␆ ␈ ␇ ␣ ␢ ␘ ␍ ␐ ␡ ␥ ␔ ␑ ␓ ␒ ␙ ␃ ␄ ␗ ␅ ␛ ␜ ␌ ␝ ␉ ␊ ␕ ␤ ␀ ␞ ␏ ␎ ␠ ␁ ␂ ␚ ␦ ␖ ␟ ␋
+
+# Multi-line brackets
+
+⎛ 1 ⎞ ⎡ a ⎤ ⎧ x ⎫
+⎜ 2 ⎟ ⎢ b ⎥ ⎪ y ⎪
+⎜ 3 ⎟ ⎢ c ⎥ ⎨ z ⎬
+⎜ 4 ⎟ ⎢ d ⎥ ⎪ y ⎪
+⎝ 5 ⎠ ⎣ e ⎦ ⎩ x ⎭
+