Skip to content

Commit c74dd80

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

16 files changed

Lines changed: 131 additions & 191 deletions

‎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 & 60 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"]
@@ -16,9 +15,7 @@
1615
["parenleft" "question" "exclam"]
1716
["parenleft" "question" "less" "exclam"]
1817
;; #850 PHP <?=
19-
["less" "question" "equal"]
20-
])
21-
18+
["less" "question" "equal"]])
2219

2320
(defn gen-ignore-prefixes [liga]
2421
(str/join
@@ -32,7 +29,6 @@
3229
" " (str/join " " (drop 1 liga))
3330
";\n"))))
3431

35-
3632
(def priorities
3733
{;; <|>
3834
["less" "bar" "greater"] 0
@@ -54,7 +50,6 @@
5450
["bar" "bar"] 2
5551
["bar" "bar" "bar"] 2})
5652

57-
5853
(def ignores
5954
(coll/multimap-by str
6055
["slash" "asterisk"]
@@ -79,12 +74,14 @@
7974

8075
;; #1061
8176
["colon" "colon"]
82-
(str " ignore sub colon' colon [less greater];\n"
83-
" ignore sub [less greater] colon' colon;\n")
77+
(str
78+
" ignore sub colon' colon [less greater];\n"
79+
" ignore sub [less greater] colon' colon;\n")
8480

8581
["colon" "colon" "colon"]
86-
(str " ignore sub colon' colon colon [less greater];\n"
87-
" ignore sub [less greater] colon' colon colon;\n")
82+
(str
83+
" ignore sub colon' colon colon [less greater];\n"
84+
" ignore sub [less greater] colon' colon colon;\n")
8885

8986
;; #621 <||>
9087
["less" "bar" "bar"]
@@ -126,14 +123,16 @@
126123
;; #948 [==[ ]==]
127124
;; #968 [== ==]
128125
["equal" "equal"]
129-
(str " ignore sub bracketleft equal' equal;\n"
130-
" ignore sub equal' equal bracketright;\n")
126+
(str
127+
" ignore sub bracketleft equal' equal;\n"
128+
" ignore sub equal' equal bracketright;\n")
131129

132130
;; #948 [===[ ]===]
133131
;; #968 [=== ===]
134132
["equal" "equal" "equal"]
135-
(str " ignore sub bracketleft equal' equal equal;\n"
136-
" ignore sub equal' equal equal bracketright;\n")
133+
(str
134+
" ignore sub bracketleft equal' equal equal;\n"
135+
" ignore sub equal' equal equal bracketright;\n")
137136

138137
;; #346 =:=
139138
["colon" "equal"]
@@ -148,78 +147,84 @@
148147

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

154154
;; #548 >=<
155155
;; #346 =>= >=> >=< >=| >=: >=! >=/
156156
["greater" "equal"]
157-
(str " ignore sub equal greater' equal;\n"
158-
" ignore sub greater' equal [less greater bar colon exclam slash];\n")
157+
(str
158+
" ignore sub equal greater' equal;\n"
159+
" ignore sub greater' equal [less greater bar colon exclam slash];\n")
159160

160161
;; #346 >>->> >>=>>
161162
;; #974 keep >>=
162163
["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")
164+
(str
165+
" ignore sub [hyphen equal] greater' greater;\n"
166+
" ignore sub greater' greater hyphen;\n"
167+
" ignore sub greater' greater equal [equal less greater bar colon exclam slash];\n")
166168

167169
;; #346 <<-<< <<=<<
168170
;; #974 keep <<=
169171
["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")
172+
(str
173+
" ignore sub [hyphen equal] less' less;\n"
174+
" ignore sub less' less hyphen;\n"
175+
" ignore sub less' less equal [equal less greater bar colon exclam slash];\n")
173176

174177
;; #346 ||-|| ||=||
175178
;; #974 keep ||=
176179
["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")
180+
(str
181+
" ignore sub [hyphen equal] bar' bar;\n"
182+
" ignore sub bar' bar hyphen;\n"
183+
" ignore sub bar' bar equal [equal less greater bar colon exclam slash];\n")
180184

181185
;; #816 //=
182186
["slash" "slash"]
183-
(str " ignore sub equal slash' slash;\n"
184-
" ignore sub slash' slash equal;\n")
187+
(str
188+
" ignore sub equal slash' slash;\n"
189+
" ignore sub slash' slash equal;\n")
185190

186191
;; #346 <--> >--< |--|
187192
["hyphen" "hyphen"]
188-
(str " ignore sub [less greater bar] hyphen' hyphen;\n"
189-
" ignore sub hyphen' hyphen [less greater bar];\n")
193+
(str
194+
" ignore sub [less greater bar] hyphen' hyphen;\n"
195+
" ignore sub hyphen' hyphen [less greater bar];\n")
190196

191197
;; #346 <==> >==< |==| /==/ =:== =!== ==:= ==!=
192198
["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")
199+
(str
200+
" ignore sub equal [colon exclam] equal' equal;\n"
201+
" ignore sub [less greater bar slash] equal' equal;\n"
202+
" ignore sub equal' equal [less greater bar slash] ;\n"
203+
" ignore sub equal' equal [colon exclam] equal;\n")
197204

198205
;; #346 <===> >===< |===| /===/ =:=== =!=== ===:= ===!=
199206
["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-
207+
(str
208+
" ignore sub equal [colon exclam] equal' equal equal;\n"
209+
" ignore sub [less greater bar slash] equal' equal equal;\n"
210+
" ignore sub equal' equal equal [less greater bar slash];\n"
211+
" ignore sub equal' equal equal [colon exclam] equal;\n")
212+
))
206213

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

216222
;; DO NOT generate ligature
217223
(def manual? #{
218-
;; /\ \/
219-
["slash" "backslash"]
220-
["backslash" "slash"]
221-
})
222-
224+
;; /\ \/
225+
["slash" "backslash"]
226+
["backslash" "slash"]
227+
})
223228

224229
(defn liga->rule
225230
"[f f i] => { [LIG LIG i] f_f_i.liga
@@ -233,7 +238,7 @@
233238
"lookup 1_2 {\n"
234239
(when-not (skip-ignores? liga)
235240
(str " ignore sub 1 1' 2;\n"
236-
" ignore sub 1' 2 2;\n"))
241+
" ignore sub 1' 2 2;\n"))
237242
(gen-ignore-prefixes liga)
238243
(get ignores liga)
239244
" sub 1.spacer 2' by 1_2.liga;\n"
@@ -246,8 +251,8 @@
246251
(str
247252
"lookup 1_2_3 {\n"
248253
(when-not (skip-ignores? liga)
249-
(str " ignore sub 1 1' 2 3;\n"
250-
" ignore sub 1' 2 3 3;\n"))
254+
(str " ignore sub 1 1' 2 3;\n"
255+
" ignore sub 1' 2 3 3;\n"))
251256
(gen-ignore-prefixes liga)
252257
(get ignores liga)
253258
" sub 1.spacer 2.spacer 3' by 1_2_3.liga;\n"
@@ -262,7 +267,7 @@
262267
"lookup 1_2_3_4 {\n"
263268
(when-not (skip-ignores? liga)
264269
(str " ignore sub 1 1' 2 3 4;\n"
265-
" ignore sub 1' 2 3 4 4;\n"))
270+
" ignore sub 1' 2 3 4 4;\n"))
266271
(gen-ignore-prefixes liga)
267272
(get ignores liga)
268273
" sub 1.spacer 2.spacer 3.spacer 4' by 1_2_3_4.liga;\n"
@@ -278,7 +283,7 @@
278283
"lookup 1_2_3_4_5 {\n"
279284
(when-not (skip-ignores? liga)
280285
(str " ignore sub 1 1' 2 3 4 5;\n"
281-
" ignore sub 1' 2 3 4 4 5;\n"))
286+
" ignore sub 1' 2 3 4 4 5;\n"))
282287
(gen-ignore-prefixes liga)
283288
(get ignores liga)
284289
" sub 1.spacer 2.spacer 3.spacer 4.spacer 5' by 1_2_3_4_5.liga;\n"
@@ -289,8 +294,7 @@
289294
; "sub 1 2 3 4 5 by 1_2_3_4_5.liga;"
290295
"} 1_2_3_4_5;")
291296
#"\d" {"1" a "2" b "3" c "4" d "5" e}))
292-
))
293-
297+
))
294298

295299
(defn compare-ligas [l1 l2]
296300
(let [p1 (priorities l1 Long/MAX_VALUE)
@@ -304,7 +308,6 @@
304308
(not= 0 cc) (- cc) ;; longer first
305309
:else (compare l1 l2)))) ;; alphabetical
306310

307-
308311
(defn replace-calt [font ligas]
309312
(let [ligas' (->> ligas
310313
(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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
[clojure.java.io :as io]
44
[clojure.string :as str]
55
[fira-code.glyphs :as glyphs]
6-
[fira-code.files :as files]))
7-
6+
[fira-code.files :as files])
7+
(:import
8+
[java.io File]))
89

910
(defn fill-class [font file]
10-
(let [[_ name] (re-matches #"([^.]+)\.fea" (.getName file))
11+
(let [[_ name] (re-matches #"([^.]+)\.fea" (File/.getName file))
1112
code (slurp file)
1213
class {:code (str/trim code)
1314
:name name}]
1415
(glyphs/set-class font name class)))
1516

16-
1717
(defn fill-all [font]
1818
(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: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
[clojure.java.io :as io]
44
[clojure.string :as str]
55
[fira-code.glyphs :as glyphs]
6-
[fira-code.files :as files]))
7-
6+
[fira-code.files :as files])
7+
(:import
8+
[java.io File]))
89

910
(defn append-calt [font]
1011
(let [features (->> (files/find "features/calt" #"features/calt/[^/]+\.fea")
@@ -15,9 +16,8 @@
1516
(glyphs/update-code font :features "calt"
1617
#(str % "\n\n" features))))
1718

18-
1919
(defn fill-feature [font file]
20-
(let [[_ name] (re-matches #"([^.]+)\.fea" (.getName file))
20+
(let [[_ name] (re-matches #"([^.]+)\.fea" (File/.getName file))
2121
code (slurp file)
2222
[_ notes code'] (re-matches #"(?s)#([^\n]+)\n(.*)" code)
2323
feature (cond-> {:code (str/trim (or code' code))
@@ -26,12 +26,10 @@
2626
(assoc :notes (str/trim notes)))]
2727
(glyphs/set-feature font name feature)))
2828

29-
3029
(defn fill-features [font]
3130
(reduce fill-feature font (files/find "features" #"features/[^/]+\.fea")))
3231

33-
3432
(defn fill-all [font]
3533
(-> font
3634
(append-calt)
37-
(fill-features)))
35+
(fill-features)))

‎clojure/fira_code/files.clj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
(:refer-clojure :exclude [find])
33
(:require
44
[clojure.java.io :as io]
5-
[clojure.string :as str]))
6-
5+
[clojure.string :as str])
6+
(:import
7+
[java.io File]))
78

89
(defn find [path re]
910
(->> (file-seq (io/file path))
1011
(next) ;; skip directory itself
11-
(filter #(re-matches re (.getPath %)))
12-
(sort-by #(.getPath %))))
12+
(filter #(re-matches re (File/.getPath %)))
13+
(sort-by File/.getPath)))

0 commit comments

Comments
 (0)