Added future table support

This commit is contained in:
Maximilien Rigaut 2022-05-31 06:22:52 +02:00
parent cea75227e9
commit 61351acb81
No known key found for this signature in database
GPG Key ID: 4F14B23709ADA5B1
3 changed files with 159 additions and 51 deletions

View File

@ -229,15 +229,15 @@ class DisplayContainer(BaseContainer):
pass
class TableMainContainer(BaseContainer):
class TableSeparatorContainer(BaseContainer):
pass
class TableHeadContainer(BaseContainer):
def __init__(self, content=None):
super().__init__(content)
self.map['colspan'] = ""
pass
# class TableHeadContainer(BaseContainer):
# def __init__(self, content=None):
# super().__init__(content)
# self.map['colspan'] = ""
# pass
class TableRowContainer(BaseContainer):
@ -279,6 +279,9 @@ _to_container = {
"se:start:section": SeContainer,
"hyperlink": HyperLinkContainer,
"linebreak": LinebreakContainer,
"table:row": TableRowContainer,
"table:cell": TableCellContainer,
"table:separator": TableSeparatorContainer,
}

View File

@ -20,14 +20,20 @@ _list_classes = [
context_mngr.SeContainer,
context_mngr.HeaderContainer,
context_mngr.DisplayContainer,
context_mngr.TableMainContainer,
context_mngr.TableHeadContainer,
context_mngr.TableSeparatorContainer,
context_mngr.TableRowContainer,
context_mngr.TableCellContainer,
context_mngr.LinebreakContainer,
]
_base_list = [sy.TextToken([1]), sy.TextToken([2]), sy.TextToken([3]), sy.TextToken([4])]
_opts = sy.OptionalToken([
sy.OptionalVarToken([
sy.BeAssignToken([["class", "blue"]]),
sy.BeValueToken([123]),
]),
sy.OptionalInsertToken(["var='test', number=11"]),
])
_token_list_with_expected_result = [
[
@ -233,69 +239,163 @@ _token_list_with_expected_result = [
],
[
[
sy.HeaderToken(["h1"]),
sy.HeaderToken(["#", "h1"]),
sy.TextToken(["a"]),
sy.HeaderToken(["h2"]),
sy.HeaderToken(["##", "h2"]),
sy.TextToken(["b"]),
sy.HeaderToken(["h3"]),
sy.HeaderToken(["###", "h3"]),
sy.TextToken(["c"]),
sy.HeaderToken(["h4"]),
sy.HeaderToken(["####", "h4"]),
sy.TextToken(["d"]),
sy.HeaderToken(["h5"]),
sy.HeaderToken(["#####", "h5"]),
sy.TextToken(["e"]),
sy.HeaderToken(["h6"]),
sy.HeaderToken(["######", "h6"]),
],
[
context_mngr.HeaderContainer([
sy.HeaderToken(["h1"]),
sy.HeaderToken(["#", "h1"]),
]),
context_mngr.TextContainer([sy.TextToken(["a"])]),
context_mngr.HeaderContainer([
sy.HeaderToken(["h2"]),
sy.HeaderToken(["##", "h2"]),
]),
context_mngr.TextContainer([sy.TextToken(["b"])]),
context_mngr.HeaderContainer([
sy.HeaderToken(["h3"]),
sy.HeaderToken(["###", "h3"]),
]),
context_mngr.TextContainer([sy.TextToken(["c"])]),
context_mngr.HeaderContainer([
sy.HeaderToken(["h4"]),
sy.HeaderToken(["####", "h4"]),
]),
context_mngr.TextContainer([sy.TextToken(["d"])]),
context_mngr.HeaderContainer([
sy.HeaderToken(["h5"]),
sy.HeaderToken(["#####", "h5"]),
]),
context_mngr.TextContainer([sy.TextToken(["e"])]),
context_mngr.HeaderContainer([
sy.HeaderToken(["h6"]),
sy.HeaderToken(["######", "h6"]),
]),
],
__GLk(1),
],
[
[
sy.DisplayToken(["Display"]),
sy.DisplayToken(["!", "Display"]),
sy.TextToken(["a"]),
],
[
context_mngr.DisplayContainer([
sy.DisplayToken(["Display"]),
sy.DisplayToken(["!", "Display"]),
]),
context_mngr.TextContainer([sy.TextToken(["a"])]),
],
__GLk(1),
],
# context_mngr.TableMainContainer,
# context_mngr.TableHeadContainer,
# context_mngr.TableRowContainer,
# context_mngr.TableCellContainer,
[
[sy.TextToken([1]), sy.Linebreak([])],
[
context_mngr.TextContainer([sy.TextToken([1])]),
context_mngr.LinebreakContainer([sy.Linebreak([])])
sy.TableRowToken([
sy.TableCellToken([
sy.TextToken(["a"]),
]),
sy.TableCellToken([
sy.TextToken(["b"]),
]),
]),
],
[
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["a"])]),
]),
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["b"])]),
]),
]),
],
__GLk(1),
__XF,
],
[
[
sy.TableRowToken([
"2",
sy.TableCellToken([
sy.TextToken(["a"]),
]),
"3",
sy.TableCellToken([
sy.TextToken(["b"]),
]),
]),
],
[
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([ # MONITOR # The colspan must be taken into account
context_mngr.TextContainer([sy.TextToken(["a"])]),
]),
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["b"])]),
]),
]),
],
__GLk(1),
__XF,
],
[
[
sy.TableSeparatorToken(["---", "---"]),
],
[
context_mngr.TableSeparatorContainer([
sy.TableSeparatorToken(["---", "---"]),
]),
],
__GLk(1),
__XF,
],
[
[
sy.TableRowToken([
sy.TableCellToken([
sy.TextToken(["a"]),
]),
sy.TableCellToken([
sy.TextToken(["b"]),
]),
]),
sy.TableSeparatorToken(["---", "---"]),
sy.TableRowToken([
sy.TableCellToken([
sy.TextToken(["c"]),
]),
sy.TableCellToken([
sy.TextToken(["d"]),
]),
]),
],
[
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["a"])]),
]),
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["b"])]),
]),
]),
context_mngr.TableSeparatorContainer([
sy.TableSeparatorToken(["---", "---"]),
]),
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["c"])]),
]),
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["d"])]),
]),
]),
],
__GLk(1),
__XF,
],
]

View File

@ -127,38 +127,43 @@ _list_classes_expected_value = [
__XF,
],
[
context_mngr.TableMainContainer([
context_mngr.TableHeadContainer([
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([
sy.TextToken(['test13']),
]),
]),
]),
]),
[
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([
sy.TextToken(['test14']),
]),
context_mngr.TextContainer([sy.TextToken(["a"])]),
]),
]),
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([
sy.TextToken(['test15']),
]),
context_mngr.TextContainer([sy.TextToken(["b"])]),
]),
]),
]),
"<table><thead><tr><td>test13</td></tr></thead><tbody><tr><td>test14</td></tr><tr><td>test15</td></tr></tbody></table>",
],
"<table><tr><td>a</td><td>b</td></tr></table>",
__GLk(1),
__XF,
],
[
context_mngr.LinebreakContainer([]),
"<br/>",
[
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["a"])]),
]),
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["b"])]),
]),
]),
context_mngr.TableSeparatorContainer([
sy.TableSeparatorToken(["---", "---"]),
]),
context_mngr.TableRowContainer([
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["c"])]),
]),
context_mngr.TableCellContainer([
context_mngr.TextContainer([sy.TextToken(["d"])]),
]),
]),
],
"<table><tr><td>a</td><td>b</td></tr><tr></tr><tr><td>c</td><td>d</td></tr></table>",
__GLk(1),
__XF,
],