X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=make-man-index.py;h=b40c963f946287bf3b2bdffdb1a4d9f7872a568d;hp=29e3578758d80601ea00b62aa85d339896248f0b;hb=cbc06dcd8f74e9e757c55884a4acf49784fc3444;hpb=a6c9b1c492378a093fe7db69c42a19b8f8193814

diff --git a/make-man-index.py b/make-man-index.py
index 29e357875..b40c963f9 100755
--- a/make-man-index.py
+++ b/make-man-index.py
@@ -1,14 +1,46 @@
-#!/usr/bin/env python
+#  -*- Mode: python; indent-tabs-mode: nil -*- */
+#
+#  This file is part of systemd.
+#
+#  Copyright 2012 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 from xml.etree.ElementTree import parse, Element, SubElement, tostring
 from sys import argv, stdout
 
 index = {}
 
+def prettify(elem, indent = 0):
+        s = "\n" + indent * "  "
+        if len(elem):
+                if not elem.text or not elem.text.strip():
+                        elem.text = s + "  "
+                for e in elem:
+                        prettify(e, indent + 1)
+                        if not e.tail or not e.tail.strip():
+                                e.tail = s + "  "
+                if not e.tail or not e.tail.strip():
+                        e.tail = s
+        else:
+                if indent and (not elem.tail or not elem.tail.strip()):
+                        elem.tail = s
+
 for p in argv[1:]:
         t = parse(p)
         section = t.find('./refmeta/manvolnum').text
-        purpose = t.find('./refnamediv/refpurpose').text
+        purpose = ' '.join(t.find('./refnamediv/refpurpose').text.split())
         for f in t.findall('./refnamediv/refname'):
                 index[f.text] = (p, section, purpose)
 
@@ -57,4 +89,7 @@ hr = SubElement(body, 'hr')
 p = SubElement(body, 'p')
 p.text = "This index contains %s entries, referring to %i individual manual pages." % (len(index), len(argv)-1)
 
+if hasattr(stdout, "buffer"):
+	stdout = stdout.buffer
+prettify(html)
 stdout.write(tostring(html))