inset-split: consider that freeSpacing() doesn't DEPM

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 14784a27d23315456d7eddb2286a912d28572a97..dfb5afebda3f2d3ad5abacfccbcba3fe0e9db062 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -58,7 +58,7 @@ public:
        void setUnknown(bool unknown) { unknown_ = unknown; }
        /// Reads a layout definition from file
        /// \return true on success.
-       bool read(Lexer &, TextClass const &);
+       bool read(Lexer &, TextClass const &, bool validating = false);
        ///
        void readAlign(Lexer &);
        ///
@@ -74,7 +74,7 @@ public:
        ///
        void readSpacing(Lexer &);
        ///
-       void readArgument(Lexer &);
+       void readArgument(Lexer &, bool);
        /// Write a layout definition in utf8 encoding
        void write(std::ostream &) const;
        ///
@@ -93,8 +93,8 @@ public:
        struct latexarg {
                docstring labelstring;
                docstring menustring;
-               bool mandatory;
-               bool nodelims;
+               bool mandatory = false;
+               bool nodelims = false;
                docstring ldelim;
                docstring rdelim;
                docstring defaultarg;
@@ -102,16 +102,20 @@ public:
                docstring tooltip;
                std::string required;
                std::string decoration;
-               FontInfo font;
-               FontInfo labelfont;
-               bool autoinsert;
-               bool insertcotext;
-               bool insertonnewline;
-               ArgPassThru passthru;
+               FontInfo font = inherit_font;
+               FontInfo labelfont = inherit_font;
+               bool autoinsert = false;
+               bool insertcotext = false;
+               bool insertonnewline = false;
+               ArgPassThru passthru = PT_INHERITED;
                docstring pass_thru_chars;
-               bool is_toc_caption;
-               bool free_spacing;
+               bool is_toc_caption = false;
+               bool free_spacing = false;
                std::string newlinecmd;
+               docstring docbooktag;
+               docstring docbooktagtype;
+               docstring docbookattr;
+               bool docbookargumentbeforemaintag = false;
        };
        ///
        typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -199,6 +203,12 @@ public:
        ///
        std::string const & docbooktagtype() const;
        ///
+       std::string const & docbookinnertag() const;
+       ///
+       std::string const & docbookinnerattr() const;
+       ///
+       std::string const & docbookinnertagtype() const;
+       ///
        std::string const & docbookininfo() const;
        ///
        bool docbookabstract() const { return docbookabstract_; }
@@ -213,6 +223,8 @@ public:
        ///
        std::string const & docbooksectiontag() const;
        ///
+       bool docbooksection() const { return docbooksection_; }
+       ///
        std::string const & docbookitemwrappertag() const;
        ///
        std::string const & docbookitemwrapperattr() const;
@@ -256,13 +268,13 @@ public:
        bool labelIsInline() const {
                return labeltype == LABEL_STATIC
                        || labeltype == LABEL_SENSITIVE
-                 || labeltype == LABEL_ENUMERATE
+                       || labeltype == LABEL_ENUMERATE
                        || labeltype == LABEL_ITEMIZE;
        }
        bool labelIsAbove() const {
                return labeltype == LABEL_ABOVE
                        || labeltype == LABEL_CENTERED
-                 || labeltype == LABEL_BIBLIO;
+                       || labeltype == LABEL_BIBLIO;
        }
        ///
        bool addToToc() const { return add_to_toc_; }
@@ -381,8 +393,8 @@ public:
        docstring counter;
        /// Resume counter?
        bool resumecounter;
-       /// Step master counter?
-       bool stepmastercounter;
+       /// Step parent counter?
+       bool stepparentcounter;
        /// Prefix to use when creating labels
        docstring refprefix;
        /// Depth of XML command
@@ -411,7 +423,7 @@ public:
 private:
        /// Reads a layout definition from file
        /// \return true on success.
-       bool readIgnoreForcelocal(Lexer &, TextClass const &);
+       bool readIgnoreForcelocal(Lexer &, TextClass const &, bool validating);
        /// generates the default CSS for this layout
        void makeDefaultCSS() const;
        ///
@@ -509,6 +521,12 @@ private:
        mutable std::string docbookattr_;
        /// DocBook tag type corresponding to this layout (block, paragraph, or inline; default: block).
        mutable std::string docbooktagtype_;
+       /// DocBook inner tag corresponding to this layout.
+       mutable std::string docbookinnertag_;
+       /// Roles to add to docbookinnertag_, if any (default: none).
+       mutable std::string docbookinnerattr_;
+       /// DocBook inner-tag type corresponding to this layout (block, paragraph, or inline; default: block).
+       mutable std::string docbookinnertagtype_;
        /// DocBook tag corresponding to this item (mainly for lists).
        mutable std::string docbookitemtag_;
        /// Roles to add to docbookitemtag_, if any (default: none).
@@ -545,6 +563,8 @@ private:
        /// Outer tag for this section, only if this layout represent a sectionning item, including chapters
        /// (default: section).
        mutable std::string docbooksectiontag_;
+       /// Whether this element should be considered as a section-level element in DocBook.
+       bool docbooksection_;
        /// Whether this tag must/can/can't go into an <info> tag (default: never, as it only makes sense for metadata).
        mutable std::string docbookininfo_;
        /// Wehther this paragraph should be considered as abstract.