Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / insets / Inset.cpp

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 96e2174064c4e7045409739b5a309d95fd074ed1..58a14a2e5418ec09b2897a8b26f363f343ecc24c 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -94,6 +94,9 @@ static void build_translator()
        insetnames[FLOAT_CODE] = InsetName("float", _("Float"));
        insetnames[WRAP_CODE] = InsetName("wrap");
        insetnames[SPECIALCHAR_CODE] = InsetName("specialchar");
+       insetnames[IPA_CODE] = InsetName("ipa");
+       insetnames[IPACHAR_CODE] = InsetName("ipachar");
+       insetnames[IPADECO_CODE] = InsetName("ipadeco");
        insetnames[TABULAR_CODE] = InsetName("tabular", _("Table"));
        insetnames[EXTERNAL_CODE] = InsetName("external");
        insetnames[CAPTION_CODE] = InsetName("caption");
@@ -115,6 +118,7 @@ static void build_translator()
        insetnames[INFO_CODE] = InsetName("info", _("Info"));
        insetnames[COLLAPSABLE_CODE] = InsetName("collapsable");
        insetnames[NEWPAGE_CODE] = InsetName("newpage");
+       insetnames[SCRIPT_CODE] = InsetName("script");
        insetnames[CELL_CODE] = InsetName("tablecell");
        insetnames[MATH_AMSARRAY_CODE] = InsetName("mathamsarray");
        insetnames[MATH_ARRAY_CODE] = InsetName("matharray");
@@ -122,6 +126,8 @@ static void build_translator()
        insetnames[MATH_BOLDSYMBOL_CODE] = InsetName("mathboldsymbol");
        insetnames[MATH_BOX_CODE] = InsetName("mathbox");
        insetnames[MATH_BRACE_CODE] = InsetName("mathbrace");
+       insetnames[MATH_CANCEL_CODE] = InsetName("mathcancel");
+       insetnames[MATH_CANCELTO_CODE] = InsetName("mathcancelto");
        insetnames[MATH_CASES_CODE] = InsetName("mathcases");
        insetnames[MATH_CHAR_CODE] = InsetName("mathchar");
        insetnames[MATH_COLOR_CODE] = InsetName("mathcolor");
@@ -168,6 +174,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;
@@ -184,11 +191,10 @@ Buffer & Inset::buffer()
 {
        if (!buffer_) {
                odocstringstream s;
-               lyxerr << "Inset: " << this
-                                       << " LyX Code: " << lyxCode()
-                                       << " name: " << insetName(lyxCode())
-                                       << std::endl;
-               s << "LyX Code: " << lyxCode() << " name: " << name();
+               string const iname = insetName(lyxCode());
+               LYXERR0("Inset: " << this << " LyX Code: " << lyxCode()
+                                       << " name: " << iname);
+               s << "LyX Code: " << lyxCode() << " name: " << iname;
                LASSERT(false, /**/);
                throw ExceptionMessage(BufferException, 
                        from_ascii("Inset::buffer_ member not initialized!"), s.str());
@@ -216,7 +222,7 @@ bool Inset::isBufferValid() const
 }
 
 
-docstring Inset::name() const
+docstring Inset::layoutName() const
 {
        return from_ascii("unknown");
 }
@@ -233,15 +239,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();
 }
 
 
@@ -251,9 +258,20 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 }
 
 
-docstring Inset::contextMenu(BufferView const &, int, int) const
+void Inset::forToc(docstring &, size_t) const
 {
-       return docstring();
+}
+
+
+string Inset::contextMenu(BufferView const &, int, int) const
+{
+       return contextMenuName();
+}
+
+
+string Inset::contextMenuName() const
+{
+       return string();
 }
 
 
@@ -296,7 +314,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);
 }
@@ -332,7 +350,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
                // if the derived inset did not explicitly handle mouse_release,
                // we assume we request the settings dialog
                if (!cur.selection() && cmd.button() == mouse_button::button1
-                         && hasSettings()) {
+                   && clickable(cmd.x(), cmd.y()) && hasSettings()) {
                        FuncRequest tmpcmd(LFUN_INSET_SETTINGS);
                        dispatch(cur, tmpcmd);
                }
@@ -347,7 +365,7 @@ void Inset::doDispatch(Cursor & cur, FuncRequest &cmd)
                break;
 
        default:
-               cur.noUpdate();
+               cur.noScreenUpdate();
                cur.undispatched();
                break;
        }
@@ -393,12 +411,17 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
                } else {
                        return false;
                }
-       
+
        case LFUN_IN_MATHMACROTEMPLATE:
                // By default we're not in a MathMacroTemplate inset
                flag.setEnabled(false);
                return true;
 
+       case LFUN_IN_IPA:
+               // By default we're not in an IPA inset
+               flag.setEnabled(false);
+               return true;
+
        default:
                break;
        }
@@ -565,7 +588,7 @@ InsetLayout const & Inset::getLayout() const
 {
        if (!buffer_)
                return DocumentClass::plainInsetLayout();
-       return buffer().params().documentClass().insetLayout(name());
+       return buffer().params().documentClass().insetLayout(layoutName());
 }
 
 
@@ -609,6 +632,12 @@ void Inset::setDimCache(MetricsInfo const & mi, Dimension const & dim) const
 
 Buffer const * Inset::updateFrontend() const
 {
+       //FIXME (Abdel 03/12/10): see bugs #6814 and #6949
+       // If the Buffer is null and we end up here this is most probably because we
+       // are in the CutAndPaste stack. See InsetGraphics, RenderGraphics and
+       // RenderPreview.
+       if (!buffer_)
+               return 0;
        return theApp() ? theApp()->updateInset(this) : 0;
 }