A few more md -> html improvements

2 files changed, 8 insertions, 2 deletions

diff --git a/md2man b/md2man
index 8736dd1c..7ee63f53 100755
--- a/md2man
+++ b/md2man
@@ -334,7 +334,9 @@ def manify(txt):
 
 
 def htmlify(txt):
-    return txt.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("\xa0", '&nbsp;')
+    return re.sub(r'(\W)-', r'\1&#8209;',
+            txt.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;')
+            .replace('--', '&#8209;&#8209;').replace("\xa0-", '&nbsp;&#8209;').replace("\xa0", '&nbsp;'))
 
 
 def warn(*msg):
diff --git a/packaging/md2html b/packaging/md2html
index 6c944458..a1613aa7 100755
--- a/packaging/md2html
+++ b/packaging/md2html
@@ -44,6 +44,9 @@ md_parser = None
 
 def main():
     for mdfn in args.mdfiles:
+        if not mdfn.endswith('.md'):
+            print('Ignoring non-md input file:', mdfn)
+            continue
         title = re.sub(r'.*/', '', mdfn).replace('.md', '')
         htfn = mdfn.replace('.md', '.html')
 
@@ -57,7 +60,8 @@ 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 = html.replace("\xa0", '&nbsp;')
+        html = html.replace('--', '&#8209;&#8209;').replace("\xa0-", '&nbsp;&#8209;').replace("\xa0", '&nbsp;')
+        html = re.sub(r'(\W)-', r'\1&#8209;', html)
 
         with open(htfn, 'w', encoding='utf-8') as fh:
             fh.write(HTML_START % title)