#include "insets/InsetRef.h"
#include "insets/RenderPreview.h"
+#include "graphics/GraphicsImage.h"
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.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();
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, output_active);
}
-bool InsetMathHull::previewState(BufferView * bv) const
+bool InsetMathHull::previewState(const BufferView *const bv) const
{
- if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON
- && type_ != hullRegexp)
+ if (!editing(bv) && RenderPreview::previewMath()
+ && type_ != hullRegexp)
{
graphics::PreviewImage const * pimage =
preview_->getPreviewImage(bv->buffer());
}
+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;
}
+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);
}
}
{
// 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();
bool InsetMathHull::notifyCursorLeaves(Cursor const & old, Cursor & cur)
{
- if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
+ if (RenderPreview::previewMath()) {
reloadPreview(old);
cur.screenUpdateFlags(Update::Force);
}
}
-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;
}
docstring number = empty_docstring();
if (type_ == hullMultline) {
if (row + 1 == nrows()) {
- numbered_[row] = false;
+ numbered_[row] = NONUMBER;
swap(label, label_[row]);
swap(number, numbers_[row]);
} else
numbered = false;
}
- numbered_.insert(numbered_.begin() + row + 1, numbered);
+ 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])
{
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;
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().empty()) {
+ 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_PARAGRAPH_BREAK:
// 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;
}
// 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;
// and do not include the newline.
if (op.for_toc || op.for_tooltip || oss.str().size() >= max_length)
break;
- wi << "\n";
+ if (r < nrows() - 1)
+ wi << "\n";
}
}
docstring const str = oss.str();
if (getType() == hullSimple)
return havenumbers;
for (size_t i = 0; i != numbered_.size(); ++i) {
- if (numbered_[i]) {
+ if (numbered(i)) {
havenumbers = true;
break;
}
}
-void InsetMathHull::forToc(docstring & os, size_t) const
+void InsetMathHull::forOutliner(docstring & os, size_t) const
{
odocstringstream ods;
OutputParams op(0);
projects / lyx.git / blobdiff