From f6c55448d48585ea366b2e2ce0d1784416593bb0 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Tue, 2 May 2023 11:57:49 +0200
Subject: cleanup yomichan user folder

---
 common.mk                            |  4 ++-
 yomichan-user/assets/copy-bitmap.svg | 50 ++++++++++++++++++++++++++++++++++++
 yomichan-user/assets/copy.svg        |  3 +++
 yomichan-user/copy-bitmap.svg        | 50 ------------------------------------
 yomichan-user/copy.svg               |  3 ---
 yomichan-user/makefile               | 17 +++++++-----
 6 files changed, 67 insertions(+), 60 deletions(-)
 create mode 100644 yomichan-user/assets/copy-bitmap.svg
 create mode 100644 yomichan-user/assets/copy.svg
 delete mode 100644 yomichan-user/copy-bitmap.svg
 delete mode 100644 yomichan-user/copy.svg

diff --git a/common.mk b/common.mk
index 0b18c7c..efbe3c4 100644
--- a/common.mk
+++ b/common.mk
@@ -1,3 +1,5 @@
+M4FLAGS += -I..
+
 TO_SINGLE_LINE:=tr '\n' ' '
 REMOVE_DOUBLE_SLASH_COMMENTS:=sed 's/\/\/.*$$//g'
 REMOVE_SLASH_STAR_COMMENTS:=sed 's/\/\*[^\*]*\*\///g'
@@ -12,7 +14,7 @@ TRIM_WHITESPACE:=sed -E 's/^\s*(.*)\s+$$/\1/g'
 	cat $< | $(TO_SINGLE_LINE) | $(REMOVE_SLASH_STAR_COMMENTS) | $(REMOVE_TABS) | $(REMOVE_WHITESPACE) | $(TRIM_WHITESPACE) > $@
 
 %: %.m4
-	m4 -I.. $< > $@
+	m4 $(M4FLAGS) $< > $@
 
 %.b64: %
 	base64 -w0 $< > $@
diff --git a/yomichan-user/assets/copy-bitmap.svg b/yomichan-user/assets/copy-bitmap.svg
new file mode 100644
index 0000000..f2b157b
--- /dev/null
+++ b/yomichan-user/assets/copy-bitmap.svg
@@ -0,0 +1,50 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_218)">
+<g clip-path="url(#clip1_1_218)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 4H7V7V15H12H15V7H12V4ZM13 5H14V6H13V5Z" fill="url(#paint0_linear_1_218)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 3H12H13V4H14V5H15V6H16V7V15V16H15L7 16H6V15V4V3H7ZM7 15V4H12V6V7H13H15V15H7ZM14 5H13L13 6H14V5Z" fill="black"/>
+</g>
+<g opacity="0.5" clip-path="url(#clip2_1_218)">
+<path d="M3 1V11H2V13H1V15H9V14H11V13H12V12H13V5H12V4H11V3H10V2H9V1H3Z" fill="black"/>
+</g>
+<g clip-path="url(#clip3_1_218)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 1H3V5H2V11H1V13H3H4H7V11H11V5H7V1ZM9 2H8V3V4H9H10V3H9V2Z" fill="url(#paint1_linear_1_218)"/>
+<path d="M10 10H6V13H10V10Z" fill="url(#paint2_linear_1_218)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 0H3H2V1V10H3V1H7V4V5H8H11V10H10V12H11V11H12V5V4H11V3H10V4H8L8 2H9V1H8V0H7ZM9 2H10V3H9V2ZM8 13V12H10V13H8ZM8 13V14H4V13H8ZM1 12H2V10H1V12ZM1 12H0V14H1V12Z" fill="url(#paint3_linear_1_218)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 9H8V10H7V11V12H6V13H5V14H1V13H4V12H5V11H6V10V9H7ZM8 10H10V11H8V10Z" fill="#06070A"/>
+<rect x="4" y="2" width="3" height="1" fill="#06070A"/>
+<rect x="4" y="4" width="3" height="1" fill="#06070A"/>
+<rect x="4" y="6" width="5" height="1" fill="#06070A"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1_218" x1="11" y1="4" x2="11" y2="15" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7B818D"/>
+<stop offset="1" stop-color="#484A58"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1_218" x1="6" y1="1" x2="6" y2="13" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCD1F9"/>
+<stop offset="1" stop-color="#B2B4BE"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1_218" x1="8" y1="10" x2="8" y2="13" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A808C"/>
+<stop offset="1" stop-color="#4A4C5A"/>
+</linearGradient>
+<linearGradient id="paint3_linear_1_218" x1="6" y1="0" x2="6" y2="14" gradientUnits="userSpaceOnUse">
+<stop stop-color="#989CB7"/>
+<stop offset="1" stop-color="#5C5C5C"/>
+</linearGradient>
+<clipPath id="clip0_1_218">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1_218">
+<rect width="10" height="13" fill="white" transform="translate(6 3)"/>
+</clipPath>
+<clipPath id="clip2_1_218">
+<rect width="12" height="14" fill="white" transform="translate(1 1)"/>
+</clipPath>
+<clipPath id="clip3_1_218">
+<rect width="12" height="14" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/yomichan-user/assets/copy.svg b/yomichan-user/assets/copy.svg
new file mode 100644
index 0000000..ff2f5a9
--- /dev/null
+++ b/yomichan-user/assets/copy.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 2C2 1.17157 2.67157 0.5 3.5 0.5H10.5V2L3.5 2V12H2V2ZM4.5 4.5C4.5 3.67157 5.17157 3 6 3H12.5C13.3284 3 14 3.67157 14 4.5V14.25C14 15.0784 13.3284 15.75 12.5 15.75H6C5.17157 15.75 4.5 15.0784 4.5 14.25V4.5ZM12.5 4.5H6V14.25H12.5V4.5Z" fill="currentColor"/>
+</svg>
diff --git a/yomichan-user/copy-bitmap.svg b/yomichan-user/copy-bitmap.svg
deleted file mode 100644
index f2b157b..0000000
--- a/yomichan-user/copy-bitmap.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1_218)">
-<g clip-path="url(#clip1_1_218)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 4H7V7V15H12H15V7H12V4ZM13 5H14V6H13V5Z" fill="url(#paint0_linear_1_218)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 3H12H13V4H14V5H15V6H16V7V15V16H15L7 16H6V15V4V3H7ZM7 15V4H12V6V7H13H15V15H7ZM14 5H13L13 6H14V5Z" fill="black"/>
-</g>
-<g opacity="0.5" clip-path="url(#clip2_1_218)">
-<path d="M3 1V11H2V13H1V15H9V14H11V13H12V12H13V5H12V4H11V3H10V2H9V1H3Z" fill="black"/>
-</g>
-<g clip-path="url(#clip3_1_218)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 1H3V5H2V11H1V13H3H4H7V11H11V5H7V1ZM9 2H8V3V4H9H10V3H9V2Z" fill="url(#paint1_linear_1_218)"/>
-<path d="M10 10H6V13H10V10Z" fill="url(#paint2_linear_1_218)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 0H3H2V1V10H3V1H7V4V5H8H11V10H10V12H11V11H12V5V4H11V3H10V4H8L8 2H9V1H8V0H7ZM9 2H10V3H9V2ZM8 13V12H10V13H8ZM8 13V14H4V13H8ZM1 12H2V10H1V12ZM1 12H0V14H1V12Z" fill="url(#paint3_linear_1_218)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 9H8V10H7V11V12H6V13H5V14H1V13H4V12H5V11H6V10V9H7ZM8 10H10V11H8V10Z" fill="#06070A"/>
-<rect x="4" y="2" width="3" height="1" fill="#06070A"/>
-<rect x="4" y="4" width="3" height="1" fill="#06070A"/>
-<rect x="4" y="6" width="5" height="1" fill="#06070A"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_1_218" x1="11" y1="4" x2="11" y2="15" gradientUnits="userSpaceOnUse">
-<stop stop-color="#7B818D"/>
-<stop offset="1" stop-color="#484A58"/>
-</linearGradient>
-<linearGradient id="paint1_linear_1_218" x1="6" y1="1" x2="6" y2="13" gradientUnits="userSpaceOnUse">
-<stop stop-color="#CCD1F9"/>
-<stop offset="1" stop-color="#B2B4BE"/>
-</linearGradient>
-<linearGradient id="paint2_linear_1_218" x1="8" y1="10" x2="8" y2="13" gradientUnits="userSpaceOnUse">
-<stop stop-color="#7A808C"/>
-<stop offset="1" stop-color="#4A4C5A"/>
-</linearGradient>
-<linearGradient id="paint3_linear_1_218" x1="6" y1="0" x2="6" y2="14" gradientUnits="userSpaceOnUse">
-<stop stop-color="#989CB7"/>
-<stop offset="1" stop-color="#5C5C5C"/>
-</linearGradient>
-<clipPath id="clip0_1_218">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-<clipPath id="clip1_1_218">
-<rect width="10" height="13" fill="white" transform="translate(6 3)"/>
-</clipPath>
-<clipPath id="clip2_1_218">
-<rect width="12" height="14" fill="white" transform="translate(1 1)"/>
-</clipPath>
-<clipPath id="clip3_1_218">
-<rect width="12" height="14" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/yomichan-user/copy.svg b/yomichan-user/copy.svg
deleted file mode 100644
index ff2f5a9..0000000
--- a/yomichan-user/copy.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 2C2 1.17157 2.67157 0.5 3.5 0.5H10.5V2L3.5 2V12H2V2ZM4.5 4.5C4.5 3.67157 5.17157 3 6 3H12.5C13.3284 3 14 3.67157 14 4.5V14.25C14 15.0784 13.3284 15.75 12.5 15.75H6C5.17157 15.75 4.5 15.0784 4.5 14.25V4.5ZM12.5 4.5H6V14.25H12.5V4.5Z" fill="currentColor"/>
-</svg>
diff --git a/yomichan-user/makefile b/yomichan-user/makefile
index 21b41d5..e0e543d 100644
--- a/yomichan-user/makefile
+++ b/yomichan-user/makefile
@@ -1,4 +1,6 @@
-.PHONY: clean
+.PHONY: clean all
+
+M4FLAGS += -I./assets/
 
 all: yomichan-user.js yomichan-user.css
 
@@ -12,13 +14,15 @@ user.js: conf.d/shortcuts.js
 
 include ../common.mk
 
-copy.svg.b64: copy.svg
-copy-bitmap.svg.b64: copy-bitmap.svg
+assets/copy.svg.b64: assets/copy.svg
+assets/copy-bitmap.svg.b64: assets/copy-bitmap.svg
+GARBAGE += assets/copy.svg.b64
+GARBAGE += assets/copy-bitmap.svg.b64
 
-conf.d/sentence-export.css: copy.svg.b64
+# extra dependencies
+conf.d/sentence-export.css: assets/copy.svg.b64
 conf.d/sentence-export.css: conf.d/sentence-export.css.m4
-
-conf.d/word-export.css: copy-bitmap.svg.b64
+conf.d/word-export.css: assets/copy-bitmap.svg.b64
 
 user.js:
 	cat $^ > $@
@@ -36,4 +40,5 @@ yomichan-user.css: header.txt user.min.css
 
 clean:
 	$(RM) user.js user.css user.min.js user.min.css header.txt yomichan-user.css yomichan-user.js
+	$(RM) $(GARBAGE)
 
-- 
cgit v1.2.3