From f49018d6cb01ba7f0dd3dbae94ee153c04b13fb2 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 27 Jul 2017 19:28:40 -0400 Subject: [PATCH] Fix: doc/man: use a single XSL file and match local names Matching the local name instead of the full name, that is: *[local-name() = 'co'] instead of just `co` matches both the non-namespaced element and the DocBook-namespaced element whether we're using the DocBook 4.5 or DocBook 5.0 stylesheets. Signed-off-by: Philippe Proulx Signed-off-by: Mathieu Desnoyers --- doc/man/Makefile.am | 16 ++++-------- doc/man/manpage.xsl | 38 ++++++++++++++++++++++++++++ doc/man/xsl/manpage-bold-literal.xsl | 8 ------ doc/man/xsl/manpage-callouts.xsl | 17 ------------- doc/man/xsl/manpage-headings.xsl | 6 ----- doc/man/xsl/manpage-links.xsl | 11 -------- doc/man/xsl/manpage.xsl | 9 ------- 7 files changed, 43 insertions(+), 62 deletions(-) create mode 100644 doc/man/manpage.xsl delete mode 100644 doc/man/xsl/manpage-bold-literal.xsl delete mode 100644 doc/man/xsl/manpage-callouts.xsl delete mode 100644 doc/man/xsl/manpage-headings.xsl delete mode 100644 doc/man/xsl/manpage-links.xsl delete mode 100644 doc/man/xsl/manpage.xsl diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 3d8ee494..fcc4c5c7 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -34,13 +34,7 @@ COMMON_TXT = \ # AsciiDoc configuration and XSL files: ASCIIDOC_CONF = $(srcdir)/asciidoc.conf -XSL_FILES = \ - manpage.xsl \ - manpage-callouts.xsl \ - manpage-bold-literal.xsl \ - manpage-links.xsl \ - manpage-headings.xsl -XSL_SRC_FILES = $(addprefix $(srcdir)/xsl/,$(XSL_FILES)) +XSL_FILE = $(srcdir)/manpage.xsl # Common dependencies: COMMON_DEPS = $(ASCIIDOC_CONF) $(COMMON_TXT) @@ -59,19 +53,19 @@ ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \ -a lttng_ust_register_timeout="@LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS@" ADOC_DOCBOOK = $(ADOC) -b docbook -XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man +XTO = $(XMLTO) -m $(XSL_FILE) man # Recipes: %.1.xml: $(srcdir)/%.1.txt $(COMMON_DEPS) $(ADOC_DOCBOOK) -o $@ $< -%.1: %.1.xml $(XSL_SRC_FILES) +%.1: %.1.xml $(XSL_FILE) $(XTO) $< %.3.xml: $(srcdir)/%.3.txt $(COMMON_DEPS) $(ADOC_DOCBOOK) -o $@ $< -%.3: %.3.xml $(XSL_SRC_FILES) +%.3: %.3.xml $(XSL_FILE) $(XTO) $< # Only clean the generated files if we have the tools to generate them again. @@ -114,4 +108,4 @@ dist-hook: endif # !MAN_PAGES_OPT # Always distribute the source files. -EXTRA_DIST += $(MAN_TXT) $(COMMON_TXT) $(XSL_SRC_FILES) $(ASCIIDOC_CONF) +EXTRA_DIST += $(MAN_TXT) $(COMMON_TXT) $(XSL_FILE) $(ASCIIDOC_CONF) diff --git a/doc/man/manpage.xsl b/doc/man/manpage.xsl new file mode 100644 index 00000000..d576e140 --- /dev/null +++ b/doc/man/manpage.xsl @@ -0,0 +1,38 @@ + + + + + + + + + sp + + + + + + + + br + + + + + <> + + + \fI\fR + + + + + \fB + + \fR + + + + 0 + diff --git a/doc/man/xsl/manpage-bold-literal.xsl b/doc/man/xsl/manpage-bold-literal.xsl deleted file mode 100644 index 36dff92e..00000000 --- a/doc/man/xsl/manpage-bold-literal.xsl +++ /dev/null @@ -1,8 +0,0 @@ - - - - \fB - - \fR - - diff --git a/doc/man/xsl/manpage-callouts.xsl b/doc/man/xsl/manpage-callouts.xsl deleted file mode 100644 index 2f7a5d7f..00000000 --- a/doc/man/xsl/manpage-callouts.xsl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - sp - - - - - - - - br - - diff --git a/doc/man/xsl/manpage-headings.xsl b/doc/man/xsl/manpage-headings.xsl deleted file mode 100644 index 70e44e18..00000000 --- a/doc/man/xsl/manpage-headings.xsl +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/doc/man/xsl/manpage-links.xsl b/doc/man/xsl/manpage-links.xsl deleted file mode 100644 index a92e209b..00000000 --- a/doc/man/xsl/manpage-links.xsl +++ /dev/null @@ -1,11 +0,0 @@ - - - - <> - - - - - \fI\fR - - diff --git a/doc/man/xsl/manpage.xsl b/doc/man/xsl/manpage.xsl deleted file mode 100644 index 2c593c46..00000000 --- a/doc/man/xsl/manpage.xsl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - 0 - -- 2.34.1