Compatibility fix for sphinx documentation

diff --git a/doc/en/conf.py b/doc/en/conf.py
index d1c9d94942b29ae50e64d80da63e7632fa7f08fa..b1d0cb0a30ba8bb52eed0e26eddd1d0508c3942b 100644 (file)
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -34,7 +34,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys, os, sphinx
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -57,8 +57,12 @@ except:
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ["sphinx.ext.imgmath"]
-# extensions = ["sphinx.ext.pngmath"]
+from distutils.version import LooseVersion #, StrictVersion
+if LooseVersion(sphinx.__version__) < LooseVersion("1.4.0"):
+    extensions = ["sphinx.ext.pngmath"]
+else:
+    extensions = ["sphinx.ext.imgmath"]
+#
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

diff --git a/doc/fr/conf.py b/doc/fr/conf.py
index 2f76da9fd9e1685019d6285ebee84113c6ef59ae..7fa242a292e7a2f8a7071104bb9e9c7f751959fc 100644 (file)
--- a/doc/fr/conf.py
+++ b/doc/fr/conf.py
@@ -34,7 +34,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys, os, sphinx
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -57,8 +57,12 @@ except:
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ["sphinx.ext.imgmath"]
-# extensions = ["sphinx.ext.pngmath"]
+from distutils.version import LooseVersion #, StrictVersion
+if LooseVersion(sphinx.__version__) < LooseVersion("1.4.0"):
+    extensions = ["sphinx.ext.pngmath"]
+else:
+    extensions = ["sphinx.ext.imgmath"]
+#
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']