From: Lady Date: Sat, 6 Jan 2024 05:05:05 +0000 (-0500) Subject: Use ⛩️📰 书社 to build the site X-Git-Url: https://git.ladys.computer/WWW/commitdiff_plain/86942bda88e834ee9fd5129483d38be15fe5950f?ds=inline;hp=86cf574f61317617f237eefb8f39c2a2e1216f5c Use ⛩️📰 书社 to build the site Leverage it for inclusions of media and shared metadata across pages. --- diff --git a/.gitignore b/.gitignore index e20a29e..24e9b31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +/build +/public .grass %* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0355c5d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "书社"] + path = .shushe + url = https://git.ladys.computer/Shushe.git diff --git a/.rsync-filter b/.rsync-filter index 1e3fbfe..e551a94 100644 --- a/.rsync-filter +++ b/.rsync-filter @@ -1,9 +1,3 @@ -s .DS_Store --s .git --s .gitignore --s /GNUmakefile --s /.grass -- /.rsync-filter --s README* -s #* -s %* diff --git a/.shushe b/.shushe new file mode 160000 index 0000000..d627a52 --- /dev/null +++ b/.shushe @@ -0,0 +1 @@ +Subproject commit d627a5222e6649e8c359395febcfc093580b51f1 diff --git a/GNUmakefile b/GNUmakefile index 3ed5755..b40c209 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,6 @@ SHELL = /bin/sh -# © 2023 Lady [@ Lady’s Computer]. +# © 2023–2024 Lady [@ Lady’s Computer]. # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -21,10 +21,17 @@ DESTINATION_CHARSET = utf-8 GIT_FORCE = +SHUSHE = .shushe +SHUSHE_OPTIONS = 'INCLUDEDIR=sources/INCLUDE' 'TRANSFORMS=$(wildcard transforms/*.xslt) $(wildcard $(SHUSHE)/transforms/*.xslt)' + build: -# Put any necessary build scripts in here! + rm -rf ./public + @$(MAKE) -f $(SHUSHE)/GNUmakefile install $(SHUSHE_OPTIONS) touch .grass +list: + @$(MAKE) -f $(SHUSHE)/GNUmakefile list $(SHUSHE_OPTIONS) + ensure-build: @if [ ! -f .grass ]; then echo 'Error: The website has not been built yet!' >&2; echo 'Run `make` before syncing.' >&2; exit 1; fi @if buildtime=$$(stat -f '%m' .grass) && committime=$$(git log -1 --format='%ct' | awk '{print $$NF}') && [ "$$committime" -gt "$$buildtime" ]; then echo 'Error: A commit was made after the last build!' >&2; echo 'Run `make` before syncing.' >&2; exit 1; fi @@ -37,10 +44,10 @@ ensure-clean: @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi dry-sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build - $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) + cd public && $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". ../$(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build - $(RSYNC) $(RSYNC_FLAGS) --del --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) + cd public && $(RSYNC) $(RSYNC_FLAGS) --del --filter=". ../$(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) git push$(if $(GIT_FORCE), --force,) .PHONY: build dry-sync ensure-branch-up-to-date ensure-build ensure-clean sync; diff --git a/about/index.html b/about/index.html deleted file mode 100644 index 916f46a..0000000 --- a/about/index.html +++ /dev/null @@ -1,41 +0,0 @@ - -About | Lady’s Computer - - - -

Lady’s Computer ∷ About

- -
-

About this Site

-

- Lady’s Computer is a humble home for my various digital creations on the internet. - The name began as a joke/reference to the early Pokémon games, when the in‐universe cloud storage for Pokémon was literally called “Someone’s P·C”. - You could, of course, also log into Prof Oak’s P·C to get your Pokédex evaluated, or log into your home P·C to access your storage. - This site is like the last of those: - It’s remote storage for my various files and digital clutter that you can log into from the internet. - It’s designed and organized the way I would like to use it, and I hope that in your time here some of that personality shines through. -

- If you’re technically‐minded, I have a growing number of modules, scripts, and other code available on the Gitweb instance attached to this site. - Otherwise, I have a blog which may interest you. - More functionality will probably be added to this site over time! -

- -
-

About Lady

-

- I’m a writer who got into programming because she wanted to publish her stories on the internet, and who got good at programming because she spent way too much time conlanging when she was in college and needed tools for dealing with that. - I’m a fan of Nintendo games and have been known to write fanfiction about them. - I’m also a dyke and a Gender Studies major, so I’m not one to shy away from speaking openly and frankly about sexuality. -

- If you want to contact me, I am @·able over on the (Mastodon‐compatible) fediverse @Lady@cat.family, where I mostly yell about pornography in Zelda fanfiction. - You can also send me a message via electronic mail; my name is lady and my website is ladys.computer, so I’m sure you can figure the rest out. -

diff --git a/index.html b/index.html deleted file mode 100644 index 03d3774..0000000 --- a/index.html +++ /dev/null @@ -1,47 +0,0 @@ - -Lady’s Computer - - - -

Lady’s Computer

- - - diff --git a/media/index.html b/media/index.html deleted file mode 100644 index 5bb41e7..0000000 --- a/media/index.html +++ /dev/null @@ -1,65 +0,0 @@ - -Media | Lady’s Computer - - - -

Lady’s Computer ∷ Media

- -
-

Lady’s Computer

-
-

Banners, Buttons & Badges

-
- -
Banner (468×60)
-
-
- -
Logo (144×72)
-
-
- -
Button (88×31)
-
-
- -
Button (72×27)
-
-
-
- - -
-
Badges (80×15)
-
-
- -
Icon (48×48)
-
-
-
- - - - -
-
Icons (32×32)
-
-
- -
Icon (16×16)
-
-
-
diff --git a/media/badge-alt.png b/sources/INCLUDE/brand/badge-alt.png similarity index 100% rename from media/badge-alt.png rename to sources/INCLUDE/brand/badge-alt.png diff --git a/media/badge.png b/sources/INCLUDE/brand/badge.png similarity index 100% rename from media/badge.png rename to sources/INCLUDE/brand/badge.png diff --git a/media/banner.png b/sources/INCLUDE/brand/banner.png similarity index 100% rename from media/banner.png rename to sources/INCLUDE/brand/banner.png diff --git a/media/button-small.png b/sources/INCLUDE/brand/button-small.png similarity index 100% rename from media/button-small.png rename to sources/INCLUDE/brand/button-small.png diff --git a/media/button.png b/sources/INCLUDE/brand/button.png similarity index 100% rename from media/button.png rename to sources/INCLUDE/brand/button.png diff --git a/media/icon-heart.png b/sources/INCLUDE/brand/icon-heart.png similarity index 100% rename from media/icon-heart.png rename to sources/INCLUDE/brand/icon-heart.png diff --git a/media/icon-lady.png b/sources/INCLUDE/brand/icon-lady.png similarity index 100% rename from media/icon-lady.png rename to sources/INCLUDE/brand/icon-lady.png diff --git a/media/icon-large.png b/sources/INCLUDE/brand/icon-large.png similarity index 100% rename from media/icon-large.png rename to sources/INCLUDE/brand/icon-large.png diff --git a/media/icon-logotype.png b/sources/INCLUDE/brand/icon-logotype.png similarity index 100% rename from media/icon-logotype.png rename to sources/INCLUDE/brand/icon-logotype.png diff --git a/media/icon-small.png b/sources/INCLUDE/brand/icon-small.png similarity index 100% rename from media/icon-small.png rename to sources/INCLUDE/brand/icon-small.png diff --git a/media/icon.png b/sources/INCLUDE/brand/icon.png similarity index 100% rename from media/icon.png rename to sources/INCLUDE/brand/icon.png diff --git a/media/logo.png b/sources/INCLUDE/brand/logo.png similarity index 100% rename from media/logo.png rename to sources/INCLUDE/brand/logo.png diff --git a/sources/INCLUDE/buttons/fc.gif b/sources/INCLUDE/buttons/fc.gif new file mode 100644 index 0000000..efa949d Binary files /dev/null and b/sources/INCLUDE/buttons/fc.gif differ diff --git a/sources/INCLUDE/buttons/u2764.gif b/sources/INCLUDE/buttons/u2764.gif new file mode 100644 index 0000000..a70f1ed Binary files /dev/null and b/sources/INCLUDE/buttons/u2764.gif differ diff --git a/sources/INCLUDE/buttons/viatrix.png b/sources/INCLUDE/buttons/viatrix.png new file mode 100644 index 0000000..d79f3e2 Binary files /dev/null and b/sources/INCLUDE/buttons/viatrix.png differ diff --git a/sources/about/index.xhtml b/sources/about/index.xhtml new file mode 100644 index 0000000..edf22a9 --- /dev/null +++ b/sources/about/index.xhtml @@ -0,0 +1,33 @@ + +
+ +

Lady’s Computer ∷ About

+
+

About this Site

+

+ Lady’s Computer is a humble home for my various digital creations on the internet. + The name began as a joke/reference to the early Pokémon games, when the in‐universe cloud storage for Pokémon was literally called “Someone’s P·C”. + You could, of course, also log into Prof Oak’s P·C to get your Pokédex evaluated, or log into your home P·C to access your storage. + This site is like the last of those: + It’s remote storage for my various files and digital clutter that you can log into from the internet. + It’s designed and organized the way I would like to use it, and I hope that in your time here some of that personality shines through. +

+

+ If you’re technically‐minded, I have a growing number of modules, scripts, and other code available on the Gitweb instance attached to this site. + Otherwise, I have a blog which may interest you. + More functionality will probably be added to this site over time! +

+
+
+

About Lady

+

+ I’m a writer who got into programming because she wanted to publish her stories on the internet, and who got good at programming because she spent way too much time conlanging when she was in college and needed tools for dealing with that. + I’m a fan of Nintendo games and have been known to write fanfiction about them. + I’m also a dyke and a Gender Studies major, so I’m not one to shy away from speaking openly and frankly about sexuality. +

+

+ If you want to contact me, I am @·able over on the (Mastodon‐compatible) fediverse @Lady@cat.family, where I mostly yell about pornography in Zelda fanfiction. + You can also send me a message via electronic mail; my name is lady and my website is ladys.computer, so I’m sure you can figure the rest out. +

+
+
diff --git a/sources/index.xhtml b/sources/index.xhtml new file mode 100644 index 0000000..927a178 --- /dev/null +++ b/sources/index.xhtml @@ -0,0 +1,45 @@ + + + + +

Lady’s Computer

+ + + + diff --git a/sources/media/index.xhtml b/sources/media/index.xhtml new file mode 100644 index 0000000..59183bf --- /dev/null +++ b/sources/media/index.xhtml @@ -0,0 +1,56 @@ + +
+ + +

Lady’s Computer ∷ Media

+
+

Lady’s Computer

+
+

Banners, Buttons & Badges

+
+ <书社:apply-attributes width="468" height="60"><书社:link xlink:href="about:shushe?include=brand/banner.png" xlink:show="embed"/> +
Banner (468×60)
+
+
+ <书社:apply-attributes width="144" height="72"><书社:link xlink:href="about:shushe?include=brand/logo.png" xlink:show="embed"/> +
Logo (144×72)
+
+
+ <书社:apply-attributes width="88" height="31"><书社:link xlink:href="about:shushe?include=brand/button.png" xlink:show="embed"/> +
Button (88×31)
+
+
+ <书社:apply-attributes width="72" height="27"><书社:link xlink:href="about:shushe?include=brand/button-small.png" xlink:show="embed"/> +
Button (72×27)
+
+
+
+ <书社:apply-attributes width="80" height="15"><书社:link xlink:href="about:shushe?include=brand/badge.png" xlink:show="embed"/> + <书社:apply-attributes width="80" height="15"><书社:link xlink:href="about:shushe?include=brand/badge-alt.png" xlink:show="embed"/> +
+
Badges (80×15)
+
+
+ <书社:apply-attributes width="48" height="48"><书社:link xlink:href="about:shushe?include=brand/icon-large.png" xlink:show="embed"/> +
Icon (48×48)
+
+
+
+ <书社:apply-attributes width="32" height="32"><书社:link xlink:href="about:shushe?include=brand/icon.png" xlink:show="embed"/> + <书社:apply-attributes width="32" height="32"><书社:link xlink:href="about:shushe?include=brand/icon-heart.png" xlink:show="embed"/> + <书社:apply-attributes width="32" height="32"><书社:link xlink:href="about:shushe?include=brand/icon-lady.png" xlink:show="embed"/> + <书社:apply-attributes width="32" height="32"><书社:link xlink:href="about:shushe?include=brand/icon-logotype.png" xlink:show="embed"/> +
+
Icons (32×32)
+
+
+ <书社:apply-attributes width="16" height="16"><书社:link xlink:href="about:shushe?include=brand/icon-small.png" xlink:show="embed"/> +
Icon (16×16)
+
+
+
+
diff --git a/transforms/metadata.xslt b/transforms/metadata.xslt new file mode 100644 index 0000000..a6d724f --- /dev/null +++ b/transforms/metadata.xslt @@ -0,0 +1,23 @@ + + + <书社:id>urn:fdc:ladys.computer:20240106:WWW:metadata.xslt + +