From: Lady <redacted>
Date: Sat, 6 Jul 2024 17:47:18 +0000 (-0400)
Subject: Update ⛩📰 书社 and make·file; minor re·organizations
X-Git-Url: https://git.ladys.computer/WWW/commitdiff_plain/HEAD?ds=sidebyside

Update ⛩📰 书社 and make·file; minor re·organizations
---

diff --git a/.gitmodules b/.gitmodules
index d7f81d4..aa85e3c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "书社"]
-	path = .shushe
+	path = .⛩📰
 	url = https://git.ladys.computer/Shushe.git
 [submodule "Yseme"]
-	path = .yseme
+	path = .👥📤
 	url = https://git.ladys.computer/Yseme.git
diff --git a/.shushe b/.shushe
deleted file mode 160000
index bf451bf..0000000
--- a/.shushe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bf451bf2f46fd1ea21f925ee02db620859cf2100
diff --git "a/.\342\233\251\360\237\223\260" "b/.\342\233\251\360\237\223\260"
new file mode 160000
index 0000000..9c3c345
--- /dev/null
+++ "b/.\342\233\251\360\237\223\260"
@@ -0,0 +1 @@
+Subproject commit 9c3c3458b411ab2748587681465e8662d15f56bb
diff --git a/.yseme "b/.\360\237\221\245\360\237\223\244"
similarity index 100%
rename from .yseme
rename to ".\360\237\221\245\360\237\223\244"
diff --git a/GNUmakefile b/GNUmakefile
index 275f6ca..8486bff 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,31 +6,48 @@ SHELL = /bin/sh
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-SHUSHE := .shushe
-SHUSHE_OPTIONS := INCLUDEDIR='sources/INCLUDE' TRANSFORMS='$(wildcard transforms/*.xslt) $(wildcard $(SHUSHE)/transforms/*.xslt)'
+SRCDIR := sources
+BUILDDIR := build
+BUILDTARGET := .grass
+DESTDIR := public
 
-YSEME := .yseme
-YSEME_OPTIONS := DESTDIR=public SERVERPATH=lady/www
+SHUSHE := .⛩📰
+SHUSHEOPTS := SRCDIR='$(SRCDIR)' INCLUDEDIR='$(SRCDIR)/{include}' EXTRAPARSERS='$(wildcard parsers/*.xslt)' EXTRATRANSFORMS='$(wildcard transforms/*.xslt)'
 
-build: $(SHUSHE)/GNUmakefile
-	rm -rf ./public
-	@$(MAKE) -f $< install $(SHUSHE_OPTIONS)
-	touch .grass
+YSEME := .👥📤
+YSEMEOPTS := BUILDTARGET='.grass' DESTDIR='$(DESTDIR)' SERVERPATH='lady/www'
 
-list: $(SHUSHE)/GNUmakefile
-	@$(MAKE) -f $< $@ $(SHUSHE_OPTIONS)
+# ━ § Call out to ⛩📰 书社 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-$(SHUSHE)/GNUmakefile $(YSEME)/GNUmakefile: %/GNUmakefile:
-	git submodule update --init $*
+build : $(SHUSHE)/GNUmakefile prebuild
+	@for publicfile in $(patsubst %,"%",$(wildcard $(DESTDIR)/*)); do if git check-ignore -q "$$publicfile"; then rm -rf "$$publicfile"; fi; done
+	@$(MAKE) -f '$<' install $(SHUSHEOPTS)
+	@touch '$(BUILDTARGET)'
 
-GNUmakefile: $(SHUSHE)/GNUmakefile $(YSEME)/GNUmakefile
-	touch GNUmakefile
+prebuild : $(SHUSHE)/GNUmakefile
+	@$(MAKE) -f '$<' $(SHUSHEOPTS)
 
-ifneq ($(wildcard $(YSEME)/GNUmakefile),)
-YSEME_TARGETS := $(shell sed '/^\.PHONY[ :]/!d;/^\.PHONY[ :]/s/ *;.*//;/^\.PHONY[ :]/s/\.PHONY.*: *//' < $(YSEME)/GNUmakefile)
+list : $(SHUSHE)/GNUmakefile
+	@$(MAKE) -f '$<' $@ $(SHUSHEOPTS)
 
-$(YSEME_TARGETS): $(YSEME)/GNUmakefile
-	@$(MAKE) -f $< $@ $(YSEME_OPTIONS)
-endif
+$(BUILDDIR)/% $(DESTDIR)/% : $(SHUSHE)/GNUmakefile
+	@$(MAKE) -f '$<' $@ $(SHUSHEOPTS)
 
-.PHONY: build list $(YSEME_TARGETS);
+# ━ § Call out to 👥📤 Yseme ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+dry-sync sync : $(YSEME)/GNUmakefile
+	$(MAKE) -f '$<' $@ $(YSEMEOPTS)
+
+# ━ § Special targets ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+gone :
+	@for publicfile in $(patsubst %,"%",$(wildcard $(DESTDIR)/*)); do if git check-ignore -q "$$publicfile"; then rm -rf "$$publicfile"; fi; done
+
+FORCE : ;
+
+.PHONY : FORCE build dry-sync gone list prebuild sync ;
+
+# ━ § Make·file targets ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+$(SHUSHE)/GNUmakefile $(YSEME)/GNUmakefile : %/GNUmakefile : FORCE
+	git submodule update --init '$*'
diff --git a/sources/INCLUDE/brand/badge-alt.png b/sources/{include}/brand/badge-alt.png
similarity index 100%
rename from sources/INCLUDE/brand/badge-alt.png
rename to sources/{include}/brand/badge-alt.png
diff --git a/sources/INCLUDE/brand/badge.png b/sources/{include}/brand/badge.png
similarity index 100%
rename from sources/INCLUDE/brand/badge.png
rename to sources/{include}/brand/badge.png
diff --git a/sources/INCLUDE/brand/banner.png b/sources/{include}/brand/banner.png
similarity index 100%
rename from sources/INCLUDE/brand/banner.png
rename to sources/{include}/brand/banner.png
diff --git a/sources/INCLUDE/brand/button-small.png b/sources/{include}/brand/button-small.png
similarity index 100%
rename from sources/INCLUDE/brand/button-small.png
rename to sources/{include}/brand/button-small.png
diff --git a/sources/INCLUDE/brand/button.png b/sources/{include}/brand/button.png
similarity index 100%
rename from sources/INCLUDE/brand/button.png
rename to sources/{include}/brand/button.png
diff --git a/sources/INCLUDE/brand/icon-heart.png b/sources/{include}/brand/icon-heart.png
similarity index 100%
rename from sources/INCLUDE/brand/icon-heart.png
rename to sources/{include}/brand/icon-heart.png
diff --git a/sources/INCLUDE/brand/icon-lady.png b/sources/{include}/brand/icon-lady.png
similarity index 100%
rename from sources/INCLUDE/brand/icon-lady.png
rename to sources/{include}/brand/icon-lady.png
diff --git a/sources/INCLUDE/brand/icon-large.png b/sources/{include}/brand/icon-large.png
similarity index 100%
rename from sources/INCLUDE/brand/icon-large.png
rename to sources/{include}/brand/icon-large.png
diff --git a/sources/INCLUDE/brand/icon-logotype.png b/sources/{include}/brand/icon-logotype.png
similarity index 100%
rename from sources/INCLUDE/brand/icon-logotype.png
rename to sources/{include}/brand/icon-logotype.png
diff --git a/sources/INCLUDE/brand/icon-small.png b/sources/{include}/brand/icon-small.png
similarity index 100%
rename from sources/INCLUDE/brand/icon-small.png
rename to sources/{include}/brand/icon-small.png
diff --git a/sources/INCLUDE/brand/icon.png b/sources/{include}/brand/icon.png
similarity index 100%
rename from sources/INCLUDE/brand/icon.png
rename to sources/{include}/brand/icon.png
diff --git a/sources/INCLUDE/brand/logo.png b/sources/{include}/brand/logo.png
similarity index 100%
rename from sources/INCLUDE/brand/logo.png
rename to sources/{include}/brand/logo.png
diff --git a/sources/INCLUDE/buttons/fc.gif b/sources/{include}/buttons/fc.gif
similarity index 100%
rename from sources/INCLUDE/buttons/fc.gif
rename to sources/{include}/buttons/fc.gif
diff --git a/sources/INCLUDE/buttons/noracodes.png b/sources/{include}/buttons/noracodes.png
similarity index 100%
rename from sources/INCLUDE/buttons/noracodes.png
rename to sources/{include}/buttons/noracodes.png
diff --git a/sources/INCLUDE/buttons/u2764.gif b/sources/{include}/buttons/u2764.gif
similarity index 100%
rename from sources/INCLUDE/buttons/u2764.gif
rename to sources/{include}/buttons/u2764.gif
diff --git a/sources/INCLUDE/buttons/viatrix.png b/sources/{include}/buttons/viatrix.png
similarity index 100%
rename from sources/INCLUDE/buttons/viatrix.png
rename to sources/{include}/buttons/viatrix.png
diff --git a/transforms/metadata.xslt b/transforms/metadata.xslt
index a6d724f..dd2dac4 100644
--- a/transforms/metadata.xslt
+++ b/transforms/metadata.xslt
@@ -7,7 +7,7 @@
 	version="1.0"
 >
 	<书社:id>urn:fdc:ladys.computer:20240106:WWW:metadata.xslt</书社:id>
-	<template match="xslt:include[@书社:id='urn:fdc:ladys.computer:20240106:WWW:metadata.xslt']" mode="书社:metadata">
+	<template match="书社:id[string(.)='urn:fdc:ladys.computer:20240106:WWW:metadata.xslt']" mode="书社:metadata">
 		<html:meta name="viewport" content="width=480"/>
 		<html:style><text>@charset "UTF-8";
 html{ Color: #F3DEE3; Background: #1A1A1A; Font-Family: 'Charis SIL', Charter, 'Bitstream Charter', 'Palatino Linotype', 'URW Palladio L', P052, Georgia, 'STIX Two Math', Serif; Line-Height: 1.5; Text-Align: Justify; Text-Align-Last: Center }