Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index c4a12a4018a9e17eaee309c0b4676ba08ed7afe1..00e3ba64d7184cc90143a4d813a4fc81e8deee1b 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -44,7 +44,6 @@ public:
                NOLYXTYPE,
                CHARSTYLE,
                CUSTOM,
-               ELEMENT,
                END,
                STANDARD
        };
@@ -56,7 +55,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 +66,8 @@ public:
        ///
        docstring labelstring() const { return labelstring_; }
        ///
+       docstring menustring() const { return menustring_; }
+       ///
        bool contentaslabel() const { return contentaslabel_; }
        ///
        InsetDecoration decoration() const { return decoration_; }
@@ -146,7 +148,11 @@ public:
        /// Defaults to true.
        bool htmlisblock() const { return htmlisblock_; }
        ///
-       std::set<std::string> requires() const { return requires_; }
+       std::string docbooktag() const { return docbooktag_; }
+       ///
+       std::string docbookattr() const { return docbookattr_; }
+       ///
+       std::set<std::string> required() const { return required_; }
        ///
        bool isMultiPar() const { return multipar_; }
        ///
@@ -158,10 +164,19 @@ 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_; }
        ///
        bool isKeepEmpty() const { return keepempty_; }
@@ -187,6 +202,8 @@ public:
        std::string tocType() const { return toc_type_; }
        ///
        bool isTocCaption() const { return is_toc_caption_; }
+       ///
+       bool editExternally () const { return edit_external_; }
 private:
        ///
        void makeDefaultCSS() const;
@@ -199,12 +216,14 @@ private:
        /**
                * This is only used (at present) to decide where to put them on the menus.
                * Values are 'charstyle', 'custom' (things that by default look like a
-               * footnote), 'element' (docbook), 'standard'.
+               * footnote), 'standard'.
                */
        InsetLyXType lyxtype_;
        ///
        docstring labelstring_;
        ///
+       docstring menustring_;
+       ///
        bool contentaslabel_;
        ///
        InsetDecoration decoration_;
@@ -260,7 +279,11 @@ private:
        ///
        bool htmlisblock_;
        ///
-       std::set<std::string> requires_;
+       std::string docbooktag_;
+       ///
+       std::string docbookattr_;
+       ///
+       std::set<std::string> required_;
        ///
        bool multipar_;
        ///
@@ -272,8 +295,12 @@ private:
        ///
        docstring passthru_chars_;
        ///
+       std::string newline_cmd_;
+       ///
        bool parbreakisnewline_;
        ///
+       bool parbreakignored_;
+       ///
        bool freespacing_;
        ///
        bool keepempty_;
@@ -283,6 +310,10 @@ private:
        bool forceownlines_;
        ///
        bool needprotect_;
+       ///
+       bool needcprotect_;
+       ///
+       bool needmboxprotect_;
        /// should the contents be written to TOC strings?
        bool intoc_;
        /// check spelling of this inset?
@@ -308,6 +339,8 @@ private:
        std::string toc_type_;
        ///
        bool is_toc_caption_;
+       ///
+       bool edit_external_;
 };
 
 ///