diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-11 03:42:42 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-02-11 04:22:32 +0100 |
| commit | d3f85ae6eafd35fe066138149f7263ee3f89c4d8 (patch) | |
| tree | d32eed11ad2cfcbca35cb650aa67455bef4f50ee | |
| parent | 56265e91d6468bb45d035dbf0120c56edbd12b67 (diff) | |
| download | gnome-shell-wip/jtojnar/adoc.tar.gz | |
extension-tool: Use asciidoctor for manpagewip/jtojnar/adoc
The Python implementation of Asciidoc is abandoned and stuck with Python 2.
Asciidoctor is a maintained implementation written in Ruby.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/992
| -rw-r--r-- | subprojects/extensions-tool/man/meson.build | 4 | ||||
| -rw-r--r-- | subprojects/extensions-tool/man/stylesheet.xsl | 27 | ||||
| -rw-r--r-- | subprojects/extensions-tool/meson.build | 2 |
3 files changed, 3 insertions, 30 deletions
diff --git a/subprojects/extensions-tool/man/meson.build b/subprojects/extensions-tool/man/meson.build index cca6fc49f..5de246d6b 100644 --- a/subprojects/extensions-tool/man/meson.build +++ b/subprojects/extensions-tool/man/meson.build @@ -1,7 +1,7 @@ custom_target('gnome-extensions.1', - input: ['gnome-extensions.adoc', 'stylesheet.xsl'], + input: 'gnome-extensions.adoc', output: 'gnome-extensions.1', - command: [a2x, '-D', '@OUTDIR@', '--xsl-file', '@INPUT1@', '-f', 'manpage', '@INPUT0@'], + command: [asciidoctor, '-D', '@OUTDIR@', '-b', 'manpage', '@INPUT@'], install_dir: mandir + '/man1', install: true ) diff --git a/subprojects/extensions-tool/man/stylesheet.xsl b/subprojects/extensions-tool/man/stylesheet.xsl deleted file mode 100644 index 047bd1b59..000000000 --- a/subprojects/extensions-tool/man/stylesheet.xsl +++ /dev/null @@ -1,27 +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/manpages/docbook.xsl"/> - -<xsl:template match="variablelist/title"> - <xsl:text>.PP </xsl:text> - <xsl:call-template name="bold"> - <xsl:with-param name="node" select="."/> - <xsl:with-param name="context" select=".."/> - </xsl:call-template> - <xsl:text> </xsl:text> -</xsl:template> - -<xsl:template match="varlistentry[preceding-sibling::title]"> - <xsl:if test="not(preceding-sibling::varlistentry)"> - <xsl:text>.RS 4 </xsl:text> - <!-- comment out the leading .PP added by the original template --> - <xsl:text>.\"</xsl:text> - </xsl:if> - <xsl:apply-imports/> - <xsl:if test="position() = last()"> - <xsl:text>.RE </xsl:text> - </xsl:if> -</xsl:template> - -</xsl:stylesheet> diff --git a/subprojects/extensions-tool/meson.build b/subprojects/extensions-tool/meson.build index ca7e67ce2..7f7d8e4e9 100644 --- a/subprojects/extensions-tool/meson.build +++ b/subprojects/extensions-tool/meson.build @@ -36,7 +36,7 @@ if bash_completion.found() endif if get_option('man') - a2x = find_program('a2x') + asciidoctor = find_program('asciidoctor') subdir('man') endif |