From 7d1d00e303775347d4b4eb02c2e9b97c452e1563 Mon Sep 17 00:00:00 2001
From: be5invis <belleve@typeof.net>
Date: Fri, 27 Nov 2020 16:20:10 -0800
Subject: [PATCH] Add standalone web-font target

---
 README.md    |  4 ++--
 verdafile.js | 34 +++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index e9292a0e0..589696078 100644
--- a/README.md
+++ b/README.md
@@ -313,8 +313,8 @@ To create a custom build, you need:
    1. `contents::<plan>` : TTF (Hinted and Unhinted), WOFF(2) and Web font CSS;
    2. `ttf::<plan>` : TTF;
    3. `ttf-unhinted::<plan>` : Unhinted TTF only;
-   4. `woff::<plan>` : TTF and WOFF only;
-   5. `woff2::<plan>` : TTF and WOFF2 only.
+   4. `webfont::<plan>` : Web fonts only (CSS + WOFF2);
+   5. `woff2::<plan>` : WOFF2 only.
 
 ### Configuring Custom Build
 
diff --git a/verdafile.js b/verdafile.js
index 02e92386e..e3a92cbe1 100644
--- a/verdafile.js
+++ b/verdafile.js
@@ -268,30 +268,34 @@ const GroupContents = task.group("contents", async (target, gr) => {
 
 // Webfont CSS
 const DistWebFontCSS = file.make(
-	gid => `${DIST}/${gid}/${gid}.css`,
-	async (target, out, gid) => {
+	gr => `${DIST}/${gr}/${gr}.css`,
+	async (target, out, gr) => {
 		// Note: this target does NOT depend on the font files.
-		const [gr, ts] = await target.need(BuildPlanOf(gid), GroupFontsOf(gid), de(out.dir));
+		const [bp, ts] = await target.need(BuildPlanOf(gr), GroupFontsOf(gr), de(out.dir));
 		const hs = await target.need(...ts.map(FontInfoOf));
-		await node("utility/make-webfont-css.js", out.full, gr.family, hs, webfontFormats);
+		await node("utility/make-webfont-css.js", out.full, bp.family, hs, webfontFormats);
 	}
 );
 
 // Content files
-const GroupTTFs = task.group("ttf", async (target, gid) => {
-	const [ts] = await target.need(GroupFontsOf(gid));
-	await target.need(ts.map(tn => DistHintedTTF(gid, tn)));
+const GroupTTFs = task.group("ttf", async (target, gr) => {
+	const [ts] = await target.need(GroupFontsOf(gr));
+	await target.need(ts.map(tn => DistHintedTTF(gr, tn)));
 });
-const GroupUnhintedTTFs = task.group("ttf-unhinted", async (target, gid) => {
-	const [ts] = await target.need(GroupFontsOf(gid));
-	await target.need(ts.map(tn => DistUnhintedTTF(gid, tn)));
+const GroupUnhintedTTFs = task.group("ttf-unhinted", async (target, gr) => {
+	const [ts] = await target.need(GroupFontsOf(gr));
+	await target.need(ts.map(tn => DistUnhintedTTF(gr, tn)));
 });
-const GroupWoff2s = task.group("woff2", async (target, gid) => {
-	const [ts] = await target.need(GroupFontsOf(gid));
-	await target.need(ts.map(tn => DistWoff2(gid, tn)));
+const GroupWebFonts = task.group("webfont", async (target, gr) => {
+	const [ts] = await target.need(GroupFontsOf(gr));
+	await target.need(GroupWoff2s(gr), DistWebFontCSS(gr));
 });
-const GroupFonts = task.group("fonts", async (target, gid) => {
-	await target.need(GroupTTFs(gid), GroupUnhintedTTFs(gid), GroupWoff2s(gid));
+const GroupWoff2s = task.group("woff2", async (target, gr) => {
+	const [ts] = await target.need(GroupFontsOf(gr));
+	await target.need(ts.map(tn => DistWoff2(gr, tn)));
+});
+const GroupFonts = task.group("fonts", async (target, gr) => {
+	await target.need(GroupTTFs(gr), GroupUnhintedTTFs(gr), GroupWoff2s(gr));
 });
 
 // Per group file