Reworked the installation of the Dynare sphinx domain and pygment lexer.

.gitignore

@@ -2,5 +2,5 @@
 python/*
 src/build/*
 src/source/__pycache__/*
-py/domain/__pycache__/*
+utils/__pycache__/*
 src/source/_static/mathjax/*

Makefile

@@ -40,8 +40,8 @@ python: python/bin/python3
 python/bin/python3:
 	python3 -m venv python
 	. python/bin/activate ; pip3 install --upgrade pip ; pip3 install sphinx recommonmark sphinx_rtd_theme
-	cp py/pygment/dynare.py python/lib/python3.*/site-packages/pygments/lexers/
-	cd python/lib/python3.*/site-packages/pygments/lexers ; python3 _mapping.py
+#	cp py/pygment/dynare.py python/lib/python3.*/site-packages/pygments/lexers/
+#	cd python/lib/python3.*/site-packages/pygments/lexers ; python3 _mapping.py
 
 mathjax: src/source/_static/mathjax/MathJax.js
 	@touch src/source/_static/mathjax/MathJax.js

src/source/conf.py

@@ -20,7 +20,7 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.abspath('../../py/domain/'))
+sys.path.insert(0, os.path.abspath('../../utils'))
 
 extensions = ['sphinx.ext.autodoc',
 			  'sphinx.ext.mathjax']
@@ -92,5 +92,7 @@ man_pages = [
 ]
 
 def setup(app):
-    from dynare import DynDomain
-    app.add_domain(DynDomain)
+    from dynare_dom import DynareDomain
+    from dynare_lex import DynareLexer
+    app.add_lexer("dynare", DynareLexer())
+    app.add_domain(DynareDomain)

utils/dynare_dom.py

@@ -287,7 +287,7 @@ class DynareXRefRole(XRefRole):
 
 ############### Dynare domain #######################
 
-class DynDomain(Domain):
+class DynareDomain(Domain):
     name = 'dynare'
     label = 'Dynare'
     object_types = {