Removed ..= (closes #757)

CHANGELOG.md

@@ -48,12 +48,13 @@ All notable changes to this project will be documented in this file.
   - U+2387 Alternative Key Symbol `⎇`
   - U+238B Broken Circle with Northwest Arrow (Escape) `⎋`
   - 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 Forces `||-` ligature and U+22A2..U+22AF `⊢ ⊣ ⊤ ⊥ ⊦ ⊧ ⊨ ⊩ ⊪ ⊫ ⊬ ⊭ ⊮ ⊯` [#709]
 - Tuned `fl` and `fi` pairs [#795]
 - Disabled ligatures after regexp lookahead/lookbehinds `(?<=<` `(?<=>` `(?<==>` `(?<=|` `(?<==` `(?=:=` `(?=!=` `(?==` `(?===` `(?==>` `(?=>` `(?=>>` `(?=<<` `(?=/=` `(?!!` `(?!!.` `(?!=` `(?!==` `(?<!!` `(?<!!.` `(?<!=` `(?<!==` `(?<!--` [#578]
 - Alternative lowercase `r` (ss01) and ampersand `&` (ss03)
+- Removed ..= [#757]
 
 #### 1.207 (April 6, 2019)
 

clojure/glyphs.clj

@@ -53,7 +53,11 @@
         :else res))))
 
 (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! []
   (skip-ws!)
@@ -111,8 +115,16 @@
                          (str \" (str/replace form escape-re escapes) \"))
     (keyword? form)    (name 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)")
-    (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")))
 

clojure/regen_calt.clj

@@ -193,6 +193,7 @@
         ligas (for [g (:glyphs font)
                     :let [name (:glyphname g)]
                     :when (str/ends-with? name ".liga")
+                    :when (not= "0" (:export g))
                     :let [[_ liga] (re-matches #"([a-z_]+)\.liga" name)]]
                 (str/split liga #"_")) ;; [ ["dash" "greater" "greater"] ... ]
         calt  (->> ligas (remove manual?) (sort compare-ligas) (map liga->rule) (str/join "\n\n"))