From 3f830124a1535875665e183e2ad2e41e5106a467 Mon Sep 17 00:00:00 2001
From: Takashi Tamura <tamuratak@users.noreply.github.com>
Date: Wed, 10 Oct 2018 08:31:41 +0900
Subject: [PATCH] remove label. skip CD env

---
 mathjax/mj.js          | 7 ++++---
 src/providers/hover.ts | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mathjax/mj.js b/mathjax/mj.js
index e52ef49c7..9dd2192ef 100644
--- a/mathjax/mj.js
+++ b/mathjax/mj.js
@@ -82,9 +82,10 @@ const setMathInDiv = function (divid, tmpid) {
 
 const setVSCodeForegroundColor = function(tex) {
     const rgb = getVSCodeEditorForegound();
-    const color = '\\color[RGB]{' + rgb[0] + ',' + rgb[1] + ',' + rgb[2] + '}'
-    const ret = tex.replace(/^(\$|\\\(|\\begin{.*?})/, '$1' + color);
-    return ret.replace(/(&|\\\\)/g, '$1' + color);
+    const color = '\\color[RGB]{' + rgb[0] + ',' + rgb[1] + ',' + rgb[2] + '}';
+    var ret = tex.replace(/^(\$|\\\(|\\begin{.*?}({.*?})*)/, '$1' + color);
+    ret = ret.replace(/(\\begin{CD}[\s\S]*?\\end{CD}|((?:\\[^\\]|[^&\\])*&+|\\\\))/g, '$1' + color);
+    return ret;
 }
 
 window.addEventListener('message', event => {
diff --git a/src/providers/hover.ts b/src/providers/hover.ts
index 9e4fa1990..b5189239f 100644
--- a/src/providers/hover.ts
+++ b/src/providers/hover.ts
@@ -67,9 +67,10 @@ export class HoverProvider implements vscode.HoverProvider  {
     }
 
     private mathjaxify_tex(tex: string, envname: string) : string {
-        const ret = tex.replace(/^\s*%.*?\r?\n/mg, '')
+        let ret = tex.replace(/^\s*%.*?\r?\n/mg, '')
+        ret = ret.replace(/\\label\{.*?\}/g, '')
         if (envname.match(/^(aligned|alignedat|array|Bmatrix|bmatrix|cases|CD|gathered|matrix|pmatrix|smallmatrix|split|subarray|Vmatrix|vmatrix)$/)) {
-            return '\\begin{equation}' + ret + '\\end{equation}'
+            ret = '\\begin{equation}' + ret + '\\end{equation}'
         }
         return ret
     }