* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include "Cursor.h"
#include "DispatchResult.h"
#include "FuncRequest.h"
+#include "Language.h"
#include "LyXRC.h"
#include "OutputParams.h"
#include "ParIterator.h"
#include "frontends/Painter.h"
+#include "support/lassert.h"
#include "support/debug.h"
#include "support/gettext.h"
#include "support/lstrings.h"
if (s == "multline") return hullMultline;
if (s == "gather") return hullGather;
if (s == "flalign") return hullFlAlign;
- lyxerr << "unknown hull type '" << to_utf8(s) << "'" << endl;
+ if (s == "regexp") return hullRegexp;
+ lyxerr << "unknown hull type '" << to_utf8(s) << "'" << endl;
return HullType(-1);
}
case hullMultline: return from_ascii("multline");
case hullGather: return from_ascii("gather");
case hullFlAlign: return from_ascii("flalign");
- default:
+ case hullRegexp: return from_ascii("regexp");
+ default:
lyxerr << "unknown hull type '" << type << "'" << endl;
return from_ascii("none");
}
static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull()
- : InsetMathGrid(1, 1), type_(hullNone), nonum_(1, false), label_(1, dummy_pointer),
- preview_(new RenderPreview(this))
+ : InsetMathGrid(1, 1), type_(hullNone), nonum_(1, false),
+ label_(1, dummy_pointer), preview_(new RenderPreview(this))
{
//lyxerr << "sizeof InsetMath: " << sizeof(InsetMath) << endl;
//lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
InsetMathHull::InsetMathHull(HullType type)
- : InsetMathGrid(getCols(type), 1), type_(type), nonum_(1, false), label_(1, dummy_pointer),
- preview_(new RenderPreview(this))
+ : InsetMathGrid(getCols(type), 1), type_(type), nonum_(1, false),
+ label_(1, dummy_pointer), preview_(new RenderPreview(this))
{
initMath();
setDefaults();
}
-InsetMathHull::InsetMathHull(InsetMathHull const & other)
+InsetMathHull::InsetMathHull(InsetMathHull const & other) : InsetMathGrid()
{
operator=(other);
}
}
-void InsetMathHull::addToToc(ParConstIterator const & pit) const
+void InsetMathHull::addToToc(DocIterator const & pit)
{
if (!buffer_) {
//FIXME: buffer_ should be set at creation for this inset! Problem is
return;
}
- // FIXME: it would be way better to directly use InsetLabel instead of this
- // label list. But it should be possible to copy&paste the code in
- // InsetLabel::addToToc() anyway.
-
Toc & toc = buffer().tocBackend().toc("equation");
for (row_type row = 0; row != nrows(); ++row) {
dim.wid += 1;
if (display())
dim.des += displayMargin();
- // Cache the inset dimension.
+ // Cache the inset dimension.
setDimCache(mi, dim);
return;
}
}
-void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
+void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const
{
- use_preview_ = previewState(pi.base.bv);
Dimension const dim = dimension(*pi.base.bv);
+ pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2,
+ dim.asc + dim.des - 1, pi.backgroundColor(this));
+}
+
- // background of mathed under focus is not painted because
- // selection at the top level of nested inset is difficult to handle.
- if (!editing(pi.base.bv))
- pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2,
- dim.asc + dim.des - 1, Color_mathbg);
+void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
+{
+ use_preview_ = previewState(pi.base.bv);
if (use_preview_) {
// one pixel gap in front
InsetMathGrid::metricsT(mi, dim);
} else {
odocstringstream os;
- WriteStream wi(os, false, true);
+ WriteStream wi(os, false, true, false);
write(wi);
dim.wid = os.str().size();
dim.asc = 1;
InsetMathGrid::drawT(pain, x, y);
} else {
odocstringstream os;
- WriteStream wi(os, false, true);
+ WriteStream wi(os, false, true, false);
write(wi);
pain.draw(x, y, os.str().c_str());
}
static docstring latexString(InsetMathHull const & inset)
{
odocstringstream ls;
- WriteStream wi(ls, false, false);
+ // This has to be static, because a preview snippet containing math
+ // in text mode (such as $\text{$\phi$}$) gets processed twice. The
+ // first time as a whole, and the second time only the inner math.
+ // In this last case inset.buffer() would be invalid.
+ // FIXME: preview snippets should only be processed once, such that
+ // both static qualifier and isBufferValid() check can be dropped.
+ static Encoding const * encoding = 0;
+ if (inset.isBufferValid())
+ encoding = &(inset.buffer().params().encoding());
+ WriteStream wi(ls, false, true, false, encoding);
inset.write(wi);
return ls.str();
}
+void InsetMathHull::initUnicodeMath() const
+{
+ // Trigger classification of the unicode symbols in this inset
+ docstring const dummy = latexString(*this);
+}
+
+
void InsetMathHull::addPreview(graphics::PreviewLoader & ploader) const
{
if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
bool InsetMathHull::notifyCursorLeaves(Cursor const & /*old*/, Cursor & cur)
{
if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
- Buffer const & buffer = cur.buffer();
+ Buffer const * buffer = cur.buffer();
docstring const snippet = latexString(*this);
- preview_->addPreview(snippet, buffer);
- preview_->startLoading(buffer);
+ preview_->addPreview(snippet, *buffer);
+ preview_->startLoading(*buffer);
cur.updateFlags(Update::Force);
}
return false;
docstring InsetMathHull::label(row_type row) const
{
- BOOST_ASSERT(row < nrows());
+ LASSERT(row < nrows(), /**/);
if (InsetLabel * il = label_[row])
return il->screenLabel();
return docstring();
if (label_[row]) {
if (label.empty()) {
delete label_[row];
- nonum_[row] = true;
label_[row] = dummy_pointer;
- } else
+ // We need an update of the Buffer reference cache.
+ // This is achieved by updateLabels().
+ buffer().updateLabels();
+ } else {
label_[row]->updateCommand(label);
+ }
return;
}
InsetCommandParams p(LABEL_CODE);
if (nonum_[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::ams() const
{
- return
- type_ == hullAlign ||
- type_ == hullFlAlign ||
- type_ == hullMultline ||
- type_ == hullGather ||
- type_ == hullAlignAt ||
- type_ == hullXAlignAt ||
- type_ == hullXXAlignAt;
+ return type_ == hullAlign
+ || type_ == hullFlAlign
+ || type_ == hullMultline
+ || type_ == hullGather
+ || type_ == hullAlignAt
+ || type_ == hullXAlignAt
+ || type_ == hullXXAlignAt;
}
Inset::DisplayType InsetMathHull::display() const
{
- return (type_ != hullSimple && type_ != hullNone) ? AlignCenter : Inline;
+ if (type_ == hullSimple || type_ == hullNone || type_ == hullRegexp)
+ return Inline;
+ return AlignCenter;
}
-
bool InsetMathHull::numberedType() const
{
if (type_ == hullNone)
return false;
if (type_ == hullXXAlignAt)
return false;
+ if (type_ == hullRegexp)
+ return false;
for (row_type row = 0; row < nrows(); ++row)
if (!nonum_[row])
return true;
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)
<< '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
break;
+ case hullRegexp:
+ os << "\\regexp{";
+ break;
+
default:
os << "\\begin{unknown" << star(n) << '}';
break;
os << "\\end{" << hullName(type_) << "}\n";
break;
+ case hullRegexp:
+ os << "}";
+ break;
+
default:
os << "\\end{unknown" << star(n) << '}';
break;
return;
bool numbered = numberedType();
+ docstring lab;
if (type_ == hullMultline) {
- if (row + 1 == nrows())
+ if (row + 1 == nrows()) {
nonum_[row] = true;
- else
+ lab = label(row);
+ } else
numbered = false;
}
nonum_.insert(nonum_.begin() + row + 1, !numbered);
label_.insert(label_.begin() + row + 1, dummy_pointer);
+ if (!lab.empty())
+ label(row + 1, lab);
InsetMathGrid::addRow(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;
+ swap(label_[row - 1], label_[row]);
+ InsetMathGrid::delRow(row);
+ return;
+ }
InsetMathGrid::delRow(row);
// The last dummy row has no number info nor a label.
// Test nrows() + 1 because we have already erased the row.
return docstring();
if (!label_[row])
return from_ascii("(#)");
- return '(' + label_[row]->screenLabel() + ')';
+ return '(' + label_[row]->screenLabel() + from_ascii(", #)");
}
void InsetMathHull::splitTo2Cols()
{
- BOOST_ASSERT(ncols() == 1);
+ LASSERT(ncols() == 1, /**/);
InsetMathGrid::addCol(1);
for (row_type row = 0; row < nrows(); ++row) {
idx_type const i = 2 * row;
void InsetMathHull::splitTo3Cols()
{
- BOOST_ASSERT(ncols() < 3);
+ LASSERT(ncols() < 3, /**/);
if (ncols() < 2)
splitTo2Cols();
InsetMathGrid::addCol(2);
void InsetMathHull::write(WriteStream & os) const
{
+ ModeSpecifier specifier(os, MATH_MODE);
header_write(os);
InsetMathGrid::write(os);
footer_write(os);
void InsetMathHull::check() const
{
- BOOST_ASSERT(nonum_.size() == nrows());
- BOOST_ASSERT(label_.size() == nrows());
+ LASSERT(nonum_.size() == nrows(), /**/);
+ LASSERT(label_.size() == nrows(), /**/);
}
// just swallow this
break;
- case LFUN_NEW_LINE:
+ case LFUN_NEWLINE_INSERT:
// some magic for the common case
if (type_ == hullSimple || type_ == hullEquation) {
cur.recordUndoInset();
else
for (row_type row = 0; row < nrows(); ++row)
numbered(row, !old);
-
+
cur.message(old ? _("No number") : _("Number"));
break;
}
InsetCommandParams p(LABEL_CODE);
p["name"] = cmd.argument().empty() ? old_label : cmd.argument();
- string const data = InsetCommandMailer::params2string("label", p);
+ string const data = InsetCommand::params2string("label", p);
if (cmd.argument().empty())
cur.bv().showDialog("label", data);
string const name = cmd.getArg(0);
if (name == "label") {
InsetCommandParams p(LABEL_CODE);
- InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), p);
+ InsetCommand::string2params(name, to_utf8(cmd.argument()), p);
docstring str = p["name"];
cur.recordUndoInset();
row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
}
if (cur.pos() > cur.lastpos())
cur.pos() = cur.lastpos();
-
+
// FIXME: find some more clever handling of the selection,
// i.e. preserve it.
cur.clearSelection();
case LFUN_FINISHED_LEFT:
case LFUN_UP:
case LFUN_DOWN:
- case LFUN_NEW_LINE:
+ case LFUN_NEWLINE_INSERT:
case LFUN_MATH_EXTERN:
case LFUN_MATH_MUTATE:
case LFUN_MATH_DISPLAY:
// we handle these
- status.enabled(true);
+ status.setEnabled(true);
return true;
case LFUN_MATH_NUMBER_TOGGLE:
// FIXME: what is the right test, this or the one of
// LABEL_INSERT?
- status.enabled(display());
+ status.setEnabled(display());
status.setOnOff(numberedType());
return true;
case LFUN_MATH_NUMBER_LINE_TOGGLE: {
// FIXME: what is the right test, this or the one of
// LABEL_INSERT?
- status.enabled(display());
+ bool const enable = (type_ == hullMultline)
+ ? (nrows() - 1 == cur.row())
+ : display() != Inline;
row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
+ status.setEnabled(enable);
status.setOnOff(numbered(r));
return true;
}
case LFUN_LABEL_INSERT:
- status.enabled(type_ != hullSimple);
+ status.setEnabled(type_ != hullSimple);
return true;
case LFUN_INSET_INSERT:
if (cmd.getArg(0) == "label") {
- status.enabled(type_ != hullSimple);
+ status.setEnabled(type_ != hullSimple);
return true;
}
return InsetMathGrid::getStatus(cur, cmd, status);
status.message(bformat(
from_utf8(N_("Can't change number of rows in '%1$s'")),
hullName(type_)));
- status.enabled(false);
+ status.setEnabled(false);
return true;
}
if (!colChangeOK()
status.message(bformat(
from_utf8(N_("Can't change number of columns in '%1$s'")),
hullName(type_)));
- status.enabled(false);
+ status.setEnabled(false);
return true;
}
if ((type_ == hullSimple
status.message(bformat(
from_utf8(N_("Can't add horizontal grid lines in '%1$s'")),
hullName(type_)));
- status.enabled(false);
+ status.setEnabled(false);
return true;
}
if (s == "add-vline-left" || s == "add-vline-right") {
status.message(bformat(
from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
hullName(type_)));
- status.enabled(false);
+ status.setEnabled(false);
return true;
}
if (s == "valign-top" || s == "valign-middle"
|| s == "valign-bottom" || s == "align-left"
|| s == "align-center" || s == "align-right") {
- status.enabled(false);
+ status.setEnabled(false);
return true;
}
return InsetMathGrid::getStatus(cur, cmd, status);
#if 0
// translate to latex
ostringstream os;
- latex(NULL, os, false, false);
+ latex(os, false, false);
string str = os.str();
// insert this text
void InsetMathHull::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
cur.push(*this);
- bool enter_front = (entry_from == Inset::ENTRY_DIRECTION_LEFT ||
+ bool enter_front = (entry_from == Inset::ENTRY_DIRECTION_LEFT ||
(entry_from == Inset::ENTRY_DIRECTION_IGNORE && front));
enter_front ? idxFirst(cur) : idxLast(cur);
// The inset formula dimension is not necessarily the same as the
// translate to latex
cur.markInsert(bv);
ostringstream os;
- write(NULL, os);
+ write(os);
string str = os.str();
cur.markErase(bv);
string::size_type pos = 0;
void InsetMathHull::write(ostream & os) const
{
odocstringstream oss;
- WriteStream wi(oss, false, false);
+ WriteStream wi(oss, false, false, false);
oss << "Formula ";
write(wi);
os << to_utf8(oss.str());
}
-int InsetMathHull::plaintext(odocstream & os, OutputParams const &) const
+bool InsetMathHull::readQuiet(Lexer & lex)
+{
+ MathAtom at;
+ bool result = mathed_parse_normal(at, lex, Parse::QUIET);
+ operator=(*at->asHullInset());
+ return result;
+}
+
+
+int InsetMathHull::plaintext(odocstream & os, OutputParams const & runparams) const
{
if (0 && display()) {
Dimension dim;
return tpain.textheight();
} else {
odocstringstream oss;
- WriteStream wi(oss, false, true);
+ WriteStream wi(oss, false, true, false, runparams.encoding);
wi << cell(0);
docstring const str = oss.str();
// Workaround for db2latex: db2latex always includes equations with
// \ensuremath{} or \begin{display}\end{display}
// so we strip LyX' math environment
- WriteStream wi(ls, false, false);
+ WriteStream wi(ls, false, false, false, runparams.encoding);
InsetMathGrid::write(wi);
ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&"), "<", "<"));
ms << ETag("alt");
projects / lyx.git / blobdiff