diff --git a/spip2md/spip.lark b/spip2md/spip.lark index b900279..91d9d76 100644 --- a/spip2md/spip.lark +++ b/spip2md/spip.lark @@ -1,7 +1,7 @@ // Flexible SPIP Markup grammar for Lark parser start: _N* block ( _N+ block )* _N* -?block: HORIZONTAL_RULE -> horizontal_rule +?block: HORIZONTAL_RULE | heading | list | table @@ -55,7 +55,7 @@ pair_inline_tag: _PAIR_INLINE_TAG_ANGLE TAG_NAME ( "|" TAG_OPTION )* ">" paragra orphan_inline_tag: _INLINE_TAG_ANGLE "/"? TAG_NAME ( "|" TAG_OPTION )* ">" -> orphan_tag _PAIR_INLINE_TAG_ANGLE: /\<(?=(?:quote|section|div|cadre|frame|code|poesie)(?:\|[0-9A-Za-z_:\/\-\.]+)*\>)/ -_INLINE_TAG_ANGLE: /\<(?=([0-9A-Za-z_:\/\-\.]+)(?:\|[0-9A-Za-z_:\/\-\.]+)*\>)/ +_INLINE_TAG_ANGLE: /\<(?!quote|section|div|cadre|frame|code|poesie)(?=[0-9A-Za-z\|_:\/\-\.]+\>)/ _link: footnote | wikilink diff --git a/test/0.spip b/test/0.spip index 1d21eeb..d70c2ab 100644 --- a/test/0.spip +++ b/test/0.spip @@ -56,7 +56,7 @@ Culpa proident adipisicing id {nulla} nisi laboris ex in Lorem sunt duis officia {{{Un bout de {{poesie}}}}} -Lorem ipsum dolor sit amet, officia excepteur ex fugiat reprehenderit enim labore culpa sint ad nisi Lorem pariatur mollit ex esse exercitation amet. Nisi anim cupidatat excepteur officia. Reprehenderit nostrud nostrud ipsum Lorem est aliquip amet voluptate voluptate dolor minim nulla est proident. Nostrud officia pariatur ut officia. Sit irure elit esse ea nulla sunt ex occaecat reprehenderit commodo officia dolor Lorem duis laboris cupidatat officia voluptate. Culpa proident adipisicing id nulla nisi laboris ex in Lorem sunt duis officia eiusmod. Aliqua reprehenderit commodo ex non excepteur duis sunt velit enim. Voluptate laboris sint cupidatat ullamco ut ea consectetur et est culpa et culpa duis. +Lorem ipsum dolor sit amet, officia excepteur ex fugiat reprehenderit enim labore culpa sint ad nisi Lorem pariatur mollit ex esse exercitation amet. Nisi anim cupidatat excepteur officia. Reprehenderit nostrud nostrud ipsum Lorem est aliquip amet voluptate voluptate dolor minim nulla est proident. Nostrud officia pariatur ut officia. Sit irure elit esse ea nulla sunt ex occaecat reprehenderit commodo officia dolor Lorem duis laboris cupidatat officia voluptate. Culpa proident adipisicing id nulla nisi laboris ex in Lorem sunt duis officia eiusmod. Aliqua reprehenderit commodo ex non excepteur duis sunt velit enim. Voluptate laboris sint cupidatat ullamco ut ea consectetur et est culpa et culpa duis. {{{Cadre de code}}}