anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 22:06:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-organize code from a last commit a bit.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34994 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-07-21 13:26:48 +00:00
parent b8d43b05bc
commit e7bb1e616e
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mathed/InsetMathHull.cpp
View File

@ -1841,6 +1841,7 @@ int InsetMathHull::docbook(odocstream & os, OutputParams const & runparams) cons
docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
{
BufferParams::MathOutput mathtype = buffer().params().html_math_output;
// FIXME Eventually we would like to do this inset by inset.
switch (mathtype) {
case BufferParams::MathML: {
@ -1866,26 +1867,26 @@ docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
case BufferParams::Images: {
reloadPreview(docit_, true);
graphics::PreviewImage const * pimage = preview_->getPreviewImage(buffer());
string const tag = (getType() == hullSimple) ? "span" : "div";
if (!pimage) {
LYXERR0("Unable to generate image. LaTeX follows.");
LYXERR0(latexString(*this));
xs << html::StartTag(tag) << "MATH" << html::EndTag(tag);
if (pimage) {
// FIXME Do we always have png?
string const tag = (getType() == hullSimple) ? "span" : "div";
FileName const & mathimg = pimage->filename();
xs << html::StartTag(tag);
xs << html::CompTag("img", "src=\"" + mathimg.onlyFileName() + "\"");
xs << html::EndTag(tag);
xs.cr();
// add the file to the list of files to be exported
op.exportdata->addExternalFile("xhtml", mathimg);
break;
}
// need to do a conversion to png, possibly.
FileName const & mathimg = pimage->filename();
xs << html::StartTag(tag);
xs << html::CompTag("img", "src=\"" + mathimg.onlyFileName() + "\"");
xs << html::EndTag(tag);
xs.cr();
op.exportdata->addExternalFile("xhtml", mathimg);
break;
LYXERR0("Unable to generate image. Falling through to LaTeX output.");
}
case BufferParams::LaTeX: {
// FIXME Obviously, the only real question is how to wrap this.
LYXERR0("LaTeX output for math presently unsupported.");
string const tag = (getType() == hullSimple) ? "span" : "div";
// FIXME Need to allow customization of wrapping tags here....
docstring const latex = latexString(*this);
xs << html::StartTag(tag) << latex << html::EndTag(tag);
xs.cr();
}
} // end switch
return docstring();