Browse Source

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

Nikita Prokopov 4 years ago
parent
commit
5eb4ec07b3
5 changed files with 35 additions and 7 deletions
  1. 1 0
      CHANGELOG.md
  2. 1 1
      FiraCode.glyphs
  3. 10 5
      clojure/fira_code/calt.clj
  4. 2 1
      extras/showcases.txt
  5. 21 0
      features/calt/center.fea

+ 1 - 0
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)
 

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


+ 10 - 5
clojure/fira_code/calt.clj

@@ -76,7 +76,16 @@
     (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"
@@ -84,10 +93,6 @@
     ["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"

+ 2 - 1
extras/showcases.txt

@@ -8,7 +8,8 @@
         <~~ <~ ~~ ~> ~~>
 
      <<< << <= <> >= >> >>>
-     {. {| [| <: :> |] |} .}
+       {. {| [|  |] |} .}
+<:> >:< >:> <:< :>: :<: :> :< >: <:
    <||| <|| <| <|> |> ||> |||>
 
             <$ <$> $>

+ 21 - 0
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;

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