XML -> asciidoctor

diff --git a/Makefile b/Makefile
index fd9188b6a06367bc0e13944e00e3491017320c3d..5c71e91b90c7ae6c465bcc6bb94456d439fcdc5d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 #
 # Makefile for `Hunt the Wumpus' and `Superhack' games
 #
-#
 # SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # SPDX-License-Identifier: BSD-2-Clause
-VERS=1.9
+
+VERS=$(shell sed -n <NEWS.adoc '/^[0-9]/s/:.*//p' | head -1)
 
 prefix?=/usr
 
@@ -25,13 +25,18 @@ clean:
 TAGS:
        etags wumpus.c
 
-wumpus.6: wumpus.xml
-       xmlto man wumpus.xml 
+# 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
 
-wumpus.html: wumpus.xml
-       xmlto html-nochunks wumpus.xml 
+.adoc.6:
+       asciidoctor -D. -a nofooter -b manpage $<
+.adoc.html:
+       asciidoctor -D. -a nofooter -a webfonts! $<
 
-SOURCES = README COPYING NEWS control Makefile wumpus.c superhack.c wumpus.xml wumpus.png wumpus.desktop superhack.desktop
+SOURCES = README COPYING NEWS control Makefile wumpus.c superhack.c wumpus.adoc wumpus.png wumpus.desktop superhack.desktop
 
 install: wumpus superhack wumpus.6
        mkdir -p $(prefix)/bin

diff --git a/NEWS b/NEWS
deleted file mode 100644 (file)
index 24d8bbb..0000000
--- a/NEWS
+++ /dev/null
@@ -1,29 +0,0 @@
-= wumpus project news =
-
-1.9: 2022-12-16::
-  Fix packaging error.
-
-1.8: 2022-03-14::
-  Numerous small C fixes by Julian Cowley. 
-
-1.7: 2019-03-25::
-  Added the logo and a historical note about it.
-  Minor bug fix for suprhack.
-  Change license from 3-clause BSD to 2-clause BSD and add SPDX tags.
-
-1.6: 2015-04-04::
-  Code audited with cppcheck. Changed to modern packaging.
-
-1.5: 2011-03-09::
-  Fixed a minor bug in the superhack starlet check.
-
-1.4: 2010-10-21::
-  Ported to modern C.
-  License changed to BSD.
-
-1.3: 2003-12-28::
-  Changing the .spec file so that it installs under a build-root.
-  Changes so that the RPM can be built as a non-root user.
-
-
-

diff --git a/NEWS.adoc b/NEWS.adoc
new file mode 100644 (file)
index 0000000..24d8bbb
--- /dev/null
+++ b/NEWS.adoc
@@ -0,0 +1,29 @@
+= wumpus project news =
+
+1.9: 2022-12-16::
+  Fix packaging error.
+
+1.8: 2022-03-14::
+  Numerous small C fixes by Julian Cowley. 
+
+1.7: 2019-03-25::
+  Added the logo and a historical note about it.
+  Minor bug fix for suprhack.
+  Change license from 3-clause BSD to 2-clause BSD and add SPDX tags.
+
+1.6: 2015-04-04::
+  Code audited with cppcheck. Changed to modern packaging.
+
+1.5: 2011-03-09::
+  Fixed a minor bug in the superhack starlet check.
+
+1.4: 2010-10-21::
+  Ported to modern C.
+  License changed to BSD.
+
+1.3: 2003-12-28::
+  Changing the .spec file so that it installs under a build-root.
+  Changes so that the RPM can be built as a non-root user.
+
+
+

diff --git a/wumpus.adoc b/wumpus.adoc
new file mode 100644 (file)
index 0000000..78bbed5
--- /dev/null
+++ b/wumpus.adoc
@@ -0,0 +1,29 @@
+= wumpus(6) =
+:doctype: manpage
+
+== NAME ==
+wumpus - the classic game of Hunt the Wumpus
+
+== SYNOPSIS ==
+galaxis
+
+[[description]]
+== DESCRIPTION ==
+
+wumpus is a faithful transcription of the 1974 game WUMPUS for the
+Atari, the first computer game to maintain a consistent external map.
+An article on the history of this classic game can be found at the
+http://www.atariarchives.org/bcc1/showpage.php?page=247[Atari
+Archives].
+
+superhack is a structurally similar game with a different premise.
+
+[[authors]]
+== AUTHORS ==
+The original Atari game was designed and written by Gregory Yob.  This
+version was cloned from the original BASIC sources by Eric S. Raymond
+<esr@snark.thyrsus.com>.  See ESR's home page at
+http://www.catb.org/~esr/'>http://www.catb.org/~esr/ for updates and
+other resources.
+
+// end

diff --git a/wumpus.xml b/wumpus.xml
deleted file mode 100644 (file)
index e92aa2f..0000000
--- a/wumpus.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE refentry PUBLIC 
-   "-//OASIS//DTD DocBook XML V4.1.2//EN"
-   "docbook/docbookx.dtd">
-<refentry id='wumpus.6'>
-<refmeta>
-<refentrytitle>wumpus</refentrytitle>
-<manvolnum>6</manvolnum>
-<refmiscinfo class='date'>Sep 7 1992</refmiscinfo>
-<refmiscinfo class='productname'>wumpus</refmiscinfo>
-<refmiscinfo class='source'>wumpus</refmiscinfo>
-<refmiscinfo class='manual'>Games</refmiscinfo>
-</refmeta>
-<refnamediv id='name'>
-<refname>wumpus</refname>
-<refpurpose>the classic game of Hunt the Wumpus</refpurpose>
-</refnamediv>
-<refsynopsisdiv id='synopsis'>
-
-<cmdsynopsis>
-  <command>wumpus</command>
-</cmdsynopsis>
-<cmdsynopsis>
-  <command>superhack</command>
-</cmdsynopsis>
-
-</refsynopsisdiv>
-
-<refsect1 id='description'><title>DESCRIPTION</title>
-
-<para><application>wumpus</application> is a faithful transcription of
-the 1974 game WUMPUS for the Atari, the first computer game to
-maintain a consistent external map.  An article on the history of this
-classic game can be found <ulink
-url='http://www.atariarchives.org/bcc1/showpage.php?page=247'>here</ulink>.</para>
-
-<para><application>superhack</application> is a structurally similar
-game with a different premise.</para>
-</refsect1>
-
-<refsect1 id='authors'><title>AUTHORS</title>
-<para>The original Atari game was designed and written by Gregory Yob.
-This version was cloned from the original BASIC sources by Eric
-S. Raymond <email>esr@snark.thyrsus.com</email>.  See ESR's home page at
-<ulink
-url='http://www.catb.org/~esr/'>http://www.catb.org/~esr/</ulink>
-for updates and other resources.</para>
-</refsect1>
-</refentry>
-