From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Sep 2018 21:04:35 +0000 (+0200)
Subject: man: Use asciidoc to generate HTML pages directly
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a847d86d7f9d87da79d956e49238d6ab6fb5870;p=network.git

man: Use asciidoc to generate HTML pages directly

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 81afc121..26726130 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -488,8 +488,7 @@ CLEANFILES += \
 	$(MANPAGES_HTML)
 
 EXTRA_DIST += \
-	$(MANPAGES_TXT) \
-	man/custom-html.xsl
+	$(MANPAGES_TXT)
 
 XSLTPROC_FLAGS = \
 	--nonet \
@@ -503,17 +502,14 @@ XSLTPROC_COMMAND_MAN = \
 	$(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
 		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-XSLTPROC_COMMAND_HTML = \
-	$(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
-
 man/%.xml: man/%.txt
 	$(AM_V_ASCIIDOC)$(ASCIIDOC) -d manpage -b docbook -o $@ $<
 
 man/%.8: man/%.xml
 	$(XSLTPROC_COMMAND_MAN)
 
-man/%.html: man/%.xml man/custom-html.xsl
-	$(XSLTPROC_COMMAND_HTML)
+man/%.html: man/%.txt
+	$(AM_V_ASCIIDOC)$(ASCIIDOC) -b html5 -a icons -a theme=flask -o $@ $<
 
 # ------------------------------------------------------------------------------
 
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
deleted file mode 100644
index fe2b54e1..00000000
--- a/man/custom-html.xsl
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0'?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-
-<!-- translate man page references to links to html pages -->
-<xsl:template match="citerefentry">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:value-of select="refentrytitle"/><xsl:text>.html</xsl:text>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<!-- add Index link at top of page -->
-<xsl:template name="user.header.content">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>Index</xsl:text>
-  </a>
-  <hr/>
-</xsl:template>
-
-<!-- Switch things to UTF-8, ISO-8859-1 is soo yesteryear -->
-<xsl:output method="html" encoding="UTF-8" indent="no"/>
-
-</xsl:stylesheet>