|", "\n", latex)
- latex = stripHTML(latex)
- return latex
-
-
-def _buildImg(col, latex: str, fname: str, model: NoteType) -> Optional[str]:
+def _save_latex_image(col: anki.storage._Collection, extracted: ExtractedLatex, header: str, footer: str, svg: bool) -> Optional[str]:
# add header/footer
- latex = model["latexPre"] + "\n" + latex + "\n" + model["latexPost"]
+ latex = header + "\n" + extracted.latex_body + "\n" + footer
# it's only really secure if run in a jail, but these are the most common
tmplatex = latex.replace("\\includegraphics", "")
for bad in (
@@ -128,8 +96,8 @@ package in the LaTeX header instead."""
% bad
)
- # commands to use?
- if model.get("latexsvg", False):
+ # commands to use
+ if svg:
latexCmds = svgCommands
ext = "svg"
else:
@@ -152,7 +120,7 @@ package in the LaTeX header instead."""
if call(latexCmd, stdout=log, stderr=log):
return _errMsg(latexCmd[0], texpath)
# add to media
- shutil.copyfile(png, os.path.join(mdir, fname))
+ shutil.copyfile(png, os.path.join(mdir, extracted.filename))
return None
finally:
os.chdir(oldcwd)
diff --git a/pylib/anki/media.py b/pylib/anki/media.py
index b825414f4..4cee09c84 100644
--- a/pylib/anki/media.py
+++ b/pylib/anki/media.py
@@ -155,12 +155,6 @@ create table meta (dirMod int, lastUsn int); insert into meta values (0, 0);
) -> List[str]:
l = []
model = self.col.models.get(mid)
- if model["type"] == MODEL_CLOZE and "{{c" in string:
- # if the field has clozes in it, we'll need to expand the
- # possibilities so we can render latex
- strings = self.col.backend.expand_clozes_to_reveal_latex(string)
- else:
- strings = string
# handle latex
string = render_latex(string, model, self.col)
# extract filenames
diff --git a/pylib/anki/rsbackend.py b/pylib/anki/rsbackend.py
index c63e2632c..8625e9857 100644
--- a/pylib/anki/rsbackend.py
+++ b/pylib/anki/rsbackend.py
@@ -127,6 +127,18 @@ MediaSyncProgress = pb.MediaSyncProgress
MediaCheckOutput = pb.MediaCheckOut
+@dataclass
+class ExtractedLatex:
+ filename: str
+ latex_body: str
+
+
+@dataclass
+class ExtractedLatexOutput:
+ html: str
+ latex: List[ExtractedLatex]
+
+
class ProgressKind(enum.Enum):
MediaSync = 0
MediaCheck = 1
@@ -268,10 +280,18 @@ class RustBackend:
return out.text, native_tags
- def expand_clozes_to_reveal_latex(self, text: str) -> str:
- return self._run_command(
- pb.BackendInput(expand_clozes_to_reveal_latex=text)
- ).expand_clozes_to_reveal_latex
+ def extract_latex(self, text: str, svg: bool) -> ExtractedLatexOutput:
+ out = self._run_command(
+ pb.BackendInput(extract_latex=pb.ExtractLatexIn(text=text, svg=svg))
+ ).extract_latex
+
+ return ExtractedLatexOutput(
+ html=out.text,
+ latex=[
+ ExtractedLatex(filename=l.filename, latex_body=l.latex_body)
+ for l in out.latex
+ ],
+ )
def add_file_to_media_folder(self, desired_name: str, data: bytes) -> str:
return self._run_command(
diff --git a/rslib/src/backend.rs b/rslib/src/backend.rs
index 2766d2e76..8f9d72552 100644
--- a/rslib/src/backend.rs
+++ b/rslib/src/backend.rs
@@ -4,8 +4,8 @@
use crate::backend_proto as pt;
use crate::backend_proto::backend_input::Value;
use crate::backend_proto::{Empty, RenderedTemplateReplacement, SyncMediaIn};
-use crate::cloze::expand_clozes_to_reveal_latex;
use crate::err::{AnkiError, NetworkErrorKind, Result, SyncErrorKind};
+use crate::latex::{extract_latex, ExtractedLatex};
use crate::media::check::MediaChecker;
use crate::media::sync::MediaSyncProgress;
use crate::media::MediaManager;
@@ -178,9 +178,7 @@ impl Backend {
}
Value::StripAvTags(text) => OValue::StripAvTags(strip_av_tags(&text).into()),
Value::ExtractAvTags(input) => OValue::ExtractAvTags(self.extract_av_tags(input)),
- Value::ExpandClozesToRevealLatex(input) => {
- OValue::ExpandClozesToRevealLatex(expand_clozes_to_reveal_latex(&input))
- }
+ Value::ExtractLatex(input) => OValue::ExtractLatex(self.extract_latex(input)),
Value::AddFileToMediaFolder(input) => {
OValue::AddFileToMediaFolder(self.add_file_to_media_folder(input)?)
}
@@ -315,6 +313,21 @@ impl Backend {
}
}
+ fn extract_latex(&self, input: pt::ExtractLatexIn) -> pt::ExtractLatexOut {
+ let (text, extracted) = extract_latex(&input.text, input.svg);
+
+ pt::ExtractLatexOut {
+ text,
+ latex: extracted
+ .into_iter()
+ .map(|e: ExtractedLatex| pt::ExtractedLatex {
+ filename: e.fname,
+ latex_body: e.latex,
+ })
+ .collect(),
+ }
+ }
+
fn add_file_to_media_folder(&mut self, input: pt::AddFileToMediaFolderIn) -> Result {
let mgr = MediaManager::new(&self.media_folder, &self.media_db)?;
let mut ctx = mgr.dbctx();