#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
+#include "support/gettext.h"
#include "support/lassert.h"
-#include <boost/next_prior.hpp>
+#include "support/lyxalgo.h"
#include <cstdlib>
MathData::MathData(Buffer * buf, const_iterator from, const_iterator to)
- : base_type(from, to), buffer_(buf)
+ : base_type(from, to), minasc_(0), mindes_(0), slevel_(0),
+ sshift_(0), kerning_(0), buffer_(buf)
{}
MathAtom & MathData::operator[](pos_type pos)
{
- LASSERT(pos < size(), /**/);
+ LBUFERR(pos < size());
return base_type::operator[](pos);
}
MathAtom const & MathData::operator[](pos_type pos) const
{
- LASSERT(pos < size(), /**/);
+ LBUFERR(pos < size());
return base_type::operator[](pos);
}
void MathData::insert(size_type pos, MathAtom const & t)
{
+ LBUFERR(pos <= size());
base_type::insert(begin() + pos, t);
}
void MathData::insert(size_type pos, MathData const & ar)
{
- LASSERT(pos <= size(), /**/);
+ LBUFERR(pos <= size());
base_type::insert(begin() + pos, ar.begin(), ar.end());
}
}
+#if 0
namespace {
bool isInside(DocIterator const & it, MathData const & ar,
}
}
-
+#endif
void MathData::metrics(MetricsInfo & mi, Dimension & dim) const
dim.asc = 0;
dim.wid = 0;
Dimension d;
- CoordCacheBase<Inset> & coords = mi.base.bv->coordCache().insets();
+ CoordCache::Insets & coords = mi.base.bv->coordCache().insets();
for (pos_type i = 0, n = size(); i != n; ++i) {
MathAtom const & at = operator[](i);
at->metrics(mi, d);
dim += d;
if (i == n - 1)
kerning_ = at->kerning(mi.base.bv);
-
+
// HACK to draw completion suggestion inline
if (inlineCompletionData != this
|| size_t(inlineCompletionPos.pos()) != i + 1)
continue;
-
+
docstring const & completion = mi.base.bv->inlineCompletion();
if (completion.length() == 0)
continue;
-
+
FontInfo font = mi.base.font;
- augmentFont(font, from_ascii("mathnormal"));
+ augmentFont(font, "mathnormal");
dim.wid += mathed_string_width(font, completion);
}
// Cache the dimension.
if (inlineCompletionPos.inMathed())
inlineCompletionData = &inlineCompletionPos.cell();
- CoordCacheBase<Inset> & coords = pi.base.bv->coordCache().insets();
+ CoordCache::Insets & coords = pi.base.bv->coordCache().insets();
for (size_t i = 0, n = size(); i != n; ++i) {
MathAtom const & at = operator[](i);
coords.add(at.nucleus(), x, y);
at->drawSelection(pi, x, y);
at->draw(pi, x, y);
x += coords.dim(at.nucleus()).wid;
-
+
// Is the inline completion here?
if (inlineCompletionData != this
|| size_t(inlineCompletionPos.pos()) != i + 1)
if (completion.length() == 0)
continue;
FontInfo f = pi.base.font;
- augmentFont(f, from_ascii("mathnormal"));
-
+ augmentFont(f, "mathnormal");
+
// draw the unique and the non-unique completion part
// Note: this is not time-critical as it is
// only done once per screen.
size_t uniqueTo = bv.inlineCompletionUniqueChars();
docstring s1 = completion.substr(0, uniqueTo);
docstring s2 = completion.substr(uniqueTo);
-
+
if (!s1.empty()) {
f.setColor(Color_inlinecompletion);
pi.pain.text(x, y, s1, f);
x += mathed_string_width(f, s1);
}
-
+
if (!s2.empty()) {
f.setColor(Color_nonunique_inlinecompletion);
pi.pain.text(x, y, s2, f);
// go over the array and look for macros
for (size_t i = 0; i < size(); ++i) {
MathMacro * macroInset = operator[](i).nucleus()->asMacro();
- if (!macroInset || macroInset->name_.empty()
- || macroInset->name_[0] == '^'
- || macroInset->name_[0] == '_'
+ if (!macroInset || macroInset->macroName().empty()
+ || macroInset->macroName()[0] == '^'
+ || macroInset->macroName()[0] == '_'
|| (macroInset->name() == edited_name
&& macroInset->displayMode() ==
MathMacro::DISPLAY_UNFOLDED))
if (oldDisplayMode == MathMacro::DISPLAY_NORMAL
&& (macroInset->arity() != macroNumArgs
|| macroInset->optionals() != macroOptionals
- || newDisplayMode == MathMacro::DISPLAY_UNFOLDED)) {
-
+ || newDisplayMode == MathMacro::DISPLAY_UNFOLDED))
detachMacroParameters(cur, i);
- // FIXME: proper anchor handling, this removes the selection
- if (cur)
- cur->clearSelection();
- }
// the macro could have been copied while resizing this
macroInset = operator[](i).nucleus()->asMacro();
// Cursor in \label?
- if (newDisplayMode != MathMacro::DISPLAY_UNFOLDED
+ if (newDisplayMode != MathMacro::DISPLAY_UNFOLDED
&& oldDisplayMode == MathMacro::DISPLAY_UNFOLDED) {
// put cursor in front of macro
if (cur) {
macroInset->setDisplayMode(newDisplayMode);
// arity changed?
- if (newDisplayMode == MathMacro::DISPLAY_NORMAL
+ if (newDisplayMode == MathMacro::DISPLAY_NORMAL
&& (macroInset->arity() != macroNumArgs
|| macroInset->optionals() != macroOptionals)) {
// is it a virgin macro which was never attached to parameters?
bool fromInitToNormalMode
- = (oldDisplayMode == MathMacro::DISPLAY_INIT
+ = (oldDisplayMode == MathMacro::DISPLAY_INIT
|| oldDisplayMode == MathMacro::DISPLAY_INTERACTIVE_INIT)
&& newDisplayMode == MathMacro::DISPLAY_NORMAL;
-
+
// if the macro was entered interactively (i.e. not by paste or during
// loading), it should not be greedy, but the cursor should
// automatically jump into the macro when behind
bool interactive = (oldDisplayMode == MathMacro::DISPLAY_INTERACTIVE_INIT);
-
+
// attach parameters
attachMacroParameters(cur, i, macroNumArgs, macroOptionals,
fromInitToNormalMode, interactive, appetite);
-
- if (cur) {
- // FIXME: proper anchor handling, this removes the selection
+
+ if (cur)
cur->updateInsets(&cur->bottom().inset());
- cur->clearSelection();
- }
}
// Give macro the chance to adapt to new situation.
- // The macroInset could be invalid now because it was put into a script
+ // The macroInset could be invalid now because it was put into a script
// inset and therefore "deep" copied. So get it again from the MathData.
InsetMath * inset = operator[](i).nucleus();
if (inset->asScriptInset())
inset = inset->asScriptInset()->nuc()[0].nucleus();
- LASSERT(inset->asMacro(), /**/);
+ LASSERT(inset->asMacro(), continue);
inset->asMacro()->updateRepresentation(cur, mc, utype);
}
}
void MathData::detachMacroParameters(DocIterator * cur, const size_type macroPos)
{
MathMacro * macroInset = operator[](macroPos).nucleus()->asMacro();
-
+ // We store this now, because the inset pointer will be invalidated in the scond loop below
+ size_t const optionals = macroInset->optionals();
+
// detach all arguments
vector<MathData> detachedArgs;
if (macroPos + 1 == size())
macroInset->detachArguments(detachedArgs, true);
else
macroInset->detachArguments(detachedArgs, false);
-
+
// find cursor slice
int curMacroSlice = -1;
if (cur)
cur->cutOff(curMacroSlice, argSlices);
cur->pop_back();
}
-
- // only [] after the last non-empty argument can be dropped later
+
+ // only [] after the last non-empty argument can be dropped later
size_t lastNonEmptyOptional = 0;
- for (size_t l = 0; l < detachedArgs.size() && l < macroInset->optionals(); ++l) {
+ for (size_t l = 0; l < detachedArgs.size() && l < optionals; ++l) {
if (!detachedArgs[l].empty())
lastNonEmptyOptional = l;
}
-
+
// optional arguments to be put back?
pos_type p = macroPos + 1;
size_t j = 0;
- for (; j < detachedArgs.size() && j < macroInset->optionals(); ++j) {
+ // We do not want to use macroInset below, the insert() call in
+ // the loop will invalidate it.
+ macroInset = 0;
+ for (; j < detachedArgs.size() && j < optionals; ++j) {
// another non-empty parameter follows?
bool canDropEmptyOptional = j >= lastNonEmptyOptional;
-
+
// then we can drop empty optional parameters
if (detachedArgs[j].empty() && canDropEmptyOptional) {
if (curMacroIdx == j)
(*cur)[curMacroSlice - 1].pos() = macroPos + 1;
continue;
}
-
+
// Otherwise we don't drop an empty optional, put it back normally
MathData optarg;
asArray(from_ascii("[]"), optarg);
MathData & arg = detachedArgs[j];
-
+
// look for "]", i.e. put a brace around?
InsetMathBrace * brace = 0;
for (size_t q = 0; q < arg.size(); ++q) {
break;
}
}
-
+
// put arg between []
if (brace) {
brace->cell(0) = arg;
optarg.insert(1, MathAtom(brace));
} else
optarg.insert(1, arg);
-
+
// insert it into the array
insert(p, optarg);
p += optarg.size();
-
+
// cursor in macro?
if (curMacroSlice == -1)
continue;
-
+
// cursor in optional argument of macro?
if (curMacroIdx == j) {
if (brace) {
// cursor right of macro
(*cur)[curMacroSlice - 1].pos() += optarg.size();
}
-
+
// put them back into the MathData
for (; j < detachedArgs.size(); ++j, ++p) {
MathData const & arg = detachedArgs[j];
- if (arg.size() == 1
+ if (arg.size() == 1
&& !arg[0]->asScriptInset()
&& !(arg[0]->asMacro() && arg[0]->asMacro()->arity() > 0))
insert(p, arg[0]);
else
insert(p, MathAtom(new InsetMathBrace(arg)));
-
+
// cursor in macro?
if (curMacroSlice == -1)
continue;
-
+
// cursor in j-th argument of macro?
if (curMacroIdx == j) {
if (operator[](p).nucleus()->asBraceInset()) {
} else if ((*cur)[curMacroSlice - 1].pos() >= int(p))
++(*cur)[curMacroSlice - 1].pos();
}
-
+
if (cur)
cur->updateInsets(&cur->bottom().inset());
}
-void MathData::attachMacroParameters(Cursor * cur,
+void MathData::attachMacroParameters(Cursor * cur,
const size_type macroPos, const size_type macroNumArgs,
const int macroOptionals, const bool fromInitToNormalMode,
const bool interactiveInit, const size_t appetite)
{
MathMacro * macroInset = operator[](macroPos).nucleus()->asMacro();
- // start at atom behind the macro again, maybe with some new arguments
+ // start at atom behind the macro again, maybe with some new arguments
// from the detach phase above, to add them back into the macro inset
size_t p = macroPos + 1;
vector<MathData> detachedArgs;
// get pointer to "deep" copied macro inset
scriptInset = operator[](macroPos).nucleus()->asScriptInset();
- macroInset = scriptInset->nuc()[0].nucleus()->asMacro();
+ macroInset = scriptInset->nuc()[0].nucleus()->asMacro();
}
// remove them from the MathData
- erase(begin() + macroPos + 1, begin() + p);
+ erase(macroPos + 1, p);
// cursor outside this MathData?
if (thisSlice == -1)
}
-void MathData::collectOptionalParameters(Cursor * cur,
- const size_type numOptionalParams, vector<MathData> & params,
+void MathData::collectOptionalParameters(Cursor * cur,
+ const size_type numOptionalParams, vector<MathData> & params,
size_t & pos, MathAtom & scriptToPutAround,
const pos_type macroPos, const int thisPos, const int thisSlice)
{
Buffer * buf = cur ? cur->buffer() : 0;
// insert optional arguments?
- while (params.size() < numOptionalParams
+ while (params.size() < numOptionalParams
&& pos < size()
&& !scriptToPutAround.nucleus()) {
// is a [] block following which could be an optional parameter?
if (operator[](pos)->getChar() != '[')
break;
-
+
// found possible optional argument, look for "]"
size_t right = pos + 1;
for (; right < size(); ++right) {
if (cell->getChar() == ']')
// found right end
break;
-
+
// maybe "]" with a script around?
InsetMathScript * script = cell.nucleus()->asScriptInset();
if (!script)
break;
}
}
-
+
// found?
if (right >= size()) {
// no ] found, so it's not an optional argument
break;
}
-
+
// add everything between [ and ] as optional argument
MathData optarg(buf, begin() + pos + 1, begin() + right);
-
+
// a brace?
bool brace = false;
if (optarg.size() == 1 && optarg[0]->asBraceInset()) {
params.push_back(optarg[0]->asBraceInset()->cell(0));
} else
params.push_back(optarg);
-
+
// place cursor in optional argument of macro
if (thisSlice != -1
&& thisPos >= int(pos) && thisPos <= int(right)) {
// fill up empty optional parameters
while (params.size() < numOptionalParams)
- params.push_back(MathData());
+ params.push_back(MathData());
}
-void MathData::collectParameters(Cursor * cur,
- const size_type numParams, vector<MathData> & params,
+void MathData::collectParameters(Cursor * cur,
+ const size_type numParams, vector<MathData> & params,
size_t & pos, MathAtom & scriptToPutAround,
const pos_type macroPos, const int thisPos, const int thisSlice,
- const size_t appetite)
+ const size_t appetite)
{
size_t startSize = params.size();
-
+
// insert normal arguments
while (params.size() < numParams
&& params.size() - startSize < appetite
&& pos < size()
&& !scriptToPutAround.nucleus()) {
MathAtom & cell = operator[](pos);
-
+
// fix cursor
vector<CursorSlice> argSlices;
int argPos = 0;
if (thisSlice != -1 && thisPos == int(pos))
- cur->cutOff(thisSlice, argSlices);
-
+ cur->cutOff(thisSlice, argSlices);
+
// which kind of parameter is it? In {}? With index x^n?
InsetMathBrace const * brace = cell->asBraceInset();
if (brace) {
// found brace, convert into argument
params.push_back(brace->cell(0));
-
+
// cursor inside of the brace or just in front of?
if (thisPos == int(pos) && !argSlices.empty()) {
argPos = argSlices[0].pos();
params.push_back(script->nuc()[0]->asBraceInset()->cell(0));
else
params.push_back(script->nuc());
-
+
// script will be put around below
scriptToPutAround = cell;
-
+
// this should only happen after loading, so make cursor handling simple
if (thisPos >= int(macroPos) && thisPos <= int(macroPos + numParams)) {
argSlices.clear();
array.insert(0, cell);
params.push_back(array);
}
-
+
// put cursor in argument again
if (thisSlice != - 1 && thisPos == int(pos)) {
cur->append(params.size() - 1, argPos);
cur->append(argSlices);
(*cur)[thisSlice].pos() = macroPos;
}
-
+
++pos;
- }
+ }
}
{
int x = 0;
size_type target = min(pos, size());
- CoordCacheBase<Inset> const & coords = bv->coordCache().getInsets();
+ CoordCache::Insets const & coords = bv->coordCache().getInsets();
for (size_type i = 0; i < target; ++i) {
const_iterator it = begin() + i;
if ((*it)->getChar() == ' ')
const_iterator it = begin();
int lastx = 0;
int currx = 0;
- CoordCacheBase<Inset> const & coords = bv->coordCache().getInsets();
+ CoordCache::Insets const & coords = bv->coordCache().getInsets();
// find first position after targetx
- for (; currx < targetx && it < end(); ++it) {
+ for (; currx < targetx && it != end(); ++it) {
lastx = currx;
if ((*it)->getChar() == ' ')
currx += glue;
* See bug 1918 for details.
**/
if (it != begin() && currx >= targetx
- && ((*boost::prior(it))->asNestInset()
+ && ((*prev(it, 1))->asNestInset()
|| abs(lastx - targetx) < abs(currx - targetx))) {
--it;
}
projects / lyx.git / blobdiff