langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle multiple clozes in cloze-only filter

Browse Source 
https://forums.ankiweb.net/t/built-in-tts-not-reading-multiple-clozes/1516
This commit is contained in:
Damien Elmes 2020-07-29 12:54:29 +10:00
parent 7e7f2d0be4
commit 6f76b86f7c
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rslib/src/cloze.rs
View File

@ -93,7 +93,9 @@ pub fn reveal_cloze_text(text: &str, cloze_ord: u16, question: bool) -> Cow<str>
} }
pub fn reveal_cloze_text_only(text: &str, cloze_ord: u16, question: bool) -> Cow<str> { pub fn reveal_cloze_text_only(text: &str, cloze_ord: u16, question: bool) -> Cow<str> {
for caps in CLOZE.captures_iter(text) { CLOZE
.captures_iter(text)
.filter(|caps| {
let captured_ord = caps let captured_ord = caps
.get(cloze_caps::ORD) .get(cloze_caps::ORD)
.unwrap() .unwrap()
@ -101,7 +103,9 @@ pub fn reveal_cloze_text_only(text: &str, cloze_ord: u16, question: bool) -> Cow
.parse() .parse()
.unwrap_or(0); .unwrap_or(0);
if captured_ord == cloze_ord { captured_ord == cloze_ord
})
.map(|caps| {
let cloze = if question { let cloze = if question {
// hint provided? // hint provided?
if let Some(hint) = caps.get(cloze_caps::HINT) { if let Some(hint) = caps.get(cloze_caps::HINT) {
@ -112,11 +116,12 @@ pub fn reveal_cloze_text_only(text: &str, cloze_ord: u16, question: bool) -> Cow
} else { } else {
caps.get(cloze_caps::TEXT).unwrap().as_str() caps.get(cloze_caps::TEXT).unwrap().as_str()
}; };
return cloze.to_owned().into();
}
}
"".into() cloze
})
.collect::<Vec<_>>()
.join(", ")
.into()
} }
/// If text contains any LaTeX tags, render the front and back /// If text contains any LaTeX tags, render the front and back
@ -214,6 +219,10 @@ mod test {
); );
assert_eq!(reveal_cloze_text_only("foo {{c1::bar}}", 1, false), "bar"); assert_eq!(reveal_cloze_text_only("foo {{c1::bar}}", 1, false), "bar");
assert_eq!(reveal_cloze_text_only("foo {{c1::bar}}", 2, false), ""); assert_eq!(reveal_cloze_text_only("foo {{c1::bar}}", 2, false), "");
assert_eq!(
reveal_cloze_text_only("{{c1::foo}} {{c1::bar}}", 1, false),
"foo, bar"
);
} }
#[test] #[test]