X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.h;h=b1070d8a33d051b960568dbeb03e36f5be75084e;hb=25ef8e7eef8dfb2b6d6d4f2935ae6775ebf2ba60;hp=e62da465e9f35556e0f4d5d19a8820a4bec67f72;hpb=bc2dd1c50c37e2361db004f5a16c06014fdc94b6;p=lyx.git

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index e62da465e9..b1070d8a33 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -17,6 +17,7 @@
 
 #include "ColorCode.h"
 #include "InsetCode.h"
+#include "InsetLayout.h"
 #include "LayoutEnums.h"
 #include "OutputEnums.h"
 
@@ -408,29 +409,25 @@ public:
 	
 	/// \return Context menu identifier. This function determines
 	/// whose Inset's menu should be shown for the given position.
-	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	virtual std::string contextMenu(BufferView const & bv, int x, int y) const;
 
 	/// \return Context menu identifier for this inset.
 	/// This default implementation returns an empty string.
-	virtual docstring contextMenuName() const;
+	virtual std::string contextMenuName() const;
 
 
-	// FIXME This should really disappear in favor of 
-	//	docstring name() const { return from_ascii(insetName(lyxCode()))); }
-	// There's no reason to be using different names in different places.
-	// But to do this we would need to change the file format, since the names
-	// used there don't correspond to what is used here. 
-	///
-	virtual docstring name() const;
+	virtual docstring layoutName() const;
 	///
 	virtual InsetLayout const & getLayout() const;
+	///
+	virtual bool isPassThru() const { return getLayout().isPassThru(); }
 	/// Is this inset's layout defined in the document's textclass?
 	bool undefined() const;
-	/// used to toggle insets
-	/// is the inset open?
-	/// should this inset be handled like a normal charater
+	/// should this inset be handled like a normal character?
+	/// (a character can be a letter or punctuation)
 	virtual bool isChar() const { return false; }
 	/// is this equivalent to a letter?
+	/// (a letter is a character that is considered part of a word)
 	virtual bool isLetter() const { return false; }
 	/// is this equivalent to a space (which is BTW different from
 	/// a line separator)?
@@ -520,14 +517,29 @@ public:
 	/// returns whether this inset is allowed in other insets of given mode
 	virtual bool allowedIn(mode_type) const { return true; }
 	/**
-	 * Is this inset allowed within a font change?
-	 *
-	 * FIXME: noFontChange means currently that the font change is closed
-	 * in LaTeX before the inset, and that the contents of the inset
-	 * will be in default font. This should be changed so that the inset
-	 * changes the font again.
+	 * The font is inherited from the parent for LaTeX export if this
+	 * method returns true. No open font changes are closed in front of
+	 * the inset for LaTeX export, and the font is inherited for all other
+	 * exports as well as on screen.
+	 * If this method returns false all open font changes are closed in
+	 * front of the inset for LaTeX export. The default font is used
+	 * inside the inset for all exports and on screen.
+	 */
+	virtual bool inheritFont() const { return true; }
+	/**
+	 * If this method returns true all explicitly set font attributes
+	 * are reset during editing operations.
+	 * For copy/paste the operations the language is never changed, since
+	 * the language of a given text never changes if the text is
+	 * formatted differently, while other font attribues like size may
+	 * need to change if the text is copied from one environment to
+	 * another one.
+	 * If it returns false no font attribute is reset.
+	 * The default implementation returns the negation of inheritFont(),
+	 * since inherited inset font attributes do not need to be changed,
+	 * and non-inherited ones need to be set explicitly.
 	 */
-	virtual bool noFontChange() const { return false; }
+	virtual bool resetFontEdit() const { return !inheritFont(); }
 
 	/// set the change for the entire inset
 	virtual void setChange(Change const &) {}