Merge branch 'fix' into 'main'

fix: use a separate document metadata YAML file for current Subplot

See merge request larswirzenius/yuck!19

4 files changed, 15 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 0dd46af..ce718ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: yuck.pdf yuck.html
 
-yuck.pdf: yuck.md yuck.yaml
-	subplot docgen yuck.md -o yuck.pdf
+yuck.pdf: yuck.subplot yuck.md yuck.yaml
+	subplot docgen yuck.subplot -o yuck.pdf
 
-yuck.html: yuck.md yuck.yaml
-	subplot docgen yuck.md -o yuck.html
+yuck.html: yuck.subplot yuck.md yuck.yaml
+	subplot docgen yuck.subplot -o yuck.html
diff --git a/build.sh b/build.sh
index b940b7a..4ab8479 100755
--- a/build.sh
+++ b/build.sh
@@ -2,5 +2,5 @@
 
 set -eu
 
-sp-docgen yuck.md -o yuck.pdf
-sp-docgen yuck.md -o yuck.html
+subplot docgen yuck.subplot -o yuck.pdf
+subplot docgen yuck.subplot -o yuck.html
diff --git a/yuck.md b/yuck.md
index 5ceb3bf..52d738e 100644
--- a/yuck.md
+++ b/yuck.md
@@ -555,13 +555,3 @@ Abstract:
 # Links to OAuth2 or OIDC implementations
 
 * [Ory](https://www.ory.sh/)
-
----
-title: "OAuth2 and OpenID Connect: protocols and acceptance criteria"
-author: Lars Wirzenius
-documentclass: report
-bindings: 
-  - yuck.yaml
-classes:
-  - json
-...
diff --git a/yuck.subplot b/yuck.subplot
new file mode 100644
index 0000000..9ba71ac
--- /dev/null
+++ b/yuck.subplot
@@ -0,0 +1,9 @@
+title: "OAuth2 and OpenID Connect: protocols and acceptance criteria"
+author: Lars Wirzenius
+documentclass: report
+markdowns:
+  - yuck.md
+bindings:
+  - yuck.yaml
+classes:
+  - json