Fix bug #6919 by splitting Inset::noFontChange() into inheritFont() and

[features.git] / src / insets / Inset.h

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index e62da465e9f35556e0f4d5d19a8820a4bec67f72..c4375b6fffadc39d2de24cbf34f83bb62e636951 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -520,14 +520,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 &) {}