#include "Exporter.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "Language.h"
#include "LaTeXFeatures.h"
#include "LyXRC.h"
#include "MacroTable.h"
#include "output_xhtml.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
#include "sgml.h"
+#include "TextClass.h"
#include "TextPainter.h"
#include "TocBackend.h"
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.h"
+#include "frontends/alert.h"
#include "frontends/Painter.h"
+#include "support/convert.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/gettext.h"
static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull(Buffer * buf)
- : InsetMathGrid(buf, 1, 1), type_(hullNone), nonum_(1, false),
- label_(1, dummy_pointer), preview_(new RenderPreview(this))
+ : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, true),
+ numbers_(1, empty_docstring()), label_(1, dummy_pointer),
+ preview_(new RenderPreview(this))
{
//lyxerr << "sizeof InsetMath: " << sizeof(InsetMath) << endl;
//lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
InsetMathHull::InsetMathHull(Buffer * buf, HullType type)
- : InsetMathGrid(buf, getCols(type), 1), type_(type), nonum_(1, false),
- label_(1, dummy_pointer), preview_(new RenderPreview(this))
+ : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, true),
+ numbers_(1, empty_docstring()), label_(1, dummy_pointer),
+ preview_(new RenderPreview(this))
{
buffer_ = buf;
initMath();
return *this;
InsetMathGrid::operator=(other);
type_ = other.type_;
- nonum_ = other.nonum_;
+ numbered_ = other.numbered_;
+ numbers_ = other.numbers_;
buffer_ = other.buffer_;
for (size_t i = 0; i < label_.size(); ++i)
delete label_[i];
}
+namespace {
+ const char * counters_to_save[] = {"section", "chapter"};
+ unsigned int const numcnts = sizeof(counters_to_save)/sizeof(char *);
+}
+
+
void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
{
if (!buffer_) {
// MathParser.cpp).
return;
}
+
+ // if any of the equations are numbered, then we want to save the values
+ // of some of the counters.
+ if (haveNumbers()) {
+ BufferParams const & bp = buffer_->params();
+ string const & lang = it->getParLanguage(bp)->code();
+ Counters & cnts = bp.documentClass().counters();
+
+ // right now, we only need to do this at export time
+ if (utype == OutputUpdate) {
+ for (size_t i = 0; i < numcnts; ++i) {
+ docstring const cnt = from_ascii(counters_to_save[i]);
+ if (cnts.hasCounter(cnt))
+ counter_map[cnt] = cnts.value(cnt);
+ }
+ }
+
+ // this has to be done separately
+ docstring const eqstr = from_ascii("equation");
+ if (cnts.hasCounter(eqstr)) {
+ if (utype == OutputUpdate) {
+ counter_map[eqstr] = cnts.value(eqstr);
+ LYXERR0(counter_map[eqstr]);}
+ for (size_t i = 0; i != label_.size(); ++i) {
+ if (numbered(i)) {
+ cnts.step(eqstr, utype);
+ numbers_[i] = cnts.theCounter(eqstr, lang);
+ } else
+ numbers_[i] = empty_docstring();
+ }
+ }
+ }
+
+ // now the labels
for (size_t i = 0; i != label_.size(); ++i) {
if (label_[i])
label_[i]->updateBuffer(it, utype);
}
-void InsetMathHull::addToToc(DocIterator const & pit)
+void InsetMathHull::addToToc(DocIterator const & pit) const
{
if (!buffer_) {
//FIXME: buffer_ should be set at creation for this inset! Problem is
Toc & toc = buffer().tocBackend().toc("equation");
for (row_type row = 0; row != nrows(); ++row) {
- if (nonum_[row])
+ if (!numbered_[row])
continue;
if (label_[row])
label_[row]->addToToc(pit);
}
-docstring InsetMathHull::standardColor() const
+ColorCode InsetMathHull::standardColor() const
{
- docstring color;
+ ColorCode color;
switch (type_) {
case hullRegexp:
- color = from_ascii("foreground");
- break;
case hullNone:
- color = from_ascii("foreground");
+ color = Color_foreground;
break;
default:
- color = from_ascii("math");
+ color = Color_math;
}
return color;
}
return;
}
+ ColorCode color = pi.selected && lyxrc.use_system_colors
+ ? Color_selectiontext : standardColor();
bool const really_change_color = pi.base.font.color() == Color_none;
- ColorChanger dummy0(pi.base.font, standardColor(), really_change_color);
+ ColorChanger dummy0(pi.base.font, color, really_change_color);
FontSetChanger dummy1(pi.base, standardFont());
StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
}
}
- docstring const snippet = macro_preamble.str() + latexString(*this);
+ docstring setcnt;
+ if (forexport && haveNumbers()) {
+ docstring eqstr = from_ascii("equation");
+ CounterMap::const_iterator it = counter_map.find(eqstr);
+ if (it != counter_map.end()) {
+ int num = it->second;
+ if (num >= 0)
+ setcnt += from_ascii("\\setcounter{") + eqstr + '}' +
+ '{' + convert<docstring>(num) + '}' + '\n';
+ }
+ for (size_t i = 0; i != numcnts; ++i) {
+ docstring cnt = from_ascii(counters_to_save[i]);
+ it = counter_map.find(cnt);
+ if (it == counter_map.end())
+ continue;
+ int num = it->second;
+ if (num > 0)
+ setcnt += from_ascii("\\setcounter{") + cnt + '}' +
+ '{' + convert<docstring>(num) + '}';
+ }
+ }
+ docstring const snippet = macro_preamble.str() +
+ setcnt + latexString(*this);
LYXERR(Debug::MACROS, "Preview snippet: " << snippet);
preview_->addPreview(snippet, *buffer, forexport);
}
void InsetMathHull::numbered(row_type row, bool num)
{
- nonum_[row] = !num;
- if (nonum_[row] && label_[row]) {
+ numbered_[row] = num;
+ if (!numbered_[row] && label_[row]) {
delete label_[row];
label_[row] = 0;
}
bool InsetMathHull::numbered(row_type row) const
{
- return !nonum_[row];
+ return numbered_[row];
}
if (type_ == hullRegexp)
return false;
for (row_type row = 0; row < nrows(); ++row)
- if (!nonum_[row])
+ if (numbered_[row])
return true;
return false;
}
case hullEquation:
if (n)
- os << "\\begin{equation" << star(n) << "}\n";
+ os << "\n\\begin{equation" << star(n) << "}\n";
else
- os << "\\[\n";
+ os << "\n\\[\n";
break;
case hullEqnArray:
case hullFlAlign:
case hullGather:
case hullMultline:
- os << "\\begin{" << hullName(type_) << star(n) << "}\n";
+ os << "\n\\begin{" << hullName(type_) << star(n) << "}\n";
break;
case hullAlignAt:
case hullXAlignAt:
- os << "\\begin{" << hullName(type_) << star(n) << '}'
+ os << "\n\\begin{" << hullName(type_) << star(n) << '}'
<< '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
break;
case hullXXAlignAt:
- os << "\\begin{" << hullName(type_) << '}'
+ os << "\n\\begin{" << hullName(type_) << '}'
<< '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
break;
break;
default:
- os << "\\begin{unknown" << star(n) << '}';
+ os << "\n\\begin{unknown" << star(n) << "}\n";
break;
}
}
case hullEquation:
if (n)
- os << "\\end{equation" << star(n) << "}\n";
+ os << "\n\\end{equation" << star(n) << "}\n";
else
- os << "\\]\n";
+ os << "\n\\]\n";
break;
case hullEqnArray:
case hullXAlignAt:
case hullGather:
case hullMultline:
- os << "\\end{" << hullName(type_) << star(n) << "}\n";
+ os << "\n\\end{" << hullName(type_) << star(n) << "}\n";
break;
case hullXXAlignAt:
- os << "\\end{" << hullName(type_) << "}\n";
+ os << "\n\\end{" << hullName(type_) << "}\n";
break;
case hullRegexp:
break;
default:
- os << "\\end{unknown" << star(n) << '}';
+ os << "\n\\end{unknown" << star(n) << "}\n";
break;
}
}
docstring lab;
if (type_ == hullMultline) {
if (row + 1 == nrows()) {
- nonum_[row] = true;
+ numbered_[row] = false;
lab = label(row);
} else
numbered = false;
}
- nonum_.insert(nonum_.begin() + row + 1, !numbered);
+ numbered_.insert(numbered_.begin() + row + 1, numbered);
+ numbers_.insert(numbers_.begin() + row + 1, empty_docstring());
label_.insert(label_.begin() + row + 1, dummy_pointer);
if (!lab.empty())
label(row + 1, lab);
// gcc implements the standard std::vector<bool> which is *not* a container:
// http://www.gotw.ca/publications/N1185.pdf
// As a results, it doesn't like this:
- // swap(nonum_[row], nonum_[row + 1]);
+ // swap(numbered_[row], numbered_[row + 1]);
// so we do it manually:
- bool const b = nonum_[row];
- nonum_[row] = nonum_[row + 1];
- nonum_[row + 1] = b;
+ bool const b = numbered_[row];
+ numbered_[row] = numbered_[row + 1];
+ numbered_[row + 1] = b;
+ swap(numbers_[row], numbers_[row + 1]);
swap(label_[row], label_[row + 1]);
InsetMathGrid::swapRow(row);
}
if (nrows() <= 1 || !rowChangeOK())
return;
if (row + 1 == nrows() && type_ == hullMultline) {
- bool const b = nonum_[row - 1];
- nonum_[row - 1] = nonum_[row];
- nonum_[row] = b;
+ bool const b = numbered_[row - 1];
+ numbered_[row - 1] = numbered_[row];
+ numbered_[row] = b;
+ swap(numbers_[row - 1], numbers_[row]);
swap(label_[row - 1], label_[row]);
InsetMathGrid::delRow(row);
return;
// Test nrows() + 1 because we have already erased the row.
if (row == nrows() + 1)
row--;
- nonum_.erase(nonum_.begin() + row);
+ numbered_.erase(numbered_.begin() + row);
+ numbers_.erase(numbers_.begin() + row);
delete label_[row];
label_.erase(label_.begin() + row);
}
docstring InsetMathHull::nicelabel(row_type row) const
{
- if (nonum_[row])
+ if (!numbered_[row])
return docstring();
+ docstring const & val = numbers_[row];
if (!label_[row])
- return from_ascii("(#)");
- return '(' + label_[row]->screenLabel() + from_ascii(", #)");
+ return '(' + val + ')';
+ return '(' + val + ',' + label_[row]->screenLabel() + ')';
}
-void InsetMathHull::glueall()
+void InsetMathHull::glueall(HullType type)
{
MathData ar;
for (idx_type i = 0; i < nargs(); ++i)
ar.append(cell(i));
+ InsetLabel * label = 0;
+ if (type == hullEquation) {
+ // preserve first non-empty label
+ for (row_type row = 0; row < nrows(); ++row) {
+ if (label_[row]) {
+ label = label_[row];
+ label_[row] = 0;
+ break;
+ }
+ }
+ }
*this = InsetMathHull(buffer_, hullSimple);
+ label_[0] = label;
cell(0) = ar;
setDefaults();
}
numbered(0, false);
} else {
setType(hullEquation);
- numbered(0, false);
+ numbered(0, label_[0] ? true : false);
mutate(newtype);
}
}
else if (type_ == hullEqnArray) {
if (newtype < type_) {
- // set correct (no)numbering
- nonum_[0] = true;
- for (row_type row = 0; row < nrows(); ++row) {
- if (!nonum_[row]) {
- nonum_[0] = false;
- break;
- }
- }
-
- // set first non-empty label
- for (row_type row = 0; row < nrows(); ++row) {
- if (label_[row]) {
- label_[0] = label_[row];
- break;
- }
- }
-
- glueall();
+ glueall(newtype);
mutate(newtype);
} else { // align & Co.
changeCols(2);
}
-docstring InsetMathHull::eolString(row_type row, bool fragile, bool last_eoln) const
+docstring InsetMathHull::eolString(row_type row, bool fragile, bool latex,
+ bool last_eoln) const
{
docstring res;
if (numberedType()) {
- if (label_[row] && !nonum_[row])
- res += "\\label{" +
- escape(label_[row]->getParam("name")) + '}';
- if (nonum_[row] && (type_ != hullMultline))
+ if (label_[row] && numbered_[row]) {
+ docstring const name =
+ latex ? escape(label_[row]->getParam("name"))
+ : label_[row]->getParam("name");
+ res += "\\label{" + name + '}';
+ }
+ if (!numbered_[row] && (type_ != hullMultline))
res += "\\nonumber ";
}
// Never add \\ on the last empty line of eqnarray and friends
last_eoln = false;
- return res + InsetMathGrid::eolString(row, fragile, last_eoln);
+ return res + InsetMathGrid::eolString(row, fragile, latex, last_eoln);
}
}
-void InsetMathHull::mathmlize(MathStream & os) const
-{
- InsetMathGrid::mathmlize(os);
-}
-
-
void InsetMathHull::infoize(odocstream & os) const
{
os << "Type: " << hullName(type_);
void InsetMathHull::check() const
{
- LASSERT(nonum_.size() == nrows(), /**/);
+ LASSERT(numbered_.size() == nrows(), /**/);
+ LASSERT(numbers_.size() == nrows(), /**/);
LASSERT(label_.size() == nrows(), /**/);
}
// return;
//}
+ // only inline, display or eqnarray math is allowed
+ if (getType() > hullEqnArray) {
+ frontend::Alert::warning(_("Bad math environment"),
+ _("Computation cannot be performed for AMS "
+ "math environments.\nChange the math "
+ "formula type and try again."));
+ return;
+ }
+
MathData eq;
eq.push_back(MathAtom(new InsetMathChar('=')));
cur.recordUndoInset();
row_type r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
docstring old_label = label(r);
- // FIXME refstyle
- // Allow customization of this separator
docstring const default_label = from_ascii("eq:");
if (old_label.empty())
old_label = default_label;
InsetCommandParams p(LABEL_CODE);
p["name"] = cmd.argument().empty() ? old_label : cmd.argument();
- string const data = InsetCommand::params2string("label", p);
+ string const data = InsetCommand::params2string(p);
if (cmd.argument().empty())
cur.bv().showDialog("label", data);
// if there is an argument, find the corresponding label, else
// check whether there is at least one label.
for (row = 0; row != nrows(); ++row)
- if (!nonum_[row] && label_[row]
+ if (numbered_[row] && label_[row]
&& (cmd.argument().empty() || label(row) == cmd.argument()))
break;
}
string const name = cmd.getArg(0);
if (name == "label") {
InsetCommandParams p(LABEL_CODE);
- InsetCommand::string2params(name, to_utf8(cmd.argument()), p);
+ InsetCommand::string2params(to_utf8(cmd.argument()), p);
docstring str = p["name"];
cur.recordUndoInset();
row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
case LFUN_DOWN:
case LFUN_NEWLINE_INSERT:
case LFUN_MATH_EXTERN:
- case LFUN_MATH_DISPLAY:
// we handle these
status.setEnabled(true);
return true;
+ // we never allow this in math, and we want to bind enter
+ // to another actions in command-alternatives
+ case LFUN_BREAK_PARAGRAPH:
+ status.setEnabled(false);
+ return true;
case LFUN_MATH_MUTATE: {
- HullType ht = hullType(cmd.argument());
+ HullType const ht = hullType(cmd.argument());
status.setOnOff(type_ == ht);
status.setEnabled(true);
+
+ if (ht != hullSimple) {
+ Cursor tmpcur = cur;
+ while (!tmpcur.empty()) {
+ InsetCode code = tmpcur.inset().lyxCode();
+ if (code == BOX_CODE) {
+ return true;
+ } else if (code == TABULAR_CODE) {
+ FuncRequest tmpcmd(LFUN_MATH_DISPLAY);
+ if (tmpcur.getStatus(tmpcmd, status) && !status.enabled())
+ return true;
+ }
+ tmpcur.pop_back();
+ }
+ }
+ return true;
+ }
+ case LFUN_MATH_DISPLAY: {
+ bool enable = true;
+ if (cur.depth() > 1) {
+ Inset const & in = cur[cur.depth()-2].inset();
+ if (in.lyxCode() == SCRIPT_CODE)
+ enable = display() != Inline;
+ }
+ status.setEnabled(enable);
return true;
}
// if there is no argument and we're inside math, we retrieve
// the row number from the cursor position.
row = (type_ == hullMultline) ? nrows() - 1 : cur.row();
- enabled = numberedType() && label_[row] && !nonum_[row];
+ enabled = numberedType() && label_[row] && numbered_[row];
} else {
// if there is an argument, find the corresponding label, else
// check whether there is at least one label.
for (row_type row = 0; row != nrows(); ++row) {
- if (!nonum_[row] && label_[row] &&
+ if (numbered_[row] && label_[row] &&
(cmd.argument().empty() || label(row) == cmd.argument())) {
enabled = true;
break;
++ms.tab(); ms.cr(); ms.os() << '<' << bname << '>';
odocstringstream ls;
+ otexstream ols(ls);
if (runparams.flavor == OutputParams::XML) {
ms << MTag("alt role='tex' ");
// Workaround for db2latex: db2latex always includes equations with
ms << ETag("math");
} else {
ms << MTag("alt role='tex'");
- res = latex(ls, runparams);
+ res = latex(ols, runparams);
ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&"), "<", "<"));
ms << ETag("alt");
}
}
+bool InsetMathHull::haveNumbers() const
+{
+ bool havenumbers = false;
+ for (size_t i = 0; i != numbered_.size(); ++i) {
+ if (numbered_[i]) {
+ havenumbers = true;
+ break;
+ }
+ }
+ return havenumbers;
+}
+
+
+// FIXME XHTML
+// We need to do something about alignment here.
+//
+// This duplicates code from InsetMathGrid, but
+// we need access here to number information,
+// and we simply do not have that in InsetMathGrid.
+void InsetMathHull::htmlize(HtmlStream & os) const
+{
+ bool const havenumbers = haveNumbers();
+ bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
+
+ if (!havetable) {
+ os << cell(index(0, 0));
+ return;
+ }
+
+ os << MTag("table", "class='mathtable'");
+ for (row_type row = 0; row < nrows(); ++row) {
+ os << MTag("tr");
+ for (col_type col = 0; col < ncols(); ++col) {
+ os << MTag("td");
+ os << cell(index(row, col));
+ os << ETag("td");
+ }
+ if (havenumbers) {
+ os << MTag("td");
+ docstring const & num = numbers_[row];
+ if (!num.empty())
+ os << '(' << num << ')';
+ os << ETag("td");
+ }
+ os << ETag("tr");
+ }
+ os << ETag("table");
+}
+
+
+// this duplicates code from InsetMathGrid, but
+// we need access here to number information,
+// and we simply do not have that in InsetMathGrid.
+void InsetMathHull::mathmlize(MathStream & os) const
+{
+ bool const havenumbers = haveNumbers();
+ bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
+
+ if (havetable)
+ os << MTag("mtable");
+ char const * const celltag = havetable ? "mtd" : "mrow";
+ // FIXME There does not seem to be wide support at the moment
+ // for mlabeledtr, so we have to use just mtr for now.
+ // char const * const rowtag = havenumbers ? "mlabeledtr" : "mtr";
+ char const * const rowtag = "mtr";
+ for (row_type row = 0; row < nrows(); ++row) {
+ if (havetable)
+ os << MTag(rowtag);
+ for (col_type col = 0; col < ncols(); ++col) {
+ os << MTag(celltag)
+ << cell(index(row, col))
+ << ETag(celltag);
+ }
+ // fleqn?
+ if (havenumbers) {
+ os << MTag("mtd");
+ docstring const & num = numbers_[row];
+ if (!num.empty())
+ os << '(' << num << ')';
+ os << ETag("mtd");
+ }
+ if (havetable)
+ os << ETag(rowtag);
+ }
+ if (havetable)
+ os << ETag("mtable");
+}
+
+
+void InsetMathHull::mathAsLatex(WriteStream & os) const
+{
+ MathEnsurer ensurer(os, false);
+ bool havenumbers = haveNumbers();
+ bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
+
+ if (!havetable) {
+ os << cell(index(0, 0));
+ return;
+ }
+
+ os << "<table class='mathtable'>";
+ for (row_type row = 0; row < nrows(); ++row) {
+ os << "<tr>";
+ for (col_type col = 0; col < ncols(); ++col) {
+ os << "<td class='math'>";
+ os << cell(index(row, col));
+ os << "</td>";
+ }
+ if (havenumbers) {
+ os << "<td>";
+ docstring const & num = numbers_[row];
+ if (!num.empty())
+ os << '(' << num << ')';
+ os << "</td>";
+ }
+ os << "</tr>";
+ }
+ os << "</table>";
+}
+
+
docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
{
- BufferParams::MathOutput mathtype = buffer().params().html_math_output;
-
+ BufferParams::MathOutput const mathtype =
+ buffer().params().html_math_output;
+
+ bool success = false;
+
+ // we output all the labels just at the beginning of the equation.
+ // this should be fine.
+ for (size_t i = 0; i != label_.size(); ++i) {
+ InsetLabel const * const il = label_[i];
+ if (!il)
+ continue;
+ il->xhtml(xs, op);
+ }
+
// FIXME Eventually we would like to do this inset by inset.
- switch (mathtype) {
- case BufferParams::MathML: {
+ if (mathtype == BufferParams::MathML) {
odocstringstream os;
MathStream ms(os);
- InsetMathGrid::mathmlize(ms);
- if (getType() == hullSimple)
- xs << html::StartTag("math",
- "xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
- else
- xs << html::StartTag("math",
- "display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
- xs << XHTMLStream::NextRaw()
- << os.str()
- << html::EndTag("math");
- break;
- }
- case BufferParams::HTML: {
+ try {
+ mathmlize(ms);
+ success = true;
+ } catch (MathExportException const &) {}
+ if (success) {
+ if (getType() == hullSimple)
+ xs << html::StartTag("math",
+ "xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
+ else
+ xs << html::StartTag("math",
+ "display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
+ xs << XHTMLStream::ESCAPE_NONE
+ << os.str()
+ << html::EndTag("math");
+ }
+ } else if (mathtype == BufferParams::HTML) {
odocstringstream os;
HtmlStream ms(os);
- InsetMathGrid::htmlize(ms);
- string const tag = (getType() == hullSimple) ? "span" : "div";
- xs << html::StartTag(tag, "class='formula'", true)
- << XHTMLStream::NextRaw()
- << os.str()
- << html::EndTag(tag);
- break;
- }
- case BufferParams::Images: {
+ try {
+ htmlize(ms);
+ success = true;
+ } catch (MathExportException const &) {}
+ if (success) {
+ string const tag = (getType() == hullSimple) ? "span" : "div";
+ xs << html::StartTag(tag, "class='formula'", true)
+ << XHTMLStream::ESCAPE_NONE
+ << os.str()
+ << html::EndTag(tag);
+ }
+ }
+
+ // what we actually want is this:
+ // if (
+ // ((mathtype == BufferParams::MathML || mathtype == BufferParams::HTML)
+ // && !success)
+ // || mathtype == BufferParams::Images
+ // )
+ // but what follows is equivalent, since we'll enter only if either (a) we
+ // tried and failed with MathML or HTML or (b) didn't try yet at all but
+ // aren't doing LaTeX, in which case we are doing Images.
+ if (!success && mathtype != BufferParams::LaTeX) {
loadPreview(docit_);
graphics::PreviewImage const * pimage = preview_->getPreviewImage(buffer());
if (pimage) {
xs.cr();
// add the file to the list of files to be exported
op.exportdata->addExternalFile("xhtml", mathimg);
- break;
+ success = true;
}
- LYXERR0("Unable to generate image. Falling through to LaTeX output.");
- }
- case BufferParams::LaTeX: {
- string const tag = (getType() == hullSimple) ? "span" : "div";
+ }
+
+ // so we'll pass this test if we've failed everything else, or
+ // if mathtype was LaTeX, since we won't have entered any of the
+ // earlier branches
+ if (!success /* || mathtype != BufferParams::LaTeX */) {
// Unfortunately, we cannot use latexString() because we do not want
// $...$ or whatever.
odocstringstream ls;
WriteStream wi(ls, false, true, WriteStream::wsPreview);
ModeSpecifier specifier(wi, MATH_MODE);
- InsetMathGrid::write(wi);
+ mathAsLatex(wi);
docstring const latex = ls.str();
// class='math' allows for use of jsMath
// http://www.math.union.edu/~dpvc/jsMath/
// FIXME XHTML
// probably should allow for some kind of customization here
- xs << html::StartTag(tag, "class='math'")
+ string const tag = (getType() == hullSimple) ? "span" : "div";
+ xs << html::StartTag(tag, "class='math'")
+ << XHTMLStream::ESCAPE_AND
<< latex
<< html::EndTag(tag);
xs.cr();
}
- } // end switch
return docstring();
}
-void InsetMathHull::tocString(odocstream & os) const
+void InsetMathHull::toString(odocstream & os) const
{
plaintext(os, OutputParams(0));
}
-docstring InsetMathHull::contextMenu(BufferView const &, int, int) const
+void InsetMathHull::forToc(docstring & os, size_t) const
+{
+ odocstringstream ods;
+ plaintext(ods, OutputParams(0));
+ os += ods.str();
+}
+
+
+docstring InsetMathHull::contextMenuName() const
{
return from_ascii("context-math");
}
projects / lyx.git / blobdiff