summary refs log tree commit diff
path: root/bin
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-01-12 22:44:03 -0500
committerJune McEnroe <june@causal.agency>2021-01-12 22:44:03 -0500
commiteec1061c40981eb61b5033804509830a45584211 (patch)
treefa8765879f6c9a366c78d14ead2fb9b06982b7be /bin
parentDon't output a pre in hilex by default (diff)
downloadsrc-eec1061c40981eb61b5033804509830a45584211.tar.gz
src-eec1061c40981eb61b5033804509830a45584211.zip
Use hilex for bin HTML
Diffstat (limited to 'bin')
-rw-r--r--bin/Makefile2
-rw-r--r--bin/html.sh19
2 files changed, 14 insertions, 7 deletions
diff --git a/bin/Makefile b/bin/Makefile
index 9b2c06d4..6220ec06 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -137,7 +137,7 @@ WEBROOT = /usr/local/www/causal.agency
 html: ${HTMLS}
 	@true
 
-${HTMLS}: html.sh scheme ttpre htagml htmltags
+${HTMLS}: html.sh scheme hilex htagml htmltags
 
 htmltags: *.[chly]
 	rm -f $@
diff --git a/bin/html.sh b/bin/html.sh
index c86ce87a..c2ad7fa2 100644
--- a/bin/html.sh
+++ b/bin/html.sh
@@ -13,7 +13,7 @@ cat <<EOF
 <!DOCTYPE html>
 <title>${title}</title>
 <style>
-$(./scheme -s)
+$(./scheme -st)
 
 table.head, table.foot { width: 100%; }
 td.head-rtitle, td.foot-os { text-align: right; }
@@ -33,8 +33,8 @@ table.foot { margin-top: 1em; }
 html {
 	line-height: 1.25em;
 	font-family: monospace;
-	background-color: var(--ansi0);
-	color: var(--ansi7);
+	background-color: var(--ansi16);
+	color: var(--ansi17);
 	-moz-tab-size: 4;
 	tab-size: 4;
 }
@@ -51,16 +51,23 @@ ul.index li {
 a { color: var(--ansi4); }
 a:visited { color: var(--ansi5); }
 a.permalink, a.tag {
-	color: var(--ansi6);
+	color: var(--ansi3);
 	text-decoration: none;
 }
 a.permalink code:target,
 h1.Sh:target a.permalink,
 h2.Ss:target a.permalink,
 a.tag:target {
-	color: var(--ansi3);
+	color: var(--ansi11);
 	outline: none;
 }
+
+.hilex.Keyword { color: var(--ansi7); }
+.hilex.Macro { color: var(--ansi2); }
+.hilex.Comment { color: var(--ansi4); }
+.hilex.String { color: var(--ansi6); }
+.hilex.StringFormat { color: var(--ansi14); }
+.hilex.Interpolation { color: var(--ansi1); }
 </style>
 EOF
 
@@ -76,5 +83,5 @@ while [ $# -gt 0 ]; do
 	<a href="${GitURL}/${src}">${src} in git</a>
 	EOF
 	./htagml -x -f htmltags "${src}"
-	./htagml -p -f htmltags "${src}"
+	./hilex -t -f html "${src}" | ./htagml -ip -f htmltags "${src}"
 done