Merge branch 'master' into biblatex2

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

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 9a8a084cac3b0e1f4848b984b5071dee2e51559f..812aba5bfaa4ca8f07b6d8331d6c91f213567caf 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -31,6 +31,7 @@
 #include "output_xhtml.h"
 #include "Text.h"
 #include "TextClass.h"
+#include "TocBackend.h"
 
 #include "frontends/Application.h"
 #include "frontends/Painter.h"
@@ -94,6 +95,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");
@@ -123,6 +127,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");
@@ -167,7 +173,6 @@ static void build_translator()
        insetnames[MATH_UNDERSET_CODE] = InsetName("mathunderset");
        insetnames[MATH_UNKNOWN_CODE] = InsetName("mathunknown");
        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");
@@ -182,6 +187,12 @@ void Inset::setBuffer(Buffer & buffer)
 }
 
 
+void Inset::resetBuffer()
+{
+       buffer_ = nullptr;
+}
+
+
 Buffer & Inset::buffer()
 {
        if (!buffer_) {
@@ -189,8 +200,8 @@ Buffer & Inset::buffer()
                string const iname = insetName(lyxCode());
                LYXERR0("Inset: " << this << " LyX Code: " << lyxCode()
                                        << " name: " << iname);
-               s << "LyX Code: " << lyxCode() << " name: " << iname;
-               LASSERT(false, /**/);
+               s << "LyX Code: " << lyxCode() << " name: " << from_ascii(iname);
+               LATTEST(false);
                throw ExceptionMessage(BufferException, 
                        from_ascii("Inset::buffer_ member not initialized!"), s.str());
        }
@@ -253,20 +264,20 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 }
 
 
-void Inset::forToc(docstring &, size_t) const
+void Inset::forOutliner(docstring &, size_t const, bool const) const
 {
 }
 
 
-docstring Inset::contextMenu(BufferView const &, int, int) const
+string Inset::contextMenu(BufferView const &, int, int) const
 {
        return contextMenuName();
 }
 
 
-docstring Inset::contextMenuName() const
+string Inset::contextMenuName() const
 {
-       return docstring();
+       return string();
 }
 
 
@@ -345,7 +356,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(cur.bv(), cmd.x(), cmd.y()) && hasSettings()) {
                        FuncRequest tmpcmd(LFUN_INSET_SETTINGS);
                        dispatch(cur, tmpcmd);
                }
@@ -383,11 +394,6 @@ 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;
 
@@ -406,12 +412,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;
        }
@@ -516,6 +527,16 @@ void Inset::metricsMarkers2(Dimension & dim, int framesize) const
 }
 
 
+void Inset::drawBackground(PainterInfo & pi, int x, int y) const
+{
+       if (pi.full_repaint && backgroundColor(pi) == Color_none)
+               return;
+       Dimension const dim = dimension(*pi.base.bv);
+       pi.pain.fillRectangle(x, y - dim.asc, dim.wid, dim.asc + dim.des,
+                             pi.backgroundColor(this));
+}
+
+
 void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 {
        ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)?
@@ -529,7 +550,6 @@ void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
        pi.pain.line(t, d - 3, t, d, pen_color);
        pi.pain.line(x, d, x + 3, d, pen_color);
        pi.pain.line(t - 3, d, t, d, pen_color);
-       setPosCache(pi, x, y);
 }
 
 
@@ -546,7 +566,6 @@ void Inset::drawMarkers2(PainterInfo & pi, int x, int y) const
        pi.pain.line(t, a + 3, t, a, pen_color);
        pi.pain.line(x, a, x + 3, a, pen_color);
        pi.pain.line(t - 3, a, t, a, pen_color);
-       setPosCache(pi, x, y);
 }
 
 
@@ -607,19 +626,6 @@ ColorCode Inset::labelColor() const
 }
 
 
-void Inset::setPosCache(PainterInfo const & pi, int x, int y) const
-{
-       //LYXERR("Inset: set position cache to " << x << " " << y);
-       pi.base.bv->coordCache().insets().add(this, x, y);
-}
-
-
-void Inset::setDimCache(MetricsInfo const & mi, Dimension const & dim) const
-{
-       mi.base.bv->coordCache().insets().add(this, dim);
-}
-
-
 Buffer const * Inset::updateFrontend() const
 {
        //FIXME (Abdel 03/12/10): see bugs #6814 and #6949
@@ -632,6 +638,12 @@ Buffer const * Inset::updateFrontend() const
 }
 
 
+bool Inset::resetFontEdit() const
+{
+       return getLayout().resetsFont() || !inheritFont();
+}
+
+
 docstring Inset::completionPrefix(Cursor const &) const 
 {
        return docstring();