Merge pull request nicolas-raoul#83 from flerda/v2.1-latex

Updates to LaTeX code.
flerda · Jul 29, 2013 · 3f1522c · 3f1522c
2 parents 8a30749 + 53833f0
commit 3f1522c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/com/ichi2/libanki/LaTeX.java b/src/com/ichi2/libanki/LaTeX.java
@@ -17,8 +17,6 @@
 
 package com.ichi2.libanki;
 
-import android.text.Html;
-
 import com.ichi2.libanki.hooks.Hook;
 import com.ichi2.libanki.hooks.Hooks;
 
@@ -108,12 +106,7 @@ private static String _imgLink(Collection col, String latex) {
      * @return
      */
     private static String _latexFromHtml(Collection col, String latex) {
-        // entitydefs defines nbsp as \xa0 instead of a standard space, so we
-        // replace it first
-        latex = latex.replace("&nbsp;", " ");
         latex = latex.replaceAll("<br( /)?>|<div>", "\n");
-        // replace <div> etc with spaces
-        latex = latex.replaceAll("<.+?>", " ");
         latex = Utils.stripHTML(latex);
         return latex;
     }

diff --git a/src/com/ichi2/libanki/Utils.java b/src/com/ichi2/libanki/Utils.java
@@ -316,6 +316,9 @@ private String minimizeHTML(String s) {
      * @return The text with its HTML entities unescaped.
      */
     private static String entsToTxt(String html) {
+        // entitydefs defines nbsp as \xa0 instead of a standard space, so we
+        // replace it first
+        html = html.replace("&nbsp;", " ");
         Matcher htmlEntities = htmlEntitiesPattern.matcher(html);
         StringBuffer sb = new StringBuffer();
         while (htmlEntities.find()) {