From 6e89d2fb6662929db9bd43e8a9c49cab01f480da Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Tue, 3 Apr 2018 15:04:47 +0200 Subject: [PATCH] Turn off tidy indent on docs older than 11 It seems the newer tidy in Debian Stretch breaks with the output from the old docs toolchain, causing indention to happen inside
 blocks
which clearly breaks rendering.

Turn it off for thos, but keep it enabled for version 11 and up (at this
point that's just dev), because the output becomes a lot easier to read
when trying to debug things.
---
 tools/docs/docload.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/docs/docload.py b/tools/docs/docload.py
index 6cdadb8d..2965f9c8 100755
--- a/tools/docs/docload.py
+++ b/tools/docs/docload.py
@@ -40,6 +40,12 @@ def load_doc_file(filename, f):
 	else:
 		encoding = 'latin1'
 
+	# PostgreSQL prior to 11 used an older toolchain to build the docs, which does not support
+	# indented HTML. So turn it off on those, but keep it on the newer versions where it works,
+	# because it makes things a lot easier to debug.
+	if float(ver) < 11 and float(ver) > 0:
+		tidyopts['indent'] = 'no'
+
 	contents = unicode(rawcontents, encoding)
 
 	tm = re_titlematch.search(contents)