Vertically-aligned colons, greater/less signs (closes #980, closes #1061

)
tonsky · Jun 5, 2020 · 5eb4ec0 · 5eb4ec0
1 parent 35d2418
commit 5eb4ec0
Show file tree

Hide file tree

Showing 5 changed files with 312 additions and 181 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 - Added U+2236 Ratio `∶` #926
 - Added U+2E3A 2-em dash `⸺`, U+2E3B 3-em dash `⸻` #1019
 - Fixed arrows next to lowercase letters #1049 #1059
+- Vertically-aligned colons, greater/less signs #980 #1061
 
 #### 4.0 (May 18, 2020)
 

diff --git a/FiraCode.glyphs b/FiraCode.glyphs
diff --git a/clojure/fira_code/calt.clj b/clojure/fira_code/calt.clj
@@ -76,18 +76,23 @@
     (str
       "  ignore sub slash asterisk' asterisk asterisk;\n"
       "  ignore sub asterisk' asterisk asterisk slash;\n")
-
+
+    ;; #1061
+    ["colon" "colon"]
+    (str "  ignore sub colon' colon [less greater];\n"
+         "  ignore sub [less greater] colon' colon;\n")
+
+    ["colon" "colon" "colon"]
+    (str "  ignore sub colon' colon colon [less greater];\n"
+         "  ignore sub [less greater] colon' colon colon;\n")
+
     ;; #621 <||>
     ["less" "bar" "bar"]
     "  ignore sub less' bar bar greater;\n"
 
     ["bar" "bar" "greater"]
     "  ignore sub less bar' bar greater;\n"
 
-    ;; #574 :>=
-    ["colon" "greater"]
-    "  ignore sub colon' greater equal;\n"
-
     ;; #593 {|}
     ["braceleft" "bar"]
     "  ignore sub braceleft' bar braceright;\n"

diff --git a/extras/showcases.txt b/extras/showcases.txt
@@ -8,7 +8,8 @@
         <~~ <~ ~~ ~> ~~>
 
      <<< << <= <> >= >> >>>
-     {. {| [| <: :> |] |} .}
+       {. {| [|  |] |} .}
+<:> >:< >:> <:< :>: :<: :> :< >: <:
    <||| <|| <| <|> |> ||> |||>
 
             <$ <$> $>

diff --git a/features/calt/center.fea b/features/calt/center.fea
@@ -0,0 +1,21 @@
+### Vertical-align colon/greater/less
+
+# :> :< >: <:
+# :>: :<:
+# <:> >:< <:< >:>
+# <::> <::< >::< >::>
+# <:::> <:::< >:::< >:::>
+# <::::> <::::< >::::< >::::>
+
+lookup center {
+    #574 :>= :<=
+    ignore sub colon' [less greater] [equal hyphen];
+
+    # middles & ends
+    sub [less.center greater.center colon.center] colon' by colon.center;
+    sub colon.center [less greater]' by [less.center greater.center];
+
+    # starts
+    sub [less greater]' colon by [less.center greater.center];
+    sub colon' [less greater] by colon.center;
+} center;