First version of Gemini formatting

update build flags

.gitignore

@@ -1,2 +1,3 @@
 fes
 *.tar.gz
+/stuff/

Makefile

@@ -8,12 +8,12 @@ deps:
 	$(GO) mod download
 
 build: deps
-	$(GO) build -ldflags "-X fes/modules/version.gitCommit=$(shell git rev-parse --short HEAD)" -o fes
+	CGO_ENABLED=0 $(GO) build -trimpath -ldflags "-X fes/modules/version.gitCommit=$(shell git rev-parse --short HEAD) -s -w -buildid=" -o fes
 	@echo "Fes is now built to ./fes"
 
 lint:
 	$(GO) vet ./...
 	$(GO) fmt ./...
 
-install:
+install: build
-	$(GO) install fes
+	@cp fes /usr/local/bin

README.md

@@ -1,11 +1,13 @@
 # Fes
 
-A lightweight, static, and opinionated microframework.
+Fes is an embedded Lua microwebframework for create static, extensible
+websites. Using file-based routes you can easily structure you website just by
+moving files around. See [fsdproject.org](https://fsdproject.org) for a
+real-world example.
 
-## Usage
+## A Simple Example
-
-This is the `fes new <project>` output
 ```lua
+-- project/www/index.lua as created from fes new project
 local fes = require("fes")
 local site = fes.fes()
 
@@ -14,32 +16,9 @@ site:h1("Hello, World!")
 return site
 ```
 
-This can be ran with `fes run <project>` where `<project>` is the location of the website.
+```
-
+$ fes run project
-## Examples
-
-See `examples/` for different features, `canonical/` contains the best practices for this microframework.
-
-## Build
-
-```sh
-git clone https://git.vxserver.dev/fSD/fes.git
-cd fes
-
-go build .
-./fes run examples/hello-world # if this works install
-
-go install fes
 ```
 
-## Documentation
+## Contributing
-
+See [fSD hacking](https://fsdproject.org/hacking) and [fSD community](https://fsdproject.org/community)
-Run `fes doc` for the documentation website or goto [docs.vxserver.dev](https://docs.vxserver.dev)
-
-## License
-
-ISC License
-
-Copyright (C) 2025-2026 fSD
-
-See `COPYING`

examples/archive/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "archive"
-version = "0.0.1"
-authors = ["vx-clutch"]

examples/archive/README.md

@@ -1,4 +0,0 @@
-# archive
-
-This example demonstrates the archive feature of Fes it is useful for file
-sharing purposes.

examples/archive/archive/facts/seals/seals.txt

@@ -1,22 +0,0 @@
-Pinnipeds [2] are the seals and their relatives, a group of semi-aquatic marine
-mammals. The Pinnipedia is in the Order Carnivora. There are three seal
-families: Odobenidae (walruses), Otariidae (eared seals, including sea lions
-and fur seals), and Phocidae (true seals).[3]
-
-Seals are sleek-bodied and barrel-shaped. Their bodies are well adapted to the
-aquatic habitat where they spend most of their lives. Pinnipeds have flippers
-for hands, big bulky bodies, doggish faces, and big eyes. Unlike cetaceans,
-pinnipeds have their noses on their faces, and each nostril of the nose closes
-when the pinniped goes underwater. Like cetaceans, pinnipeds have a thick layer
-of blubber (fat) just under their skin: this blubber keeps them warm in cold
-waters and keeps them fed during times when food is not easily found. When they
-cannot find food, they live off the fat in the blubber.
-
-Pinnipeds are carnivorous. This means they eat only meat (such as fish or
-squid) and not plants. However, almost all pinnipeds can be eaten by polar
-bears, sharks and killer whales.
-
-Seals are often trained in zoos or aquariums to put on shows. However, in
-Sweden, it is illegal to train a seal to balance a ball on its nose.[4]
-
-From [Pinniped Wikipedia](https://simple.wikipedia.org/wiki/Pinniped)

examples/archive/www/index.lua

@@ -1,10 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-site:h1("Hello, World!")
-
-site:a("/archive", fes.std.h2("To the file room!"))
-
-return site

examples/best/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "best"
-version = "0.0.1"
-authors = ["vx-clutch"]

examples/best/README.md

@@ -1,23 +0,0 @@
-# best
-
-This is an example of best practices for the Fes framework.
-
-## Parts
-
-With best practice we can break our sites into a few parts.
-
-## Index
-
-The main page of the site loads in the header and the footer, as well as shows
-some core information
-
-## Include
-
-Within include the header and footer are defined.
-
-* **Header:** Site navigation and name display
-* **Footer:** Extra and external information.
-
-## Static
-
-This is where we store our favicon.

examples/best/include/footer.lua

@@ -1,13 +0,0 @@
-local footer = {}
-
-footer.render = function(std)
-    return table.concat({
-	std.h2("Other resources"),
-	std.tl({
-		std.external("https://git.vxserver.dev/fSD/fes", "Fes source"),
-		std.external("https://docs.vxserver.dev/static/fes.html", "Documentation"),
-	}),
-})
-end
-
-return footer

examples/best/include/header.lua

@@ -1,7 +0,0 @@
-local header = {}
-
-header.render = function(std)
-    return std.center(std.ha("/", std.h1("Best Practices")))
-end
-
-return header

examples/best/www/index.lua

@@ -1,20 +0,0 @@
-local fes = require("fes")
-local std = fes.std
-local u = fes.util
-
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-site.title = "Best practices"
-site.favicon = "/static/favicon.ico"
-
-site:banner(fes.app.header.render(std))
-
-site:note(u.cc {
-	std.h2("Hello, World!"),
-	std.p("This is an example of the best practices/canonical Fes site.")
-})
-
-site:note(fes.app.footer.render(std))
-
-return site

examples/default/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "default"
-version = "0.0.1"
-authors = ["vx-clutch"]

examples/default/www/index.lua

@@ -1,8 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-site:h1("Hello, World!")
-
-return site

examples/error/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "error"
-version = "0.0.1"
-authors = ["vx-clutch"]

examples/error/README.md

@@ -1,6 +0,0 @@
-# error
-
-This shows what a Lua error looks like to the user. Lua errors are the most
-common and the most critical so that is why they are shown to the user. Other,
-lesser errors, are only shown to the developer because of their different
-nature.

examples/error/www/index.lua

@@ -1,10 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-This is what an error looks like
-
-site:h1("Hello, World!")
-
-return site

examples/hello/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "hello"
-version = "0.0.1"
-authors = ["vx-clutch"]

examples/hello/README.md

@@ -1,4 +0,0 @@
-# hello
-
-This is a very simple hello world program, the only difference between this and
-default is this README.

examples/hello/www/index.lua

@@ -1,8 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-site:h1("Hello, World!")
-
-return site

examples/markdown/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "markdown"
-version = "0.0.1"
-authors = ["vx-clutch"]

examples/markdown/README.md

@@ -1,3 +0,0 @@
-# markdown
-
-This example demonstrate Fes's ability to handle markdown routes.

examples/markdown/www/index.md

@@ -1,3 +0,0 @@
-# Markdown!
-
-**Fes** also supports markdown routes!

examples/simple/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "simple"
-version = "0.0.1"
-authors = ["vx-clutch"]

examples/simple/README.md

@@ -1,5 +0,0 @@
-# simple
-
-This simple example shows the extensibility of the Fes framework. It shows the
-you do not necessarily need to use the site object (although it is recommended)
-you can define your own site, similar to how Lisps do things.

examples/simple/www/index.lua

@@ -1 +0,0 @@
-return "Hello, World!"

go.mod

@@ -5,7 +5,6 @@ go 1.25.4
 require (
 	github.com/fatih/color v1.18.0
 	github.com/gomarkdown/markdown v0.0.0-20250810172220-2e2c11897d1a
-	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/yuin/gopher-lua v1.1.1
 )
@@ -13,5 +12,5 @@ require (
 require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
 )

go.sum

@@ -7,8 +7,6 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
@@ -16,5 +14,5 @@ github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=

index.html

@@ -276,10 +276,6 @@ return site</code></pre>
 						<td><code>-p &lt;port&gt;</code></td>
 						<td>Set the server port.</td>
 					</tr>
-					<tr>
-						<td><code>-static</code></td>
-						<td>Render and save all pages. (this feature is yet to be implemented)</td>
-					</tr>
 					<tr>
 						<td><code>-version</code></td>
 						<td>Print the version.</td>
@@ -305,7 +301,7 @@ return site</code></pre>
 						<td>Generate a site object</td>
 					</tr>
 					<tr>
-						<td><code>:custom()</code></td>
+						<td><code>:g()</code></td>
 						<td>Add a custom string to the site body</td>
 					</tr>
 					<tr>
@@ -323,30 +319,6 @@ return site</code></pre>
 					</tr>
 				</thead>
 				<tbody>
-					<tr>
-						<td><code>std.fes_version()</code></td>
-						<td>Get the current version of fes.</td>
-					</tr>
-					<tr>
-						<td><code>std.site_version()</code></td>
-						<td>Get the current version of the site, defined in <code>Fes.toml</code>.</td>
-					</tr>
-					<tr>
-						<td><code>std.site_name()</code></td>
-						<td>Get the current name of the site, defined in <code>Fes.toml</code>.</td>
-					</tr>
-					<tr>
-						<td><code>std.site_title()</code></td>
-						<td>Get the current name of the site, defined in <code>Fes.toml</code>.</td>
-					</tr>
-					<tr>
-						<td><code>std.site_authors()</code></td>
-						<td>Get a table of the authors of the site, defined in <code>Fes.toml</code>.</td>
-					</tr>
-					<tr>
-						<td><code>std.join</code></td>
-						<td>Get a table of the authors of the site, defined in <code>Fes.toml</code>.</td>
-					</tr>
 					<tr>
 						<td><code>std.a(link: string, str: string)</code></td>
 						<td>Returns an anchor tag.</td>
@@ -448,7 +420,7 @@ return site</code></pre>
 						<td>Returns a div of class <code>class</code> with content of <code>content</code>.</td>
 					</tr>
 					<tr>
-						<td><code>std.spa(content: string, class: string)</code></td>
+						<td><code>std.span(content: string, class: string)</code></td>
 						<td>Returns a span of class <code>class</code> with content of <code>content</code>.</td>
 					</tr>
 					<tr>
@@ -486,15 +458,179 @@ return site</code></pre>
 				</thead>
 				<tbody>
 					<tr>
-						<td><code>symbol.copyright</code></td>
+						<td><code>symbol.legal.copyright</code></td>
-						<td>&#169;</td> </tr>
+						<td>&copy;</td> </tr>
 					<tr>
-						<td><code>Registered Trademark</code></td>
+						<td><code>symbol.legal.registered_trademark</code></td>
-						<td>&#174;</td>
+						<td>&reg;</td>
 					</tr>
 					<tr>
-						<td><code>Trademark</code></td>
+						<td><code>symbol.legal.trademark</code></td>
-						<td>&#8482;</td>
+						<td>&trade;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.euro</code></td>
+						<td>&euro;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.pound</code></td>
+						<td>&pound;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.yen</code></td>
+						<td>&yen;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.cent</code></td>
+						<td>&cent;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.dollar</code></td>
+						<td>$</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.plus_minus</code></td>
+						<td>&plusmn;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.multiply</code></td>
+						<td>&times;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.divide</code></td>
+						<td>&divide;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.not_equal</code></td>
+						<td>&ne;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.less_equal</code></td>
+						<td>&le;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.greater_equal</code></td>
+						<td>&ge;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.infinity</code></td>
+						<td>&infin;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.currency.approx</code></td>
+						<td>&asymp;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.arrows.left</code></td>
+						<td>&larr;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.arrows.right</code></td>
+						<td>&rarr;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.arrows.up</code></td>
+						<td>&uarr;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.arrows.down</code></td>
+						<td>&darr;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.arrows.left_right</code></td>
+						<td>&harr;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.punctuation.left_double_quote</code></td>
+						<td>&ldquo;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.punctuation.right_double_quote</code></td>
+						<td>&rdquo;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.punctuation.left_single_quote</code></td>
+						<td>&lsquo;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.punctuation.right_single_quote</code></td>
+						<td>&rsquo;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.punctuation.ellipsis</code></td>
+						<td>&hellip;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.punctuation.em_dash</code></td>
+						<td>&mdash;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.punctuation.en_dash</code></td>
+						<td>&ndash;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.whitespace.non_breaking</code></td>
+						<td>&nbsp;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.whitespace.thin</code></td>
+						<td>&thinsp;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.degree</code></td>
+						<td>&deg;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.micro</code></td>
+						<td>&micro;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.section</code></td>
+						<td>&sect;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.paragraph</code></td>
+						<td>&para;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.check</code></td>
+						<td>&check;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.cross</code></td>
+						<td>&cross;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.bullet</code></td>
+						<td>&bull;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.middle_dot</code></td>
+						<td>&middot;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.symbols.broken_bar</code></td>
+						<td>&brvbar;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.html.less_than</code></td>
+						<td>&lt;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.html.greater_than</code></td>
+						<td>&gt;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.html.ampersand</code></td>
+						<td>&amp;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.html.double_quote</code></td>
+						<td>&quot;</td>
+					</tr>
+					<tr>
+						<td><code>symbol.html.single_quote</code></td>
+						<td>&apos;</td>
 					</tr>
 				</tbody>
 			</table>
@@ -514,6 +650,14 @@ return site</code></pre>
 						<td><code>util.copyright(link: string, holder: string)</code></td>
 						<td>Used when setting the website copyright holder.</td>
 					</tr>
+					<tr>
+						<td><code>util.ls(dir)</code></td>
+						<td>Returns a table of the files in the given directory</td>
+					</tr>
+					<tr>
+						<td><code>util.run(cmd)</code></td>
+						<td>Returns the output of the provided command. stdout only.</td>
+					</tr>
 				</tbody>
 			</table>
 			<h3>Dkjson</h3>
@@ -553,28 +697,6 @@ return site</code></pre>
 					</tr>
 				</tbody>
 			</table>
-			<h3>Site</h3>
-			<table> <thead>
-					<tr>
-						<th>Name</th>
-						<th>Description</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td><code>site.version</code></td>
-						<td>The version of the website found in the Fes.toml</td>
-					</tr>
-					<tr>
-						<td><code>site.name</code></td>
-						<td>The name of the website found in the Fes.toml</td>
-					</tr>
-					<tr>
-						<td><code>site.authors</code></td>
-						<td>A table of all authors defined in Fes.toml</td>
-					</tr>
-				</tbody>
-			</table>
 			<h3>App</h3>
 			Fes's <code>app</code> module is a special table
 			because it contains user defined functions. These
@@ -627,7 +749,7 @@ return hello</pre></code> This can be called from another with,
 		</section>
 
 		<footer>
-			<p>Last updated: 2025-12-27</p>
+			<p>Last updated: 2026-01-22</p>
 		</footer>
 	</main>
 </body>

lib/fes.lua

@@ -1,9 +1,114 @@
 local std = require("lib.std")
+local symbol = require("lib.symbol")
 
 local M = {}
 M.__index = M
 
+local default_html_header = [[
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1.0">
+{{FAVICON}}
+<title>{{TITLE}}</title>
+<style>
+:root { --bg:#f5f5f5; --text:#111827; --muted:#6b7280; --link:#1a0dab; --accent:#68a6ff; --highlight:#004d99; --note-bg:#fff; --panel-bg:#fff; --border:rgba(0,0,0,.1); --table-head:#f3f4f6; --code-color:#004d99; --blockquote-border:#1a73e8; --banner-bg:#fff; --footer-bg:#fff; --shadow:rgba(0,0,0,.08); }
+@media (prefers-color-scheme: dark) { :root { --bg:#0f1113; --text:#e6eef3; --muted:#9aa6b1; --link:#68a6ff; --accent:#68a6ff; --highlight:#cde7ff; --note-bg:#1a1c20; --panel-bg:#1a1c20; --border:rgba(255,255,255,.06); --table-head:#1a1c20; --code-color:#cde7ff; --blockquote-border:#68a6ff; --banner-bg:#1a1c20; --footer-bg:#1a1c20; --shadow:rgba(0,0,0,.4); } }
+html, body { min-height:100%; margin:0; padding:0; background:var(--bg); color:var(--text); font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; line-height:1.5; -webkit-font-smoothing:antialiased; -moz-osx-font-smoothing:grayscale; }
+body { padding:36px; }
+.container { max-width:830px; margin:0 auto; }
+.container>*:not(.banner) { margin:28px 0; }
+h1,h2,h3,h4,h5,h6 { font-weight:600; margin:0 0 12px 0; }
+h1 { font-size:40px; margin-bottom:20px; font-weight:700; }
+h2 { font-size:32px; margin:26px 0 14px; }
+h3 { font-size:26px; margin:22px 0 12px; }
+h4 { font-size:20px; margin:18px 0 10px; }
+h5 { font-size:16px; margin:16px 0 8px; }
+h6 { font-size:14px; margin:14px 0 6px; color:var(--muted); }
+p { margin:14px 0; }
+a { color:var(--link); text-decoration:none; transition: color .15s ease, text-decoration-color .15s ease; }
+.hidden { color:var(--text); text-decoration:none; }
+a:hover { text-decoration:underline; }
+summary { cursor:pointer; }
+details { background:var(--panel-bg); border:1px solid var(--border); border-radius:4px; padding:14px 16px; margin:16px 0; }
+details summary { list-style:none; font-weight:600; color:var(--text); display:flex; align-items:center; }
+details summary::-webkit-details-marker { display:none; }
+details summary::before { content:"▸"; margin-right:8px; transition:transform .15s ease; color:var(--accent); }
+details[open] summary::before { transform:rotate(90deg); }
+summary::after { content:"Expand"; margin-left:auto; font-size:13px; color:var(--muted); }
+details[open] summary::after { content:"Collapse"; }
+details>*:not(summary) { margin-top:12px; }
+.note, pre, code { background:var(--note-bg); border:1px solid var(--border); }
+.note { padding:20px; border-radius:4px; margin:28px 0; color:var(--text); }
+.note strong { color:var(--text); }
+.muted { color:var(--muted); }
+.lead { font-size:15px; margin-top:8px; }
+.callout { display:block; margin:12px 0; }
+.small { font-size:13px; color:var(--muted); margin-top:6px; }
+.highlight { font-weight:700; color:var(--highlight); }
+ul, ol { margin:14px 0; padding-left:26px; }
+.tl { display:grid; grid-template-columns:repeat(auto-fill,200px); gap:15px; list-style-type:none; padding:0; margin:0; justify-content:start; }
+ul.tl li { padding:10px; width:fit-content; }
+li { margin:6px 0; }
+code { padding:3px 7px; border-radius:3px; font-family:"SF Mono",Monaco,"Cascadia Code","Roboto Mono",Consolas,"Courier New",monospace; font-size:.9em; color:var(--code-color); }
+pre { padding:20px; border-radius:4px; margin:14px 0; overflow-x:auto; font-family:"SF Mono",Monaco,"Cascadia Code","Roboto Mono",Consolas,"Courier New",monospace; font-size:14px; line-height:1.6; }
+pre code { background:none; border:none; padding:0; font-size:inherit; }
+blockquote { border-left:3px solid var(--blockquote-border); padding-left:18px; margin:14px 0; color:var(--text); font-style:italic; }
+hr { border:0; border-top:1px solid rgba(0,0,0,.08); margin:26px 0; }
+@media (prefers-color-scheme: dark) { hr { border-top-color:rgba(255,255,255,.1); } }
+img { max-width:100%; height:auto; border-radius:4px; margin:14px 0; }
+table { width:100%; border-collapse:collapse; margin:14px 0; }
+th, td { padding:12px 16px; text-align:left; border-bottom:1px solid var(--border); }
+th { background:var(--table-head); font-weight:600; color:var(--text); }
+tr:hover { background:rgba(0,0,0,0.02); }
+@media (prefers-color-scheme: dark) { tr:hover { background:rgba(255,255,255,0.02); } }
+.divider { margin:26px 0; height:1px; background:rgba(0,0,0,.08); }
+@media (prefers-color-scheme: dark) { .divider { background:rgba(255,255,255,.1); } }
+.section { margin-top:36px; }
+.links { margin:12px 0; }
+.links a { display:inline-block; margin:0 14px 6px 0; color:var(--link); }
+strong, b { font-weight:600; color:var(--text); }
+em, i { font-style:italic; }
+.center { display:flex; justify-content:center; align-items:center; }
+.banner { width:100%; box-sizing:border-box; text-align:center; background:var(--banner-bg); padding:20px; border:1px solid var(--border); border-bottom-right-radius:8px; border-bottom-left-radius:8px; color:var(--text); margin:-36px 0 28px 0; box-shadow:0 0.2em 0.6em var(--shadow); }
+.nav { margin-left:auto; margin-right:auto; }
+.nav a { color:var(--highlight); }
+.footer { background:var(--footer-bg); padding:20px 0; border-top:1px solid rgba(0,0,0,.08); font-size:14px; color:var(--muted); display:flex; justify-content:center; align-items:center; gap:24px; margin-top:28px !important; margin-bottom:0; }
+.left { text-align:left; float:left; }
+.right { text-align:right; float:right; }
+</style>
+</head>
+<body>
+<div class="container">
+]]
+
+local default_html_footer = [[
+<footer class="footer">
+<a href="https://git.vxserver.dev/fSD/fes" target="_blank">Fes Powered</a>
+<a href="https://www.lua.org/" target="_blank">Lua Powered</a>
+<a href="https://git.vxserver.dev/fSD/fes/src/branch/main/LICENSE" target="_blank">ISC Licensed</a>
+<p>{{COPYRIGHT}}</p>
+</footer>
+</div>
+</body>
+</html>
+]]
+
+local default_gemini_header = [[
+]]
+
+local default_gemini_footer = [[
+
+=> https://git.vxserver.dev/fSD/fes Fes Powered
+=> https://www.lua.org Lua Powered
+=> https://git.vxserver.dev/fSD/fes/src/branch/main/LICENSE ISC Licensed
+{{COPYRIGHT}}
+]]
+
 function M.fes(header, footer)
+	local proto = std.proto
+
 	local config = {}
 	local site_config = {}
 	local fes_mod = package.loaded.fes
@@ -14,8 +119,22 @@ function M.fes(header, footer)
 		end
 	end
 
-	if site_config.favicon then
+	if proto == "http" and site_config.favicon then
-		site_config.favicon = '<link rel="icon" type="image/x-icon" href="' .. site_config.favicon .. '">'
+		site_config.favicon =
+		    '<link rel="icon" type="image/x-icon" href="'
+		    .. site_config.favicon
+		    .. '">'
+	end
+
+	local default_header
+	local default_footer
+
+	if proto == "http" then
+		default_header = default_html_header
+		default_footer = default_html_footer
+	elseif proto == "gemini" then
+		default_header = default_gemini_header
+		default_footer = default_gemini_footer
 	end
 
 	local self = {
@@ -23,327 +142,54 @@ function M.fes(header, footer)
 		title = site_config.title,
 		copyright = site_config.copyright,
 		favicon = site_config.favicon,
-		header = header or [[
+		header = header or default_header,
-<!DOCTYPE html>
+		footer = footer or default_footer,
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width,initial-scale=1.0">
-{{FAVICON}}
-<title>{{TITLE}}</title>
-<style>
-:root {
-  --bg: #f5f5f5;
-  --text: #111827;
-  --muted: #6b7280;
-  --link: #1a0dab;
-  --accent: #68a6ff;
-  --highlight: #004d99;
-  --note-bg: #ffffff;
-  --panel-bg: #ffffff;
-  --border: rgba(0,0,0,.1);
-  --table-head: #f3f4f6;
-  --code-color: #004d99;
-  --blockquote-border: #1a73e8;
-  --banner-bg: #ffffff;
-  --footer-bg: #ffffff;
-  --shadow: rgba(0,0,0,.08);
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --bg: #0f1113;
-    --text: #e6eef3;
-    --muted: #9aa6b1;
-    --link: #68a6ff;
-    --accent: #68a6ff;
-    --highlight: #cde7ff;
-    --note-bg: #1a1c20;
-    --panel-bg: #1a1c20;
-    --border: rgba(255,255,255,.06);
-    --table-head: #1a1c20;
-    --code-color: #cde7ff;
-    --blockquote-border: #68a6ff;
-    --banner-bg: #1a1c20;
-    --footer-bg: #1a1c20;
-    --shadow: rgba(0,0,0,.4);
-  }
-}
-
-html, body {
-  min-height: 100%;
-  margin: 0;
-  padding: 0;
-  background: var(--bg);
-  color: var(--text);
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-  line-height: 1.5;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-body { padding: 36px; }
-
-.container { max-width: 830px; margin: 0 auto; }
-
-.container > *:not(.banner) { margin: 28px 0; }
-
-h1, h2, h3, h4, h5, h6 { font-weight: 600; margin: 0 0 12px 0; }
-
-h1 { font-size: 40px; margin-bottom: 20px; font-weight: 700; }
-
-h2 { font-size: 32px; margin: 26px 0 14px; }
-
-h3 { font-size: 26px; margin: 22px 0 12px; }
-
-h4 { font-size: 20px; margin: 18px 0 10px; }
-
-h5 { font-size: 16px; margin: 16px 0 8px; }
-
-h6 { font-size: 14px; margin: 14px 0 6px; color: var(--muted); }
-
-p { margin: 14px 0; }
-
-a { color: var(--link); text-decoration: none; transition: color .15s ease, text-decoration-color .15s ease; }
-
-.hidden { color: var(--text); text-decoration: none; }
-
-a:hover { text-decoration: underline; }
-
-summary { cursor: pointer; }
-
-details {
-  background: var(--panel-bg);
-  border: 1px solid var(--border);
-  border-radius: 4px;
-  padding: 14px 16px;
-  margin: 16px 0;
-}
-
-details summary {
-  list-style: none;
-  font-weight: 600;
-  color: var(--text);
-  display: flex;
-  align-items: center;
-}
-
-details summary::-webkit-details-marker { display: none; }
-
-details summary::before {
-  content: "▸";
-  margin-right: 8px;
-  transition: transform .15s ease;
-  color: var(--accent);
-}
-
-details[open] summary::before { transform: rotate(90deg); }
-
-summary::after { content: "Expand"; margin-left: auto; font-size: 13px; color: var(--muted); }
-
-details[open] summary::after { content: "Collapse"; }
-
-details > *:not(summary) { margin-top: 12px; }
-
-.note, pre, code {
-  background: var(--note-bg);
-  border: 1px solid var(--border);
-}
-
-.note {
-  padding: 20px;
-  border-radius: 4px;
-  background: var(--note-bg);
-  border: 1px solid var(--border);
-  margin: 28px 0;
-  color: var(--text);
-}
-
-.note strong { color: var(--text); }
-
-.muted { color: var(--muted); }
-
-.lead { font-size: 15px; margin-top: 8px; }
-
-.callout { display: block; margin: 12px 0; }
-
-.small { font-size: 13px; color: var(--muted); margin-top: 6px; }
-
-.highlight { font-weight: 700; color: var(--highlight); }
-
-ul, ol { margin: 14px 0; padding-left: 26px; }
-
-.tl {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, 200px);
-  gap: 15px;
-  list-style-type: none;
-  padding: 0;
-  margin: 0;
-  justify-content: start;
-}
-
-ul.tl li { padding: 10px; width: fit-content; }
-
-li { margin: 6px 0; }
-
-code {
-  padding: 3px 7px;
-  border-radius: 3px;
-  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
-  font-size: .9em;
-  color: var(--code-color);
-}
-
-pre {
-  padding: 20px;
-  border-radius: 4px;
-  margin: 14px 0;
-  overflow-x: auto;
-  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
-  font-size: 14px;
-  line-height: 1.6;
-}
-
-pre code { background: none; border: none; padding: 0; font-size: inherit; }
-
-blockquote {
-  border-left: 3px solid var(--blockquote-border);
-  padding-left: 18px;
-  margin: 14px 0;
-  color: var(--text);
-  font-style: italic;
-}
-
-hr { border: 0; border-top: 1px solid rgba(0,0,0,.08); margin: 26px 0; }
-
-@media (prefers-color-scheme: dark) {
-  hr { border-top-color: rgba(255,255,255,.1); }
-}
-
-img { max-width: 100%; height: auto; border-radius: 4px; margin: 14px 0; }
-
-table { width: 100%; border-collapse: collapse; margin: 14px 0; }
-
-th, td {
-  padding: 12px 16px;
-  text-align: left;
-  border-bottom: 1px solid var(--border);
-}
-
-th {
-  background: var(--table-head);
-  font-weight: 600;
-  color: var(--text);
-}
-
-tr:hover { background: rgba(0,0,0,0.02); }
-
-@media (prefers-color-scheme: dark) {
-  tr:hover { background: rgba(255,255,255,0.02); }
-}
-
-.divider { margin: 26px 0; height: 1px; background: rgba(0,0,0,.08); }
-
-@media (prefers-color-scheme: dark) {
-  .divider { background: rgba(255,255,255,.1); }
-}
-
-.section { margin-top: 36px; }
-
-.links { margin: 12px 0; }
-
-.links a { display: inline-block; margin: 0 14px 6px 0; color: var(--link); }
-
-strong, b { font-weight: 600; color: var(--text); }
-
-em, i { font-style: italic; }
-
-.center { display: flex; justify-content: center; align-items: center; }
-
-.banner {
-  width: 100%;
-  box-sizing: border-box;
-  text-align: center;
-  background: var(--banner-bg);
-  padding: 20px;
-  border: 1px solid var(--border);
-  border-bottom-right-radius: 8px;
-  border-bottom-left-radius: 8px;
-  color: var(--text);
-  margin: -36px 0 28px 0;
-  box-shadow: 0 0.2em 0.6em var(--shadow);
-}
-
-.nav { margin-left: auto; margin-right: auto; }
-
-.nav a { color: var(--highlight); }
-
-.footer {
-  background: var(--footer-bg);
-  padding: 20px 0;
-  border-top: 1px solid rgba(0,0,0,.08);
-  font-size: 14px;
-  color: var(--muted);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 24px;
-  margin-top: 28px !important;
-  margin-bottom: 0;
-}
-
-.left { text-align: left; float: left; }
-
-.right { text-align: right; float: right; }
-</style>
-</head>
-<body>
-<div class="container">
-]],
-		footer = footer or [[
-<footer class="footer">
-<a href="https://git.vxserver.dev/fSD/fes" target="_blank">Fes Powered</a>
-<a href="https://www.lua.org/" target="_blank">Lua Powered</a>
-<a href="https://git.vxserver.dev/fSD/fes/src/branch/master/COPYING" target="_blank">ISC Licensed</a>
-<p>{{COPYRIGHT}}</p>
-</footer>
-</div>
-</body>
-</html>
-]],
 		parts = {},
+		proto = proto,
 	}
 
 	return setmetatable(self, M)
 end
 
-function M:custom(str)
+function M:raw(str)
-	table.insert(self.parts, str)
+	table.insert(self.parts, (str or "") .. "\n")
 	return self
 end
 
 for name, func in pairs(std) do
 	if type(func) == "function" then
 		M[name] = function(self, ...)
-			local result = func(...)
+			table.insert(self.parts, func(...))
-			table.insert(self.parts, result)
 			return self
 		end
 	end
 end
 
 function M:build()
-	local header = self.header
+	if self.proto == "http" then
-	header = header:gsub("{{TITLE}}", self.title or "Document")
+		local header = self.header:gsub("{{TITLE}}", self.title or "Document")
-	local favicon_html = self.favicon and ('<link rel="icon" type="image/x-icon" href="' .. self.favicon .. '">')
+		local favicon_html = self.favicon
-	header = header:gsub(
+		    or
-		"{{FAVICON}}",
+		    '<link rel="icon" href="data:image/svg+xml,<svg xmlns=%%22http://www.w3.org/2000/svg%%22 viewBox=%%220 0 100 100%%22><text y=%%22.9em%%22 font-size=%%2290%%22>🔥</text></svg>">'
-		favicon_html
+		header = header:gsub("{{FAVICON}}", favicon_html)
-			or [[<link rel="icon" href="data:image/svg+xml,<svg xmlns=%%22http://www.w3.org/2000/svg%%22 viewBox=%%220 0 100 100%%22><text y=%%22.9em%%22 font-size=%%2290%%22>🔥</text></svg>">]]
+
-	)
+		local footer = self.footer:gsub(
-	local footer = self.footer:gsub("{{COPYRIGHT}}", self.copyright or "&#169; The Copyright Holder")
+			"{{COPYRIGHT}}",
-	return header .. table.concat(self.parts, "\n") .. footer
+			self.copyright or symbol.legal.copyright .. "The Copyright Holder"
+		)
+
+		return header .. table.concat(self.parts, "\n") .. footer
+	elseif self.proto == "gemini" then
+		local footer = self.footer:gsub(
+			"{{COPYRIGHT}}",
+			self.copyright or "(c) The Copyright Holder"
+		)
+		local header = self.header
+
+		return header .. table.concat(self.parts, "\n") .. footer
+	end
+
+	return table.concat(self.parts, "\n")
 end
 
 M.__tostring = function(self)

lib/std.lua

@@ -1,214 +1,150 @@
 local M = {}
 
-function M.fes_version()
+M.proto = "http"
-	local fes_mod = package.loaded.fes
+M.__fes_banner_set = false
-	if fes_mod and fes_mod.config and fes_mod.config.fes and fes_mod.config.fes.version then
+
-		return fes_mod.config.fes.version
+local function isHttp()
+	-- return M.proto == "http"
+	return false
+end
+
+local function isGemini()
+	-- return M.proto == "gemini"
+	return true
+end
+
+M.p = function(s)
+	s = s or ""
+	if isHttp() then
+		return "<p>" .. s .. "</p>"
+	elseif isGemini() then
+		return s
 	end
-	return ""
 end
 
-function M.site_version()
+M.h = function(level, s)
-	local fes_mod = package.loaded.fes
+	level = tonumber(level) or 1
-	if fes_mod and fes_mod.config and fes_mod.config.site and fes_mod.config.site.version then
+	if level < 1 then level = 1 end
-		return fes_mod.config.site.version
+	if level > 6 then level = 6 end
+	s = s or ""
+	if isHttp() then
+		return "<h" .. level .. ">" .. s .. "</h" .. level .. ">"
+	elseif isGemini() then
+		return "\n" .. string.rep("#", level) .. " " .. s .. "\n"
 	end
-	return ""
 end
 
-function M.a(link, str)
+M.codeblock = function(s)
-	link = link or "https://example.com"
+	s = s or ""
-	str = str or link
+	if isHttp() then
-	return '<a href="' .. link .. '">' .. str .. "</a>"
+		return "<pre><code>" .. s .. "</code></pre>"
+	elseif isGemini() then
+		return "```\n" .. s .. "\n```"
+	end
 end
 
-function M.ha(link, str)
+M.inline = function(s)
-	link = link or "https://example.com"
+	s = s or ""
-	str = str or link
+	if isHttp() then
-	return '<a class="hidden" href="' .. link .. '">' .. str .. "</a>"
+		return "<code>" .. s .. "</code>"
+	elseif isGemini() then
+		return "`" .. s .. "`"
+	end
 end
 
-function M.external(link, str)
+M.link = function(url, text)
-	return '<a target="_blank" href="' .. link .. '">' .. str .. "</a>"
+	url = url or ""
+	text = text or url
+	if isHttp() then
+		return "<a href=\"" .. url .. "\">" .. text .. "</a>"
+	elseif isGemini() then
+		return "=> " .. url .. " " .. text
+	end
 end
 
-function M.note(str)
+M.list = function(items, ordered)
-	return '<div class="note">' .. str .. "</div>"
-end
-
-function M.muted(str)
-	return '<div class="muted">' .. str .. "</div>"
-end
-
-function M.callout(str)
-	return '<div class="callout">' .. str .. "</div>"
-end
-
-function M.h1(str)
-	return "<h1>" .. (str or "") .. "</h1>"
-end
-
-function M.h2(str)
-	return "<h2>" .. (str or "") .. "</h2>"
-end
-
-function M.h3(str)
-	return "<h3>" .. (str or "") .. "</h3>"
-end
-function M.h4(str)
-	return "<h4>" .. (str or "") .. "</h4>"
-end
-
-function M.h5(str)
-	return "<h5>" .. (str or "") .. "</h5>"
-end
-
-function M.h6(str)
-	return "<h6>" .. (str or "") .. "</h6>"
-end
-
-function M.p(str)
-	return "<p>" .. (str or "") .. "</p>"
-end
-
-function M.pre(str)
-	return "<pre>" .. (str or "") .. "</pre>"
-end
-
-function M.code(str)
-	return "<pre><code>" .. (str or "") .. "</code></pre>"
-end
-
-function M.ul(items)
 	items = items or {}
-	local html = "<ul>"
+	if isHttp() then
-	for _, item in ipairs(items) do
+		local tag = ordered and "ol" or "ul"
-		html = html .. "<li>" .. tostring(item) .. "</li>"
+		local out = "<" .. tag .. ">"
+		for _, v in ipairs(items) do
+			out = out .. "<li>" .. v .. "</li>"
+		end
+		out = out .. "</" .. tag .. ">"
+		return out
+	elseif isGemini() then
+		local out = {}
+		for i, v in ipairs(items) do
+			if ordered then
+				table.insert(out, i .. ". " .. v)
+			else
+				table.insert(out, "* " .. v)
+			end
+		end
+		return table.concat(out, "\n")
 	end
-	html = html .. "</ul>"
-	return html
 end
 
-function M.ol(items)
+M.blockquote = function(s)
-	items = items or {}
+	s = s or ""
-	local html = "<ol>"
+	if isHttp() then
-	for _, item in ipairs(items) do
+		return "<blockquote>" .. s .. "</blockquote>"
-		html = html .. "<li>" .. tostring(item) .. "</li>"
+	elseif isGemini() then
+		return "> " .. string.gsub(s, "\n", "\n> ")
 	end
-	html = html .. "</ol>"
-	return html
 end
 
-function M.tl(items)
+M.rule = function()
-	items = items or {}
+	if isHttp() then
-	local html = '<ul class="tl">'
+		return "<hr />"
-	for _, item in ipairs(items) do
+	elseif isGemini() then
-		html = html .. "<li>" .. tostring(item) .. "</li>"
+		return "---"
 	end
-	html = html .. "</ul>"
-	return html
 end
 
-function M.blockquote(str)
+M.image = function(alt, src)
-	return "<blockquote>" .. (str or "") .. "</blockquote>"
-end
-
-function M.hr()
-	return "<hr>"
-end
-
-function M.img(src, alt)
-	src = src or ""
 	alt = alt or ""
-	return '<img src="' .. src .. '" alt="' .. alt .. '">'
+	src = src or ""
-end
+	if isHttp() then
-
+		return "<img src=\"" .. src .. "\" alt=\"" .. alt .. "\" />"
-function M.strong(str)
+	elseif isGemini() then
-	return "<strong>" .. (str or "") .. "</strong>"
+		return "=> " .. src .. " " .. alt
-end
-
-function M.em(str)
-	return "<em>" .. (str or "") .. "</em>"
-end
-
-function M.br()
-	return "<br>"
-end
-
-function M.div(content, class)
-	content = content or ""
-	class = class or ""
-	local class_attr = class ~= "" and (' class="' .. class .. '"') or ""
-	return "<div" .. class_attr .. ">" .. content .. "</div>"
-end
-
-function M.span(content, class)
-	content = content or ""
-	class = class or ""
-	local class_attr = class ~= "" and (' class="' .. class .. '"') or ""
-	return "<span" .. class_attr .. ">" .. content .. "</span>"
-end
-
--- HTML escaping utility
-function M.escape(str)
-	str = tostring(str or "")
-	str = str:gsub("&", "&amp;")
-	str = str:gsub("<", "&lt;")
-	str = str:gsub(">", "&gt;")
-	str = str:gsub('"', "&quot;")
-	str = str:gsub("'", "&#39;")
-	return str
-end
-
--- Get site name from config
-function M.site_name()
-	local fes_mod = package.loaded.fes
-	if fes_mod and fes_mod.config and fes_mod.config.site and fes_mod.config.site.name then
-		return fes_mod.config.site.name
 	end
-	return ""
 end
 
--- Get site title from config
+M.file = function(text, url)
-function M.site_title()
+	text = text or ""
-	local fes_mod = package.loaded.fes
+	url = url or ""
-	if fes_mod and fes_mod.config and fes_mod.config.site and fes_mod.config.site.title then
+	if isHttp() then
-		return fes_mod.config.site.title
+		return "<a href=\"" .. url .. "\" download>" .. text .. "</a>"
+	elseif isGemini() then
+		return "=> " .. url .. " " .. text
 	end
-	return ""
 end
 
--- Get site authors from config
+M.note = function(text)
-function M.site_authors()
+	text = text or ""
-	local fes_mod = package.loaded.fes
+	if isHttp() then
-	if fes_mod and fes_mod.config and fes_mod.config.site and fes_mod.config.site.authors then
+		return "<div class=\"note\">" .. text .. "</div>"
-		return fes_mod.config.site.authors
+	elseif isGemini() then
+		return "\n" .. text .. "\n"
 	end
-	return {}
 end
 
-function M.highlight(str)
+M.banner = function (text)
-	return '<span class="highlight">' .. (str or "") .. "</span>"
+	text = text or ""
-end
 
-function M.banner(str)
+	if M.__fes_banner_set then
-	return '<div class="banner">' .. (str or "") .. "</div>"
+		error("Page already contains header")
-end
+		return ""
+	end
 
-function M.center(str)
+	M.__fes_banner_set = true
-	return '<div class="center">' .. (str or "") .. "</div>"
+	if isHttp() then
-end
+		return "<div class=\"banner\">" .. text .. "</div>"
-
+	elseif isGemini() then
-function M.nav(link, str)
+		return text
-	link = link or "example.com"
+	end
-	str = str or link
-	return '<a class="nav" href="' .. link .. '">' .. str .. "</a>"
-end
-
-function M.rl(r, l)
-	r = r or ""
-	l = l or ""
-	return string.format('<span class="left">%s</span><span class="right">%s</span>', r, l)
 end
 
 return M

lib/symbol.lua

@@ -1,7 +1,75 @@
 local M = {}
 
-M.copyright = "©"
+local function get(s)
-M.registered_trademark = "®"
+	return "&" .. (s or "") .. ";"
-M.trademark = "™"
+end
+
+M.legal = {
+	copyright = get("copy"),
+	registered_trademark = get("reg"),
+	trademark = get("trade"),
+}
+
+M.currency = {
+	euro = get("euro"),
+	pound = get("pound"),
+	yen = get("yen"),
+	cent = get("cent"),
+	dollar = "$",
+}
+
+M.math = {
+	plus_minus = get("plusmn"),
+	multiply = get("times"),
+	divide = get("divide"),
+	not_equal = get("ne"),
+	less_equal = get("le"),
+	greater_equal = get("ge"),
+	infinity = get("infin"),
+	approx = get("asymp"),
+}
+
+M.arrows = {
+	left = get("larr"),
+	right = get("rarr"),
+	up = get("uarr"),
+	down = get("darr"),
+	left_right = get("harr"),
+}
+
+M.punctuation = {
+	left_double_quote = get("ldquo"),
+	right_double_quote = get("rdquo"),
+	left_single_quote = get("lsquo"),
+	right_single_quote = get("rsquo"),
+	ellipsis = get("hellip"),
+	em_dash = get("mdash"),
+	en_dash = get("ndash"),
+}
+
+M.whitespace = {
+	non_breaking = get("nbsp"),
+	thin = get("thinsp"),
+}
+
+M.symbols = {
+	degree = get("deg"),
+	micro = get("micro"),
+	section = get("sect"),
+	paragraph = get("para"),
+	check = get("check"),
+	cross = get("cross"),
+	bullet = get("bull"),
+	middle_dot = get("middot"),
+	broken_bar = get("brvbar"),
+}
+
+M.html = {
+	less_than = get("lt"),
+	greater_than = get("gt"),
+	ampersand = get("amp"),
+	double_quote = get("quot"),
+	single_quote = get("apos"),
+}
 
 return M

lib/util.lua

@@ -1,14 +1,31 @@
-local std = require("lib.std")
-local symbol = require("lib.symbol")
-
 local M = {}
 
-function M.cc(tbl)
+function M.cc(tbl, sep)
-	return table.concat(tbl)
+	return table.concat(tbl, sep or "")
 end
 
-function M.copyright(link, holder)
+function M.ls(dir)
-	return symbol.copyright .. " " .. std.external(link, holder)
+	local p = io.popen('ls -A -1 -- ' .. string.format('%q', dir))
+	if not p then
+		return nil
+	end
+	local t = {}
+	for line in p:lines() do
+		t[#t + 1] = line
+	end
+	p:close()
+	return t
+end
+
+function M.run(cmd)
+	cmd = cmd or "echo nil"
+	local p = io.popen(cmd)
+	if not p then
+		return nil
+	end
+	local r = p:read("*a"):gsub("%s+$", "")
+	p:close()
+	return r
 end
 
 return M

main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"embed"
-	"errors"
 	"flag"
 	"fmt"
 	"os"
@@ -32,6 +31,7 @@ func init() {
 	config.Lib = lib
 	config.Doc = documentation
 	config.Verbose = flag.Bool("verbose", false, "Enable verbose logging")
+	config.Proto = flag.String("proto", "", "Force protocol")
 }
 
 func main() {
@@ -65,10 +65,6 @@ func main() {
 		color.NoColor = true
 	}
 
-	if *config.Port == 3000 {
-		ui.WARNING("Using default port, this may lead to conflicts with other services")
-	}
-
 	args := flag.Args()
 	if len(args) < 1 {
 		flag.Usage()
@@ -99,21 +95,15 @@ func main() {
 		}
 	case "run":
 		ui.Log("Fes is starting")
+		if *config.Port == 3000 {
+			ui.WARNING("Using default port, this may lead to conflicts with other services")
+		}
 		ui.Log("Fes version=%s, commit=%s, just started", version.VERSION, version.GetCommit())
 
 		runtime.ReadMemStats(&m)
 		ui.Log("FRE memory usage when created %v Mb", m.TotalAlloc/1024/1024)
 
-		if err := server.Start(dir); err != nil {
+		server.Start(dir)
-			if errors.Is(err, os.ErrNotExist) {
-				fmt.Fprintf(os.Stderr, "%s does not exist\n", dir)
-				fmt.Fprintf(os.Stderr, "Try: fes new %s\n", dir)
-				os.Exit(1)
-			} else {
-				fmt.Fprintln(os.Stderr, "Error:", err)
-				os.Exit(1)
-			}
-		}
 	default:
 		fmt.Fprintf(os.Stderr, "Unknown command: %s\n", cmd)
 		flag.Usage()

modules/config/config.go

@@ -12,6 +12,7 @@ var Color *bool
 var Static *bool
 var Docker *bool
 var Verbose *bool
+var Proto *string
 
 type AppConfig struct {
 	App struct {

modules/gemini/gemini.go

@@ -0,0 +1,196 @@
+package gemini
+
+import (
+	"bufio"
+	"crypto/tls"
+	"net"
+	"net/url"
+	"strings"
+	"sync"
+)
+
+const (
+	StatusSuccess       = 20
+	StatusTemporaryFail = 40
+	StatusPermanentFail = 50
+	StatusNotFound      = 51
+	StatusBadRequest    = 59
+)
+
+type Handler interface {
+	ServeGemini(ResponseWriter, *Request)
+}
+
+type HandlerFunc func(ResponseWriter, *Request)
+
+func (f HandlerFunc) ServeGemini(w ResponseWriter, r *Request) {
+	f(w, r)
+}
+
+type ServeMux struct {
+	mu       sync.RWMutex
+	handlers map[string]Handler
+}
+
+func NewServeMux() *ServeMux {
+	return &ServeMux{
+		handlers: make(map[string]Handler),
+	}
+}
+
+func (m *ServeMux) Handle(pattern string, h Handler) {
+	m.mu.Lock()
+	m.handlers[pattern] = h
+	m.mu.Unlock()
+}
+
+func (m *ServeMux) HandleFunc(pattern string, f func(ResponseWriter, *Request)) {
+	m.Handle(pattern, HandlerFunc(f))
+}
+
+func (m *ServeMux) ServeGemini(w ResponseWriter, r *Request) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+
+	path := r.URL.Path
+
+	for pattern, handler := range m.handlers {
+		if strings.HasPrefix(path, pattern) {
+			handler.ServeGemini(w, r)
+			return
+		}
+	}
+
+	w.WriteHeader(StatusNotFound, "not found")
+}
+
+var DefaultServeMux = NewServeMux()
+
+func Handle(pattern string, h Handler) {
+	DefaultServeMux.Handle(pattern, h)
+}
+
+func HandleFunc(pattern string, f func(ResponseWriter, *Request)) {
+	DefaultServeMux.HandleFunc(pattern, f)
+}
+
+type Request struct {
+	URL  *url.URL
+	Conn net.Conn
+}
+
+type ResponseWriter interface {
+	Write([]byte) (int, error)
+	WriteHeader(status int, meta string)
+}
+
+type response struct {
+	conn        net.Conn
+	wroteHeader bool
+}
+
+func (r *response) WriteHeader(status int, meta string) {
+	if r.wroteHeader {
+		return
+	}
+	r.conn.Write([]byte(
+		strings.TrimSpace(
+			strings.Join([]string{
+				strings.TrimSpace(
+					strings.Join([]string{
+						string(rune(status/10 + '0')),
+						string(rune(status%10 + '0')),
+					}, ""),
+				),
+				meta,
+			}, " "),
+		) + "\r\n"))
+	r.wroteHeader = true
+}
+
+func (r *response) Write(b []byte) (int, error) {
+	if !r.wroteHeader {
+		r.WriteHeader(StatusSuccess, "text/gemini")
+	}
+	return r.conn.Write(b)
+}
+
+type Server struct {
+	Addr      string
+	Handler   Handler
+	TLSConfig *tls.Config
+}
+
+func (s *Server) ListenAndServeTLS(certFile, keyFile string) error {
+	handler := s.Handler
+	if handler == nil {
+		handler = DefaultServeMux
+	}
+
+	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		return err
+	}
+
+	cfg := s.TLSConfig
+	if cfg == nil {
+		cfg = &tls.Config{}
+	}
+	cfg.Certificates = []tls.Certificate{cert}
+
+	ln, err := tls.Listen("tcp", s.Addr, cfg)
+	if err != nil {
+		return err
+	}
+
+	for {
+		conn, err := ln.Accept()
+		if err != nil {
+			continue
+		}
+		go s.serve(conn, handler)
+	}
+}
+
+func (s *Server) serve(conn net.Conn, handler Handler) {
+	defer conn.Close()
+
+	reader := bufio.NewReader(conn)
+
+	line, err := reader.ReadString('\n')
+	if err != nil {
+		return
+	}
+
+	if len(line) > 1026 {
+		conn.Write([]byte("59 request too long\r\n"))
+		return
+	}
+
+	line = strings.TrimSpace(line)
+
+	u, err := url.Parse(line)
+	if err != nil {
+		conn.Write([]byte("59 bad request\r\n"))
+		return
+	}
+
+	req := &Request{
+		URL:  u,
+		Conn: conn,
+	}
+
+	rw := &response{
+		conn: conn,
+	}
+
+	handler.ServeGemini(rw, req)
+}
+
+func ListenAndServeTLS(addr, certFile, keyFile string, h Handler) error {
+	s := &Server{
+		Addr:    addr,
+		Handler: h,
+	}
+	return s.ListenAndServeTLS(certFile, keyFile)
+}

modules/new/new.go

@@ -74,14 +74,9 @@ local site = fes.fes()
 
 -- site.copyright = fes.util.copyright("https://example.com", "%s")
 
-site:h1("Hello, World!")
+site:h(1, "Hello, World!")
 
 return site`, name)
-	write("Fes.toml", `[app]
-
-name = "%s"
-version = "0.0.1"
-authors = ["%s"]`, dir, name)
 	write("README.md", strings.ReplaceAll(`# %s
 
 $$$$$$
@@ -110,19 +105,121 @@ All commands are run from the root of the project, from a terminal:
 
 | Command                   | Action                                           |
 | :------------------------ | :----------------------------------------------- |
-| $$fes run .$$               | Runs the project at $$.$$                          |
+| $$fes run .$$             | Runs the project at $$.$$                        |
+
+## Gemini
+
+Fes supports many different protocols. One of which is the Gemini protocol; this
+protocol has specific encryption standards which makes the providing $$key.pem$$
+and a $$cert.pem$$ files. *Please* regenerate these files by running this command.
+$$$$$$
+openssl req -x509 -nodes -days 365 \
+  -newkey rsa:2048 \
+  -keyout key.pem \
+  -out cert.pem \
+  -subj "/C=US/ST=State/L=City/O=Local Development/OU=Localhost/CN=localhost" \
+  -addext "subjectAltName=DNS:localhost,IP:127.0.0.1,IP:::1" \
+  -addext "basicConstraints=CA:FALSE" \
+  -addext "keyUsage=digitalSignature,keyEncipherment" \
+  -addext "extendedKeyUsage=serverAuth"
+$$$$$$
 
 ## What to learn more?
 
 Check out [Fes's docs](https://docs.vxserver.dev/static/fes.html).`, "$$", "`"), dir, dir)
+	write("key.pem", `-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCfl+m81U9+WLBn
+PiJ1ZADnZC+BecXArguAdnbkgDlmfqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvo
+DdjomXM4yb9Axu2KDHfflTcw3wHD3850ganf9rwVG460gkVfUGaRiokyCvEJKd05
+BxKmx8Zh6G2tpetaDKm72ONYQFyaBCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+
+sTEkCTWsjUesiG0393t3psFa/SlZKsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQ
+iFtQse2gqC4IhG2MGi0b4mu4Qa3+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j
+/h40l1J3h/aTM5/qS7malAtXySMVzLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhV
+Cx/sovrvgFF+8j4nLXOBgrx8llYB5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+
+OHeKhgdnz/a+pCUBwJe8JAzX7fzoZ+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5
+PciN0xsWQdaAWPcVe6+YYRKS6l6qaWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT
+4MDFUJWXFmTnyhHg3Cq7pWJR7pv2erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimh
+vZZIa5W2vzpkLHbWgI2XGbx8yKRXowIDAQABAoICAENZb5lyB5cRRHh9XztdFYiQ
+3f9s7UhP6qiu1aO+fPrFDm9mHwEMF7eLTYep9j3HYMazE3IQRU8z76SRW21lfJuF
+gEGM8aeldV0UcnMcWXlY1J6ULaVHUb4yn/mLVE1R98cJyLYmqeutEB/F3VgmzJB6
+7vYuI/EfkO2mLOMMXkfc4wJGpIyJRLvP8tcoj4bG+r+qphFXGrYgNmLUEiHcBRup
+j4q/FCBfP2qSI90LI0zu3/rJK1aDFlHW1J8baWOUoBzUAX3rGzDth8iSUr7uJ5L6
+Blsvz68lSM4QslbS2OOfcATJrE5Apex+kTOas023BPVJgwfFCmey3mUdk4+sIG+I
+YpvrfUHBAbhRt1itGjjx/BH3HVtkwKsm3nNNgE8qS0qmziGVa60amLng0OgD4SOH
+QKWrotcojYlWHywdHNAmiaWP+ZV9U0u4T59dkHhjqBoPuY64kNddRCLYItszqOmC
+tamnflcoFPThdBnDpnXhLX+MnvQKIO2K2QTKjdYrkSMvEC/m96H49Vf4w+Fe3coc
+SLsyMqHmYSG3+QtFN3JSmqDdBLQ+bFK0KZOk3IE2UK+lvabmtHuGLkYguur/fOnG
+FvxcC+MIHHFrtSfqfvIrXeGFqe2Fb6DIKdMJFPV8iP5Px91A0GAGeabyktyya1n5
+kk5nMJY3A7rTmnDO2PUBAoIBAQDSd+pvNGDf/We74+NODKQBcleCfF0NNzvRIuYH
+9vel5jhyD28Y30XQS7+YBo3Y5Yo5pVlJ425Z5CveZOmr4VImuYG8LTbbGYY8ns3c
+R/IdP1ByAcIa1eRGQNcKHid7RW4aEoFdvW3jZNj6/ukbJwd9ZHOt4HEUv5MOObn7
+VXiXiwHjVy3X4uD5j0bHS4owd7S3Ygg0OneUzX3XJ+8qUgfU9B+lD3SbtsI4baoU
+qUKcQc/0yXKvJvoz9oX2tjQOHqGrGwHdootc2CLnr0PMI7fKBwT3k63B+24xEGcx
+OAPc5tUuiqIewiCn1oZbeCxmNnnimkAjDfG2KXMXj1R1G96BAoIBAQDCHnTNQhXH
+tcfwnxj86E+Zd7ORS7iH/5eWvnspt2pnNCpufLFQlbdiL3d9ysSN9nw3+y15/o83
+R79s7fLdC0+blc6q/ZQEdB1C+8YQa0nTlqqlZWVbRPjQUV+SfGssaZFEO4W7QWh3
+hJL14HbWUFC3XSdMAeKTNOcgvfVvQ9M8HlJI1ZPo4Pe4rGNFIEsKUz/6HVE7HFgQ
+OwcLSxZlSQSQ6/YErP/XJoyQUPjHldAjphV/rn28cvh2quoI35fbBuZu5pyKLXTg
+RKbdWbeoIZTthRojpqnfqnIR+rPXIIiaMYhStdPshNUxLL7DX+/3yI05qq8R+yqa
+2gLb2mJltuwjAoIBAF0WQI/ywK4Q7CKEBnLs0FT7d4z06EsCFOjI4KjBKIMtseVw
+whhkGAKqnhDlRTObQmmAol81wgbsDiMMyvUEcUtDXQgXj12UinShYDd/cqxQ5omm
+EW3BEHeqEfIdqCSzbqEFckY9lC6w2e8Zc4xY1M028psC28DrgmUWTxXEldOg3bLp
+ShNj+1Eld46J8JLDPyCksTA4c89Sm8ffl75GDcS4PI7KqS59xKUki8cbnaRyz0Fb
+H+gr+xmkfVfC+n8MOUDubwLR84Wa6sVCFWBio9UtCZteq8lSJUh6EsoIFl1LkxpE
+orOr9LmG/mHSYwDKM1pwEtHuRuvkpUzUTeyF6QECggEAbm/vWZtgUsdbocyR5cix
+CImuUlo2+MBz2KIz5c7grShjf4pXQpZ6x1Rj8d/7JRz3HM482Cv4BKZABNP3GMTH
+nKeE9YjgvgvlXedpjovLa6JLIV/nYx6BQ9sXuXopaxIAQEZw1dDngx+ckGAMm+8D
+jN5lbfugkMlHOTx5Nrzqn0hM3f0McjATHzCMJZayuoQUYNJvFWcRvuImJsmoSyVY
+gK6Nv6lAwIHA9JXsg3f6+10Q3BxEkoMCUlj4XuX+OfDaBnwS0RX9aV4FZOcW8oNw
+fBT+gwvdl08cKJht2lU7AiZt/UhO8j+8HobrXLHnDxw9JHKzuVIgsgqYF8ZNtrpz
+6wKCAQEAqJc9xfNYL2jyJTVBvqX34Uct9xV1fq7z45B3gpPHj4tc0dBOIwPKSsu8
+rGyefPuMDvbecJoaXqRZGQEcv03ecLVtHHDCsJcWavth9sCQJW9mnOxjOnLHdGnl
+h2yIV4iVzNEx5XA1+0JRAAwFMXrC9LUZDTT61opjohMJSEySo/HVekoWG9A0bQGn
+Ui+JbtLeuuCwwAGSgdAhVkjr27ANyFtjR63KVrDvSLbYFyZXKxrRYnZWs92Ho/g6
+oTLnUSmkbLlhsUDjknAaNfp+enETSoPHcpkd7MeqVw2oYrLw6MCo4h2tBsIgtZEd
+h6CgX4Gc3+bhvKx36XYxVwScPJUWsQ==
+-----END PRIVATE KEY-----`)
+	write("cert.pem", `-----BEGIN CERTIFICATE-----
+MIIFmzCCA4OgAwIBAgIUZGaMDLeCAQplfhhjXb2HaL6xpFYwDQYJKoZIhvcNAQEL
+BQAwXTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
+MQwwCgYDVQQKDANPcmcxDTALBgNVBAsMBFVuaXQxEjAQBgNVBAMMCWxvY2FsaG9z
+dDAeFw0yNjAyMjQwMjUwMzVaFw0yNzAyMjQwMjUwMzVaMF0xCzAJBgNVBAYTAlVT
+MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEMMAoGA1UECgwDT3JnMQ0w
+CwYDVQQLDARVbml0MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCfl+m81U9+WLBnPiJ1ZADnZC+BecXArguAdnbkgDlm
+fqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvoDdjomXM4yb9Axu2KDHfflTcw3wHD
+3850ganf9rwVG460gkVfUGaRiokyCvEJKd05BxKmx8Zh6G2tpetaDKm72ONYQFya
+BCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+sTEkCTWsjUesiG0393t3psFa/SlZ
+KsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQiFtQse2gqC4IhG2MGi0b4mu4Qa3+
+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j/h40l1J3h/aTM5/qS7malAtXySMV
+zLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhVCx/sovrvgFF+8j4nLXOBgrx8llYB
+5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+OHeKhgdnz/a+pCUBwJe8JAzX7fzo
+Z+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5PciN0xsWQdaAWPcVe6+YYRKS6l6q
+aWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT4MDFUJWXFmTnyhHg3Cq7pWJR7pv2
+erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimhvZZIa5W2vzpkLHbWgI2XGbx8yKRX
+owIDAQABo1MwUTAdBgNVHQ4EFgQUcyq+ZZWmAUejOPEQpHpl4hOllHswHwYDVR0j
+BBgwFoAUcyq+ZZWmAUejOPEQpHpl4hOllHswDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEANwdjxlPHqvOOyNTFJcFhcNff3862/74CyCiglrstk/ea
+txjyHxXFwXOtyAtm0tqaQPpzHWFM5MDqVD7Qip4aZrPcRvvfJ8zxXuakrgy7oI6i
+Wl4/BXzvIoxh8MyFVC7VdGmuv11fq091RaNPlnz5lH9Qxhb6QCGbk73PjTXxD/7A
+yusNiXuJvx3oRhLLGuksotFKEnngOq21Jla3ZPUmJTLAZdk/joXITk5Q64ZBp5uD
+rpxFZDtdHTBuL3nmNPUHixsxQRFzCSloufRlatdI2ldDc+d2WLLFhkpdM35Oedf3
+Hib0VXPgJ8j/w6RK+oYKMP27RojMFXALolzRBSQu3Zbd1bD1qVhh/dO5Uyn4E3mb
+2LW5+a9zuabD9wt8smSU9V5ZYw5hcR0ANN7xYmaMvGFKrNPNkI3m0c2dyj22vgg0
+zQqeMze4KxZqDf/gFifJ4UIybBAgc/p1uOIceFTSYplVXJQIgFACn9l6c4Zo0GZD
+H48iKQLwlxDdUSM8aHtItWxRddLCL7lYNKtu2/qu8I9NKkjx4/Kn3I9Is/f37EIn
+rF3ygUg3ee5zo3fvMjlhCNs6djm+ANx2KzdZkS7UU/jb0o+OSEvoMIgZh5NNgUlC
+aVR3opS3PTqwu4plN0Evh5kr3nEOx0vcIK726DwnpgNRhcG9cNcSi2UB4NYCWaw=
+-----END CERTIFICATE-----`)
 
 	ui.Hint("you can run this with `fes run %s`", dir)
 
 	fmt.Println("Created new Fes project at", func() string {
-		if res, err := filepath.Abs(dir); err == nil {
+		if cwd, err := os.Getwd(); err != nil {
-			return res
+			return dir
+		} else {
+			return cwd
 		}
-		return dir
 	}())
 
 	return nil

modules/server/archive.go

@@ -0,0 +1,117 @@
+package server
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"sort"
+	"strings"
+	"text/template"
+	"time"
+)
+
+/* this indexes and generate the page for viewing the archive directory */
+func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
+	info, err := os.Stat(fsPath)
+	if err != nil {
+		return "", err
+	}
+	if !info.IsDir() {
+		return "", fmt.Errorf("not a directory")
+	}
+	ents, err := os.ReadDir(fsPath)
+	if err != nil {
+		return "", err
+	}
+	type entryInfo struct {
+		name  string
+		isDir bool
+		href  string
+		size  int64
+		mod   time.Time
+	}
+	var list []entryInfo
+	for _, e := range ents {
+		n := e.Name()
+		full := filepath.Join(fsPath, n)
+		st, err := os.Stat(full)
+		if err != nil {
+			continue
+		}
+		isd := st.IsDir()
+		displayName := n
+		if isd {
+			displayName = n + "/"
+		}
+		href := path.Join(urlPath, n)
+		if isd && !strings.HasSuffix(href, "/") {
+			href = href + "/"
+		}
+		size := int64(-1)
+		if !isd {
+			size = st.Size()
+		}
+		list = append(list, entryInfo{name: displayName, isDir: isd, href: href, size: size, mod: st.ModTime()})
+	}
+	sort.Slice(list, func(i, j int) bool {
+		if list[i].isDir != list[j].isDir {
+			return list[i].isDir
+		}
+		return strings.ToLower(list[i].name) < strings.ToLower(list[j].name)
+	})
+
+	urlPath = strings.TrimPrefix(urlPath, "/archive")
+
+	var b strings.Builder
+
+	b.WriteString("<html>\n<head><title>Index of ")
+	b.WriteString(template.HTMLEscapeString(urlPath))
+	b.WriteString("</title></head>\n<body>\n<h1>Index of ")
+	b.WriteString(template.HTMLEscapeString(urlPath))
+	b.WriteString("</h1><hr><pre>")
+	b.WriteString("<a href=\"../\">../</a>\n")
+
+	nameCol := 50
+	for _, ei := range list {
+		escapedName := template.HTMLEscapeString(ei.name)
+		dateStr := ei.mod.Local().Format("02-Jan-2006 15:04")
+		var sizeStr string
+		if ei.isDir {
+			sizeStr = "-"
+		} else {
+			sizeStr = fmt.Sprintf("%d", ei.size)
+		}
+		spaces := 1
+		if len(escapedName) < nameCol {
+			spaces = nameCol - len(escapedName)
+		}
+		line := `<a href="` + template.HTMLEscapeString(ei.href) + `">` + escapedName + `</a>` + strings.Repeat(" ", spaces) + dateStr + strings.Repeat(" ", 19-len(sizeStr)) + sizeStr + "\n"
+		b.WriteString(line)
+	}
+	b.WriteString("</pre><hr></body>\n</html>")
+	return b.String(), nil
+}
+
+/* helper to read the archive files */
+func readArchive(w io.Writer, route string, protcol Protocols) error {
+	switch protcol {
+	case HTTP:
+		fsPath := "." + route
+		if info, err := os.Stat(fsPath); err == nil && info.IsDir() {
+			if page, err := generateArchiveIndex(fsPath, route); err == nil {
+				w.Write([]byte(page))
+				return nil
+			} else {
+				return err
+			}
+		}
+	case GEMINI:
+		panic(errors.New("TODO"))
+	default:
+		panic(errors.New("Invalid Protocol"))
+	}
+	return nil
+}

modules/server/dirs.go

@@ -0,0 +1,83 @@
+package server
+
+import (
+	"fes/modules/ui"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+/* performs relavent handling based on the directory passaed
+ *
+ * Special directories
+ *  - www/     <= contains lua routes.
+ *  - static/  <= static content accessable at /static/path or /static/dir/path.
+ *  - include/ <= globally accessable lua functions, cannot directly access "fes" right now.
+ *  - archive/ <= contains user facing files such as archives or dists.
+ *
+ */
+func handleDir(entries []os.DirEntry, dir string, routes map[string]string, base string, isStatic bool) error {
+	for _, entry := range entries {
+		path := filepath.Join(dir, entry.Name())
+		if entry.IsDir() {
+			nextBase := joinBase(base, entry.Name())
+			subEntries, err := os.ReadDir(path)
+			if err != nil {
+				return fmt.Errorf("failed to read directory %s: %w", path, err)
+			}
+			if err := handleDir(subEntries, path, routes, nextBase, isStatic); err != nil {
+				return err
+			}
+			continue
+		}
+		route := joinBase(base, entry.Name())
+		if !isStatic && strings.HasSuffix(entry.Name(), ".lua") {
+			name := strings.TrimSuffix(entry.Name(), ".lua")
+			if name == "index" {
+				routes[basePath(base)] = path
+				routes[route] = path
+				continue
+			}
+			route = joinBase(base, name)
+		} else if !isStatic && strings.HasSuffix(entry.Name(), ".md") {
+			name := strings.TrimSuffix(entry.Name(), ".md")
+			if name == "index" {
+				routes[basePath(base)] = path
+				routes[route] = path
+				continue
+			}
+			route = joinBase(base, name)
+		}
+		routes[route] = path
+	}
+	return nil
+}
+
+/* helper to load all special directories */
+func loadDirs() map[string]string {
+	routes := make(map[string]string)
+
+	if entries, err := os.ReadDir("www"); err == nil {
+		ui.LogVerbose("reading www/")
+		if err := handleDir(entries, "www", routes, "", false); err != nil {
+			ui.Warning("failed to handle www directory", err)
+		}
+	}
+
+	if entries, err := os.ReadDir("static"); err == nil {
+		ui.LogVerbose("reading static/")
+		if err := handleDir(entries, "static", routes, "/static", true); err != nil {
+			ui.Warning("failed to handle static directory", err)
+		}
+	}
+
+	if entries, err := os.ReadDir("archive"); err == nil {
+		ui.LogVerbose("reading archive/")
+		if err := handleDir(entries, "archive", routes, "/archive", true); err != nil {
+			ui.Warning("failed to handle archive directory", err)
+		}
+	}
+
+	return routes
+}

modules/server/gemini.go

@@ -0,0 +1,59 @@
+package server
+
+import (
+	"fes/modules/config"
+	"fes/modules/gemini"
+	"fes/modules/ui"
+	"os"
+	"strings"
+)
+
+func geminiHandler(w gemini.ResponseWriter, r *gemini.Request) {
+	ui.LogVerbose("Received %s", r.URL.Path)
+
+	route, ok := Routes[r.URL.Path]
+
+	var err error = nil
+
+	/* defer won't update paramaters unless we do this. */
+	defer func() {
+		ui.Path(route, err)
+	}()
+
+	if !ok {
+		err = config.ErrRouteMiss
+		route = r.URL.Path
+
+		if strings.HasPrefix(route, "/archive") {
+			err = readArchive(w, route, GEMINI)
+		} else {
+			w.WriteHeader(gemini.StatusNotFound, "StatusNotFound")
+		}
+		return
+	}
+
+	params := make(map[string]string)
+	for k, v := range r.URL.Query() {
+		if len(v) > 0 {
+			params[k] = v[0]
+		}
+	}
+
+	var data []byte
+	if strings.HasSuffix(route, ".lua") {
+		data, err = render(route, reqData{path: r.URL.Path, params: params}, GEMINI)
+	} else if strings.HasSuffix(route, ".md") {
+		data, err = os.ReadFile(route)
+		data = []byte(markdownToHTML(string(data)))
+		data = []byte("<style>body {max-width: 80ch;}</style>\n" + string(data))
+	} else {
+		ui.LogVerbose("serving unrecognized file")
+		data, err = os.ReadFile(route)
+	}
+
+	if err != nil {
+		w.WriteHeader(-1, err.Error())
+	}
+
+	w.Write(data)
+}

modules/server/http.go

@@ -0,0 +1,67 @@
+package server
+
+import (
+	"fes/modules/config"
+	"fes/modules/ui"
+	"fmt"
+	"net/http"
+	"os"
+	"strings"
+)
+
+func httpHandler(w http.ResponseWriter, r *http.Request) {
+	ui.LogVerbose("Received %s", r.URL.Path)
+
+	route, ok := Routes[r.URL.Path]
+
+	var err error = nil
+
+	/* defer won't update paramaters unless we do this. */
+	defer func() {
+		ui.Path(route, err)
+	}()
+
+	if !ok {
+		err = config.ErrRouteMiss
+		route = r.URL.Path
+
+		if strings.HasPrefix(route, "/archive") {
+			err = readArchive(w, route, HTTP)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			w.Write([]byte(`<html>
+<head><title>404 Not Found</title></head>
+<body>
+<center><h1>404 Not Found</h1></center>
+<hr><center>fes</center>
+</body>
+</html>`))
+		}
+		return
+	}
+
+	params := make(map[string]string)
+	for k, v := range r.URL.Query() {
+		if len(v) > 0 {
+			params[k] = v[0]
+		}
+	}
+
+	var data []byte
+	if strings.HasSuffix(route, ".lua") {
+		data, err = render(route, reqData{path: r.URL.Path, params: params}, HTTP)
+	} else if strings.HasSuffix(route, ".md") {
+		data, err = os.ReadFile(route)
+		data = []byte(markdownToHTML(string(data)))
+		data = []byte("<style>body {max-width: 80ch;}</style>\n" + string(data))
+	} else {
+		ui.LogVerbose("serving unrecognized file")
+		data, err = os.ReadFile(route)
+	}
+
+	if err != nil {
+		http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
+	}
+
+	w.Write(data)
+}

modules/server/render.go

@@ -0,0 +1,152 @@
+package server
+
+import (
+	"fes/modules/config"
+	"io/fs"
+	"path/filepath"
+	"strings"
+
+	lua "github.com/yuin/gopher-lua"
+)
+
+type reqData struct {
+	path   string
+	params map[string]string
+}
+
+func render(luapath string, requestData reqData, protocol Protocols) ([]byte, error) {
+	L := lua.NewState()
+	defer L.Close()
+
+	if lib, err := fs.ReadDir(config.Lib, "lib"); err == nil {
+		for _, de := range lib {
+			if de.IsDir() || !strings.HasSuffix(de.Name(), ".lua") {
+				continue
+			}
+			path := filepath.Join("lib", de.Name())
+			if data, err := config.Lib.ReadFile(path); err == nil {
+				_ = L.DoString(string(data))
+			}
+		}
+	}
+
+	preloadLuaModule := func(name, path string) {
+		L.PreloadModule(name, func(L *lua.LState) int {
+			fileData, err := config.Lib.ReadFile(path)
+			if err != nil {
+				panic(err)
+			}
+
+			if err := L.DoString(string(fileData)); err != nil {
+				panic(err)
+			}
+
+			return 1
+		})
+	}
+
+	preloadLuaModule("lib.std", "lib/std.lua")
+	preloadLuaModule("lib.symbol", "lib/symbol.lua")
+	preloadLuaModule("lib.util", "lib/util.lua")
+
+	L.PreloadModule("fes", func(L *lua.LState) int {
+		fileData, err := config.Lib.ReadFile("lib/fes.lua")
+		if err != nil {
+			panic(err)
+		}
+
+		if err := L.DoString(string(fileData)); err != nil {
+			panic(err)
+		}
+
+		mod := L.Get(-1)
+		L.Pop(1)
+
+		tbl, ok := mod.(*lua.LTable)
+		if !ok {
+			panic("fes module did not return table")
+		}
+
+		if err := L.CallByParam(lua.P{
+			Fn:      L.GetGlobal("require"),
+			NRet:    1,
+			Protect: true,
+		}, lua.LString("lib.std")); err != nil {
+			panic(err)
+		}
+
+		stdMod := L.Get(-1)
+		L.Pop(1)
+
+		stdTbl, ok := stdMod.(*lua.LTable)
+		if !ok {
+			panic("lib.std did not return table")
+		}
+
+		proto := func() string {
+			switch protocol {
+			case HTTP:
+				return "http"
+			case GEMINI:
+				return "gemini"
+			default:
+				return "http"
+			}
+		}()
+		proto = "gemini"
+
+		stdTbl.RawSetString("proto", lua.LString(proto))
+		tbl.RawSetString("std", stdTbl)
+
+		bus := L.NewTable()
+		bus.RawSetString("url", lua.LString(requestData.path))
+
+		params := L.NewTable()
+		for k, v := range requestData.params {
+			params.RawSetString(k, lua.LString(v))
+		}
+		bus.RawSetString("params", params)
+
+		tbl.RawSetString("bus", bus)
+
+		tbl.RawSetString("markdown_to_html", L.NewFunction(func(L *lua.LState) int {
+			L.Push(lua.LString(markdownToHTML(L.ToString(1))))
+			return 1
+		}))
+
+		L.Push(tbl)
+		return 1
+	})
+
+	if err := L.DoFile(luapath); err != nil {
+		return []byte(""), err
+	}
+
+	if L.GetTop() == 0 {
+		return []byte(""), nil
+	}
+
+	val := L.Get(-1)
+	L.Pop(1)
+
+	if val == lua.LNil {
+		return []byte(""), nil
+	}
+
+	if err := L.CallByParam(lua.P{
+		Fn:      L.GetGlobal("tostring"),
+		NRet:    1,
+		Protect: true,
+	}, val); err != nil {
+		return nil, err
+	}
+
+	s := L.ToString(-1)
+	L.Pop(1)
+
+	if s != "" {
+		return []byte(s), nil
+	}
+
+	return []byte(""), nil
+}

modules/server/server.go

@@ -1,486 +1,77 @@
 package server
 
 import (
-	"errors"
 	"fes/modules/config"
+	"fes/modules/gemini"
 	"fes/modules/ui"
 	"fmt"
-	"html/template"
-	"io/fs"
 	"net/http"
 	"os"
-	"path"
 	"path/filepath"
-	"sort"
+	"sync"
-	"strings"
-	"time"
-
-	"github.com/pelletier/go-toml/v2"
-	lua "github.com/yuin/gopher-lua"
 )
 
-/* this is the request data we pass over the bus to the application, via the fes.bus interface */
+type Protocols int
-type reqData struct {
-	path   string
-	params map[string]string
-}
 
-/* performs relavent handling based on the directory passaed
+const (
- *
+	HTTP Protocols = iota
- * Special directories
+	GEMINI
- *  - www/     <= contains lua routes.
+)
- *  - static/  <= static content accessable at /static/path or /static/dir/path.
- *  - include/ <= globally accessable lua functions, cannot directly access "fes" right now.
- *  - archive/ <= contains user facing files such as archives or dists.
- *
- */
-func handleDir(entries []os.DirEntry, dir string, routes map[string]string, base string, isStatic bool) error {
-	for _, entry := range entries {
-		path := filepath.Join(dir, entry.Name())
-		if entry.IsDir() {
-			nextBase := joinBase(base, entry.Name())
-			subEntries, err := os.ReadDir(path)
-			if err != nil {
-				return fmt.Errorf("failed to read directory %s: %w", path, err)
-			}
-			if err := handleDir(subEntries, path, routes, nextBase, isStatic); err != nil {
-				return err
-			}
-			continue
-		}
-		route := joinBase(base, entry.Name())
-		if !isStatic && strings.HasSuffix(entry.Name(), ".lua") {
-			name := strings.TrimSuffix(entry.Name(), ".lua")
-			if name == "index" {
-				routes[basePath(base)] = path
-				routes[route] = path
-				continue
-			}
-			route = joinBase(base, name)
-		} else if !isStatic && strings.HasSuffix(entry.Name(), ".md") {
-			name := strings.TrimSuffix(entry.Name(), ".md")
-			if name == "index" {
-				routes[basePath(base)] = path
-				routes[route] = path
-				continue
-			}
-			route = joinBase(base, name)
-		}
-		routes[route] = path
-	}
-	return nil
-}
 
-// TODO(vx-clutch): this should not be a function
+var Routes map[string]string
-func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
-	app := L.NewTable()
-	ents, err := os.ReadDir(includeDir)
-	if err != nil {
-		return app
-	}
-	for _, e := range ents {
-		if e.IsDir() || !strings.HasSuffix(e.Name(), ".lua") {
-			continue
-		}
-		base := strings.TrimSuffix(e.Name(), ".lua")
-		path := filepath.Join(includeDir, e.Name())
-		if _, err := os.Stat(path); err != nil {
-			tbl := L.NewTable()
-			tbl.RawSetString("error", lua.LString(fmt.Sprintf("file not found: %s", path)))
-			app.RawSetString(base, tbl)
-			continue
-		}
-		if err := L.DoFile(path); err != nil {
-			tbl := L.NewTable()
-			tbl.RawSetString("error", lua.LString(err.Error()))
-			app.RawSetString(base, tbl)
-			continue
-		}
-		val := L.Get(-1)
-		L.Pop(1)
-		tbl, ok := val.(*lua.LTable)
-		if !ok || tbl == nil {
-			tbl = L.NewTable()
-		}
-		app.RawSetString(base, tbl)
-	}
-	return app
-}
 
-/* renders the given lua route */
+func Start(dir string) {
-func renderRoute(entry string, cfg *config.AppConfig, requestData reqData) ([]byte, error) {
-	L := lua.NewState()
-	defer L.Close()
-
-	libFiles, err := fs.ReadDir(config.Lib, "lib")
-	if err == nil {
-		for _, de := range libFiles {
-			if de.IsDir() || !strings.HasSuffix(de.Name(), ".lua") {
-				continue
-			}
-			path := filepath.Join("lib", de.Name())
-			fileData, err := config.Lib.ReadFile(path)
-			if err != nil {
-				continue
-			}
-			L.DoString(string(fileData))
-		}
-	}
-
-	preloadLuaModule := func(name, path string) {
-		L.PreloadModule(name, func(L *lua.LState) int {
-			fileData, err := config.Lib.ReadFile(path)
-			if err != nil {
-				panic(err)
-			}
-			if err := L.DoString(string(fileData)); err != nil {
-				panic(err)
-			}
-			L.Push(L.Get(-1))
-			return 1
-		})
-	}
-
-	preloadLuaModule("lib.std", "lib/std.lua")
-	preloadLuaModule("lib.symbol", "lib/symbol.lua")
-	preloadLuaModule("lib.util", "lib/util.lua")
-
-	L.PreloadModule("fes", func(L *lua.LState) int {
-		mod := L.NewTable()
-		libModules := []string{}
-		if ents, err := fs.ReadDir(config.Lib, "lib"); err == nil {
-			for _, e := range ents {
-				if e.IsDir() || !strings.HasSuffix(e.Name(), ".lua") {
-					continue
-				}
-				libModules = append(libModules, strings.TrimSuffix(e.Name(), ".lua"))
-			}
-		}
-		for _, modName := range libModules {
-			path := filepath.Join("lib", modName+".lua")
-			fileData, err := config.Lib.ReadFile(path)
-			if err != nil {
-				continue
-			}
-			if err := L.DoString(string(fileData)); err != nil {
-				continue
-			}
-			val := L.Get(-1)
-			L.Pop(1)
-			tbl, ok := val.(*lua.LTable)
-			if !ok || tbl == nil {
-				tbl = L.NewTable()
-			}
-			if modName == "fes" {
-				tbl.ForEach(func(k, v lua.LValue) { mod.RawSet(k, v) })
-			} else {
-				mod.RawSetString(modName, tbl)
-			}
-		}
-
-		mod.RawSetString("app", loadIncludeModules(L, filepath.Join(".", "include")))
-
-		if cfg != nil {
-			site := L.NewTable()
-			site.RawSetString("version", lua.LString(cfg.App.Version))
-			site.RawSetString("name", lua.LString(cfg.App.Name))
-			authors := L.NewTable()
-			for i, a := range cfg.App.Authors {
-				authors.RawSetInt(i+1, lua.LString(a))
-			}
-			site.RawSetString("authors", authors)
-			mod.RawSetString("site", site)
-		}
-
-		bus := L.NewTable()
-		bus.RawSetString("url", lua.LString(requestData.path))
-		params := L.NewTable()
-		for k, v := range requestData.params {
-			params.RawSetString(k, lua.LString(v))
-		}
-		bus.RawSetString("params", params)
-		mod.RawSetString("bus", bus)
-
-		mod.RawSetString("markdown_to_html", L.NewFunction(func(L *lua.LState) int {
-			L.Push(lua.LString(markdownToHTML(L.ToString(1))))
-			return 1
-		}))
-
-		L.Push(mod)
-		return 1
-	})
-
-	if err := L.DoFile(entry); err != nil {
-		return []byte(""), err
-	}
-
-	if L.GetTop() == 0 {
-		return []byte(""), nil
-	}
-
-	L.SetGlobal("__fes_result", L.Get(-1))
-	if err := L.DoString("return tostring(__fes_result)"); err != nil {
-		L.GetGlobal("__fes_result")
-		if s := L.ToString(-1); s != "" {
-			return []byte(s), nil
-		}
-		return []byte(""), nil
-	}
-
-	if s := L.ToString(-1); s != "" {
-		return []byte(s), nil
-	}
-	return []byte(""), nil
-}
-
-/* this indexes and generate the page for viewing the archive directory */
-func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
-	info, err := os.Stat(fsPath)
-	if err != nil {
-		return "", err
-	}
-	if !info.IsDir() {
-		return "", fmt.Errorf("not a directory")
-	}
-	ents, err := os.ReadDir(fsPath)
-	if err != nil {
-		return "", err
-	}
-	type entryInfo struct {
-		name  string
-		isDir bool
-		href  string
-		size  int64
-		mod   time.Time
-	}
-	var list []entryInfo
-	for _, e := range ents {
-		n := e.Name()
-		full := filepath.Join(fsPath, n)
-		st, err := os.Stat(full)
-		if err != nil {
-			continue
-		}
-		isd := st.IsDir()
-		displayName := n
-		if isd {
-			displayName = n + "/"
-		}
-		href := path.Join(urlPath, n)
-		if isd && !strings.HasSuffix(href, "/") {
-			href = href + "/"
-		}
-		size := int64(-1)
-		if !isd {
-			size = st.Size()
-		}
-		list = append(list, entryInfo{name: displayName, isDir: isd, href: href, size: size, mod: st.ModTime()})
-	}
-	sort.Slice(list, func(i, j int) bool {
-		if list[i].isDir != list[j].isDir {
-			return list[i].isDir
-		}
-		return strings.ToLower(list[i].name) < strings.ToLower(list[j].name)
-	})
-
-	urlPath = basePath(strings.TrimPrefix(urlPath, "/archive"))
-
-	var b strings.Builder
-
-	b.WriteString("<html>\n<head><title>Index of ")
-	b.WriteString(template.HTMLEscapeString(urlPath))
-	b.WriteString("</title></head>\n<body>\n<h1>Index of ")
-	b.WriteString(template.HTMLEscapeString(urlPath))
-	b.WriteString("</h1><hr><pre>")
-
-	if urlPath != "/" {
-		b.WriteString(
-			`<a href="/archive` +
-				template.HTMLEscapeString(path.Dir(strings.TrimSuffix(urlPath, "/"))) +
-				`">../</a>` + "\n",
-		)
-	} else {
-		b.WriteString(
-			`<a href="/">../</a>` + "\n",
-		)
-	}
-
-	nameCol := 50
-	for _, ei := range list {
-		escapedName := template.HTMLEscapeString(ei.name)
-		dateStr := ei.mod.Local().Format("02-Jan-2006 15:04")
-		var sizeStr string
-		if ei.isDir {
-			sizeStr = "-"
-		} else {
-			sizeStr = fmt.Sprintf("%d", ei.size)
-		}
-		spaces := 1
-		if len(escapedName) < nameCol {
-			spaces = nameCol - len(escapedName)
-		}
-		line := `<a href="` + template.HTMLEscapeString(ei.href) + `">` + escapedName + `</a>` + strings.Repeat(" ", spaces) + dateStr + strings.Repeat(" ", 19-len(sizeStr)) + sizeStr + "\n"
-		b.WriteString(line)
-	}
-	b.WriteString("</pre><hr></body>\n</html>")
-	return b.String(), nil
-}
-
-/* generates the data for the not found page. Checks for user-defined source in this order
- * 404.lua => 404.md => 404.html => default.
- */
-func generateNotFoundData(cfg *config.AppConfig) []byte {
-	notFoundData := []byte(`
-<html>
-<head><title>404 Not Found</title></head>
-<body>
-<center><h1>404 Not Found</h1></center>
-<hr><center>fes</center>
-</body>
-</html>
-`)
-	if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil {
-		if nf, err := renderRoute("www/404.lua", cfg, reqData{}); err == nil {
-			notFoundData = nf
-		}
-	} else if _, err := os.Stat("www/404.md"); err == nil {
-		if buf, err := os.ReadFile("www/404.html"); err == nil {
-			notFoundData = []byte(markdownToHTML(string(buf)))
-		}
-	} else if _, err := os.Stat("www/404.html"); err == nil {
-		if buf, err := os.ReadFile("www/404.html"); err == nil {
-			notFoundData = buf
-		}
-	}
-	return notFoundData
-}
-
-/* helper to load all special directories */
-func loadDirs() map[string]string {
-	routes := make(map[string]string)
-
-	if entries, err := os.ReadDir("www"); err == nil {
-		if err := handleDir(entries, "www", routes, "", false); err != nil {
-			ui.Warning("failed to handle www directory", err)
-		}
-	}
-
-	if entries, err := os.ReadDir("static"); err == nil {
-		if err := handleDir(entries, "static", routes, "/static", true); err != nil {
-			ui.Warning("failed to handle static directory", err)
-		}
-	}
-
-	if entries, err := os.ReadDir("archive"); err == nil {
-		if err := handleDir(entries, "archive", routes, "/archive", true); err != nil {
-			ui.Warning("failed to handle archive directory", err)
-		}
-	}
-
-	return routes
-}
-
-/* helper to parse the Fes.toml and generate config */
-func parseConfig() config.AppConfig {
-	defaultCfg := config.AppConfig{}
-	defaultCfg.App.Authors = []string{"unknown"}
-	defaultCfg.App.Name = "unknown"
-	defaultCfg.App.Version = "unknown"
-
-	tomlDocument, err := os.ReadFile("Fes.toml")
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			ui.WARN("no config file found, using the default config. In order to specify a config file write to Fes.toml")
-			return defaultCfg
-		} else {
-			ui.Error("failed to read Fes.toml", err)
-			os.Exit(1)
-		}
-	}
-	docStr := fixMalformedToml(string(tomlDocument))
-	var cfg config.AppConfig
-	if err := toml.Unmarshal([]byte(docStr), &cfg); err != nil {
-		ui.Warning("failed to parse Fes.toml", err)
-		cfg = defaultCfg
-	}
-	return cfg
-}
-
-/* helper to read the archive files */
-func readArchive(w http.ResponseWriter, route string) error {
-	fsPath := "." + route
-	if info, err := os.Stat(fsPath); err == nil && info.IsDir() {
-		if page, err := generateArchiveIndex(fsPath, route); err == nil {
-			w.Write([]byte(page))
-			return nil
-		} else {
-			return err
-		}
-	}
-	return nil
-}
-
-/* start the Fes server */
-func Start(dir string) error {
 	if err := os.Chdir(dir); err != nil {
-		return ui.Error(fmt.Sprintf("failed to change directory to %s", dir), err)
+		ui.Error(fmt.Sprintf("failed to change directory to %s", dir), err)
 	}
 
-	ui.Log("Running root=%s, port=%d.", filepath.Clean(dir), *config.Port)
+	root := filepath.Clean(dir)
 
-	cfg := parseConfig()
+	if root == "." {
-	notFoundData := generateNotFoundData(&cfg)
+		if res, err := filepath.Abs(root); err == nil {
-	routes := loadDirs()
+			root = filepath.Base(res)
-
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		route, ok := routes[r.URL.Path]
-
-		var err error = nil
-
-		/* defer won't update paramaters unless we do this. */
-		defer func() {
-			ui.Path(route, err)
-		}()
-
-		if !ok {
-			err = config.ErrRouteMiss
-			route = r.URL.Path
-
-			if strings.HasPrefix(route, "/archive") {
-				err = readArchive(w, route)
-			} else {
-				w.WriteHeader(http.StatusNotFound)
-				w.Write([]byte(notFoundData))
-			}
-			return
-		}
-
-		params := make(map[string]string)
-		for k, v := range r.URL.Query() {
-			if len(v) > 0 {
-				params[k] = v[0]
-			}
-		}
-
-		var data []byte
-		if strings.HasSuffix(route, ".lua") {
-			data, err = renderRoute(route, &cfg, reqData{path: r.URL.Path, params: params})
-		} else if strings.HasSuffix(route, ".md") {
-			data, err = os.ReadFile(route)
-			data = []byte(markdownToHTML(string(data)))
-			data = []byte("<style>body {max-width: 80ch;}</style>\n" + string(data))
 		} else {
-			data, err = os.ReadFile(route)
+			ui.Error("failed to get absolute path", err)
 		}
+	}
 
-		if err != nil {
+	ui.Log("running root=%s, port=%d.", root, *config.Port)
-			http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
+
-		}
+	ui.LogVerbose("start loading directories")
+	Routes = loadDirs()
+
+	http.HandleFunc("/", httpHandler)
+	gemini.HandleFunc("/", geminiHandler)
+
+	var wg sync.WaitGroup
+	errs := make(chan error, 2)
+
+	wg.Add(2)
+
+	go func() {
+		defer wg.Done()
+		errs <- http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *config.Port), nil)
+	}()
+
+	go func() {
+		defer wg.Done()
+		errs <- gemini.ListenAndServeTLS(fmt.Sprintf("0.0.0.0:%d", *config.Port-1035), "cert.pem", "key.pem", nil)
+	}()
 
-		w.Write(data)
-	})
 	ui.Log("Server initialized")
+	wg.Wait()
+	close(errs)
 
-	ui.Log("Ready to accept connections tcp")
+	var collected []error
-	return http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *config.Port), nil)
+
+	for err := range errs {
+		if err != nil {
+			collected = append(collected, err)
+		}
+	}
+
+	if len(collected) > 0 {
+		fmt.Printf("errors: %v\n", collected)
+		return
+	}
 }

modules/server/util.go

@@ -4,36 +4,8 @@ import (
 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/html"
 	"github.com/gomarkdown/markdown/parser"
-	"regexp"
-	"strings"
 )
 
-func joinBase(base, name string) string {
-	if base == "" {
-		return "/" + name
-	}
-	return base + "/" + name
-}
-
-func basePath(base string) string {
-	if base == "" || base == "." {
-		return "/"
-	}
-	return base
-}
-
-func fixMalformedToml(content string) string {
-	re := regexp.MustCompile(`(?m)^(\s*\w+\s*=\s*)$`)
-	return re.ReplaceAllStringFunc(content, func(match string) string {
-		parts := strings.Split(strings.TrimSpace(match), "=")
-		if len(parts) == 2 && strings.TrimSpace(parts[1]) == "" {
-			key := strings.TrimSpace(parts[0])
-			return key + " = \"\""
-		}
-		return match
-	})
-}
-
 func markdownToHTML(mdText string) string {
 	extensions := parser.CommonExtensions | parser.AutoHeadingIDs | parser.NoEmptyLineBeforeBlock
 	p := parser.NewWithExtensions(extensions)
@@ -43,3 +15,17 @@ func markdownToHTML(mdText string) string {
 	renderer := html.NewRenderer(opts)
 	return string(markdown.Render(doc, renderer))
 }
+
+func basePath(base string) string {
+	if base == "" || base == "." {
+		return "/"
+	}
+	return base
+}
+
+func joinBase(base, name string) string {
+	if base == "" {
+		return "/" + name
+	}
+	return base + "/" + name
+}

modules/ui/ui.go

@@ -72,7 +72,7 @@ func Hint(msg string, args ...any) {
 		g = (hex >> 8) & 0xFF
 		b = hex & 0xFF
 		return
-	}(hintColor)).Printf("%s * hint: %s\n", formatTimestamp(), formatted)
+	}(hintColor)).Printf("hint: %s\n", formatted)
 }
 
 // Path logging: prints route and status

modules/version/version.go

@@ -9,7 +9,7 @@ var gitCommit string = "devel"
 
 const PROGRAM_NAME string = "fes"
 const PROGRAM_NAME_LONG string = "fes/fSD"
-const VERSION string = "0.2.1"
+const VERSION string = "2.0.0"
 
 func Version() {
 	fmt.Printf("%s version %s\n", PROGRAM_NAME_LONG, VERSION)

scripts/test_all

@@ -0,0 +1,88 @@
+#! /bin/sh
+# Runs Fes on all projects in test/
+
+scriptversion="1"
+
+#
+# 
+# Copyright (C) 2025-2026 fSD
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+me=$0
+version="$me/fSD v$scriptversion
+
+Copyright (C) 2025-2026 fSD.
+This is free software; you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
+
+usage="Usage: $me [OPTION]... <arg1> <arg2>
+Runs Fes on all projects in test/
+
+Options:
+   --help         print this help and exit
+   --version      output version information"
+
+say() {
+    if [ -z "$q" ]; then
+        echo "$me: $*"
+    fi
+}
+
+lsay() {
+    if [ -z "$q" ]; then
+        echo " => $*"
+    fi
+}
+
+check_dep() {
+	printf 'checking for %s... ' "$1"
+	if command -v "$1" > /dev/null; then
+		echo "yes"
+	else
+	    echo "no"
+	    exit 1
+	fi
+}
+
+while [ $# -gt 0 ]; do
+  case $1 in
+    --help) echo "$usage"; exit 0 ;;
+    --version) echo "$version"; exit 0 ;;
+    -*) echo "$me: Unknown option '$1'." >&2; exit 1 ;;
+  esac
+done
+
+if [ ! -d "modules" ]; then
+    echo "$me: error: must be run in project root." >&2
+    exit 1
+fi
+
+if [ ! -f "fes" ]; then
+    echo "$me: error: run 'make'." >&2
+    exit 1
+fi
+
+for dir in test/*; do
+    ./fes run "$dir" >/dev/null 2>&1 &
+    pid=$!
+
+    printf "test '%s'" "$dir"
+
+    printf "\nPress [Enter] to move to start the next..."
+    read -r unused
+
+    if kill -0 $pid 2>/dev/null; then
+        kill $pid
+    fi
+done
+
+echo "done"
+kill $$
+
+# BUGS
+#
+# doesn't kill the last test

test/README.md

@@ -1,7 +1,7 @@
-# default
+# test
 
 ```
-fes new default
+fes new test
 ```
 
 > **Know what you are doing?** Delete this file. Have fun!

test/cert.pem

@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFmzCCA4OgAwIBAgIUZGaMDLeCAQplfhhjXb2HaL6xpFYwDQYJKoZIhvcNAQEL
+BQAwXTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
+MQwwCgYDVQQKDANPcmcxDTALBgNVBAsMBFVuaXQxEjAQBgNVBAMMCWxvY2FsaG9z
+dDAeFw0yNjAyMjQwMjUwMzVaFw0yNzAyMjQwMjUwMzVaMF0xCzAJBgNVBAYTAlVT
+MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEMMAoGA1UECgwDT3JnMQ0w
+CwYDVQQLDARVbml0MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCfl+m81U9+WLBnPiJ1ZADnZC+BecXArguAdnbkgDlm
+fqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvoDdjomXM4yb9Axu2KDHfflTcw3wHD
+3850ganf9rwVG460gkVfUGaRiokyCvEJKd05BxKmx8Zh6G2tpetaDKm72ONYQFya
+BCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+sTEkCTWsjUesiG0393t3psFa/SlZ
+KsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQiFtQse2gqC4IhG2MGi0b4mu4Qa3+
+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j/h40l1J3h/aTM5/qS7malAtXySMV
+zLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhVCx/sovrvgFF+8j4nLXOBgrx8llYB
+5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+OHeKhgdnz/a+pCUBwJe8JAzX7fzo
+Z+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5PciN0xsWQdaAWPcVe6+YYRKS6l6q
+aWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT4MDFUJWXFmTnyhHg3Cq7pWJR7pv2
+erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimhvZZIa5W2vzpkLHbWgI2XGbx8yKRX
+owIDAQABo1MwUTAdBgNVHQ4EFgQUcyq+ZZWmAUejOPEQpHpl4hOllHswHwYDVR0j
+BBgwFoAUcyq+ZZWmAUejOPEQpHpl4hOllHswDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEANwdjxlPHqvOOyNTFJcFhcNff3862/74CyCiglrstk/ea
+txjyHxXFwXOtyAtm0tqaQPpzHWFM5MDqVD7Qip4aZrPcRvvfJ8zxXuakrgy7oI6i
+Wl4/BXzvIoxh8MyFVC7VdGmuv11fq091RaNPlnz5lH9Qxhb6QCGbk73PjTXxD/7A
+yusNiXuJvx3oRhLLGuksotFKEnngOq21Jla3ZPUmJTLAZdk/joXITk5Q64ZBp5uD
+rpxFZDtdHTBuL3nmNPUHixsxQRFzCSloufRlatdI2ldDc+d2WLLFhkpdM35Oedf3
+Hib0VXPgJ8j/w6RK+oYKMP27RojMFXALolzRBSQu3Zbd1bD1qVhh/dO5Uyn4E3mb
+2LW5+a9zuabD9wt8smSU9V5ZYw5hcR0ANN7xYmaMvGFKrNPNkI3m0c2dyj22vgg0
+zQqeMze4KxZqDf/gFifJ4UIybBAgc/p1uOIceFTSYplVXJQIgFACn9l6c4Zo0GZD
+H48iKQLwlxDdUSM8aHtItWxRddLCL7lYNKtu2/qu8I9NKkjx4/Kn3I9Is/f37EIn
+rF3ygUg3ee5zo3fvMjlhCNs6djm+ANx2KzdZkS7UU/jb0o+OSEvoMIgZh5NNgUlC
+aVR3opS3PTqwu4plN0Evh5kr3nEOx0vcIK726DwnpgNRhcG9cNcSi2UB4NYCWaw=
+-----END CERTIFICATE-----

test/key.pem

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCfl+m81U9+WLBn
+PiJ1ZADnZC+BecXArguAdnbkgDlmfqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvo
+DdjomXM4yb9Axu2KDHfflTcw3wHD3850ganf9rwVG460gkVfUGaRiokyCvEJKd05
+BxKmx8Zh6G2tpetaDKm72ONYQFyaBCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+
+sTEkCTWsjUesiG0393t3psFa/SlZKsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQ
+iFtQse2gqC4IhG2MGi0b4mu4Qa3+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j
+/h40l1J3h/aTM5/qS7malAtXySMVzLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhV
+Cx/sovrvgFF+8j4nLXOBgrx8llYB5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+
+OHeKhgdnz/a+pCUBwJe8JAzX7fzoZ+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5
+PciN0xsWQdaAWPcVe6+YYRKS6l6qaWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT
+4MDFUJWXFmTnyhHg3Cq7pWJR7pv2erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimh
+vZZIa5W2vzpkLHbWgI2XGbx8yKRXowIDAQABAoICAENZb5lyB5cRRHh9XztdFYiQ
+3f9s7UhP6qiu1aO+fPrFDm9mHwEMF7eLTYep9j3HYMazE3IQRU8z76SRW21lfJuF
+gEGM8aeldV0UcnMcWXlY1J6ULaVHUb4yn/mLVE1R98cJyLYmqeutEB/F3VgmzJB6
+7vYuI/EfkO2mLOMMXkfc4wJGpIyJRLvP8tcoj4bG+r+qphFXGrYgNmLUEiHcBRup
+j4q/FCBfP2qSI90LI0zu3/rJK1aDFlHW1J8baWOUoBzUAX3rGzDth8iSUr7uJ5L6
+Blsvz68lSM4QslbS2OOfcATJrE5Apex+kTOas023BPVJgwfFCmey3mUdk4+sIG+I
+YpvrfUHBAbhRt1itGjjx/BH3HVtkwKsm3nNNgE8qS0qmziGVa60amLng0OgD4SOH
+QKWrotcojYlWHywdHNAmiaWP+ZV9U0u4T59dkHhjqBoPuY64kNddRCLYItszqOmC
+tamnflcoFPThdBnDpnXhLX+MnvQKIO2K2QTKjdYrkSMvEC/m96H49Vf4w+Fe3coc
+SLsyMqHmYSG3+QtFN3JSmqDdBLQ+bFK0KZOk3IE2UK+lvabmtHuGLkYguur/fOnG
+FvxcC+MIHHFrtSfqfvIrXeGFqe2Fb6DIKdMJFPV8iP5Px91A0GAGeabyktyya1n5
+kk5nMJY3A7rTmnDO2PUBAoIBAQDSd+pvNGDf/We74+NODKQBcleCfF0NNzvRIuYH
+9vel5jhyD28Y30XQS7+YBo3Y5Yo5pVlJ425Z5CveZOmr4VImuYG8LTbbGYY8ns3c
+R/IdP1ByAcIa1eRGQNcKHid7RW4aEoFdvW3jZNj6/ukbJwd9ZHOt4HEUv5MOObn7
+VXiXiwHjVy3X4uD5j0bHS4owd7S3Ygg0OneUzX3XJ+8qUgfU9B+lD3SbtsI4baoU
+qUKcQc/0yXKvJvoz9oX2tjQOHqGrGwHdootc2CLnr0PMI7fKBwT3k63B+24xEGcx
+OAPc5tUuiqIewiCn1oZbeCxmNnnimkAjDfG2KXMXj1R1G96BAoIBAQDCHnTNQhXH
+tcfwnxj86E+Zd7ORS7iH/5eWvnspt2pnNCpufLFQlbdiL3d9ysSN9nw3+y15/o83
+R79s7fLdC0+blc6q/ZQEdB1C+8YQa0nTlqqlZWVbRPjQUV+SfGssaZFEO4W7QWh3
+hJL14HbWUFC3XSdMAeKTNOcgvfVvQ9M8HlJI1ZPo4Pe4rGNFIEsKUz/6HVE7HFgQ
+OwcLSxZlSQSQ6/YErP/XJoyQUPjHldAjphV/rn28cvh2quoI35fbBuZu5pyKLXTg
+RKbdWbeoIZTthRojpqnfqnIR+rPXIIiaMYhStdPshNUxLL7DX+/3yI05qq8R+yqa
+2gLb2mJltuwjAoIBAF0WQI/ywK4Q7CKEBnLs0FT7d4z06EsCFOjI4KjBKIMtseVw
+whhkGAKqnhDlRTObQmmAol81wgbsDiMMyvUEcUtDXQgXj12UinShYDd/cqxQ5omm
+EW3BEHeqEfIdqCSzbqEFckY9lC6w2e8Zc4xY1M028psC28DrgmUWTxXEldOg3bLp
+ShNj+1Eld46J8JLDPyCksTA4c89Sm8ffl75GDcS4PI7KqS59xKUki8cbnaRyz0Fb
+H+gr+xmkfVfC+n8MOUDubwLR84Wa6sVCFWBio9UtCZteq8lSJUh6EsoIFl1LkxpE
+orOr9LmG/mHSYwDKM1pwEtHuRuvkpUzUTeyF6QECggEAbm/vWZtgUsdbocyR5cix
+CImuUlo2+MBz2KIz5c7grShjf4pXQpZ6x1Rj8d/7JRz3HM482Cv4BKZABNP3GMTH
+nKeE9YjgvgvlXedpjovLa6JLIV/nYx6BQ9sXuXopaxIAQEZw1dDngx+ckGAMm+8D
+jN5lbfugkMlHOTx5Nrzqn0hM3f0McjATHzCMJZayuoQUYNJvFWcRvuImJsmoSyVY
+gK6Nv6lAwIHA9JXsg3f6+10Q3BxEkoMCUlj4XuX+OfDaBnwS0RX9aV4FZOcW8oNw
+fBT+gwvdl08cKJht2lU7AiZt/UhO8j+8HobrXLHnDxw9JHKzuVIgsgqYF8ZNtrpz
+6wKCAQEAqJc9xfNYL2jyJTVBvqX34Uct9xV1fq7z45B3gpPHj4tc0dBOIwPKSsu8
+rGyefPuMDvbecJoaXqRZGQEcv03ecLVtHHDCsJcWavth9sCQJW9mnOxjOnLHdGnl
+h2yIV4iVzNEx5XA1+0JRAAwFMXrC9LUZDTT61opjohMJSEySo/HVekoWG9A0bQGn
+Ui+JbtLeuuCwwAGSgdAhVkjr27ANyFtjR63KVrDvSLbYFyZXKxrRYnZWs92Ho/g6
+oTLnUSmkbLlhsUDjknAaNfp+enETSoPHcpkd7MeqVw2oYrLw6MCo4h2tBsIgtZEd
+h6CgX4Gc3+bhvKx36XYxVwScPJUWsQ==
+-----END PRIVATE KEY-----

test/www/index.lua

@@ -0,0 +1,46 @@
+local fes = require("fes")
+local site = fes.fes()
+
+local std = fes.std
+local u = fes.util
+
+site.copyright = std.link("https://fsdproject.org/", "fSD")
+
+site:banner(table.concat {
+	std.h(1, "Testing Page"),
+})
+
+site:note(table.concat {
+	std.h(1, "Example syntax features"),
+	std.h(2, "Paragraphs"),
+	std.p("This is a paragraph."),
+	std.h(2, "Codeblocks"),
+	std.codeblock([[
+#include <stdio.h>
+
+int main() {
+	puts("Hello, World!");
+	return 0;
+}]]),
+	std.h(2, "Inline Codeblocks"),
+	std.inline([[puts("Hello, World!");]]),
+	std.h(2, "Links"),
+	std.link("geminiprotocol.net/"),
+	std.h(2, "Lists"),
+	std.list {
+		"Item 1",
+		"Item 2",
+		"Item 3",
+	},
+	std.h(2, "Blockquotes"),
+	std.blockquote([["UNIX is very simple" - Dennis Ritchie
+"GNU's Not UNIX" - Richard Stallman]]),
+	std.h(2, "Rules"),
+	std.rule(),
+	std.h(2, "Images"),
+	std.image("fluffy baby seal", "/static/seal.png"),
+	std.h(2, "Files"),
+	std.file("seal.png", "/static/seal.png"),
+})
+
+return site

todo

@@ -0,0 +1,2 @@
+gemini: Add command-line options
+http: https://git.erock.io