X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=cce0f327feb49aa1b9fbe56790e24ba918f31689;hb=fd5d47d182a70de532225715a04b77fe4155aa18;hp=8566129b3a0172ce77bd4909ae09bfd3a956581e;hpb=dea050cb93ec5b427caaf1dcfe0e0addec121881;p=lyx.git

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 8566129b3a..cce0f327fe 100644
--- 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");
@@ -123,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");
@@ -186,12 +191,11 @@ Buffer & Inset::buffer()
 {
 	if (!buffer_) {
 		odocstringstream s;
-		lyxerr << "Inset: " << this
-					<< " LyX Code: " << lyxCode()
-					<< " name: " << insetName(lyxCode())
-					<< std::endl;
-		s << "LyX Code: " << lyxCode() << " name: " << name();
-		LASSERT(false, /**/);
+		string const iname = insetName(lyxCode());
+		LYXERR0("Inset: " << this << " LyX Code: " << lyxCode()
+					<< " name: " << iname);
+		s << "LyX Code: " << lyxCode() << " name: " << iname;
+		LATTEST(false);
 		throw ExceptionMessage(BufferException, 
 			from_ascii("Inset::buffer_ member not initialized!"), s.str());
 	}
@@ -218,7 +222,7 @@ bool Inset::isBufferValid() const
 }
 
 
-docstring Inset::name() const
+docstring Inset::layoutName() const
 {
 	return from_ascii("unknown");
 }
@@ -254,9 +258,20 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 }
 
 
-docstring Inset::contextMenu(BufferView const &, int, int) const
+void Inset::forOutliner(docstring &, size_t) const
 {
-	return docstring();
+}
+
+
+string Inset::contextMenu(BufferView const &, int, int) const
+{
+	return contextMenuName();
+}
+
+
+string Inset::contextMenuName() const
+{
+	return string();
 }
 
 
@@ -335,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);
 		}
@@ -396,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;
 	}
@@ -568,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());
 }
 
 
@@ -612,10 +632,22 @@ 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;
 }
 
 
+bool Inset::resetFontEdit() const
+{
+	return getLayout().resetsFont() || !inheritFont();
+}
+
+
 docstring Inset::completionPrefix(Cursor const &) const 
 {
 	return docstring();