Force redraw after completion

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index a3390219fa4a89e578ab309214f126b595581503..99cc4df5475e2dd7bdab1f04a721370cbd09d02d 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -89,7 +89,7 @@ public:
        std::string const & latexname() const { return latexname_; }
        ///
        std::string const & itemcommand() const { return itemcommand_; }
-       /// The arguments of this layout
+       /// One argument of this layout
        struct latexarg {
                docstring labelstring;
                docstring menustring;
@@ -112,6 +112,16 @@ public:
                bool is_toc_caption = false;
                bool free_spacing = false;
                std::string newlinecmd;
+               /// The DocBook tag corresponding to this argument.
+               docstring docbooktag;
+               docstring docbooktagtype;
+               docstring docbookattr;
+        /// Whether this argument should be output after the main tag (default: inside). The result if the argument
+        /// should be output both before and after the main tag is undefined.
+               bool docbookargumentbeforemaintag = false;
+        /// Whether this argument should be output before the main tag (default: inside). The result if the argument
+        /// should be output both before and after the main tag is undefined.
+               bool docbookargumentaftermaintag = false;
        };
        ///
        typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -199,6 +209,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 +229,8 @@ public:
        ///
        std::string const & docbooksectiontag() const;
        ///
+       bool docbooksection() const { return docbooksection_; }
+       ///
        std::string const & docbookitemwrappertag() const;
        ///
        std::string const & docbookitemwrapperattr() const;
@@ -239,6 +257,8 @@ public:
        ///
        std::string const & docbookforceabstracttag() const;
        ///
+       bool docbooknofontinside() const { return docbooknofontinside_; }
+       ///
        bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
        ///
        bool isCommand() const { return latextype == LATEX_COMMAND; }
@@ -256,13 +276,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 +401,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
@@ -509,6 +529,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 +571,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.
@@ -553,6 +581,8 @@ private:
        /// in LyX must be considered as the abstract if this is true); this text must be output with the specific tag
        /// held by this attribute
        mutable std::string docbookforceabstracttag_;
+       /// Whether font tags are allowed inside this tag.
+       bool docbooknofontinside_ = false;
        /// Should we generate the default CSS for this layout, even if HTMLStyle
        /// has been given? Default is false.
        /// Note that the default CSS is output first, then the user CSS, so it is