]> git.madduck.net Git - etc/mutt.git/blobdiff - .mutt/markdown2html

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

enable autolink bare uris extension
[etc/mutt.git] / .mutt / markdown2html
index 44ec07c99cab6ae0fcd109dcac6375a853e93bcc..be705d65d73aeef55e0badc0e8ffebc02ad67c74 100755 (executable)
@@ -62,6 +62,7 @@ DEFAULT_CSS += '''
     color: #999;
     font-size: 80%;
 }
+.quotechar { display: none; }
 .footnote-ref, .footnote-back { text-decoration: none;}
 .signature {
     color: #999;
@@ -69,7 +70,17 @@ DEFAULT_CSS += '''
     white-space: pre;
     margin: 1em 0 0 0;
     font-size: 80%;
-}'''
+}
+table, th, td {
+    border-collapse: collapse;
+    border: 1px solid #999;
+}
+th, td { padding: 0.5em; }
+.header {
+    background: #eee;
+}
+.even { background: #eee; }
+'''
 
 STYLESHEET = os.path.join(os.path.expanduser('~/.mutt'),
                           'markdown2html.css')
@@ -98,7 +109,15 @@ def _preprocess_markdown(mdwn):
     # convert hard line breaks within paragraphs to 2 trailing spaces, which
     # is the markdown way of representing hard line breaks. Note how the
     # regexp will not match between paragraphs.
-    ret = re.sub(r'(\S)\n(\s*\S)', r'\g<1>  \n\g<2>', mdwn, re.MULTILINE)
+    ret = re.sub(r'(\S)\n(\s*\S)', r'\g<1>  \n\g<2>', mdwn, flags=re.MULTILINE)
+
+    # Clients like Thunderbird need the leading '>' to be able to properly
+    # create nested quotes, so we duplicate the symbol, the first instance
+    # will tell pandoc to create a blockquote, while the second instance will
+    # be a <span> containing the character, along with a class that causes CSS
+    # to actually hide it from display. However, this does not work with the
+    # text-mode HTML2text converters, and so it's left commented for now.
+    #ret = re.sub(r'\n>', r'  \n>[>]{.quotechar}', ret, flags=re.MULTILINE)
 
     return ret
 
@@ -153,13 +172,13 @@ def _identify_quotes_for_later(mdwn):
         elif prev and re.match(r'^.+:\s*$', prev) and cur.startswith('>'):
             ret.append(re.sub(r'^(\s*>\s*)+(.+)',
                               r'\g<1>{.quoteinitial}\g<2>',
-                              cur, re.MULTILINE))
+                              cur, flags=re.MULTILINE))
 
         # All other occurrences of blockquotes get the "subsequent" marker:
-        elif cur.startswith('>') and not prev.startswith('>'):
+        elif cur.startswith('>') and prev and not prev.startswith('>'):
             ret.append(re.sub(r'^((?:\s*>\s*)+)(.+)',
                               r'\g<1>{.quotesubsequent}\g<2>',
-                              cur, re.MULTILINE))
+                              cur, flags=re.MULTILINE))
 
         else: # pass through everything else.
             ret.append(cur)
@@ -174,7 +193,7 @@ def _reformat_quotes(html):
     '''
     ret = html.replace('<p>{.quotelead}', '<p class="quotelead">')
     ret = re.sub(r'<blockquote>\n((?:<blockquote>\n)*)<p>(?:\{\.quote(\w+)\})',
-                 r'<blockquote class="quote \g<2>">\n\g<1><p>', ret, re.MULTILINE)
+                 r'<blockquote class="quote \g<2>">\n\g<1><p>', ret, flags=re.MULTILINE)
     return ret
 
 
@@ -208,10 +227,12 @@ def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5',
                        'inline_notes',
                        'emoji',
                        'tex_math_double_backslash',
+                       'autolink_bare_uris'
                       ]
     if not ext_disabled:
         ext_disabled = [ 'tex_math_single_backslash',
                          'tex_math_dollars',
+                         'smart',
                          'raw_html'
                        ]