#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "ColorSet.h"
#include "CutAndPaste.h"
#include "Encoding.h"
+#include "Exporter.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "LaTeXFeatures.h"
static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull(Buffer * buf)
- : InsetMathGrid(buf, 1, 1), type_(hullNone), nonum_(1, false),
+ : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, true),
label_(1, dummy_pointer), preview_(new RenderPreview(this))
{
//lyxerr << "sizeof InsetMath: " << sizeof(InsetMath) << endl;
InsetMathHull::InsetMathHull(Buffer * buf, HullType type)
- : InsetMathGrid(buf, getCols(type), 1), type_(type), nonum_(1, false),
+ : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, true),
label_(1, dummy_pointer), preview_(new RenderPreview(this))
{
buffer_ = buf;
return *this;
InsetMathGrid::operator=(other);
type_ = other.type_;
- nonum_ = other.nonum_;
+ numbered_ = other.numbered_;
buffer_ = other.buffer_;
for (size_t i = 0; i < label_.size(); ++i)
delete label_[i];
}
-void InsetMathHull::updateLabels(ParIterator const & it, bool out)
+void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
{
if (!buffer_) {
//FIXME: buffer_ should be set at creation for this inset! Problem is
}
for (size_t i = 0; i != label_.size(); ++i) {
if (label_[i])
- label_[i]->updateLabels(it, out);
+ label_[i]->updateBuffer(it, utype);
}
+ // pass down
+ InsetMathGrid::updateBuffer(it, utype);
}
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::standardFont() const
{
- return from_ascii(type_ == hullNone ? "lyxnochange" : "mathnormal");
+ docstring font_name;
+ switch (type_) {
+ case hullRegexp:
+ font_name = from_ascii("texttt");
+ break;
+ case hullNone:
+ font_name = from_ascii("lyxnochange");
+ break;
+ default:
+ font_name = from_ascii("mathnormal");
+ }
+ return font_name;
+}
+
+
+ColorCode InsetMathHull::standardColor() const
+{
+ ColorCode color;
+ switch (type_) {
+ case hullRegexp:
+ case hullNone:
+ color = Color_foreground;
+ break;
+ default:
+ color = Color_math;
+ }
+ return color;
}
{
use_preview_ = previewState(pi.base.bv);
+ if (type_ == hullRegexp) {
+ Dimension const dim = dimension(*pi.base.bv);
+ pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
+ dim.width() - 2, dim.height() - 2, Color_regexpframe);
+ }
if (use_preview_) {
// one pixel gap in front
preview_->draw(pi, x + 1, y);
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, color, really_change_color);
FontSetChanger dummy1(pi.base, standardFont());
StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+
InsetMathGrid::draw(pi, x + 1, y);
if (numberedType()) {
}
-void InsetMathHull::preparePreview(DocIterator const & pos) const
+void InsetMathHull::preparePreview(DocIterator const & pos,
+ bool forexport) const
{
- Buffer const * buffer = pos.buffer();
-
- // collect macros at this position
- MacroNameSet macros;
- buffer->listMacroNames(macros);
- MacroNameSet::iterator it = macros.begin();
- MacroNameSet::iterator end = macros.end();
- odocstringstream macro_preamble;
- for (; it != end; ++it) {
- MacroData const * data = buffer->getMacro(*it, pos, true);
- if (data) {
- data->write(macro_preamble, true);
- macro_preamble << endl;
+ // there is no need to do all the macro stuff if we're not
+ // actually going to generate the preview.
+ if (RenderPreview::status() != LyXRC::PREVIEW_ON && !forexport)
+ return;
+
+ Buffer const * buffer = pos.buffer();
+
+ // collect macros at this position
+ MacroNameSet macros;
+ buffer->listMacroNames(macros);
+ MacroNameSet::iterator it = macros.begin();
+ MacroNameSet::iterator end = macros.end();
+ odocstringstream macro_preamble;
+ for (; it != end; ++it) {
+ MacroData const * data = buffer->getMacro(*it, pos, true);
+ if (data) {
+ data->write(macro_preamble, true);
+ macro_preamble << endl;
}
- }
+ }
- docstring const snippet = macro_preamble.str() + latexString(*this);
- LYXERR(Debug::MACROS, "Preview snippet: " << snippet);
- preview_->addPreview(snippet, *buffer);
+ docstring const snippet = macro_preamble.str() + latexString(*this);
+ LYXERR(Debug::MACROS, "Preview snippet: " << snippet);
+ preview_->addPreview(snippet, *buffer, forexport);
}
}
+void InsetMathHull::loadPreview(DocIterator const & pos) const
+{
+ bool const forexport = true;
+ preparePreview(pos, forexport);
+ preview_->startLoading(*pos.buffer(), forexport);
+}
+
+
bool InsetMathHull::notifyCursorLeaves(Cursor const & old, Cursor & cur)
{
if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
reloadPreview(old);
- cur.updateFlags(Update::Force);
+ cur.screenUpdateFlags(Update::Force);
}
return false;
}
if (label.empty()) {
delete label_[row];
label_[row] = dummy_pointer;
- // We need an update of the Buffer reference cache.
- // This is achieved by updateLabels().
- if (buffer_)
- buffer().updateLabels();
} else {
if (buffer_)
label_[row]->updateCommand(label);
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;
- if (!buffer_) {
- // The buffer is set at the end of readInset.
- // When parsing the inset, buffer_ is 0.
- return;
- }
- // We need an update of the Buffer reference cache.
- // This is achieved by updateLabels().
- buffer().updateLabels();
}
}
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;
}
void InsetMathHull::validate(LaTeXFeatures & features) const
{
- if (ams())
- features.require("amsmath");
-
- // Validation is necessary only if not using AMS math.
- // To be safe, we will always run mathedvalidate.
- //if (features.amsstyle)
- // return;
-
- //features.binom = true;
-
+ if (features.runparams().isLaTeX()) {
+ if (ams())
+ features.require("amsmath");
+
+ if (type_ == hullRegexp) {
+ features.require("color");
+ string frcol = lcolor.getLaTeXName(Color_regexpframe);
+ string bgcol = "white";
+ features.addPreambleSnippet(
+ string("\\newcommand{\\regexp}[1]{\\fcolorbox{")
+ + frcol + string("}{")
+ + bgcol + string("}{\\texttt{#1}}}"));
+ }
+
+ // Validation is necessary only if not using AMS math.
+ // To be safe, we will always run mathedvalidate.
+ //if (features.amsstyle)
+ // return;
+
+ //features.binom = true;
+ } else if (features.runparams().math_flavor == OutputParams::MathAsHTML) {
+ // it would be better to do this elsewhere, but we can't validate in
+ // InsetMathMatrix and we have no way, outside MathExtern, to know if
+ // we even have any matrices.
+ features.addPreambleSnippet("<style type=\"text/css\">\n"
+ "table.matrix{display: inline-block; vertical-align: middle; text-align:center;}\n"
+ "table.matrix td{padding: 0.25px;}\n"
+ "td.ldelim{width: 0.5ex; border: thin solid black; border-right: none;}\n"
+ "td.rdelim{width: 0.5ex; border: thin solid black; border-left: none;}\n"
+ "</style>");
+ }
InsetMathGrid::validate(features);
}
break;
case hullRegexp:
- os << "\\regexp{";
+ os << "\\regexp{{{";
break;
default:
- os << "\\begin{unknown" << star(n) << '}';
+ os << "\\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:
- os << "}";
+ os << "}}}";
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);
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(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(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);
delete label_[row];
label_.erase(label_.begin() + row);
}
docstring InsetMathHull::nicelabel(row_type row) const
{
- if (nonum_[row])
+ if (!numbered_[row])
return docstring();
if (!label_[row])
return from_ascii("(#)");
}
-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) 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{" + 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 ";
}
- return res + InsetMathGrid::eolString(row, fragile);
+ // Never add \\ on the last empty line of eqnarray and friends
+ last_eoln = false;
+ return res + InsetMathGrid::eolString(row, fragile, latex, last_eoln);
}
void InsetMathHull::check() const
{
- LASSERT(nonum_.size() == nrows(), /**/);
+ LASSERT(numbered_.size() == nrows(), /**/);
LASSERT(label_.size() == nrows(), /**/);
}
void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- //lyxerr << "action: " << cmd.action << endl;
- switch (cmd.action) {
+ //lyxerr << "action: " << cmd.action() << endl;
+ switch (cmd.action()) {
case LFUN_FINISHED_BACKWARD:
case LFUN_FINISHED_FORWARD:
case LFUN_FINISHED_RIGHT:
case LFUN_FINISHED_LEFT:
- //lyxerr << "action: " << cmd.action << endl;
+ //lyxerr << "action: " << cmd.action() << endl;
InsetMathGrid::doDispatch(cur, cmd);
cur.undispatched();
break;
bool const align =
cur.bv().buffer().params().use_amsmath == BufferParams::package_on;
mutate(align ? hullAlign : hullEqnArray);
+ // mutate() may change labels and such.
+ cur.forceBufferUpdate();
cur.idx() = nrows() * ncols() - 1;
cur.pos() = cur.lastpos();
}
numbered(row, !old);
cur.message(old ? _("No number") : _("Number"));
+ cur.forceBufferUpdate();
break;
}
bool old = numbered(r);
cur.message(old ? _("No number") : _("Number"));
numbered(r, !old);
+ cur.forceBufferUpdate();
break;
}
cur.recordUndoInset();
row_type r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
docstring old_label = label(r);
- docstring const default_label = from_ascii(
- (lyxrc.label_init_length >= 0) ? "eq:" : "");
+ // 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;
}
} else if (numbered(row(cur.idx()))) {
cur.recordUndoInset();
numbered(row(cur.idx()), false);
+ cur.forceBufferUpdate();
} else {
InsetMathGrid::doDispatch(cur, cmd);
return;
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();
label_[r]->initView();
}
}
+ cur.forceBufferUpdate();
break;
}
InsetMathGrid::doDispatch(cur, cmd);
if (cur.pos() > cur.lastpos())
cur.pos() = cur.lastpos();
+ cur.forceBufferUpdate();
// FIXME: find some more clever handling of the selection,
// i.e. preserve it.
cur.clearSelection();
bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & status) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_FINISHED_BACKWARD:
case LFUN_FINISHED_FORWARD:
case LFUN_FINISHED_RIGHT:
case LFUN_MATH_NUMBER_TOGGLE:
// FIXME: what is the right test, this or the one of
// LABEL_INSERT?
- status.setEnabled(display());
+ status.setEnabled(display() != Inline);
status.setOnOff(numberedType());
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;
}
return InsetMathGrid::getStatus(cur, cmd, status);
- case LFUN_TABULAR_FEATURE: {
+ case LFUN_INSET_MODIFY: {
istringstream is(to_utf8(cmd.argument()));
string s;
is >> s;
+ if (s != "tabular")
+ return InsetMathGrid::getStatus(cur, cmd, status);
+ is >> s;
if (!rowChangeOK()
&& (s == "append-row"
|| s == "delete-row"
// The inset formula dimension is not necessarily the same as the
// one of the instant preview image, so we have to indicate to the
// BufferView that a metrics update is needed.
- cur.updateFlags(Update::Force);
+ cur.screenUpdateFlags(Update::Force);
}
int InsetMathHull::plaintext(odocstream & os, OutputParams const &) const
{
+ // disables ASCII-art for export of equations. See #2275.
if (0 && display()) {
Dimension dim;
TextMetricsInfo mi;
}
-docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
{
- if (getType() == hullSimple)
- xs << StartTag("math", "xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
- else
- xs << StartTag("math",
- "display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
- MathStream ms(xs.os());
- InsetMathGrid::mathmlize(ms);
- xs << EndTag("math");
+ BufferParams::MathOutput const mathtype =
+ buffer().params().html_math_output;
+
+ bool success = false;
+ // FIXME Eventually we would like to do this inset by inset.
+ if (mathtype == BufferParams::MathML) {
+ odocstringstream os;
+ MathStream ms(os);
+ try {
+ InsetMathGrid::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::NextRaw()
+ << os.str()
+ << html::EndTag("math");
+ }
+ } else if (mathtype == BufferParams::HTML) {
+ odocstringstream os;
+ HtmlStream ms(os);
+ try {
+ InsetMathGrid::htmlize(ms);
+ success = true;
+ } catch (MathExportException const &) {}
+ if (success) {
+ string const tag = (getType() == hullSimple) ? "span" : "div";
+ xs << html::StartTag(tag, "class='formula'", true)
+ << XHTMLStream::NextRaw()
+ << 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) {
+ // FIXME Do we always have png?
+ string const tag = (getType() == hullSimple) ? "span" : "div";
+ FileName const & mathimg = pimage->filename();
+ xs << html::StartTag(tag)
+ << html::CompTag("img", "src=\"" + mathimg.onlyFileName() + "\"")
+ << html::EndTag(tag);
+ xs.cr();
+ // add the file to the list of files to be exported
+ op.exportdata->addExternalFile("xhtml", mathimg);
+ success = true;
+ }
+ }
+
+ // 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 */) {
+ string const tag = (getType() == hullSimple) ? "span" : "div";
+ // 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);
+ 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'")
+ << latex
+ << html::EndTag(tag);
+ xs.cr();
+ }
return docstring();
}
}
+void InsetMathHull::recordLocation(DocIterator const & di)
+{
+ docit_ = di;
+}
+
} // namespace lyx
projects / lyx.git / blobdiff