X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/e6b10645e7470208f5122055489c7a19733e50bc..c5dd77c95d501a9f2d2eaeb021afab9313e9fade:/Makefile?ds=inline

diff --git a/Makefile b/Makefile
index 806e5be..19fe1d1 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ word/put.js: $(download)
 word/%.min.js: word/%.js
 	uglifyjs -m '' $< -o $@
 
-data: data/digraphs.inc.pl data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl data/digraphs-xorg.inc.pl data/unicode-sampler word
+data: data/digraphs.json data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl data/digraphs-xorg.json data/unicode-sampler word keyboard/symbols/unigraph
 
 data/DerivedAge.txt: $(download)
 	tools/wget-ifmodified http://www.unicode.org/Public/UNIDATA/$(@F) $@
@@ -48,8 +48,15 @@ data/digraphs-shiar.inc.pl: tools/mkdigraphs-shiar shiar.inc.txt
 	$(call cmdsave,$^)
 
 data/xorg-compose: $(download)
-	tools/wget-ifmodified http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre $@
-data/digraphs-xorg.inc.pl: tools/mkdigraphs-xorg data/xorg-compose
+	tools/wget-ifmodified http://gitlab.freedesktop.org/xorg/lib/libx11/-/raw/master/nls/en_US.UTF-8/Compose.pre $@
+data/keysymdef.h: $(download)
+	tools/wget-ifmodified http://gitlab.freedesktop.org/xorg/proto/xorgproto/-/raw/master/include/X11/$(@F) $@
+data/keysymdef.json: tools/mkxkeysymdef data/keysymdef.h
+	$(call cmdsave,$^)
+data/digraphs-xorg.json: tools/mkdigraphs-xorg data/xorg-compose data/keysymdef.json
+	$(call cmdsave,$^)
+
+keyboard/symbols/%: tools/mkxkbsymbols data/keyboard/altgr/%.eng.json
 	$(call cmdsave,$^)
 
 data/digraphs-vim.inc.pl: tools/mkdigraphs-vim
@@ -60,7 +67,7 @@ data/digraphs-plan9.txt:
 data/digraphs-plan9.inc.pl: tools/mkdigraphs-plan9 data/digraphs-plan9.txt
 	$(call cmdsave,$^)
 
-data/digraphs.inc.pl: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl
+data/digraphs.json: tools/mkdigraphlist data/digraphs-rfc.inc.pl data/digraphs-vim.inc.pl data/digraphs-shiar.inc.pl data/unicode-char.inc.pl
 	$(call cmdsave,$<)
 
 data/unicode-char.inc.pl: tools/mkcharinfo data/digraphs-rfc.inc.pl data/digraphs-shiar.inc.pl data/unicode-age.inc.pl unicode-table.inc.pl
@@ -79,6 +86,11 @@ data/xcolors: $(download)
 data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
 	$(call cmdsave,$^/*)
 
+data/camels.pexels-4321178.jpg:
+	tools/wget-ifmodified https://images.pexels.com/photos/4321178/pexels-photo-4321178.jpeg $@
+data/camels.jpg: data/camels.pexels-4321178.jpg
+	tools/mkimgthumb --jpg 800x400 'data/camels.smaller:-area:0x225.jpg' .
+
 data/wordlist.version.txt: force
 	@[ -e $@ ] || date -Is >$@
 	tools/lastword $@ || true
@@ -152,7 +164,7 @@ data/browser/usage-wm.inc.pl: tools/mkusage-wikimedia data/browser/usage-wm.tsv
 	$(call cmdsave,$^)
 
 clean:
-	-rm data/digraphs.inc.pl
+	-rm data/digraphs.json
 	-rm data/unicode-char.inc.pl
 	-rm data/unicode-age.inc.pl
 	-rm -rf data/font/