From 4dd57a774b1a1ddfbbafcd7d3a81c110ca0604f8 Mon Sep 17 00:00:00 2001
From: Hagen Wierstorf <hwierstorf@audeering.com>
Date: Mon, 24 Jun 2019 14:13:05 +0200
Subject: [PATCH 1/5] Remove deprecated sphinx.ext.mathbase.setup_math

---
 sphinxcontrib/katex.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sphinxcontrib/katex.py b/sphinxcontrib/katex.py
index 53b69b9..f88b69b 100644
--- a/sphinxcontrib/katex.py
+++ b/sphinxcontrib/katex.py
@@ -20,7 +20,8 @@
 from sphinx.locale import _
 from sphinx.errors import ExtensionError
 from sphinx.util.osutil import copyfile
-from sphinx.ext.mathbase import setup_math as mathbase_setup
+from sphinx import add_html_math_renderer
+#from sphinx.ext.mathbase import setup_math as mathbase_setup
 
 
 __version__ = '0.4.1'
@@ -204,8 +205,8 @@ def setup_static_path(app):
 
 def setup(app):
     try:
-        mathbase_setup(app, (html_visit_math, None),
-                       (html_visit_displaymath, None))
+        app.add_html_math_renderer((html_visit_math, None),
+                                   (html_visit_displaymath, None))
     except ExtensionError:
         raise ExtensionError('KaTeX: other math package is already loaded')
 

From 68fd287f62d876afe03c74e3d33a1d4a2c2aa303 Mon Sep 17 00:00:00 2001
From: Hagen Wierstorf <hwierstorf@audeering.com>
Date: Mon, 24 Jun 2019 14:15:27 +0200
Subject: [PATCH 2/5] Change sphinx dependency to >=1.8

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 752e68f..a3389c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-sphinx>=1.6
+sphinx>=1.8

From b6e23c40abed44f8ebacbb61851e73dab2c3a2b4 Mon Sep 17 00:00:00 2001
From: Hagen Wierstorf <hwierstorf@audeering.com>
Date: Mon, 24 Jun 2019 14:19:53 +0200
Subject: [PATCH 3/5] Fix obsolete comment

---
 sphinxcontrib/katex.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sphinxcontrib/katex.py b/sphinxcontrib/katex.py
index f88b69b..30466b5 100644
--- a/sphinxcontrib/katex.py
+++ b/sphinxcontrib/katex.py
@@ -21,7 +21,6 @@
 from sphinx.errors import ExtensionError
 from sphinx.util.osutil import copyfile
 from sphinx import add_html_math_renderer
-#from sphinx.ext.mathbase import setup_math as mathbase_setup
 
 
 __version__ = '0.4.1'

From 5fdfca468ab76b7f4e550f2efee64f23c0f85db1 Mon Sep 17 00:00:00 2001
From: Hagen Wierstorf <hwierstorf@audeering.com>
Date: Mon, 24 Jun 2019 14:26:57 +0200
Subject: [PATCH 4/5] FIX: try to fix import error

---
 sphinxcontrib/katex.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sphinxcontrib/katex.py b/sphinxcontrib/katex.py
index 30466b5..af854a8 100644
--- a/sphinxcontrib/katex.py
+++ b/sphinxcontrib/katex.py
@@ -20,7 +20,6 @@
 from sphinx.locale import _
 from sphinx.errors import ExtensionError
 from sphinx.util.osutil import copyfile
-from sphinx import add_html_math_renderer
 
 
 __version__ = '0.4.1'
@@ -204,8 +203,11 @@ def setup_static_path(app):
 
 def setup(app):
     try:
-        app.add_html_math_renderer((html_visit_math, None),
-                                   (html_visit_displaymath, None))
+        app.add_html_math_renderer(
+            'katex',
+            inline_renderers=(html_visit_math, None),
+            block_renderers=(html_visit_displaymath, None)
+        )
     except ExtensionError:
         raise ExtensionError('KaTeX: other math package is already loaded')
 

From 67b6b6cfc55c4f68199fe2012e4edb966d449c25 Mon Sep 17 00:00:00 2001
From: Hagen Wierstorf <hwierstorf@audeering.com>
Date: Mon, 24 Jun 2019 14:43:23 +0200
Subject: [PATCH 5/5] FIX: make it Sphinx>=1.6 compatible again

---
 requirements.txt       | 2 +-
 sphinxcontrib/katex.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a3389c3..752e68f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-sphinx>=1.8
+sphinx>=1.6
diff --git a/sphinxcontrib/katex.py b/sphinxcontrib/katex.py
index af854a8..88b612c 100644
--- a/sphinxcontrib/katex.py
+++ b/sphinxcontrib/katex.py
@@ -208,8 +208,11 @@ def setup(app):
             inline_renderers=(html_visit_math, None),
             block_renderers=(html_visit_displaymath, None)
         )
-    except ExtensionError:
-        raise ExtensionError('KaTeX: other math package is already loaded')
+    except AttributeError:
+        # Versions of sphinx<1.8 require setup_math instead
+        from sphinx.ext.mathbase import setup_math
+        setup_math(app, (html_visit_math, None),
+                   (html_visit_displaymath, None))
 
     # Include KaTex CSS and JS files
     katex_url = 'https://cdn.jsdelivr.net/npm/katex@{version}/dist/'.format(