From 9e3141482b7e2a5643438faf46a12f539db6ac82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
 <stepan@adjemian.io>
Date: Tue, 19 Feb 2019 09:32:45 +0100
Subject: [PATCH] Reworked the installation of the Dynare sphinx domain and
 pygment lexer.

---
 .gitignore                                  | 2 +-
 Makefile                                    | 4 ++--
 src/source/conf.py                          | 8 +++++---
 py/domain/dynare.py => utils/dynare_dom.py  | 2 +-
 py/pygment/dynare.py => utils/dynare_lex.py | 0
 5 files changed, 9 insertions(+), 7 deletions(-)
 rename py/domain/dynare.py => utils/dynare_dom.py (99%)
 rename py/pygment/dynare.py => utils/dynare_lex.py (100%)

diff --git a/.gitignore b/.gitignore
index 9d0daac45..ce69cc11a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 python/*
 src/build/*
 src/source/__pycache__/*
-py/domain/__pycache__/*
+utils/__pycache__/*
 src/source/_static/mathjax/*
\ No newline at end of file
diff --git a/Makefile b/Makefile
index db5db78f7..84a99a025 100644
--- a/Makefile
+++ b/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
diff --git a/src/source/conf.py b/src/source/conf.py
index 38c8d52cd..ccdce0115 100644
--- a/src/source/conf.py
+++ b/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)
diff --git a/py/domain/dynare.py b/utils/dynare_dom.py
similarity index 99%
rename from py/domain/dynare.py
rename to utils/dynare_dom.py
index 76751bcae..6a2855913 100644
--- a/py/domain/dynare.py
+++ b/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 = {
diff --git a/py/pygment/dynare.py b/utils/dynare_lex.py
similarity index 100%
rename from py/pygment/dynare.py
rename to utils/dynare_lex.py