From 41378d55e17213bfc988dafcb9175a805b43c246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Genov=C3=A9s?= Date: Fri, 24 Jan 2020 19:12:20 +0100 Subject: [PATCH 1/2] Fixes #154 Fix regex for horizontal rules (yaml metadata delimiters should not be counted as rules) --- uberwriter/markup_regex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uberwriter/markup_regex.py b/uberwriter/markup_regex.py index f4ed094..54d95f9 100644 --- a/uberwriter/markup_regex.py +++ b/uberwriter/markup_regex.py @@ -19,7 +19,7 @@ LINK_ALT = re.compile( IMAGE = re.compile( r"!\[(?P.*)\]\((?P.+?)(?: \"(?P.+)\")?\)") HORIZONTAL_RULE = re.compile( - r"(?:^|\n)(?P<symbols> {0,3}[*\-_]{3,} *)(?:\n+|$)") + r"(?:\n\n)(?P<symbols> {0,3}[*\-_]{3,} *)(?:\n\n+)") LIST = re.compile( r"(?:^|\n)(?P<content>(?P<indent>(?:\t| {4})*)[\-*+]( +)(?P<text>.+(?:\n+ \2.+)*))") ORDERED_LIST = re.compile( From 68bcc1206b3699e36292ae8b2d9f1dec07cc6432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Genov=C3=A9s?= <manuel.genoves@gmail.com> Date: Sat, 25 Jan 2020 01:41:36 +0100 Subject: [PATCH 2/2] fix top/bottom rules --- uberwriter/markup_regex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uberwriter/markup_regex.py b/uberwriter/markup_regex.py index 54d95f9..1b557a6 100644 --- a/uberwriter/markup_regex.py +++ b/uberwriter/markup_regex.py @@ -19,7 +19,7 @@ LINK_ALT = re.compile( IMAGE = re.compile( r"!\[(?P<text>.*)\]\((?P<url>.+?)(?: \"(?P<title>.+)\")?\)") HORIZONTAL_RULE = re.compile( - r"(?:\n\n)(?P<symbols> {0,3}[*\-_]{3,} *)(?:\n\n+)") + r"(?:^|\n{2,})(?P<symbols> {0,3}[*\-_]{3,} *)(?:\n{2,}|$)") LIST = re.compile( r"(?:^|\n)(?P<content>(?P<indent>(?:\t| {4})*)[\-*+]( +)(?P<text>.+(?:\n+ \2.+)*))") ORDERED_LIST = re.compile(