#include "support/convert.h"
#include "support/lassert.h"
#include "support/debug.h"
+#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
}
+// 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) {
// this has to be done separately
docstring const eqstr = from_ascii("equation");
if (cnts.hasCounter(eqstr)) {
- if (utype == OutputUpdate) {
+ 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);
}
-void InsetMathHull::addToToc(DocIterator const & pit)
+void InsetMathHull::addToToc(DocIterator const & pit, bool output_active) const
{
if (!buffer_) {
//FIXME: buffer_ should be set at creation for this inset! Problem is
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
{
- if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON
+ && type_ != hullRegexp)
+ {
graphics::PreviewImage const * pimage =
preview_->getPreviewImage(bv->buffer());
return pimage && pimage->image();
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;
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)
return;
-
+
Buffer const * buffer = pos.buffer();
// collect macros at this position
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);
}
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);
}
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;
case hullRegexp:
- os << "\\regexp{{{";
+ os << "\\regexp{";
break;
default:
- os << "\\begin{unknown" << star(n) << "}\n";
+ os << "\n\\begin{unknown" << star(n) << "}\n";
break;
}
}
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);
+ 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);
+ numbers_.insert(numbers_.begin() + row + 1, number);
+ label_.insert(label_.begin() + row + 1, label);
InsetMathGrid::addRow(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());
}
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());
}
MathData ar;
if (cur.inMathed() && cur.selection()) {
asArray(grabAndEraseSelection(cur), ar);
- } else if (pos == cur.cell().size()) {
+ } else if (!pos == cur.cell().empty()) {
ar = cur.cell();
lyxerr << "use whole cell: " << ar << endl;
} else {
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
// 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: {
// LABEL_INSERT?
bool const enable = (type_ == hullMultline)
? (nrows() - 1 == cur.row())
- : display() != Inline && nrows() > 1;
+ : display() != Inline;
row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
status.setEnabled(enable);
status.setOnOff(enable && numbered(r));
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 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;
+ wi << "\n";
+ }
+ }
+ docstring const str = oss.str();
+ os << str;
+ return str.size();
}
InsetMathGrid::mathmlize(ms);
ms << ETag("math");
} else {
+ TexRow texrow;
+ texrow.reset();
+ otexstream ols(ls, texrow);
ms << MTag("alt role='tex'");
- res = latex(ls, runparams);
+ latex(ols, runparams);
+ res = texrow.rows();
ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&"), "<", "<"));
ms << ETag("alt");
}
bool InsetMathHull::haveNumbers() const
{
bool havenumbers = false;
+ // inline formulas are never numbered (bug 7351 part 3)
+ if (getType() == hullSimple)
+ return havenumbers;
for (size_t i = 0; i != numbered_.size(); ++i) {
if (numbered_[i]) {
havenumbers = true;
// and we simply do not have that in InsetMathGrid.
void InsetMathHull::mathmlize(MathStream & os) const
{
- bool havenumbers = haveNumbers();
+ bool const havenumbers = haveNumbers();
bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
if (havetable)
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) {
- loadPreview(docit_);
- graphics::PreviewImage const * pimage = preview_->getPreviewImage(buffer());
- if (pimage) {
+ graphics::PreviewImage const * pimage = 0;
+ if (!op.dryrun) {
+ loadPreview(docit_);
+ pimage = preview_->getPreviewImage(buffer());
// FIXME Do we always have png?
+ }
+
+ 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";
- 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);
+ xs << html::CR()
+ << html::StartTag(tag)
+ << html::CompTag("img", "src=\"" + filename + "\" alt=\"Mathematical Equation\"")
+ << html::EndTag(tag)
+ << html::CR();
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
- << html::EndTag(tag);
- xs.cr();
+ << latex
+ << html::EndTag(tag)
+ << html::CR();
}
return docstring();
}
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
{
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