Merge branch 'fix-subplot' into 'main'

fix: use new Subplot external YAML metadata file

See merge request larswirzenius/ewww!31

3 files changed, 23 insertions, 25 deletions

diff --git a/check b/check
index a3939c0..3f172ba 100755
--- a/check
+++ b/check
@@ -48,11 +48,11 @@ if cargo fmt --help >/dev/null 2>/dev/null; then
 	$hideok cargo fmt -- --check
 fi
 
-for md in [^CR]*.md; do
-	$hideok echo "$md ====================================="
-	codegen "$md" test.py
-	docgen "$md" "$(basename "$md" .md).pdf"
-	docgen "$md" "$(basename "$md" .md).html"
+for subplot in [^CR]*.subplot; do
+	$hideok echo "$subplot ====================================="
+	codegen "$subplot" test.py
+	docgen "$subplot" "$(basename "$subplot" .subplot).pdf"
+	docgen "$subplot" "$(basename "$subplto" .subplot).html"
 	$hideok echo
 done
 
diff --git a/ewww.md b/ewww.md
index 9844592..3a1212f 100644
--- a/ewww.md
+++ b/ewww.md
@@ -1,23 +1,3 @@
----
-title: "Ewww — a Web server for static sites"
-author: Lars Wirzenius
-bindings:
-  - subplot/ewww.yaml
-  - lib/daemon.yaml
-  - lib/files.yaml
-  - lib/runcmd.yaml
-impls:
-  python:
-  - subplot/ewww.py
-  - subplot/http.py
-  - lib/daemon.py
-  - lib/files.py
-  - lib/runcmd.py
-classes:
-  - scenario-disabled
-...
-
-
 # Introduction
 
 Ewww is a web server for static sites. It aims to be simple code,
diff --git a/ewww.subplot b/ewww.subplot
new file mode 100644
index 0000000..a710712
--- /dev/null
+++ b/ewww.subplot
@@ -0,0 +1,18 @@
+title: "Ewww — a Web server for static sites"
+author: Lars Wirzenius
+markdowns:
+  - ewww.md
+bindings:
+  - subplot/ewww.yaml
+  - lib/daemon.yaml
+  - lib/files.yaml
+  - lib/runcmd.yaml
+impls:
+  python:
+  - subplot/ewww.py
+  - subplot/http.py
+  - lib/daemon.py
+  - lib/files.py
+  - lib/runcmd.py
+classes:
+  - scenario-disabled