GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-11 15:17:12 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

better fix for html in type answer

Browse source 
- compare in txt mode so things like < are treated as a single char
- escape text just before applying styles
This commit is contained in:
Damien Elmes 2012-04-19 06:12:29 +09:00
parent 23609c1175
commit 43880409f3
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
aqt/reviewer.py
View file

@ -2,8 +2,9 @@
# 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 import time, os, stat, shutil, difflib, simplejson, re, cgi
import unicodedata as ucd import unicodedata as ucd
import HTMLParser
from aqt.qt import * from aqt.qt import *
from anki.utils import fmtTimeSpan, stripHTML, isMac from anki.utils import fmtTimeSpan, stripHTML, isMac
from anki.hooks import addHook, runHook, runFilter from anki.hooks import addHook, runHook, runFilter
@ -320,9 +321,11 @@ img { max-width: 95%; max-height: 95%; }
# tell webview to call us back with the input content # tell webview to call us back with the input content
self.web.eval("_getTypedText();") self.web.eval("_getTypedText();")
# munge correct value # munge correct value
cor = self.mw.col.media.strip(stripHTML(self.typeCorrect)) parser = HTMLParser.HTMLParser()
cor = parser.unescape(self.typeCorrect)
given = self.typedAnswer
# compare with typed answer # compare with typed answer
res = self.correct(cor, self.typedAnswer) res = self.correct(cor, given)
# and update the type answer area # and update the type answer area
return re.sub(self.typeAnsPat, """ return re.sub(self.typeAnsPat, """
<span style="font-family: '%s'; font-size: %spx">%s</span>""" % <span style="font-family: '%s'; font-size: %spx">%s</span>""" %
@ -347,13 +350,13 @@ img { max-width: 95%; max-height: 95%; }
"returns given sring in style correct (green)" "returns given sring in style correct (green)"
if len(a) == 0: if len(a) == 0:
return "" return ""
return "<span style='%s'>%s</span>" % (self.styleOk, a) return "<span style='%s'>%s</span>" % (self.styleOk, cgi.escape(a))
def bad(self, a): def bad(self, a):
"returns given sring in style incorrect (red)" "returns given sring in style incorrect (red)"
if len(a) == 0: if len(a) == 0:
return "" return ""
return "<span style='%s'>%s</span>" % (self.styleBad, a) return "<span style='%s'>%s</span>" % (self.styleBad, cgi.escape(a))
def applyStyle(self, testChar, correct, wrong): def applyStyle(self, testChar, correct, wrong):
"Calculates answer fragment depending on testChar's unicode category" "Calculates answer fragment depending on testChar's unicode category"