From ecbfe0822f1cdc57d9a5e27b080fac472c0896f1 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Fri, 30 Dec 2016 01:17:41 +0100
Subject: [PATCH] Another version of the indice/exposants

---
 core/markdown.py | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/core/markdown.py b/core/markdown.py
index abe1d177..7f391f17 100644
--- a/core/markdown.py
+++ b/core/markdown.py
@@ -26,15 +26,15 @@ class SithInlineGrammar(InlineGrammar):
     underline = re.compile(
         r'^_{2}([\s\S]+?)_{2}(?!_)'  # __word__
     )
-    exposant = re.compile(
-        r'^\^([\s\S]+?)\^(?!\^)'  # ^text^
-        r'|'
-        r'^\^(\S*)'  # ^word
+    exposant = re.compile( # FIXME Does not work for now
+        r'^\^([\s\S]+?)\^'  # ^text^
+        # r'|' # FIXME doesn't properly works like this
+        # r'^\^(\S+)'  # ^word
     )
-    indice = re.compile( # XXX FIXME: don't work with inline code
-        r'^_([\s\S]+?)_(?!_)'  # _text_
-        r'|'
-        r'^_(\S*)'  # _word
+    indice = re.compile(
+        r'^_([\s\S]+?)_'  # _text_ (^` hack, because no other solution were found :/ this sadly prevent code in indices)
+        # r'|' # FIXME doesn't properly works like this
+        # r'^_(\S+)'  # _word
     )
 
 class SithInlineLexer(InlineLexer):
@@ -49,11 +49,11 @@ class SithInlineLexer(InlineLexer):
         'link',
         'reflink',
         'nolink',
+        'exposant',
         'double_emphasis',
         'emphasis',
         'underline',
-        # 'indice',
-        'exposant',
+        'indice',
         'code',
         'linebreak',
         'strikethrough',
@@ -66,11 +66,11 @@ class SithInlineLexer(InlineLexer):
         'link',
         'reflink',
         'nolink',
+        'exposant',
         'double_emphasis',
         'emphasis',
         'underline',
-        # 'indice',
-        'exposant',
+        'indice',
         'code',
         'linebreak',
         'strikethrough',
@@ -82,11 +82,11 @@ class SithInlineLexer(InlineLexer):
         return self.renderer.underline(text)
 
     def output_exposant(self, m):
-        text = m.group(1) or m.group(2)
+        text = m.group(1)
         return self.renderer.exposant(text)
 
     def output_indice(self, m):
-        text = m.group(1) or m.group(2)
+        text = m.group(1)
         return self.renderer.indice(text)
 
     # Double emphasis rule changed
@@ -124,11 +124,6 @@ class SithInlineLexer(InlineLexer):
 renderer = SithRenderer()
 inline = SithInlineLexer(renderer)
 
-# enable the features
-# inline.enable_indice()
-# inline.enable_exposant()
-# inline.enable_underline()
-
 markdown = Markdown(renderer, inline=inline)
 
 if __name__ == "__main__":
@@ -145,10 +140,9 @@ if __name__ == "__main__":
 
 * ~~Barrer du texte~~ : `~~texte~~`
 
-* ^Mettre du texte^ en ^exposant : `^mot` ou `^texte^`
-just ^another test
+* Mettre ^du texte^ en ^exposant^ : `^mot` ou `^texte^`
 
-* _Mettre du texte_ en _indice : `_mot` ou `_texte_`
+* _Mettre du texte_ en _indice_ : `_mot` ou `_texte_`
 
 * Pied de page [^en pied de page]
 
@@ -167,6 +161,8 @@ Un bloc de citation se crée ainsi :
 
 Il est possible d'intégrer de la syntaxe Markdown-AE dans un tel bloc.
 
+Petit *test* _sur_ ^une^ **seule** ^ligne pour voir^
+
 """
     print(markdown(text))