Reorganise location of Pygments lexer. [ci skip]

The name has to be src/misc/pygments/custom_lexers so
that Python doesn't get confused with the installed pygments/lexers
when doing an import from sphinx.

doc/tutorial/conf.py

@@ -19,10 +19,12 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
 sys.path.insert(0, os.path.abspath('./_static'))
+sys.path.insert(0, os.path.abspath('../../src/misc/pygments'))
 import custom_lexers.xfelix
 
 from sphinx.highlighting import lexers
 lexers['xfelix']= custom_lexers.xfelix.XFelixLexer()
+lexers['felix']= custom_lexers.xfelix.FelixLexer()
 
 # -- General configuration ------------------------------------------------
 

doc/tutorial/hello.rst

@@ -28,3 +28,18 @@ into C++, compiles the program, and runs it. All the generated files
 are cached in the .felix/cache subdirectory of your $HOME directory
 on Unix like systems, and $USERPROFILE on Windows.
 
+Test felix:
+
+.. code-block:: felix
+
+    var x = \alpha \(x^2\)
+
+Test xfelix:
+
+.. code-block:: xfelix
+
+    var x = \alpha \(x^2\)
+
+
+
+

doc/tutorial/_static/custom_lexers/xfelix.py → src/misc/pygments/custom_lexers/xfelix.py

@@ -14,33 +14,11 @@
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Token
 
-__all__ = ['XFelixLexer']
+__all__ = ['XFelixLexer','FelixLexer']
 
 XMath = Token.XMath
 
-class XFelixLexer(RegexLexer):
-    """
-    For `Felix <http://felix-lang.org>`_ source code.
-
-    .. versionadded:: 1.2
-    """
-
-    # screws up latex! Keep for reference. Testing HACK only! 
-    def get_tokens_unprocessed(self,text):
-      for index,token,value in RegexLexer.get_tokens_unprocessed(self,text):
-        if token == Generic:
-          value = "\\(" + value + "\\)"
-          yield (index,token,value)
-        elif token == XMath:
-          yield (index,Generic,value)
-        else:
-          yield (index,token,value)
-
-
-    name = 'XFelix'
-    aliases = ['xfelix', 'xflx']
-    filenames = ['*.flx', '*.flxh']
-    mimetypes = ['text/x-felix']
+class FelixBase(RegexLexer):
 
     keywords = (
         '_', '_deref', 'all', 'as','begin','end','while','connector','pin',
@@ -107,7 +85,7 @@ def get_tokens_unprocessed(self,text):
 
             # Keywords
             (words(('axiom', 'ctor', 'chip', 'fun', 'gen', 'proc', 'reduce','regdef',
-              'var','val','typedef',
+              'var','val','typedef','device',
               'union'), suffix=r'\b'),
              Keyword, 'funcname'),
             (words(('class', 'cclass', 'cstruct', 'obj', 'struct', 'object'), suffix=r'\b'),
@@ -234,3 +212,41 @@ def get_tokens_unprocessed(self,text):
             include('nl')
         ],
     }
+
+class XFelixLexer(FelixBase):
+    def get_tokens_unprocessed(self,text):
+      for index,token,value in RegexLexer.get_tokens_unprocessed(self,text):
+        if token == Generic:
+          value = "\\(" + value + "\\)"
+          yield (index,token,value)
+        elif token == XMath:
+          yield (index,Generic,value)
+        else:
+          yield (index,token,value)
+
+
+    name = 'XFelix'
+    aliases = ['xfelix', 'xflx']
+    filenames = ['*.flx', '*.flxh']
+    mimetypes = ['text/x-felix']
+
+class FelixLexer(FelixBase):
+    def get_tokens_unprocessed(self,text):
+      for index,token,value in RegexLexer.get_tokens_unprocessed(self,text):
+        if token == Generic:
+          yield (index,token,value)
+        elif token == XMath:
+           yield (index,Punctuation,u"\\")
+           yield (index,Punctuation,u"(")
+           yield (index,Generic,value[2:-2])
+           yield (index,Punctuation,u"\\")
+           yield (index,Punctuation,u")")
+        else:
+          yield (index,token,value)
+
+    name = 'Felix'
+    aliases = ['felix', 'flx']
+    filenames = ['*.flx', '*.flxh']
+    mimetypes = ['text/x-felix']
+
+