From: Wayne Davison <wayne@opencoder.net>
Date: Thu, 23 Jul 2020 23:20:07 +0000 (-0700)
Subject: Fix multi-line code blocks.
X-Git-Tag: v3.2.3pre1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=918cb39fed973e75aae01ad07310525fdd74db30;p=thirdparty%2Frsync.git

Fix multi-line code blocks.
---

diff --git a/packaging/md2html b/packaging/md2html
index 0ee7c405..fa8d8b96 100755
--- a/packaging/md2html
+++ b/packaging/md2html
@@ -75,7 +75,7 @@ def main():
 
         html = md_parser(txt)
 
-        html = re.sub(r'(<code>)([\s\S]*?)(</code>)', lambda m: m[1] + re.sub(r'\s', '\xa0', m[2]) + m[3], html)
+        html = re.sub(r'(?<!<pre>)(<code>)([\s\S]*?)(</code>)', lambda m: m[1] + re.sub(r'\s', '\xa0', m[2]) + m[3], html)
         html = html.replace('--', '&#8209;&#8209;').replace("\xa0-", '&nbsp;&#8209;').replace("\xa0", '&nbsp;')
         html = re.sub(r'(\W)-', r'\1&#8209;', html)