Merge pull request #159 from goncalossilva/fix.markup

Small markup fixes

.gitignore

@@ -16,6 +16,7 @@ flatpak/*
 data/ui/shortcut_handlers
 *.ui~
 .vscode/
+.idea/
 *.glade~
 dist/uberwriter-2.0b0-py3.7.egg
 builddir/*

uberwriter/stats_counter.py

@@ -11,8 +11,11 @@ from uberwriter import helpers
 class StatsCounter:
     """Counts characters, words, sentences and read time using a background thread."""
 
-    # Regexp that matches any character, except for newlines and subsequent spaces.
-    CHARACTERS = re.compile(r"[^\s]|(?:[^\S\n](?!\s))")
+    # Regexp that matches characters, with the following exceptions:
+    # * Newlines
+    # * Sequential spaces
+    # * Sequential dashes
+    CHARACTERS = re.compile(r"[^\s-]|(?:[^\S\n](?!\s)|-(?![-\n]))")
 
     # Regexp that matches Asian letters, general symbols and hieroglyphs,
     # as well as sequences of word characters optionally containing non-word characters in-between.

uberwriter/text_view_markup_handler.py

@@ -37,13 +37,13 @@ class MarkupHandler:
         "BOLDITALIC": re.compile(r"(\*\*\*|___)(.+?)\1"),
         "STRIKETHROUGH": re.compile(r"~~.+?~~"),
         "LINK": re.compile(r"(\[).*(\]\(.+?\))"),
-        "HORIZONTALRULE": re.compile(r"\n\n([ ]{0,3}[*\-_]{3,}[ ]*)\n", re.MULTILINE),
+        "HORIZONTALRULE": re.compile(r"\n\n([ ]{0,3}[*\-_]{3,}[ ]*)\n\n", re.MULTILINE),
         "LIST": re.compile(r"^((?:\t|[ ]{4})*)[\-*+] .+", re.MULTILINE),
         "NUMERICLIST": re.compile(r"^((\d|[a-z]|#)+[.)]) ", re.MULTILINE),
         "NUMBEREDLIST": re.compile(r"^((?:\t|[ ]{4})*)((?:\d|[a-z])+[.)]) .+", re.MULTILINE),
         "BLOCKQUOTE": re.compile(r"^[ ]{0,3}(?:>|(?:> )+).+", re.MULTILINE),
         "HEADER": re.compile(r"^[ ]{0,3}(#{1,6}) [^\n]+", re.MULTILINE),
-        "HEADER_UNDER": re.compile(r"^[ ]{0,3}\w.+\n[ ]{0,3}[=\-]{3,}", re.MULTILINE),
+        "HEADER_UNDER": re.compile(r"^\n[ ]{0,3}\w.+\n[ ]{0,3}[=\-]{3,}", re.MULTILINE),
         "CODE": re.compile(r"(?:^|\n)[ ]{0,3}(([`~]{3}).+?[ ]{0,3}\2)(?:\n|$)", re.DOTALL),
         "TABLE": re.compile(r"^[\-+]{5,}\n(.+?)\n[\-+]{5,}\n", re.DOTALL),
         "MATH": re.compile(r"[$]{1,2}([^` ].+?[^`\\ ])[$]{1,2}"),