X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=916278d96c779b44575f6ab0c0193a98d5c6a8dc;hb=f5123ccfa82215030c70561af881175d92244492;hp=dcd11e599dff9c285fdc68ed3f2c2bd4c8398611;hpb=8480d1dd9af6f3d403ea42e2b891d38dd3ce2509;p=lyx.git diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp index dcd11e599d..916278d96c 100644 --- a/src/insets/Inset.cpp +++ b/src/insets/Inset.cpp @@ -168,6 +168,7 @@ static void build_translator() insetnames[MATH_XARROW_CODE] = InsetName("mathxarrow"); insetnames[MATH_XYARROW_CODE] = InsetName("mathxyarrow"); insetnames[MATH_XYMATRIX_CODE] = InsetName("mathxymatrix"); + insetnames[MATH_DIAGRAM_CODE] = InsetName("mathdiagram"); insetnames[MATH_MACRO_CODE] = InsetName("mathmacro"); passed = true; @@ -233,15 +234,16 @@ bool Inset::allowEmpty() const return getLayout().isKeepEmpty(); } + bool Inset::forceLTR() const { return getLayout().forceLTR(); } -void Inset::initView() + +bool Inset::isInToc() const { - if (isLabeled()) - buffer().updateBuffer(); + return getLayout().isInToc(); } @@ -296,7 +298,7 @@ void Inset::dispatch(Cursor & cur, FuncRequest & cmd) << insetName(lyxCode()) << std::endl; } else if (cur.buffer() != buffer_) lyxerr << "cur.buffer() != buffer_ in Inset::dispatch()" << std::endl; - cur.updateFlags(Update::Force | Update::FitCursor); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); cur.dispatched(); doDispatch(cur, cmd); } @@ -347,7 +349,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd) break; default: - cur.noUpdate(); + cur.noScreenUpdate(); cur.undispatched(); break; } @@ -370,6 +372,11 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd, // Allow modification of our data. // This needs to be handled in the doDispatch method of our // instantiatable children. + // FIXME: Why don't we let the insets determine whether this + // should be enabled or not ? Now we need this check for + // the tabular features. (vfr) + if (cmd.getArg(0) == "tabular") + return false; flag.setEnabled(true); return true;