Browse Source

Removed `/**` `**/` and disabled ligatures for `/*/` `*/*` sequences (closes #219, closes #238)

Nikita Prokopov 8 years ago
parent
commit
9704650782
3 changed files with 25 additions and 3 deletions
  1. 0 3
      FiraCode.glyphs
  2. 1 0
      README.md
  3. 24 0
      gen_calt.clj

File diff suppressed because it is too large
+ 0 - 3
FiraCode.glyphs


+ 1 - 0
README.md

@@ -135,6 +135,7 @@ Other monospaced fonts with ligatures:
 #### 1.201 (August 30, 2016)
 
 - Removed `[]` (#92) `{-` `-}` (#248)
+- Removed `/**` `**/` and disabled ligatures for `/*/` `*/*` sequences (#219 #238)
 
 #### 1.200 (July 18, 2016)
 

+ 24 - 0
gen_calt.clj

@@ -30,6 +30,27 @@
 ;     ["asterisk" "asterisk"]
 ;     ["asterisk" "asterisk" "asterisk"]])
 
+(def ignores
+  { ["slash" "asterisk"]
+    (str
+      "    ignore sub slash' asterisk slash;\n"
+      "    ignore sub asterisk slash' asterisk;\n")
+
+    ["asterisk" "slash"]
+    (str
+      "    ignore sub slash asterisk' slash;\n"
+      "    ignore sub asterisk' slash asterisk;\n")
+
+    ["asterisk" "asterisk"]
+    (str
+      "    ignore sub slash asterisk' asterisk;\n"
+      "    ignore sub asterisk' asterisk slash;\n")
+
+    ["asterisk" "asterisk" "asterisk"]
+    (str
+      "    ignore sub slash asterisk' asterisk asterisk;\n"
+      "    ignore sub asterisk' asterisk asterisk slash;\n")
+    })
 
 (defn liga->rule
   "[f f i] => { [CR CR i] f_f_i.liga
@@ -42,6 +63,7 @@
           (str "  lookup 1_2 {\n"
                "    ignore sub 1 1' 2;\n"
                "    ignore sub 1' 2 2;\n"
+               (get ignores liga)
                "    sub CR 2' by 1_2.liga;\n"
                "    sub 1' 2  by CR;\n"
                "  } 1_2;")
@@ -51,6 +73,7 @@
           (str "  lookup 1_2_3 {\n"
                "    ignore sub 1 1' 2 3;\n"
                "    ignore sub 1' 2 3 3;\n"
+               (get ignores liga)
                "    sub CR CR 3' by 1_2_3.liga;\n"
                "    sub CR 2' 3  by CR;\n"
                "    sub 1' 2  3  by CR;\n"
@@ -61,6 +84,7 @@
           (str "  lookup 1_2_3_4 {\n"
                "    ignore sub 1 1' 2 3 4;\n"
                "    ignore sub 1' 2 3 4 4;\n"
+               (get ignores liga)
                "    sub CR CR CR 4' by 1_2_3_4.liga;\n"
                "    sub CR CR 3' 4  by CR;\n"
                "    sub CR 2' 3  4  by CR;\n"

Some files were not shown because too many files changed in this diff