voussoir/voussoir.net
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix dash spacer for nested quotes and other indented blocks.

Browse source
This commit is contained in:
voussoir 2021-05-17 17:03:12 -07:00
parent f7ca8b74bf
commit 1f7c31899a
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
voussoir.net/writing/vmarkdown.py
View file

@ -130,10 +130,13 @@ class VoussoirInlineGrammar(mistune.InlineGrammar):
footnote_text = re.compile(r'\[footnote_text\]') footnote_text = re.compile(r'\[footnote_text\]')
subreddit = re.compile(r'\/r\/[A-Za-z0-9_]+') subreddit = re.compile(r'\/r\/[A-Za-z0-9_]+')
redditor = re.compile(r'\/u\/[A-Za-z0-9_]+') redditor = re.compile(r'\/u\/[A-Za-z0-9_]+')
dash_spacer = re.compile(r'^\s*-$', re.MULTILINE)
# This `text` override is based on this article: # This `text` override is based on this article:
# https://ana-balica.github.io/2015/12/21/mistune-custom-lexers-we-are-going-deeper/ # https://ana-balica.github.io/2015/12/21/mistune-custom-lexers-we-are-going-deeper/
# in which we have to keep adding characters to the recognized list every # in which we have to keep adding characters to the recognized list every
# time we make a new rule. My additions so far are \- and \^. # time we make a new rule. My additions so far are:
# \- for --
# \^ for superscript
text = re.compile(r'^[\s\S]+?(?=[\\<!\[_*`~\-\^\/]|https?:\/\/| {2,}\n|$)') text = re.compile(r'^[\s\S]+?(?=[\\<!\[_*`~\-\^\/]|https?:\/\/| {2,}\n|$)')
class VoussoirInline(mistune.InlineLexer): class VoussoirInline(mistune.InlineLexer):
@ -148,6 +151,7 @@ class VoussoirInline(mistune.InlineLexer):
default_rules.insert(0, 'footnote_text') default_rules.insert(0, 'footnote_text')
default_rules.insert(0, 'subreddit') default_rules.insert(0, 'subreddit')
default_rules.insert(0, 'redditor') default_rules.insert(0, 'redditor')
default_rules.insert(0, 'dash_spacer')
def __init__(self, renderer, **kwargs): def __init__(self, renderer, **kwargs):
rules = VoussoirInlineGrammar() rules = VoussoirInlineGrammar()
@ -197,8 +201,13 @@ class VoussoirInline(mistune.InlineLexer):
def output_redditor(self, m): def output_redditor(self, m):
return f'<a href="https://old.reddit.com{m.group(0)}">{m.group(0)}</a>' return f'<a href="https://old.reddit.com{m.group(0)}">{m.group(0)}</a>'
def output_dash_spacer(self, m):
return ''
class VoussoirBlockGrammar(mistune.BlockGrammar): class VoussoirBlockGrammar(mistune.BlockGrammar):
dash_spacer = re.compile(r'^-$', re.MULTILINE) # The single hyphen is used to create a split between elements that
# would normally merge together, such as block quotes.
dash_spacer = re.compile(r'^\s*-$', re.MULTILINE)
class VoussoirBlock(mistune.BlockLexer): class VoussoirBlock(mistune.BlockLexer):
default_rules = copy.copy(mistune.BlockLexer.default_rules) default_rules = copy.copy(mistune.BlockLexer.default_rules)