Properly fix handling of title layouts within insets (#11787)

[lyx.git] / src / insets / InsetLayout.h

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 79390e522de7e422b271a6d3d7e7b177c839e684..3bab0a48981e19b8369b33a2430b5ed6e31bcf2b 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -56,7 +56,8 @@ public:
                ILT_ERROR
        };
        ///
-       bool read(Lexer & lexrc, TextClass const & tclass);
+       bool read(Lexer & lexrc, TextClass const & tclass,
+                       bool validating = false);
        ///
        docstring name() const { return name_; }
        ///
@@ -66,6 +67,8 @@ public:
        ///
        docstring labelstring() const { return labelstring_; }
        ///
+       docstring menustring() const { return menustring_; }
+       ///
        bool contentaslabel() const { return contentaslabel_; }
        ///
        InsetDecoration decoration() const { return decoration_; }
@@ -146,7 +149,7 @@ public:
        /// Defaults to true.
        bool htmlisblock() const { return htmlisblock_; }
        ///
-       std::set<std::string> requires() const { return requires_; }
+       std::set<std::string> required() const { return required_; }
        ///
        bool isMultiPar() const { return multipar_; }
        ///
@@ -158,11 +161,18 @@ public:
        ///
        docstring passThruChars() const { return passthru_chars_; }
        ///
+       std::string newlineCmd() const { return newline_cmd_; }
+       ///
        bool parbreakIsNewline() const { return parbreakisnewline_; }
        ///
+       bool parbreakIgnored() const { return parbreakignored_; }
+       ///
        bool isNeedProtect() const { return needprotect_; }
        ///
        bool needsCProtect() const { return needcprotect_; }
+       /// Protection of some elements such as \ref and \cite
+       /// in \mbox (needed by commands building on soul or ulem)
+       bool isNeedMBoxProtect() const { return needmboxprotect_; }
        ///
        bool isFreeSpacing() const { return freespacing_; }
        ///
@@ -209,6 +219,8 @@ private:
        ///
        docstring labelstring_;
        ///
+       docstring menustring_;
+       ///
        bool contentaslabel_;
        ///
        InsetDecoration decoration_;
@@ -264,7 +276,7 @@ private:
        ///
        bool htmlisblock_;
        ///
-       std::set<std::string> requires_;
+       std::set<std::string> required_;
        ///
        bool multipar_;
        ///
@@ -276,8 +288,12 @@ private:
        ///
        docstring passthru_chars_;
        ///
+       std::string newline_cmd_;
+       ///
        bool parbreakisnewline_;
        ///
+       bool parbreakignored_;
+       ///
        bool freespacing_;
        ///
        bool keepempty_;
@@ -289,6 +305,8 @@ private:
        bool needprotect_;
        ///
        bool needcprotect_;
+       ///
+       bool needmboxprotect_;
        /// should the contents be written to TOC strings?
        bool intoc_;
        /// check spelling of this inset?