#include "BufferView.h"
#include "CoordCache.h"
#include "Cursor.h"
-#include "support/debug.h"
+#include "mathed/InsetMathUnknown.h"
+
+#include "support/debug.h"
#include "support/docstream.h"
#include "frontends/FontMetrics.h"
Cursor & cur = mi.base.bv->cursor();
const_cast<MathData*>(this)->updateMacros(&cur, mi.macrocontext);
+ DocIterator const & inlineCompletionPos = mi.base.bv->inlineCompletionPos();
+ MathData const * inlineCompletionData = 0;
+ if (inlineCompletionPos.inMathed())
+ inlineCompletionData = &inlineCompletionPos.cell();
+
dim.asc = 0;
dim.wid = 0;
Dimension d;
CoordCacheBase<Inset> & coords = mi.base.bv->coordCache().insets();
- for (size_t i = 0, n = size(); i != n; ++i) {
+ for (pos_type i = 0, n = size(); i != n; ++i) {
MathAtom const & at = operator[](i);
at->metrics(mi, d);
coords.add(at.nucleus(), 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;
+
+ dim.wid += mathed_string_width(mi.base.font, completion);
}
// Cache the dimension.
mi.base.bv->coordCache().arrays().add(this, dim);
|| x >= bv. workWidth())
return;
+ DocIterator const & inlineCompletionPos = bv.inlineCompletionPos();
+ MathData const * inlineCompletionData = 0;
+ if (inlineCompletionPos.inMathed())
+ inlineCompletionData = &inlineCompletionPos.cell();
+
CoordCacheBase<Inset> & coords = pi.base.bv->coordCache().insets();
for (size_t i = 0, n = size(); i != n; ++i) {
MathAtom const & at = operator[](i);
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)
+ continue;
+ docstring const & completion = bv.inlineCompletion();
+ if (completion.length() == 0)
+ continue;
+ FontInfo f = pi.base.font;
+
+ // 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.size() > 0) {
+ f.setColor(Color_inlinecompletion);
+ pi.pain.text(x, y, s1, f);
+ x += mathed_string_width(f, s1);
+ }
+
+ if (s2.size() > 0) {
+ f.setColor(Color_nonunique_inlinecompletion);
+ pi.pain.text(x, y, s2, f);
+ x += mathed_string_width(f, s2);
+ }
}
}
// arity changed or other reason to detach?
if (oldDisplayMode == MathMacro::DISPLAY_NORMAL
- && (macroInset->arity() != macroNumArgs
- || macroInset->optionals() != macroOptionals
- || newDisplayMode == MathMacro::DISPLAY_UNFOLDED)) {
+ && (macroInset->arity() != macroNumArgs
+ || macroInset->optionals() != macroOptionals
+ || newDisplayMode == MathMacro::DISPLAY_UNFOLDED)) {
detachMacroParameters(cur, i);
}
// Cursor in \label?
if (newDisplayMode != MathMacro::DISPLAY_UNFOLDED
- && oldDisplayMode == MathMacro::DISPLAY_UNFOLDED) {
+ && oldDisplayMode == MathMacro::DISPLAY_UNFOLDED) {
// put cursor in front of macro
if (cur) {
int macroSlice = cur->find(macroInset);
}
// update the display mode
+ size_t appetite = macroInset->appetite();
macroInset->setDisplayMode(newDisplayMode);
// arity changed?
if (newDisplayMode == MathMacro::DISPLAY_NORMAL
- && (macroInset->arity() != macroNumArgs
- || macroInset->optionals() != macroOptionals)) {
+ && (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_INTERACTIVE_INIT)
- && newDisplayMode == MathMacro::DISPLAY_NORMAL;
+ || 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
// attach parameters
attachMacroParameters(cur, i, macroNumArgs, macroOptionals,
- fromInitToNormalMode, interactive);
+ fromInitToNormalMode, interactive, appetite);
if (cur) {
// FIXME: proper anchor handling, this removes the selection
if (inset->asScriptInset())
inset = inset->asScriptInset()->nuc()[0].nucleus();
BOOST_ASSERT(inset->asMacro());
- inset->asMacro()->updateRepresentation(cur);
+ inset->asMacro()->updateRepresentation();
}
}
void MathData::attachMacroParameters(Cursor * cur,
const size_type macroPos, const size_type macroNumArgs,
const int macroOptionals, const bool fromInitToNormalMode,
- const bool interactiveInit)
+ const bool interactiveInit, const size_t appetite)
{
MathMacro * macroInset = operator[](macroPos).nucleus()->asMacro();
if (!interactiveInit) {
collectOptionalParameters(cur, macroOptionals, detachedArgs, p,
scriptToPutAround, macroPos, thisPos, thisSlice);
- collectParameters(cur, macroNumArgs, detachedArgs, p,
- scriptToPutAround, macroPos, thisPos, thisSlice);
}
+ collectParameters(cur, macroNumArgs, detachedArgs, p,
+ scriptToPutAround, macroPos, thisPos, thisSlice, appetite);
// attach arguments back to macro inset
macroInset->attachArguments(detachedArgs, macroNumArgs, macroOptionals);
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 pos_type macroPos, const int thisPos, const int thisSlice,
+ 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);
projects / lyx.git / blobdiff