From 65fd6f077455a9d16cf73f5c93f65816d0c66616 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 20 Aug 2022 23:21:30 +0200 Subject: [PATCH] nixos/make-options-doc: eat newlines in MD admonitions leaving some newlines around after an admonition was closed causes the newline rule to match, which in turn inserts literallayout newlines into te xml output. that's not what we want. --- nixos/lib/make-options-doc/mergeJSON.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index d7dc6ca30074..c7577e41e2d2 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -151,7 +151,7 @@ def p_manpage(md): md.inline.rules.append('manpage') def p_admonition(md): - ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::\n', flags=re.MULTILINE|re.DOTALL) + ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::$\n*', flags=re.MULTILINE|re.DOTALL) def parse(self, m, state): return { 'type': 'admonition',