summary refs log tree commit diff
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
commitc6291b195f80a5ebfed20fb0860eaf427d05c016 (patch)
tree29be52e4f1503a6ba04ba454495ae3269e50ee96
parentDon't output a pre in hilex by default (diff)
downloadsrc-c6291b195f80a5ebfed20fb0860eaf427d05c016.tar.gz
src-c6291b195f80a5ebfed20fb0860eaf427d05c016.zip
Use hilex for bin HTML
-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
>June McEnroe 2018-03-31Link against ncursesJune McEnroe 2018-03-05Miscellaneous code cleanupJune McEnroe 2018-03-05Pass message structs by valueJune McEnroe 2018-03-05Use stdio in merge and metaJune McEnroe 2018-03-05Clean up spawn constantsJune McEnroe 2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe 2018-03-05Pack message type enumsJune McEnroe 2018-03-05Undef COLOR_ constants in torus.hJune McEnroe 2018-03-05Generate tagsJune McEnroe 2017-10-03Simplify Makefile with pattern ruleJune McEnroe Insert rant about how GNU make handles the .c rule with extra dependencies. Also I don't care that everything links curses now. 2017-09-27Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 9a6c9c91c8092603b914cc0b3085d059e162ca29. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe