From 43a08621e4404bb47e3bde1d0b6c12bf79d7066e Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sun, 4 Feb 2024 15:52:03 -0500
Subject: [PATCH] asciidoc -> asciidoctor.

---
 Dockerfile.ci |  2 +-
 Makefile      | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 598687b..b8eeef5 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -9,4 +9,4 @@ FROM ubuntu
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update
-RUN apt-get install --yes --no-install-recommends make gcc-10 libedit-dev libasan6 libubsan1 python3 python3-yaml lcov asciidoc libxslt1.1 pkg-config docbook-xml xsltproc
+RUN apt-get install --yes --no-install-recommends make gcc libedit-dev libasan6 libubsan1 python3 python3-yaml lcov asciidoctor libxslt1.1 pkg-config docbook-xml xsltproc
diff --git a/Makefile b/Makefile
index 978d5a8..ea8fcd4 100644
--- a/Makefile
+++ b/Makefile
@@ -87,15 +87,16 @@ reflow:
 coverage: clean debug
 	cd tests; $(MAKE) coverage --quiet
 
-.SUFFIXES: .adoc .html .6
+# Note: to suppress the footers with timestamps being generated in HTML,
+# we use "-a nofooter".
+# To debug asciidoc problems, you may need to run "xmllint --nonet --noout --valid"
+# on the intermediate XML that throws an error.
+.SUFFIXES: .html .adoc .6
 
-# Requires asciidoc and xsltproc/docbook stylesheets.
 .adoc.6:
-	a2x --doctype manpage --format manpage $<
+	asciidoctor -D. -a nofooter -b manpage $<
 .adoc.html:
-	asciidoc $<
-.adoc:
-	asciidoc $<
+	asciidoctor -D. -a nofooter -a webfonts! $<
 
 html: advent.html history.html hints.html
 
-- 
2.31.1