Revert "escape HTML in type in the answer"

This reverts commit 8dbfd676ef.
This commit is contained in:
Damien Elmes 2012-04-19 05:59:27 +09:00
parent c0de34120f
commit 23609c1175

View file

@ -2,7 +2,7 @@
# Copyright: Damien Elmes <anki@ichi2.net> # Copyright: Damien Elmes <anki@ichi2.net>
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import time, os, stat, shutil, difflib, simplejson, re, cgi import time, os, stat, shutil, difflib, simplejson, re
import unicodedata as ucd import unicodedata as ucd
from aqt.qt import * from aqt.qt import *
from anki.utils import fmtTimeSpan, stripHTML, isMac from anki.utils import fmtTimeSpan, stripHTML, isMac
@ -359,12 +359,11 @@ img { max-width: 95%; max-height: 95%; }
"Calculates answer fragment depending on testChar's unicode category" "Calculates answer fragment depending on testChar's unicode category"
ZERO_SIZE = 'Mn' ZERO_SIZE = 'Mn'
def head(a): def head(a):
return cgi.escape(a[:len(a) - 1]) return a[:len(a) - 1]
def tail(a): def tail(a):
return cgi.escape(a[len(a) - 1:]) return a[len(a) - 1:]
if ucd.category(testChar) == ZERO_SIZE: if ucd.category(testChar) == ZERO_SIZE:
return self.ok(head(correct)) + self.bad( return self.ok(head(correct)) + self.bad(tail(correct) + wrong)
tail(correct) + cgi.escape(wrong))
return self.ok(correct) + self.bad(wrong) return self.ok(correct) + self.bad(wrong)
def correct(self, a, b): def correct(self, a, b):
@ -377,7 +376,7 @@ img { max-width: 95%; max-height: 95%; }
s = difflib.SequenceMatcher(None, b, a) s = difflib.SequenceMatcher(None, b, a)
for tag, i1, i2, j1, j2 in s.get_opcodes(): for tag, i1, i2, j1, j2 in s.get_opcodes():
if tag == "equal": if tag == "equal":
lastEqual = cgi.escape(b[i1:i2]) lastEqual = b[i1:i2]
elif tag == "replace": elif tag == "replace":
ret += self.applyStyle(b[i1], lastEqual, ret += self.applyStyle(b[i1], lastEqual,
b[i1:i2] + ("-" * ((j2 - j1) - (i2 - i1)))) b[i1:i2] + ("-" * ((j2 - j1) - (i2 - i1))))