]> 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:

Fix matching of blockquotes
[etc/mutt.git] / .mutt / markdown2html
index 2ffe54faeb64a8fffffc2dd78dc72c6af025af71..487d3db98ab227baca19a888d6cd925b7b412d8f 100755 (executable)
@@ -95,6 +95,7 @@ h4 { font-size: 107%; }
 h5 { font-size: 103%; }
 h6 { font-size: 100%; }
 p { padding: 0 0.5em; }
+pre { padding: 0 1em; }
 '''
 
 STYLESHEET = os.path.join(os.path.expanduser('~/.mutt'),
@@ -177,7 +178,7 @@ def _identify_quotes_for_later(mdwn):
         # The lead-in to a quote is a single line immediately preceding the
         # quote, and ending with ':'. Note that there could be multiple of
         # these:
-        if re.match(r'^.+:\s*$', cur) and nxt.startswith('>'):
+        if re.match(r'^[^>]+.*:\s*$', cur) and nxt.startswith('>'):
             ret.append(f'{{.quotelead}}{cur.strip()}')
             # pandoc needs an empty line before the blockquote, so
             # we enter one for the purpose of HTML rendition:
@@ -186,13 +187,13 @@ def _identify_quotes_for_later(mdwn):
 
         # The first blockquote after such a lead-in gets marked as the
         # "initial" quote:
-        elif prev and re.match(r'^.+:\s*$', prev) and cur.startswith('>'):
+        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, flags=re.MULTILINE))
 
         # All other occurrences of blockquotes get the "subsequent" marker:
-        elif cur.startswith('>') and prev and not prev.startswith('>'):
+        elif cur.startswith('>') and prev is not None and not prev.startswith('>'):
             ret.append(re.sub(r'^((?:\s*>\s*)+)(.+)',
                               r'\g<1>{.quotesubsequent}\g<2>',
                               cur, flags=re.MULTILINE))