|
 |
e43452d |
From 1b6836c15717a62ef81cef8e9617fc7df6c7e605 Mon Sep 17 00:00:00 2001
|
|
|
e43452d |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
e43452d |
Date: Mon, 19 Dec 2011 20:25:52 +0100
|
|
|
f1996ec |
Subject: [PATCH] man: switch to UTF-8 output, to work around charset issues
|
|
|
f1996ec |
(cherry picked from commit
|
|
|
e43452d |
76318284fc970b30e9dc4c079960807345331dad)
|
|
|
e43452d |
|
|
|
e43452d |
---
|
|
|
e43452d |
Makefile.am | 9 +++++----
|
|
|
e43452d |
man/custom-html.xsl | 29 +++++++++++++++++++++++++++++
|
|
|
e43452d |
2 files changed, 34 insertions(+), 4 deletions(-)
|
|
|
e43452d |
create mode 100644 man/custom-html.xsl
|
|
|
e43452d |
|
|
|
e43452d |
diff --git a/Makefile.am b/Makefile.am
|
|
|
e43452d |
index 9ee2c7f..295944d 100644
|
|
|
e43452d |
--- a/Makefile.am
|
|
|
e43452d |
+++ b/Makefile.am
|
|
|
e43452d |
@@ -495,7 +495,8 @@ EXTRA_DIST = \
|
|
|
e43452d |
src/libsystemd-login.sym \
|
|
|
e43452d |
introspect.awk \
|
|
|
e43452d |
src/73-seat-late.rules.in \
|
|
|
e43452d |
- src/99-systemd.rules.in
|
|
|
e43452d |
+ src/99-systemd.rules.in \
|
|
|
e43452d |
+ man/custom-html.xsl
|
|
|
e43452d |
|
|
|
e43452d |
if ENABLE_BINFMT
|
|
|
e43452d |
EXTRA_DIST += \
|
|
|
e43452d |
@@ -1696,7 +1697,7 @@ endif
|
|
|
e43452d |
if HAVE_XSLTPROC
|
|
|
e43452d |
XSLTPROC_FLAGS = \
|
|
|
e43452d |
--nonet \
|
|
|
e43452d |
- --param funcsynopsis.style "'ansi'"
|
|
|
e43452d |
+ --stringparam funcsynopsis.style ansi
|
|
|
e43452d |
|
|
|
e43452d |
XSLTPROC_PROCESS_MAN = \
|
|
|
e43452d |
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
|
|
e43452d |
@@ -1709,11 +1710,11 @@ XSLTPROC_PROCESS_MAN_IN = \
|
|
|
e43452d |
|
|
|
e43452d |
XSLTPROC_PROCESS_HTML = \
|
|
|
e43452d |
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
|
|
e43452d |
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
|
|
|
e43452d |
+ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $<
|
|
|
e43452d |
|
|
|
e43452d |
XSLTPROC_PROCESS_HTML_IN = \
|
|
|
e43452d |
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
|
|
e43452d |
- $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< && \
|
|
|
e43452d |
+ $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \
|
|
|
e43452d |
mv ${@:.in=} $@
|
|
|
e43452d |
|
|
|
e43452d |
man/%.1: man/%.xml
|
|
|
e43452d |
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
|
|
|
e43452d |
new file mode 100644
|
|
|
e43452d |
index 0000000..2d2f458
|
|
|
e43452d |
--- /dev/null
|
|
|
e43452d |
+++ b/man/custom-html.xsl
|
|
|
e43452d |
@@ -0,0 +1,29 @@
|
|
|
e43452d |
+
|
|
|
e43452d |
+
|
|
|
e43452d |
+
|
|
|
e43452d |
+ This file is part of systemd.
|
|
|
e43452d |
+
|
|
|
e43452d |
+ Copyright 2011 Lennart Poettering
|
|
|
e43452d |
+
|
|
|
e43452d |
+ systemd is free software; you can redistribute it and/or modify it
|
|
|
e43452d |
+ under the terms of the GNU General Public License as published by
|
|
|
e43452d |
+ the Free Software Foundation; either version 2 of the License, or
|
|
|
e43452d |
+ (at your option) any later version.
|
|
|
e43452d |
+
|
|
|
e43452d |
+ systemd is distributed in the hope that it will be useful, but
|
|
|
e43452d |
+ WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
e43452d |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
e43452d |
+ General Public License for more details.
|
|
|
e43452d |
+
|
|
|
e43452d |
+ You should have received a copy of the GNU General Public License
|
|
|
e43452d |
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
e43452d |
+-->
|
|
|
e43452d |
+
|
|
|
e43452d |
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
|
|
|
e43452d |
+
|
|
|
e43452d |
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
|
|
|
e43452d |
+
|
|
|
e43452d |
+
|
|
|
e43452d |
+<xsl:output method="html" encoding="UTF-8" indent="no"/>
|
|
|
e43452d |
+
|
|
|
e43452d |
+</xsl:stylesheet>
|
|
|
e43452d |
--
|
|
|
e43452d |
1.7.7.5
|
|
|
e43452d |
|