Skip to content

Commit f8ea065

Browse files
tonskytonsky
committed
Code formatting, tools.namespace -> clj-reload, clojure+
1 parent 20498e4 commit f8ea065

File tree

16 files changed

+119
-184
lines changed

16 files changed

+119
-184
lines changed

‎FiraCode.glyphs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
2-
.appVersion = "3414";
2+
.appVersion = "3436";
33
.formatVersion = 3;
4-
DisplayStrings = (
5-
"/ampersand_ampersand.liga.ss03 & &&"
6-
);
74
axes = (
85
{
96
name = Weight;

‎clojure/fira_code/calt.clj‎

Lines changed: 63 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
[fira-code.time :as time]
77
[flatland.ordered.map :refer [ordered-map]]))
88

9-
109
;; No ligature should follow those sequences
1110
(def ignore-prefixes
1211
[["parenleft" "question" "colon"]
@@ -17,8 +16,7 @@
1716
["parenleft" "question" "less" "exclam"]
1817
;; #850 PHP <?=
1918
["less" "question" "equal"]
20-
])
21-
19+
])
2220

2321
(defn gen-ignore-prefixes [liga]
2422
(str/join
@@ -32,7 +30,6 @@
3230
" " (str/join " " (drop 1 liga))
3331
";\n"))))
3432

35-
3633
(def priorities
3734
{;; <|>
3835
["less" "bar" "greater"] 0
@@ -54,7 +51,6 @@
5451
["bar" "bar"] 2
5552
["bar" "bar" "bar"] 2})
5653

57-
5854
(def ignores
5955
(coll/multimap-by str
6056
["slash" "asterisk"]
@@ -79,12 +75,14 @@
7975

8076
;; #1061
8177
["colon" "colon"]
82-
(str " ignore sub colon' colon [less greater];\n"
83-
" ignore sub [less greater] colon' colon;\n")
78+
(str
79+
" ignore sub colon' colon [less greater];\n"
80+
" ignore sub [less greater] colon' colon;\n")
8481

8582
["colon" "colon" "colon"]
86-
(str " ignore sub colon' colon colon [less greater];\n"
87-
" ignore sub [less greater] colon' colon colon;\n")
83+
(str
84+
" ignore sub colon' colon colon [less greater];\n"
85+
" ignore sub [less greater] colon' colon colon;\n")
8886

8987
;; #621 <||>
9088
["less" "bar" "bar"]
@@ -126,14 +124,16 @@
126124
;; #948 [==[ ]==]
127125
;; #968 [== ==]
128126
["equal" "equal"]
129-
(str " ignore sub bracketleft equal' equal;\n"
130-
" ignore sub equal' equal bracketright;\n")
127+
(str
128+
" ignore sub bracketleft equal' equal;\n"
129+
" ignore sub equal' equal bracketright;\n")
131130

132131
;; #948 [===[ ]===]
133132
;; #968 [=== ===]
134133
["equal" "equal" "equal"]
135-
(str " ignore sub bracketleft equal' equal equal;\n"
136-
" ignore sub equal' equal equal bracketright;\n")
134+
(str
135+
" ignore sub bracketleft equal' equal equal;\n"
136+
" ignore sub equal' equal equal bracketright;\n")
137137

138138
;; #346 =:=
139139
["colon" "equal"]
@@ -148,78 +148,84 @@
148148

149149
;; #346 =<= <=< <=> <=| <=: <=! <=/
150150
["less" "equal"]
151-
(str " ignore sub equal less' equal;\n"
152-
" ignore sub less' equal [less greater bar colon exclam slash];\n")
151+
(str
152+
" ignore sub equal less' equal;\n"
153+
" ignore sub less' equal [less greater bar colon exclam slash];\n")
153154

154155
;; #548 >=<
155156
;; #346 =>= >=> >=< >=| >=: >=! >=/
156157
["greater" "equal"]
157-
(str " ignore sub equal greater' equal;\n"
158-
" ignore sub greater' equal [less greater bar colon exclam slash];\n")
158+
(str
159+
" ignore sub equal greater' equal;\n"
160+
" ignore sub greater' equal [less greater bar colon exclam slash];\n")
159161

160162
;; #346 >>->> >>=>>
161163
;; #974 keep >>=
162164
["greater" "greater"]
163-
(str " ignore sub [hyphen equal] greater' greater;\n"
164-
" ignore sub greater' greater hyphen;\n"
165-
" ignore sub greater' greater equal [equal less greater bar colon exclam slash];\n")
165+
(str
166+
" ignore sub [hyphen equal] greater' greater;\n"
167+
" ignore sub greater' greater hyphen;\n"
168+
" ignore sub greater' greater equal [equal less greater bar colon exclam slash];\n")
166169

167170
;; #346 <<-<< <<=<<
168171
;; #974 keep <<=
169172
["less" "less"]
170-
(str " ignore sub [hyphen equal] less' less;\n"
171-
" ignore sub less' less hyphen;\n"
172-
" ignore sub less' less equal [equal less greater bar colon exclam slash];\n")
173+
(str
174+
" ignore sub [hyphen equal] less' less;\n"
175+
" ignore sub less' less hyphen;\n"
176+
" ignore sub less' less equal [equal less greater bar colon exclam slash];\n")
173177

174178
;; #346 ||-|| ||=||
175179
;; #974 keep ||=
176180
["bar" "bar"]
177-
(str " ignore sub [hyphen equal] bar' bar;\n"
178-
" ignore sub bar' bar hyphen;\n"
179-
" ignore sub bar' bar equal [equal less greater bar colon exclam slash];\n")
181+
(str
182+
" ignore sub [hyphen equal] bar' bar;\n"
183+
" ignore sub bar' bar hyphen;\n"
184+
" ignore sub bar' bar equal [equal less greater bar colon exclam slash];\n")
180185

181186
;; #816 //=
182187
["slash" "slash"]
183-
(str " ignore sub equal slash' slash;\n"
184-
" ignore sub slash' slash equal;\n")
188+
(str
189+
" ignore sub equal slash' slash;\n"
190+
" ignore sub slash' slash equal;\n")
185191

186192
;; #346 <--> >--< |--|
187193
["hyphen" "hyphen"]
188-
(str " ignore sub [less greater bar] hyphen' hyphen;\n"
189-
" ignore sub hyphen' hyphen [less greater bar];\n")
194+
(str
195+
" ignore sub [less greater bar] hyphen' hyphen;\n"
196+
" ignore sub hyphen' hyphen [less greater bar];\n")
190197

191198
;; #346 <==> >==< |==| /==/ =:== =!== ==:= ==!=
192199
["equal" "equal"]
193-
(str " ignore sub equal [colon exclam] equal' equal;\n"
194-
" ignore sub [less greater bar slash] equal' equal;\n"
195-
" ignore sub equal' equal [less greater bar slash] ;\n"
196-
" ignore sub equal' equal [colon exclam] equal;\n")
200+
(str
201+
" ignore sub equal [colon exclam] equal' equal;\n"
202+
" ignore sub [less greater bar slash] equal' equal;\n"
203+
" ignore sub equal' equal [less greater bar slash] ;\n"
204+
" ignore sub equal' equal [colon exclam] equal;\n")
197205

198206
;; #346 <===> >===< |===| /===/ =:=== =!=== ===:= ===!=
199207
["equal" "equal" "equal"]
200-
(str " ignore sub equal [colon exclam] equal' equal equal;\n"
201-
" ignore sub [less greater bar slash] equal' equal equal;\n"
202-
" ignore sub equal' equal equal [less greater bar slash];\n"
203-
" ignore sub equal' equal equal [colon exclam] equal;\n")
204-
))
205-
208+
(str
209+
" ignore sub equal [colon exclam] equal' equal equal;\n"
210+
" ignore sub [less greater bar slash] equal' equal equal;\n"
211+
" ignore sub equal' equal equal [less greater bar slash];\n"
212+
" ignore sub equal' equal equal [colon exclam] equal;\n")
213+
))
206214

207215
;; DO NOT generate ignores at all
208216
(def skip-ignores? #{
209-
;; #410 <<*>> <<+>> <<$>>
210-
["less" "asterisk" "greater"]
211-
["less" "plus" "greater"]
212-
["less" "dollar" "greater"]
213-
})
214-
217+
;; #410 <<*>> <<+>> <<$>>
218+
["less" "asterisk" "greater"]
219+
["less" "plus" "greater"]
220+
["less" "dollar" "greater"]
221+
})
215222

216223
;; DO NOT generate ligature
217224
(def manual? #{
218-
;; /\ \/
219-
["slash" "backslash"]
220-
["backslash" "slash"]
221-
})
222-
225+
;; /\ \/
226+
["slash" "backslash"]
227+
["backslash" "slash"]
228+
})
223229

224230
(defn liga->rule
225231
"[f f i] => { [LIG LIG i] f_f_i.liga
@@ -233,7 +239,7 @@
233239
"lookup 1_2 {\n"
234240
(when-not (skip-ignores? liga)
235241
(str " ignore sub 1 1' 2;\n"
236-
" ignore sub 1' 2 2;\n"))
242+
" ignore sub 1' 2 2;\n"))
237243
(gen-ignore-prefixes liga)
238244
(get ignores liga)
239245
" sub 1.spacer 2' by 1_2.liga;\n"
@@ -246,8 +252,8 @@
246252
(str
247253
"lookup 1_2_3 {\n"
248254
(when-not (skip-ignores? liga)
249-
(str " ignore sub 1 1' 2 3;\n"
250-
" ignore sub 1' 2 3 3;\n"))
255+
(str " ignore sub 1 1' 2 3;\n"
256+
" ignore sub 1' 2 3 3;\n"))
251257
(gen-ignore-prefixes liga)
252258
(get ignores liga)
253259
" sub 1.spacer 2.spacer 3' by 1_2_3.liga;\n"
@@ -262,7 +268,7 @@
262268
"lookup 1_2_3_4 {\n"
263269
(when-not (skip-ignores? liga)
264270
(str " ignore sub 1 1' 2 3 4;\n"
265-
" ignore sub 1' 2 3 4 4;\n"))
271+
" ignore sub 1' 2 3 4 4;\n"))
266272
(gen-ignore-prefixes liga)
267273
(get ignores liga)
268274
" sub 1.spacer 2.spacer 3.spacer 4' by 1_2_3_4.liga;\n"
@@ -278,7 +284,7 @@
278284
"lookup 1_2_3_4_5 {\n"
279285
(when-not (skip-ignores? liga)
280286
(str " ignore sub 1 1' 2 3 4 5;\n"
281-
" ignore sub 1' 2 3 4 4 5;\n"))
287+
" ignore sub 1' 2 3 4 4 5;\n"))
282288
(gen-ignore-prefixes liga)
283289
(get ignores liga)
284290
" sub 1.spacer 2.spacer 3.spacer 4.spacer 5' by 1_2_3_4_5.liga;\n"
@@ -289,8 +295,7 @@
289295
; "sub 1 2 3 4 5 by 1_2_3_4_5.liga;"
290296
"} 1_2_3_4_5;")
291297
#"\d" {"1" a "2" b "3" c "4" d "5" e}))
292-
))
293-
298+
))
294299

295300
(defn compare-ligas [l1 l2]
296301
(let [p1 (priorities l1 Long/MAX_VALUE)
@@ -304,7 +309,6 @@
304309
(not= 0 cc) (- cc) ;; longer first
305310
:else (compare l1 l2)))) ;; alphabetical
306311

307-
308312
(defn replace-calt [font ligas]
309313
(let [ligas' (->> ligas
310314
(remove manual?)

‎clojure/fira_code/checks.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
(defn -main [& args]
2121
(let [path (or (first args) "FiraCode.glyphs")
2222
font (glyphs/load path)]
23-
(widths font)))
23+
(widths font)))

‎clojure/fira_code/classes.clj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
[fira-code.glyphs :as glyphs]
66
[fira-code.files :as files]))
77

8-
98
(defn fill-class [font file]
109
(let [[_ name] (re-matches #"([^.]+)\.fea" (.getName file))
1110
code (slurp file)
1211
class {:code (str/trim code)
1312
:name name}]
1413
(glyphs/set-class font name class)))
1514

16-
1715
(defn fill-all [font]
1816
(reduce fill-class font (files/find "classes" #"classes/[^/]+\.fea")))

‎clojure/fira_code/coll.clj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
(ns fira-code.coll)
22

3-
43
(defn index-of [pred xs]
54
(let [res (reduce (fn [i x] (if (pred x) (reduced i) (inc i))) 0 xs)]
65
(if (>= res (count xs))
76
-1
87
res)))
98

10-
119
(defn group-by-to [key-fn value-fn xs]
1210
(reduce-kv
1311
(fn [m k vs]
1412
(assoc m k (value-fn vs)))
1513
{}
1614
(group-by key-fn xs)))
1715

18-
1916
(defn multimap-by [f & kvs]
2017
(reduce
2118
(fn [m [k v]]
2219
(if (contains? m k)
2320
(update m k f v)
2421
(assoc m k v)))
25-
{} (partition 2 kvs)))
22+
{} (partition 2 kvs)))

‎clojure/fira_code/features.clj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[fira-code.glyphs :as glyphs]
66
[fira-code.files :as files]))
77

8-
98
(defn append-calt [font]
109
(let [features (->> (files/find "features/calt" #"features/calt/[^/]+\.fea")
1110
(map slurp)
@@ -15,7 +14,6 @@
1514
(glyphs/update-code font :features "calt"
1615
#(str % "\n\n" features))))
1716

18-
1917
(defn fill-feature [font file]
2018
(let [[_ name] (re-matches #"([^.]+)\.fea" (.getName file))
2119
code (slurp file)
@@ -26,12 +24,10 @@
2624
(assoc :notes (str/trim notes)))]
2725
(glyphs/set-feature font name feature)))
2826

29-
3027
(defn fill-features [font]
3128
(reduce fill-feature font (files/find "features" #"features/[^/]+\.fea")))
3229

33-
3430
(defn fill-all [font]
3531
(-> font
3632
(append-calt)
37-
(fill-features)))
33+
(fill-features)))

‎clojure/fira_code/files.clj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
[clojure.java.io :as io]
55
[clojure.string :as str]))
66

7-
87
(defn find [path re]
98
(->> (file-seq (io/file path))
109
(next) ;; skip directory itself
1110
(filter #(re-matches re (.getPath %)))
12-
(sort-by #(.getPath %))))
11+
(sort-by #(.getPath %))))

0 commit comments

Comments
 (0)