XML.

diff --git a/Makefile b/Makefile
index 813301922d640926907d044446943fb3ec3d313a..4f43a5e0773e675913b0d569f9aca2429a89cc61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ ascii: ascii.c splashscreen.h
 splashscreen.h: splashscreen
        sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/' -e 's/.*/P("&");/' 
 
-ascii.1: ascii.sgml
-       docbook2man ascii.sgml 
+ascii.1: ascii.xml
+       xmlto man ascii.xml 
 
 clean:
        rm -f ascii ascii.tar* ascii.shar ascii.o splashscreen.h
@@ -27,10 +27,10 @@ uninstall:
        rm /usr/bin/ascii
        rm /usr/share/man/man1/ascii.1
 
-SOURCES = README Makefile ascii.c ascii.sgml ascii.lsm ascii.spec splashscreen ascii.cgi
+SOURCES = README Makefile ascii.c ascii.xml ascii.lsm ascii.spec splashscreen ascii.cgi
 
-ascii-$(VERS).tar.gz: $(SOURCES)
-       @ls $(SOURCES) | sed s:^:ascii-$(VERS)/: >MANIFEST
+ascii-$(VERS).tar.gz: $(SOURCES) ascii.1
+       @ls $(SOURCES) ascii.1 | sed s:^:ascii-$(VERS)/: >MANIFEST
        @(cd ..; ln -s ascii ascii-$(VERS))
        (cd ..; tar -czvf ascii/ascii-$(VERS).tar.gz `cat ascii/MANIFEST`)
        @(cd ..; rm ascii-$(VERS))

diff --git a/ascii.xml b/ascii.xml
index 360b8d0de4255717d2955bd6e77bc318438b7c9a..08c977d84219dbaee08f616b1bd9b2a36c85eace 100644 (file)
--- a/ascii.xml
+++ b/ascii.xml
@@ -1,9 +1,6 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % ISOnum PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
-%ISOnum;
-<!ENTITY % ISOpub PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
-%ISOpub;
-]>
+<!DOCTYPE refentry PUBLIC 
+   "-//OASIS//DTD DocBook XML V4.1.2//EN"
+   "docbook/docbookx.dtd">
 <refentry id='ascii.1'>
 <refmeta>
 <refentrytitle>ascii</refentrytitle>
@@ -289,8 +286,8 @@ for random 8-bit values.</para>
 
 <refsect1 id='author'><title>AUTHOR</title>
 
-<para>Eric S. Raymond &lt;esr@snark.thyrsus.com&gt; November 1990
-(home page at <ulink
+<para>Eric S. Raymond <email>esr@snark.thyrsus.com</email>; November
+1990 (home page at <ulink
 url='http://www.tuxedo.org/~esr/'>http://www.tuxedo.org/~esr/</ulink>).
 Reproduce, use, and modify as you like as long as you don't remove
 this authorship notice.  Ioannis E. Tambouras
@@ -302,4 +299,4 @@ Vela corrected the ISO names.  Dave Capella contributed the idea of
 listing HTML/SGML entities.</para>
 </refsect1>
 </refentry>
-G
+