1.1 --- a/moinformat/parsers/moin.py Fri Jul 13 22:58:45 2018 +0200
1.2 +++ b/moinformat/parsers/moin.py Fri Jul 13 23:59:22 2018 +0200
1.3 @@ -23,9 +23,9 @@
1.4 from moinformat.serialisers import serialise
1.5 from moinformat.tree import Break, DefItem, DefTerm, FontStyle, Heading, \
1.6 Larger, Link, List, ListItem, Monospace, Region, \
1.7 - Rule, Smaller, Subscript, Superscript, Table, \
1.8 - TableAttr, TableAttrs, TableCell, TableRow, Text, \
1.9 - Underline
1.10 + Rule, Smaller, Strikethrough, Subscript, \
1.11 + Superscript, Table, TableAttr, TableAttrs, \
1.12 + TableCell, TableRow, Text, Underline
1.13
1.14 class MoinParser(ParserBase):
1.15
1.16 @@ -404,6 +404,9 @@
1.17 def parse_smaller(self, region):
1.18 self.parse_inline(region, Smaller, "smaller")
1.19
1.20 + def parse_strike(self, region):
1.21 + self.parse_inline(region, Strikethrough, "strike")
1.22 +
1.23 def parse_sub(self, region):
1.24 self.parse_inline(region, Subscript, "sub")
1.25
1.26 @@ -475,6 +478,7 @@
1.27 "monospace" : r"`",
1.28 "rule" : r"(-----*)", # ----...
1.29 "smaller" : r"~-",
1.30 + "strike" : r"--\(", # --(
1.31 "sub" : r",,",
1.32 "super" : r"\^",
1.33 "underline" : r"__",
1.34 @@ -486,6 +490,7 @@
1.35 "largerend" : r"\+~",
1.36 "monospaceend" : r"`",
1.37 "smallerend" : r"-~",
1.38 + "strikeend" : r"\)--", # )--
1.39 "subend" : r",,",
1.40 "superend" : r"\^",
1.41 "underlineend" : r"__",
1.42 @@ -527,8 +532,8 @@
1.43 ]
1.44
1.45 inline_pattern_names = [
1.46 - "fontstyle", "larger", "link", "monospace", "smaller", "sub", "super",
1.47 - "underline",
1.48 + "fontstyle", "larger", "link", "monospace", "smaller", "strike", "sub",
1.49 + "super", "underline",
1.50 ]
1.51
1.52 list_pattern_names = [
1.53 @@ -589,6 +594,8 @@
1.54 "rule" : parse_rule,
1.55 "smaller" : parse_smaller,
1.56 "smallerend" : end_region,
1.57 + "strike" : parse_strike,
1.58 + "strikeend" : end_region,
1.59 "sub" : parse_sub,
1.60 "subend" : end_region,
1.61 "super" : parse_super,