diff --git a/src/bootstraparse/modules/syntax.py b/src/bootstraparse/modules/syntax.py
index 4f7a403..0a8d327 100644
--- a/src/bootstraparse/modules/syntax.py
+++ b/src/bootstraparse/modules/syntax.py
@@ -185,8 +185,8 @@ structural_elements = (
pp.CaselessLiteral('aside') |
pp.CaselessLiteral('section')
)('structural_element')
-header_element = pp.OneOrMore(pp.Literal('#'))
-display_element = pp.OneOrMore(pp.Literal('!'))
+header_element = pp.Word('#')
+display_element = pp.Word('!')
# Optional elements
diff --git a/tests/modules/test_syntax.py b/tests/modules/test_syntax.py
index 51bb2e2..21d9e0e 100644
--- a/tests/modules/test_syntax.py
+++ b/tests/modules/test_syntax.py
@@ -64,7 +64,7 @@ dict_advanced_syntax_input_and_expected_output = {
],
"et_strong": [
# Single strong element, should only match the first "**"
- ("**", sy.EtEmToken("**"), ),
+ ("**", sy.EtStrongToken("**"), ),
],
"et_underline": [
# Single underline element, should only match the first "__"
@@ -89,14 +89,14 @@ dict_advanced_syntax_input_and_expected_output = {
"enhanced_text": [
# Matches a line of text, with or without inline elements
("*test*", (sy.EtEmToken(["*"]), sy.TextToken(["test"]), sy.EtEmToken(["*"]))),
- ("**test**", (sy.EtEmToken(["**"]), sy.TextToken(["test"]), sy.EtEmToken(["**"]))),
+ ("**test**", (sy.EtStrongToken(["**"]), sy.TextToken(["test"]), sy.EtStrongToken(["**"]))),
("__test__", (sy.EtUnderlineToken(["__"]), sy.TextToken(["test"]), sy.EtUnderlineToken(["__"]))),
("~~test~~", (sy.EtStrikethroughToken(["~~"]), sy.TextToken(["test"]), sy.EtStrikethroughToken(["~~"]))),
("(#12345)", (sy.EtCustomSpanToken(["#12345"]), )),
("*test*test*", (sy.EtEmToken(["*"]), sy.TextToken(["test"]), sy.EtEmToken(["*"]), sy.TextToken(["test"]),
sy.EtEmToken(["*"]))),
- ("**test**test**", (sy.EtEmToken(["**"]), sy.TextToken(["test"]), sy.EtEmToken(["**"]), sy.TextToken(["test"]),
- sy.EtEmToken(["**"]), )),
+ ("**test**test**", (sy.EtStrongToken(["**"]), sy.TextToken(["test"]), sy.EtStrongToken(["**"]), sy.TextToken(["test"]),
+ sy.EtStrongToken(["**"]), )),
("__test__test__", (sy.EtUnderlineToken(["__"]), sy.TextToken(["test"]), sy.EtUnderlineToken(["__"]),
sy.TextToken(["test"]), sy.EtUnderlineToken(["__"]), )),
("~~test~~test~~", (sy.EtStrikethroughToken(["~~"]), sy.TextToken(["test"]), sy.EtStrikethroughToken(["~~"]),
@@ -104,10 +104,10 @@ dict_advanced_syntax_input_and_expected_output = {
("(#12345)test(#12345)", (sy.EtCustomSpanToken(["#12345"]), sy.TextToken(["test"]),
sy.EtCustomSpanToken(["#12345"]), )),
("__test(#12)test**test__test~~", (sy.EtUnderlineToken("__"), sy.TextToken(["test"]),
- sy.EtCustomSpanToken(["#12"]), sy.TextToken(["test"]), sy.EtEmToken(["**"]),
+ sy.EtCustomSpanToken(["#12"]), sy.TextToken(["test"]), sy.EtStrongToken(["**"]),
sy.TextToken(["test"]), sy.EtStrikethroughToken(["~~"]),
sy.TextToken(["test"]), sy.EtUnderlineToken(["__"]), )),
- ("12. List of elements", (sy.EtUlistToken(["12", "List of elements"]), )),
+ ("#. List of elements", (sy.EtUlistToken(["#", "List of elements"]), )),
("Test text with a link [link_name](link)", (sy.TextToken(["Test text with a link "]),
sy.HyperlinkToken(["link_name", "link"]), )),
("Test text with a link [link_name](link) and a *bold* text", (sy.TextToken(["Test text with a link "]),
@@ -127,18 +127,16 @@ dict_advanced_syntax_input_and_expected_output = {
],
"se": [
# Matches a div element, must be at the beginning of the line, the closing div can be with arguments
- # TODO: Implement a specific div token
- ("<
>", (sy.UnimplementedToken(["div", ">>"]))),
- # TODO: Add a specific optional token for the arguments
- ("div>> [class='blue', 123#]{var='test', number=11}", (sy.UnimplementedToken(["div", ">>", sy.UnimplementedToken(["[", "class='blue'", ",", "123#", "]"]), sy.UnimplementedToken(["{", "var='test'", ",", "number=11", "}"])]))), # noqa E501 (line too long)
+ ("div>> [class='blue', 123#]{var='test', number=11}", (sy.StructuralElementEndToken(["div", sy.OptionalToken(["[", "class='blue'", ",", "123#", "]","{", "var='test'", ",", "number=11", "}"])]))), # noqa E501 (line too long)
+ ("div>> [class='blue', 123#]", (sy.StructuralElementEndToken(["div", sy.OptionalToken(["[", "class='blue'", ",", "123#", "]"])]))), # noqa E501 (line too long)
+ ("div>> {var='test', number=11}", (sy.StructuralElementEndToken(["div", sy.OptionalToken(["{", "var='test'", ",", "number=11", "}"])]))), # noqa E501 (line too long)
],
# List Elements
"one_olist": [
# Matches a one-level ordered list element, must be at the beginning of the line
# Drop the "." from the match
- ("12. Text", (sy.EtOlistToken(["12", "Text"]), )),
+ ("#. Text", (sy.EtOlistToken(["#", "Text"]), )),
],
"one_ulist": [
# Matches a one-level unordered list element, must be at the beginning of the line
@@ -149,15 +147,15 @@ dict_advanced_syntax_input_and_expected_output = {
# Headers
"one_header": [
# Matches a one-level header element, must be at the beginning of the line
- ("# Text1 #", (sy.HeaderToken(["#", "Text1"]), )),
- ("## Text2 ##", (sy.HeaderToken(["##", "Text2"]), )),
- ("### Text3 ###", (sy.HeaderToken(["###", "Text3"]), )),
- ("#### Text4 ####", (sy.HeaderToken(["####", "Text4"]), )),
- ("##### Text5 #####", (sy.HeaderToken(["#####", "Text5"]), )),
- ("###### Text6 ######", (sy.HeaderToken(["######", "Text6"]), )),
- ("## Text2 ## {var='test', number=11}", (sy.HeaderToken(["##", "Text2"]),
+ ("# Text1 #", (sy.HeaderToken(["#", "Text1 "]), )),
+ ("## Text2 ##", (sy.HeaderToken(["##", "Text2 "]), )),
+ ("### Text3 ###", (sy.HeaderToken(["###", "Text3 "]), )),
+ ("#### Text4 ####", (sy.HeaderToken(["####", "Text4 "]), )),
+ ("##### Text5 #####", (sy.HeaderToken(["#####", "Text5 "]), )),
+ ("###### Text6 ######", (sy.HeaderToken(["######", "Text6 "]), )),
+ ("## Text2 ## {var='test', number=11}", (sy.HeaderToken(["##", "Text2 "]),
sy.UnimplementedToken(["{", "var='test'", ",", "number=11", "}"]))),
- ("### Text3 ### [class='blue', 123#]{var='test', number=11}", (sy.HeaderToken(["###", "Text3"]),
+ ("### Text3 ### [class='blue', 123#]{var='test', number=11}", (sy.HeaderToken(["###", "Text3 "]),
sy.UnimplementedToken(["[", "class='blue'", ",", "123#", "]"]), # noqa E501 (line too long)
sy.UnimplementedToken(["{", "var='test'", ",", "number=11", "}"]))), # noqa E501 (line too long)
],
@@ -179,7 +177,7 @@ dict_advanced_syntax_input_and_expected_output = {
],
"line": [
# Match any line parsed by the parser (can match header, list table etc...) this is the main syntax element
- ("# Text1 #", (sy.HeaderToken(["#", "Text1"]), )),
+ ("# Text1 #", (sy.HeaderToken(["#", "Text1 "]), )),
("Text *bold __underline__ still bold*", (sy.TextToken(["Text ", sy.EtStrongToken(["bold", " ", sy.EtUnderlineToken(["underline"]), " still bold"])]), )), # noqa E501 (line too long)
("|2 Text1 | Text2 |", (sy.TableRowToken(["|2", "Text1", "|", "Text2", "|"]), )),
("|---|---|", (sy.TableSeparatorToken(["|", "---", "|", "---", "|"]), )),
@@ -205,8 +203,8 @@ list_add_tag_input_and_expected_output = [
list_of_text_input_and_readable_output = [
# Header
- ("# Text1 #", "one_header", "
"),
- ("## Text2 ##", "one_header", "
"),
+ ("# Text1 #", "one_header", "
"),
+ ("## Text2 ##", "one_header", "
"),
# Text
("*Italic*", "et_em", "
Italic"),
@@ -221,9 +219,9 @@ list_of_text_input_and_readable_output = [
("div>>", "se", ">>"),
# Lists
- ("- Text", "et_ulist", ""),
- ("12. Text", "et_olist", ""),
- ("# Text", "et_olist", ""),
+ ("- Text", "il_ulist", ""),
+ ("12. Text", "il_olist", ""),
+ ("# Text", "il_olist", ""),
# Tables
("| Text1 | Text2 |", "table", ""),