Update HTML stuff.

9 files changed, 25 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index 66c4be2..32584fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-/html/highlightjs
-/html/index.html
-/html/notes
-/html/docs
+/html/zisp
 .zig-cache
 zig-out
 a.out
diff --git a/docs/c1/1-parse.md b/docs/c1/1-parse.md
index b01d759..73b8d8a 100644
--- a/docs/c1/1-parse.md
+++ b/docs/c1/1-parse.md
@@ -1,6 +1,6 @@
 # Parser for Code & Data
 
-*For an exact specification of the grammar, see [grammar](grammar.html).*
+*For an exact specification of the grammar, see [grammar](grammar/).*
 
 Zisp S-Expressions represent an extremely minimal set of data types; only that
 which is necessary to strategically construct more complex code and data:
diff --git a/docs/c1/grammar.abnf.txt b/docs/c1/grammar/abnf.txt
index 9279210..6daaceb 100644
--- a/docs/c1/grammar.abnf.txt
+++ b/docs/c1/grammar/abnf.txt
@@ -1,4 +1,6 @@
-; Compatible with https://www.quut.com/abnfgen/
+; Standards-compliant ABNF (RFC 5234, RFC 7405)
+
+; Compatible with: https://www.quut.com/abnfgen/
 
 ; It's unclear whether this grammar is truly complete.  It has been
 ; verified not to produce text that is rejected by the Zisp parser
diff --git a/docs/c1/grammar.md b/docs/c1/grammar/index.md
index 3364150..5bedbfc 100644
--- a/docs/c1/grammar.md
+++ b/docs/c1/grammar/index.md
@@ -2,9 +2,9 @@
 
 The grammar is available in several different formats:
 
-* [ZBNF](grammar.zbnf.txt): See below for the rules of this notation
-* [ABNF](grammar.abnf.txt): Compatible with the `abnfgen` tool
-* [PEG](grammar.peg.txt): Compatible with `peg/leg` tool
+* [ZBNF](zbnf.txt): See below for the rules of this notation
+* [ABNF](abnf.txt): Compatible with the `abnfgen` tool
+* [PEG](peg.txt): Compatible with `peg/leg` tool
 
 
 ## ZBNF notation
diff --git a/docs/c1/grammar.peg.txt b/docs/c1/grammar/peg.txt
index d194652..1e060ec 100644
--- a/docs/c1/grammar.peg.txt
+++ b/docs/c1/grammar/peg.txt
@@ -1,4 +1,4 @@
-# Compatible with https://piumarta.com/software/peg
+# Standard PEG notation
 
 Stream       <- Unit ( Blank Unit )* !.
 
@@ -67,9 +67,12 @@ ALPHA        <- [a-zA-Z]
 HEXDIG       <- [0-9a-fA-F]
 
 
-# This file should be kept in perfect sync with zbnf.txt for easy
+# Keep this in sync line-for-line with the ZBNF grammar for easy
 # comparison between the two.
 
+# This file is meant to be compatible with:
+# https://piumarta.com/software/peg
+
 # Due to a quirk in the peg tool this file is used with, the grammar
 # must not allow an empty stream.  Therefore, the Unit rule has its
 # Datum declared as mandatory rather than optional.
diff --git a/docs/c1/grammar.zbnf.txt b/docs/c1/grammar/zbnf.txt
index a8792f0..551c319 100644
--- a/docs/c1/grammar.zbnf.txt
+++ b/docs/c1/grammar/zbnf.txt
@@ -1,4 +1,4 @@
-# Custom notation with PEG semantics; see grammar.html
+# Custom notation with PEG semantics
 
 Stream        : Unit ( Blank Unit )*
 
diff --git a/html/gen.sh b/html/gen.sh
index 03ae570..ad362c7 100755
--- a/html/gen.sh
+++ b/html/gen.sh
@@ -26,13 +26,14 @@ md2ht() {
     } > "$dst"
 }
 
-md2ht index.md index.html
+md2ht index.md zisp/index.html
+cp style.css zisp/
 
 for file in ../notes/*.md
 do
     name=${file#../notes/}
     name=${name%.md}
-    md2ht "$file" "notes/$name.html"
+    md2ht "$file" "zisp/notes/$name.html"
 done
 
 shopt -s globstar
@@ -43,17 +44,17 @@ do
     name=${name%.md}
     dir=${file#../}
     dir=${dir%/*}
-    mkdir -p "$dir"
-    md2ht "$file" "docs/$name.html"
+    mkdir -p "zisp/$dir"
+    md2ht "$file" "zisp/docs/$name.html"
 done
 
 for file in ../docs/**/*.txt
 do
     dir=${file#../}
     dir=${dir%/*}
-    mkdir -p "$dir"
-    dest=docs/${file#../docs/}
+    mkdir -p "zisp/$dir"
+    dest=zisp/docs/${file#../docs/}
     cp "$file" "$dest"
 done
 
-rsync -a ./ tk:/var/www/html/zisp
+rsync -a zisp tk:/var/www/html
diff --git a/html/index.md b/html/index.md
index cc9091c..f8fe67c 100644
--- a/html/index.md
+++ b/html/index.md
@@ -1,4 +1,4 @@
-# Zisp: A full-stack Lisp for the 21st Century
+# Zisp: A full-stack Lisp for the 22nd Century
 
 Zisp is my experimental language project that first started with the
 idea of writing a simple Scheme implementation in Zig, just to learn
diff --git a/html/prelude.html b/html/prelude.html
index 14a155b..84ee345 100644
--- a/html/prelude.html
+++ b/html/prelude.html
@@ -4,8 +4,8 @@
   <title>__TITLE__</title>
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <link rel="stylesheet" type="text/css" href="/zisp/style.css"/>
-  <link rel="stylesheet" type="text/css" href="/zisp/highlightjs/styles/default.min.css"/>
-  <script src="/zisp/highlightjs/highlight.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="/highlightjs/styles/default.min.css"/>
+  <script src="/highlightjs/highlight.min.js"></script>
   <script>
     hljs.configure({languages:[]});
     hljs.initHighlightingOnLoad();