diff --git a/spip2md/spip.lark b/spip2md/spip.lark index 8aeab48..5636e4e 100644 --- a/spip2md/spip.lark +++ b/spip2md/spip.lark @@ -19,14 +19,14 @@ list_item: _inline{TEXT}+ _UL: /-\*|-[^#-]/ _OL: /-#/ -table: ( _TBL_META table_metadata "||" _N )? ( table_row _N )+ +table.1: ( _TBL_META table_metadata "||" _N )? ( table_row _N )+ table_metadata: table_title "|" table_description table_title: _inline{TABLE_TEXT} table_description: _inline{TABLE_TEXT} table_row: ( _TBL table_cell )+ "|" table_cell: _inline{TABLE_TEXT} -_TBL_META: "||" -_TBL: "|" +_TBL_META.1: "||" +_TBL.1: "|" heading: _H _inline{MARKED_TEXT}+ "}}}" _H: "{{{" @@ -63,8 +63,8 @@ A_TEXT: /[^\r\n\{]+?(?=->)/ tag.1: start_tag block? end_tag? -start_tag.1: _STAG TAG_NAME ( "|" TAG_OPTION )* ">" -end_tag.1: _ETAG TAG_NAME ( "|" TAG_OPTION )* ">" +start_tag: _STAG TAG_NAME ( "|" TAG_OPTION )* ">" +end_tag: _ETAG TAG_NAME ( "|" TAG_OPTION )* ">" _ETAG.1: /<\/(?=[0-9A-Za-z_:\|\/\-\.]+>)/ _STAG.1: /<(?=[0-9A-Za-z_:\|\/\-\.]+>)/ TAG_NAME: _PURE_TEXT