More switches and whitespace fixes

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

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index e9c736c61937d39cbcc0986757aad0fc1ba7e2ba..cce0f327feb49aa1b9fbe56790e24ba918f31689 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");
@@ -192,7 +195,7 @@ Buffer & Inset::buffer()
                LYXERR0("Inset: " << this << " LyX Code: " << lyxCode()
                                        << " name: " << iname);
                s << "LyX Code: " << lyxCode() << " name: " << iname;
-               LASSERT(false, /**/);
+               LATTEST(false);
                throw ExceptionMessage(BufferException, 
                        from_ascii("Inset::buffer_ member not initialized!"), s.str());
        }
@@ -255,7 +258,7 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 }
 
 
-void Inset::forToc(docstring &, size_t) const
+void Inset::forOutliner(docstring &, size_t) const
 {
 }
 
@@ -408,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;
        }
@@ -634,6 +642,12 @@ Buffer const * Inset::updateFrontend() const
 }
 
 
+bool Inset::resetFontEdit() const
+{
+       return getLayout().resetsFont() || !inheritFont();
+}
+
+
 docstring Inset::completionPrefix(Cursor const &) const 
 {
        return docstring();