oly
/
eorg
mirror of https://gitlab.com/python-open-source-library-collection/eorg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add in support for meta unknown attributes.

This commit is contained in:
Oliver Marks 2018-11-11 22:08:25 +00:00
parent 602f67498c
commit 7f9d60c748
3 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
eorg/const.py
View File

@ -1,10 +1,21 @@
from eorg import tokens from eorg import tokens
ESCAPE = ['\n']
ESCAPE = ["\n"]
METADATA = ['TITLE', 'AUTHOR', 'EMAIL', 'DESCRIPTION', 'KEYWORDS', 'FILETAGS', 'DATE'] METADATA = [
t_META = r"^[#]\+(" + '|'.join(METADATA) +")\:" "TITLE",
t_BLANK_LINE = '^\s*$' "AUTHOR",
"EMAIL",
"DESCRIPTION",
"KEYWORDS",
"FILETAGS",
"DATE",
"HTML_DOCTYPE",
"SETUPFILE",
]
t_META = r"^[#]\+(" + "|".join(METADATA) + ")\:"
t_BLANK_LINE = "^\s*$"
t_COMMENT_BEGIN = r"^\#\+BEGIN_COMMENT" t_COMMENT_BEGIN = r"^\#\+BEGIN_COMMENT"
t_COMMENT_END = r"^\#\+END_COMMENT" t_COMMENT_END = r"^\#\+END_COMMENT"
t_EXAMPLE_BEGIN = r"^\#\+BEGIN_EXAMPLE" t_EXAMPLE_BEGIN = r"^\#\+BEGIN_EXAMPLE"
@ -18,7 +29,11 @@ t_CAPTIONS = r"^\#\+CAPTION:"
t_IMG = r"^\[\[\s]]$" t_IMG = r"^\[\[\s]]$"
t_RESULTS_END = r"^\:..*" t_RESULTS_END = r"^\:..*"
t_BULLET_START = r"^\s*[\+|\-]"
t_BULLET_END = r"^(?!\s*\[\+|\-]).*$"
t_HEADER = r"^\*+" t_HEADER = r"^\*+"
t_META_OTHER = r"^[#]\+[A-Z\_]+\:"
# Start regex, End regex, skip start, skip end, count matches # Start regex, End regex, skip start, skip end, count matches
TOKENS = { TOKENS = {
@ -29,12 +44,13 @@ TOKENS = {
tokens.CAPTION: (t_CAPTIONS, False, 2, None, False), tokens.CAPTION: (t_CAPTIONS, False, 2, None, False),
tokens.SOURCE: (t_SRC_BEGIN, t_SRC_END, 2, None, False), tokens.SOURCE: (t_SRC_BEGIN, t_SRC_END, 2, None, False),
tokens.TABLE: (t_TABLE_START, t_TABLE_END, 0, None, False), tokens.TABLE: (t_TABLE_START, t_TABLE_END, 0, None, False),
tokens.BULLET: (t_BULLET_START, t_BULLET_END, 0, None, False),
tokens.RESULTS: (t_SRC_BEGIN, t_SRC_END, 2, None, False), tokens.RESULTS: (t_SRC_BEGIN, t_SRC_END, 2, None, False),
tokens.HEADER: (t_HEADER, False, 1, None, True), tokens.HEADER: (t_HEADER, False, 1, None, True),
tokens.META_OTHER: (t_META_OTHER, False, 2, -1, False),
} }
class Token: class Token:
__slots__ = ["token", "value"] __slots__ = ["token", "value"]
@ -45,4 +61,5 @@ class Token:
def __repr__(self): def __repr__(self):
return f"Token(token={self.token}, value={self.value})" return f"Token(token={self.token}, value={self.value})"
image_extensions = (".jpg", ".jpeg", ".png", ".svg") image_extensions = (".jpg", ".jpeg", ".png", ".svg")

5
eorg/tokens.py
View File

@ -1,6 +1,7 @@
BLANK = 0 BLANK = 0
META = 1 META = 1
HEADER = 2 META_OTHER = 2
HEADER = 5
BOLD = 10 BOLD = 10
ITALIC = 11 ITALIC = 11
UNDERLINED = 12 UNDERLINED = 12
@ -10,6 +11,7 @@ TEXT = 21
IMAGE = 22 IMAGE = 22
LINK = 23 LINK = 23
CAPTION = 24 CAPTION = 24
BULLET = 25
SOURCE = 50 SOURCE = 50
EXAMPLE = 51 EXAMPLE = 51
RESULTS = 52 RESULTS = 52
@ -17,7 +19,6 @@ COMMENT = 53
TABLE = 54 TABLE = 54
class Token: class Token:
__slots__ = ["token", "value", "attrs"] __slots__ = ["token", "value", "attrs"]

16
tests/test_regex.py
View File

@ -6,6 +6,22 @@ from eorg.parser import parse
from eorg.generate import html from eorg.generate import html
def test_meta_headers():
text="#+TITLE: test title"
rx = const.t_META
match = re.search(rx, text)
assert match is not None
text="#+UNKNOWN: test title"
rx = const.t_META
match = re.search(rx, text)
assert match is None
text="#+UNKNOWN: test title"
rx = const.t_META_OTHER
match = re.search(rx, text)
assert match is not None
def test_example(): def test_example():
text="#+BEGIN_EXAMPLE" text="#+BEGIN_EXAMPLE"
rx = const.t_EXAMPLE_BEGIN rx = const.t_EXAMPLE_BEGIN