From 3f4321677068b7a0d6090e9ba5fbee7d6fe6d61e Mon Sep 17 00:00:00 2001
From: Matthias Geier <Matthias.Geier@gmail.com>
Date: Fri, 13 Jul 2018 18:20:26 +0200
Subject: [PATCH] Convert pandoc's RawInline("tex") to DisplayMath

---
 src/nbsphinx.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/nbsphinx.py b/src/nbsphinx.py
index 0b3e2081..dc4a425a 100644
--- a/src/nbsphinx.py
+++ b/src/nbsphinx.py
@@ -849,19 +849,29 @@ def markdown2rst(text):
     except that it uses a pandoc filter to convert raw LaTeX blocks to
     "math" directives (instead of "raw:: latex" directives).
 
+    NB: At some point, pandoc changed its behavior!  In former times,
+    it converted LaTeX math environments to RawBlock ("latex"), at some
+    later point this was changed to RawInline ("tex").
+    Either way, we convert it to Math/DisplayMath.
+
     """
 
+    def displaymath(text):
+        return {
+            't': 'Math',
+            'c': [
+                {'t': 'DisplayMath', 'c': []},
+                # Special marker characters are removed below:
+                '\x0e:nowrap:\x0f\n\n' + text,
+            ]
+        }
+
     def rawlatex2math_hook(obj):
         if obj.get('t') == 'RawBlock' and obj['c'][0] == 'latex':
             obj['t'] = 'Para'
-            obj['c'] = [{
-                't': 'Math',
-                'c': [
-                    {'t': 'DisplayMath', 'c': []},
-                    # Special marker characters are removed below:
-                    '\x0e:nowrap:\x0f\n\n' + obj['c'][1],
-                ]
-            }]
+            obj['c'] = [displaymath(obj['c'][1])]
+        elif obj.get('t') == 'RawInline' and obj['c'][0] == 'tex':
+            obj = displaymath(obj['c'][1])
         return obj
 
     def rawlatex2math(text):