From: Petr Špaček <pspacek@isc.org>
Date: Thu, 30 Jun 2022 08:03:38 +0000 (+0200)
Subject: Remove extra whitespace in grammar for null statement
X-Git-Tag: v9.19.3~16^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1af157eb2095aca49f078d8e7d831b26cd9a676e;p=thirdparty%2Fbind9.git

Remove extra whitespace in grammar for null statement
---

diff --git a/doc/arm/_ext/iscconf.py b/doc/arm/_ext/iscconf.py
index e59cf4d6f96..d7f1e495de3 100644
--- a/doc/arm/_ext/iscconf.py
+++ b/doc/arm/_ext/iscconf.py
@@ -180,11 +180,11 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
                     separator = ""
                     paths = ""
                 subgrammar = grammar_grp[0].subgrammar
-                grammar_txt = (
-                    subgrammar.get("_pprint_name", self.isc_name)
-                    + " "
-                    + checkgrammar.pformat_grammar(grammar_grp[0].subgrammar, level=1)
-                )
+                subgrammar_txt = checkgrammar.pformat_grammar(subgrammar).strip()
+                grammar_txt = subgrammar.get("_pprint_name", self.isc_name)
+                if subgrammar_txt != ";":
+                    grammar_txt += " "
+                grammar_txt += subgrammar_txt
                 if "\n" in grammar_txt.strip():
                     nodetype = nodes.literal_block
                 else: