From 3fe19a8ec622d505eae5a6ae89a7fa0d2f86920e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilhem=20Faur=C3=A9?= Date: Wed, 26 Apr 2023 15:02:33 +0200 Subject: [PATCH] html aliases for links, but paragraphs are priorized --- spip2md/spip.lark | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/spip2md/spip.lark b/spip2md/spip.lark index 85066d4..d6ac84b 100644 --- a/spip2md/spip.lark +++ b/spip2md/spip.lark @@ -38,20 +38,17 @@ nested_italic: _NOT_LBRACE "{" ( TEXT | link ) "}" _NOT_RBRACE -> em _NOT_LBRACE: /[^\{]/ _NOT_RBRACE: /[^\}]/ -?link: internal_link - | external_link +?link: a | footnote - | glossary + | wikipedia_link -internal_link: "[" TEXT "->" TEXT "]" -external_link: "[" TEXT "->" _PROTOCOL "://" TEXT "]" - -// Protocol, probably http(s) -// Is made of 2 to 8 latin letters -_PROTOCOL: /[a-zA-Z]{2,8}/ - -footnote: "[[" TEXT "]]" -glossary: "[?" TEXT "]" +a: "[" link_text "->" link_destination "]" -> a +link_text: TEXT -> text +link_destination: TEXT -> href +footnote: "[[" footnote_content "]]" -> footnote +footnote_content: TEXT -> content +wikipedia_link: "[?" wikipedia_query "]" -> a_wikipedia +wikipedia_query: TEXT -> query // Pure text : // - Never contains line breaks