X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=make-man-index.py;h=1e67287c08482b5f01899ae9bccf6fc3fba5331b;hp=44d15f8c291341fc2ab7f6ea7f3a48e39cee5641;hb=02b89260ce14bfae9167b7ca64bb196592b3573d;hpb=051eaebb587d466ed21b51863d52d31fc1df57ca

diff --git a/make-man-index.py b/make-man-index.py
index 44d15f8c2..1e67287c0 100755
--- a/make-man-index.py
+++ b/make-man-index.py
@@ -5,10 +5,25 @@ 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)
 
@@ -36,7 +51,7 @@ for n in sorted(index.keys(), key = str.lower):
         if letter is None or n[0].upper() != letter:
                 letter = n[0].upper()
 
-                h2 = SubElement(body, 'h1')
+                h2 = SubElement(body, 'h2')
                 h2.text = letter
 
                 ul = SubElement(body, 'ul')
@@ -57,4 +72,5 @@ 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)
 
+prettify(html)
 stdout.write(tostring(html))