GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

typeanswer: [type:nc] - use nfkd again (#3627)

Browse source
This commit is contained in:
a.r 2024-12-14 11:53:48 +01:00 committed by GitHub
parent a2ad0bce55
commit 1fb5e99efc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rslib/src/typeanswer.rs
View file

@ -7,6 +7,8 @@ use std::sync::LazyLock;
use difflib::sequencematcher::SequenceMatcher; use difflib::sequencematcher::SequenceMatcher;
use regex::Regex; use regex::Regex;
use unic_ucd_category::GeneralCategory; use unic_ucd_category::GeneralCategory;
use unicode_normalization::char::is_combining_mark;
use unicode_normalization::UnicodeNormalization;
use crate::card_rendering::strip_av_tags; use crate::card_rendering::strip_av_tags;
use crate::text::normalize_to_nfc; use crate::text::normalize_to_nfc;
@ -195,18 +197,12 @@ impl DiffTrait for DiffNonCombining {
fn new(expected: &str, typed: &str) -> Self { fn new(expected: &str, typed: &str) -> Self {
// filter out combining elements // filter out combining elements
let mut typed_stripped: Vec<char> = Vec::new(); let typed_stripped: Vec<char> = typed.nfkd().filter(|&c| !is_combining_mark(c)).collect();
let mut expected_stripped: Vec<char> = Vec::new(); let mut expected_stripped: Vec<char> = Vec::new();
// also tokenize into "char+combining" for final rendering // also tokenize into "char+combining" for final rendering
let mut expected_split: Vec<String> = Vec::new(); let mut expected_split: Vec<String> = Vec::new();
for c in normalize(typed) { for c in expected.nfkd() {
if !unicode_normalization::char::is_combining_mark(c) {
typed_stripped.push(c);
}
}
for c in normalize(expected) {
if unicode_normalization::char::is_combining_mark(c) { if unicode_normalization::char::is_combining_mark(c) {
if let Some(last) = expected_split.last_mut() { if let Some(last) = expected_split.last_mut() {
last.push(c); last.push(c);
@ -423,5 +419,9 @@ mod test {
compare_answer("חוֹף", "חופ", false), compare_answer("חוֹף", "חופ", false),
"<code id=typeans><span class=typeGood>חו</span><span class=typeBad>פ</span><br><span id=typearrow>&darr;</span><br><span class=typeGood>חוֹ</span><span class=typeMissed>ף</span></code>" "<code id=typeans><span class=typeGood>חו</span><span class=typeBad>פ</span><br><span id=typearrow>&darr;</span><br><span class=typeGood>חוֹ</span><span class=typeMissed>ף</span></code>"
); );
assert_eq!(
compare_answer("ば", "は", false),
"<code id=typeans><span class=typeGood>ば</span></code>"
);
} }
} }