Merge branch 'usedirs' into 'main'

ikiwiki usedirs

Closes #2

See merge request larswirzenius/riki!53

1 files changed, 24 insertions, 36 deletions

diff --git a/riki.md b/riki.md
index 199130e..de4e08a 100644
--- a/riki.md
+++ b/riki.md
@@ -1,15 +1,3 @@
----
-title: riki static site generator
-subtitle: Subset of ikiwiki rewritten in Rust
-bindings:
-- subplot/riki.yaml
-- lib/files.yaml
-- lib/runcmd.yaml
-impls:
-  rust:
-  - subplot/riki.rs
-...
-
 [ikiwiki]: http://ikiwiki.info/
 [Subplot]: https://subplot.tech/
 
@@ -39,7 +27,7 @@ be an empty HTML file._
 given an installed riki
 given file site/empty.mdwn from empty
 when I run riki build --plain-body site output
-then AST of site/empty.mdwn matches that of output/empty.html
+then AST of site/empty.mdwn matches that of output/empty/index.html
 ~~~
 
 
@@ -55,7 +43,7 @@ be an HTML file with the same text, without extra elements._
 given an installed riki
 given file site/page.mdwn from para
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -75,7 +63,7 @@ output must have a blockquote element.
 given an installed riki
 given file site/page.mdwn from blockquote
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -93,7 +81,7 @@ output must have a pre element.
 given an installed riki
 given file site/page.mdwn from indented-code
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -111,7 +99,7 @@ output must have a pre element.
 given an installed riki
 given file site/page.mdwn from fenced-code
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -132,7 +120,7 @@ must have an img element.
 given an installed riki
 given file site/page.mdwn from image-link
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -149,7 +137,7 @@ in HTML output._
 given an installed riki
 given file site/page.mdwn from emph
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -166,7 +154,7 @@ strong element in HTML output._
 given an installed riki
 given file site/page.mdwn from strong
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -183,7 +171,7 @@ element in HTML output._
 given an installed riki
 given file site/page.mdwn from strike
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -202,7 +190,7 @@ supported._
 given an installed riki
 given file site/page.mdwn from headings
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -224,7 +212,7 @@ element in HTML output._
 given an installed riki
 given file site/page.mdwn from backticks
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -243,7 +231,7 @@ output._
 given an installed riki
 given file site/page.mdwn from table
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -264,7 +252,7 @@ HTML output._
 given an installed riki
 given file site/page.mdwn from rule
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -285,7 +273,7 @@ in HTML output._
 given an installed riki
 given file site/page.mdwn from ul
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -306,7 +294,7 @@ the same as the Markdown.***
 given an installed riki
 given file site/page.mdwn from ol
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 <!--
@@ -325,7 +313,7 @@ in HTML output._
 given an installed riki
 given file site/page.mdwn from tasklist
 when I run riki build --plain-body site output
-then AST of site/page.mdwn matches that of output/page.html
+then AST of site/page.mdwn matches that of output/page/index.html
 ~~~
 
 
@@ -359,7 +347,7 @@ then stderr contains "definition list"
 
 given file site/page.mdwn from dl-3
 when I run riki build --plain-body site output
-then file output/page.html contains ": bar"
+then file output/page/index.html contains ": bar"
 ~~~
 
 ~~~{#dl-1 .file}
@@ -393,10 +381,10 @@ given file site/dir/sibling.mdwn from empty
 given file site/dir/foo/child.mdwn from empty
 given file site/dir/foo/child/grandchild.mdwn from empty
 when I run riki build --plain-body site output
-then file output/dir/foo.html contains "href="../absolute""
-then file output/dir/foo.html contains "href="sibling""
-then file output/dir/foo.html contains "href="foo/child""
-then file output/dir/foo.html contains "href="foo/child/grandchild""
+then file output/dir/foo/index.html contains "href="../absolute""
+then file output/dir/foo/index.html contains "href="sibling""
+then file output/dir/foo/index.html contains "href="foo/child""
+then file output/dir/foo/index.html contains "href="foo/child/grandchild""
 ~~~
 
 Note the uppercase link to the `child` page in the test page below.
@@ -570,7 +558,7 @@ given an installed riki
 given file site/a.mdwn from use_shortcut
 given file site/b.mdwn from define_shortcut
 when I run riki build site output
-then file output/a.html contains "<a href="https://example.com/foo/123">foo!123</a>"
+then file output/a/index.html contains "<a href="https://example.com/foo/123">foo!123</a>"
 ~~~
 
 ~~~{#use_shortcut .file .markdown}
@@ -647,8 +635,8 @@ given an installed riki
 given file site/foo/page.mdwn from image
 given file site/bar/image.jpg from para
 when I run riki build --plain-body site output
-then AST of site/foo/page.mdwn matches that of output/foo/page.html
-then files site/bar//image.jpg and output/bar/image.jpg match
+then AST of site/foo/page.mdwn matches that of output/foo/page/index.html
+then files site/bar/image.jpg and output/bar/image.jpg match
 ~~~
 
 ## Output directory tree