#include "insets/InsetRef.h"
#include "insets/RenderPreview.h"
+#include "graphics/GraphicsImage.h"
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.h"
#include "support/convert.h"
#include "support/lassert.h"
#include "support/debug.h"
+#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
namespace lyx {
using cap::grabAndEraseSelection;
+using cap::reduceSelectionToOneCell;
namespace {
static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull(Buffer * buf)
- : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, true),
+ : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
- preview_(new RenderPreview(this))
+ preview_(new RenderPreview(this)), use_preview_(false)
{
//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), numbered_(1, true),
+ : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, NUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
- preview_(new RenderPreview(this))
+ preview_(new RenderPreview(this)), use_preview_(false)
{
buffer_ = buf;
initMath();
}
+// FIXME This should really be controlled by the TOC level, or
+// something of the sort.
namespace {
const char * counters_to_save[] = {"section", "chapter"};
unsigned int const numcnts = sizeof(counters_to_save)/sizeof(char *);
if (haveNumbers()) {
BufferParams const & bp = buffer_->params();
string const & lang = it->getParLanguage(bp)->code();
- Counters & cnts = bp.documentClass().counters();
+ Counters & cnts =
+ buffer_->masterBuffer()->params().documentClass().counters();
// right now, we only need to do this at export time
if (utype == OutputUpdate) {
}
-void InsetMathHull::addToToc(DocIterator const & pit) const
+void InsetMathHull::addToToc(DocIterator const & pit, bool output_active) 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 (!numbered_[row])
+ if (!numbered(row))
continue;
if (label_[row])
- label_[row]->addToToc(pit);
- toc.push_back(TocItem(pit, 0, nicelabel(row)));
+ label_[row]->addToToc(pit, output_active);
+ toc.push_back(TocItem(pit, 0, nicelabel(row), output_active));
}
}
{
if (type_ == hullEqnArray)
return "rcl"[col];
+ if (type_ == hullMultline)
+ return 'c';
if (type_ == hullGather)
return 'c';
if (type_ >= hullAlign)
}
+char InsetMathHull::displayColAlign(col_type col, row_type row) const
+{
+ if (type_ == hullMultline) {
+ if (row == 0)
+ return 'l';
+ if (row == nrows() - 1)
+ return 'r';
+ }
+ return InsetMathGrid::displayColAlign(col, row);
+}
+
+
int InsetMathHull::defaultColSpace(col_type col)
{
if (type_ == hullAlign || type_ == hullAlignAt)
}
-bool InsetMathHull::previewState(BufferView * bv) const
+bool InsetMathHull::previewState(const BufferView *const bv) const
{
- if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ if (!editing(bv) && RenderPreview::previewMath()
+ && type_ != hullRegexp)
+ {
graphics::PreviewImage const * pimage =
preview_->getPreviewImage(bv->buffer());
return pimage && pimage->image();
}
+namespace {
+static const int ERROR_FRAME_WIDTH = 2;
+}
+
void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
{
if (previewState(mi.base.bv)) {
preview_->metrics(mi, dim);
- // insert a one pixel gap in front of the formula
- dim.wid += 1;
- if (display())
- dim.des += displayMargin();
+ if (previewTooSmall(dim)) {
+ // preview image is too small
+ dim.wid += 2 * ERROR_FRAME_WIDTH;
+ dim.asc += 2 * ERROR_FRAME_WIDTH;
+ } else {
+ // insert a one pixel gap in front of the formula
+ dim.wid += 1;
+ if (display())
+ dim.des += displayMargin();
+ }
// Cache the inset dimension.
setDimCache(mi, dim);
return;
dim.wid += 30 + l;
}
+ if (type_ == hullRegexp)
+ dim.wid += 2;
// make it at least as high as the current font
int asc = 0;
int des = 0;
}
+bool InsetMathHull::previewTooSmall(Dimension const & dim) const
+{
+ return dim.width() <= 10 && dim.height() <= 10;
+}
+
+
ColorCode InsetMathHull::backgroundColor(PainterInfo const & pi) const
{
- if (previewState(pi.base.bv))
+ BufferView const * const bv = pi.base.bv;
+ if (previewState(bv)) {
+ Dimension const dim = dimension(*pi.base.bv);
+ if (previewTooSmall(dim))
+ return Color_error;
return graphics::PreviewLoader::backgroundColor();
+ }
return Color_mathbg;
}
void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const
{
Dimension const dim = dimension(*pi.base.bv);
+ if (previewTooSmall(dim)) {
+ pi.pain.fillRectangle(x, y - 2 * ERROR_FRAME_WIDTH,
+ dim.wid, dim.asc + dim.des, backgroundColor(pi));
+ return;
+ }
pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2,
- dim.asc + dim.des - 1, pi.backgroundColor(this));
+ dim.asc + dim.des - 1, pi.backgroundColor(this));
}
void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
{
- use_preview_ = previewState(pi.base.bv);
+ BufferView const * const bv = pi.base.bv;
+ use_preview_ = previewState(bv);
if (type_ == hullRegexp) {
- Dimension const dim = dimension(*pi.base.bv);
+ Dimension const dim = dimension(*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);
+ Dimension const dim = dimension(*bv);
+ if (previewTooSmall(dim)) {
+ // we have an extra frame
+ preview_->draw(pi, x + ERROR_FRAME_WIDTH, y);
+ } else {
+ // one pixel gap in front
+ preview_->draw(pi, x + 1, y);
+ }
setPosCache(pi, x, y);
return;
}
void InsetMathHull::addPreview(DocIterator const & inset_pos,
graphics::PreviewLoader & /*ploader*/) const
{
- if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ if (RenderPreview::previewMath()) {
preparePreview(inset_pos);
}
}
void InsetMathHull::preparePreview(DocIterator const & pos,
- bool forexport) const
+ bool forexport) const
{
// 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)
+ if (!RenderPreview::previewMath() && !forexport)
return;
-
+
Buffer const * buffer = pos.buffer();
// collect macros at this position
bool InsetMathHull::notifyCursorLeaves(Cursor const & old, Cursor & cur)
{
- if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ if (RenderPreview::previewMath()) {
reloadPreview(old);
cur.screenUpdateFlags(Update::Force);
}
docstring InsetMathHull::label(row_type row) const
{
- LASSERT(row < nrows(), /**/);
+ LASSERT(row < nrows(), return docstring());
if (InsetLabel * il = label_[row])
return il->screenLabel();
return docstring();
label_[row] = dummy_pointer;
} else {
if (buffer_)
- label_[row]->updateCommand(label);
+ label_[row]->updateLabelAndRefs(label);
else
label_[row]->setParam("name", label);
}
}
-void InsetMathHull::numbered(row_type row, bool num)
+void InsetMathHull::numbered(row_type row, Numbered num)
{
numbered_[row] = num;
- if (!numbered_[row] && label_[row]) {
+ if (!numbered(row) && label_[row]) {
delete label_[row];
label_[row] = 0;
}
bool InsetMathHull::numbered(row_type row) const
{
- return numbered_[row];
+ return numbered_[row] == NUMBER;
}
bool InsetMathHull::ams() const
{
- return type_ == hullAlign
- || type_ == hullFlAlign
- || type_ == hullMultline
- || type_ == hullGather
- || type_ == hullAlignAt
- || type_ == hullXAlignAt
- || type_ == hullXXAlignAt;
+ switch (type_) {
+ case hullAlign:
+ case hullFlAlign:
+ case hullMultline:
+ case hullGather:
+ case hullAlignAt:
+ case hullXAlignAt:
+ case hullXXAlignAt:
+ return true;
+ case hullNone:
+ case hullSimple:
+ case hullEquation:
+ case hullEqnArray:
+ case hullRegexp:
+ break;
+ }
+ for (size_t row = 0; row < numbered_.size(); ++row)
+ if (numbered_[row] == NOTAG)
+ return true;
+ return false;
}
if (type_ == hullRegexp)
return false;
for (row_type row = 0; row < nrows(); ++row)
- if (numbered_[row])
+ if (numbered(row))
return true;
return false;
}
if (features.runparams().isLaTeX()) {
if (ams())
features.require("amsmath");
-
+
if (type_ == hullRegexp) {
features.require("color");
string frcol = lcolor.getLaTeXName(Color_regexpframe);
features.addPreambleSnippet(
string("\\newcommand{\\regexp}[1]{\\fcolorbox{")
+ frcol + string("}{")
- + bgcol + string("}{\\texttt{#1}}}"));
+ + bgcol + string("}{\\ensuremath{\\mathtt{#1}}}}"));
+ features.addPreambleSnippet(
+ string("\\newcommand{\\endregexp}{}"));
}
-
+
// 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"
+ features.addCSSSnippet(
"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>");
+ "td.rdelim{width: 0.5ex; border: thin solid black; border-left: none;}");
}
InsetMathGrid::validate(features);
}
break;
case hullRegexp:
- os << "\\regexp{{{";
+ os << "\\regexp{";
break;
default:
break;
case hullRegexp:
- os << "}}}";
+ // Only used as a heuristic to find the regexp termination, when searching in ignore-format mode
+ os << "\\endregexp{}}";
break;
default:
return;
bool numbered = numberedType();
- docstring lab;
+ // Move the number and raw pointer, do not call label() (bug 7511)
+ InsetLabel * label = dummy_pointer;
+ docstring number = empty_docstring();
if (type_ == hullMultline) {
if (row + 1 == nrows()) {
- numbered_[row] = false;
- lab = label(row);
+ numbered_[row] = NONUMBER;
+ swap(label, label_[row]);
+ swap(number, numbers_[row]);
} else
numbered = false;
}
- 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);
+ numbered_.insert(numbered_.begin() + row + 1, numbered ? NUMBER : NONUMBER);
+ numbers_.insert(numbers_.begin() + row + 1, number);
+ label_.insert(label_.begin() + row + 1, label);
InsetMathGrid::addRow(row);
}
return;
if (row + 1 == nrows())
--row;
- // 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(numbered_[row], numbered_[row + 1]);
- // so we do it manually:
- bool const b = numbered_[row];
- numbered_[row] = numbered_[row + 1];
- numbered_[row + 1] = b;
+ swap(numbered_[row], numbered_[row + 1]);
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 = numbered_[row - 1];
- numbered_[row - 1] = numbered_[row];
- numbered_[row] = b;
+ swap(numbered_[row - 1], numbered_[row]);
swap(numbers_[row - 1], numbers_[row]);
swap(label_[row - 1], label_[row]);
InsetMathGrid::delRow(row);
docstring InsetMathHull::nicelabel(row_type row) const
{
- if (!numbered_[row])
+ if (!numbered(row))
return docstring();
docstring const & val = numbers_[row];
if (!label_[row])
void InsetMathHull::splitTo2Cols()
{
- LASSERT(ncols() == 1, /**/);
+ LASSERT(ncols() == 1, return);
InsetMathGrid::addCol(1);
for (row_type row = 0; row < nrows(); ++row) {
idx_type const i = 2 * row;
void InsetMathHull::splitTo3Cols()
{
- LASSERT(ncols() < 3, /**/);
+ LASSERT(ncols() < 3, return);
if (ncols() < 2)
splitTo2Cols();
InsetMathGrid::addCol(2);
for (row_type row = 0; row < nrows(); ++row) {
idx_type const i = 3 * row + 1;
- if (cell(i).size()) {
+ if (!cell(i).empty()) {
cell(i + 1) = MathData(buffer_, cell(i).begin() + 1, cell(i).end());
cell(i).erase(1, cell(i).size());
}
{
docstring res;
if (numberedType()) {
- if (label_[row] && numbered_[row]) {
+ 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 ";
+ if (type_ != hullMultline) {
+ if (numbered_[row] == NONUMBER)
+ res += "\\nonumber ";
+ else if (numbered_[row] == NOTAG)
+ res += "\\notag ";
+ }
}
// Never add \\ on the last empty line of eqnarray and friends
last_eoln = false;
void InsetMathHull::check() const
{
- LASSERT(numbered_.size() == nrows(), /**/);
- LASSERT(numbers_.size() == nrows(), /**/);
- LASSERT(label_.size() == nrows(), /**/);
+ LATTEST(numbered_.size() == nrows());
+ LATTEST(numbers_.size() == nrows());
+ LATTEST(label_.size() == nrows());
}
extra = from_ascii("noextra");
string const lang = to_ascii(dlang);
- // FIXME: temporarily disabled
- //if (cur.selection()) {
- // MathData ar;
- // selGet(cur.ar);
- // lyxerr << "use selection: " << ar << endl;
- // insert(pipeThroughExtern(lang, extra, ar));
- // return;
- //}
+ // replace selection with result of computation
+ if (reduceSelectionToOneCell(cur)) {
+ MathData ar;
+ asArray(grabAndEraseSelection(cur), ar);
+ lyxerr << "use selection: " << ar << endl;
+ cur.insert(pipeThroughExtern(lang, extra, ar));
+ return;
+ }
// only inline, display or eqnarray math is allowed
if (getType() > hullEqnArray) {
if (getType() == hullSimple) {
size_type pos = cur.cell().find_last(eq);
MathData ar;
- if (cur.inMathed() && cur.selection()) {
- asArray(grabAndEraseSelection(cur), ar);
- } else if (pos == cur.cell().size()) {
+ if (pos == cur.cell().size()) {
ar = cur.cell();
lyxerr << "use whole cell: " << ar << endl;
} else {
case LFUN_FINISHED_LEFT:
//lyxerr << "action: " << cmd.action() << endl;
InsetMathGrid::doDispatch(cur, cmd);
- cur.undispatched();
break;
- case LFUN_BREAK_PARAGRAPH:
+ case LFUN_PARAGRAPH_BREAK:
// just swallow this
break;
if (type_ == hullSimple || type_ == hullEquation) {
cur.recordUndoInset();
bool const align =
- cur.bv().buffer().params().use_amsmath == BufferParams::package_on;
+ cur.bv().buffer().params().use_package("amsmath") == BufferParams::package_on;
mutate(align ? hullAlign : hullEqnArray);
// mutate() may change labels and such.
cur.forceBufferUpdate();
}
case LFUN_LABEL_INSERT: {
- cur.recordUndoInset();
row_type r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
docstring old_label = label(r);
docstring const default_label = from_ascii("eq:");
break;
}
- case LFUN_LABEL_COPY_AS_REF: {
+ case LFUN_LABEL_COPY_AS_REFERENCE: {
row_type row;
if (cmd.argument().empty() && &cur.inset() == this)
// if there is no argument and we're inside math, we retrieve
// 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 (numbered_[row] && label_[row]
+ if (numbered(row) && label_[row]
&& (cmd.argument().empty() || label(row) == cmd.argument()))
break;
}
// we never allow this in math, and we want to bind enter
// to another actions in command-alternatives
- case LFUN_BREAK_PARAGRAPH:
+ case LFUN_PARAGRAPH_BREAK:
status.setEnabled(false);
return true;
case LFUN_MATH_MUTATE: {
status.setEnabled(type_ != hullSimple);
return true;
- case LFUN_LABEL_COPY_AS_REF: {
+ case LFUN_LABEL_COPY_AS_REFERENCE: {
bool enabled = false;
row_type row;
if (cmd.argument().empty() && &cur.inset() == this) {
// 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] && numbered_[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 (numbered_[row] && label_[row] &&
+ if (numbered(row) && label_[row] &&
(cmd.argument().empty() || label(row) == cmd.argument())) {
enabled = true;
break;
}
-int InsetMathHull::plaintext(odocstream & os, OutputParams const &) const
+int InsetMathHull::plaintext(odocstringstream & os,
+ OutputParams const & op, size_t max_length) const
{
// disables ASCII-art for export of equations. See #2275.
if (0 && display()) {
// reset metrics cache to "real" values
//metrics();
return tpain.textheight();
- } else {
- odocstringstream oss;
- Encoding const * const enc = encodings.fromLyXName("utf8");
- WriteStream wi(oss, false, true, WriteStream::wsDefault, enc);
- // Fix Bug #6139
- if (type_ == hullRegexp)
- write(wi);
- else
- wi << cell(0);
- docstring const str = oss.str();
- os << str;
- return str.size();
}
+
+ odocstringstream oss;
+ Encoding const * const enc = encodings.fromLyXName("utf8");
+ WriteStream wi(oss, false, true, WriteStream::wsDefault, enc);
+
+ // Fix Bug #6139
+ if (type_ == hullRegexp)
+ write(wi);
+ else {
+ for (row_type r = 0; r < nrows(); ++r) {
+ for (col_type c = 0; c < ncols(); ++c)
+ wi << (c == 0 ? "" : "\t") << cell(index(r, c));
+ // if it's for the TOC, we write just the first line
+ // and do not include the newline.
+ if (op.for_toc || op.for_tooltip || oss.str().size() >= max_length)
+ break;
+ if (r < nrows() - 1)
+ wi << "\n";
+ }
+ }
+ docstring const str = oss.str();
+ os << str;
+ return str.size();
}
if (getType() == hullSimple)
return havenumbers;
for (size_t i = 0; i != numbered_.size(); ++i) {
- if (numbered_[i]) {
+ if (numbered(i)) {
havenumbers = true;
break;
}
docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
{
- BufferParams::MathOutput const mathtype =
- buffer().params().html_math_output;
+ BufferParams::MathOutput const mathtype =
+ buffer().masterBuffer()->params().html_math_output;
bool success = false;
} catch (MathExportException const &) {}
if (success) {
if (getType() == hullSimple)
- xs << html::StartTag("math",
+ xs << html::StartTag("math",
"xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
- else
- xs << html::StartTag("math",
+ else
+ xs << html::StartTag("math",
"display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
xs << XHTMLStream::ESCAPE_NONE
<< os.str()
<< html::EndTag(tag);
}
}
-
+
// what we actually want is this:
// if (
- // ((mathtype == BufferParams::MathML || mathtype == BufferParams::HTML)
+ // ((mathtype == BufferParams::MathML || mathtype == BufferParams::HTML)
// && !success)
// || mathtype == BufferParams::Images
// )
- // but what follows is equivalent, since we'll enter only if either (a) we
+ // 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) {
if (pimage || op.dryrun) {
string const filename = pimage ? pimage->filename().onlyFileName()
: "previewimage.png";
+ if (pimage) {
+ // if we are not in the master buffer, then we need to see that the
+ // generated image is copied there; otherwise, preview fails.
+ Buffer const * mbuf = buffer().masterBuffer();
+ if (mbuf != &buffer()) {
+ string mbtmp = mbuf->temppath();
+ FileName const mbufimg(support::addName(mbtmp, filename));
+ pimage->filename().copyTo(mbufimg);
+ }
+ // add the file to the list of files to be exported
+ op.exportdata->addExternalFile("xhtml", pimage->filename());
+ }
+
string const tag = (getType() == hullSimple) ? "span" : "div";
xs << html::CR()
<< html::StartTag(tag)
- << html::CompTag("img", "src=\"" + filename + "\"")
+ << html::CompTag("img", "src=\"" + filename + "\" alt=\"Mathematical Equation\"")
<< html::EndTag(tag)
<< html::CR();
- if (pimage)
- // add the file to the list of files to be exported
- op.exportdata->addExternalFile("xhtml", pimage->filename());
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
ModeSpecifier specifier(wi, MATH_MODE);
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
string const tag = (getType() == hullSimple) ? "span" : "div";
xs << html::StartTag(tag, "class='math'")
- << XHTMLStream::ESCAPE_AND
- << latex
+ << latex
<< html::EndTag(tag)
<< html::CR();
}
void InsetMathHull::toString(odocstream & os) const
{
- plaintext(os, OutputParams(0));
+ odocstringstream ods;
+ plaintext(ods, OutputParams(0));
+ os << ods.str();
}
-void InsetMathHull::forToc(docstring & os, size_t) const
+void InsetMathHull::forOutliner(docstring & os, size_t) const
{
odocstringstream ods;
- plaintext(ods, OutputParams(0));
+ OutputParams op(0);
+ op.for_toc = true;
+ plaintext(ods, op);
os += ods.str();
}
-docstring InsetMathHull::contextMenuName() const
+string InsetMathHull::contextMenuName() const
{
- return from_ascii("context-math");
+ return "context-math";
}
projects / lyx.git / blobdiff