Actually do the layout update

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 3ea50491f2465a217fb9c98b18ade4bb6df6630e..dd64bce75987879b9688d9efeabc9bad7f91f961 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,9 +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;
@@ -186,6 +193,8 @@ public:
        ///
        std::string const & htmllabelattr() const;
        ///
+       bool htmlintoc() const { return htmlintoc_; }
+       ///
        std::string defaultCSSClass() const;
        ///
        bool htmllabelfirst() const { return htmllabelfirst_; }
@@ -250,6 +259,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; }
@@ -267,13 +278,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_; }
@@ -392,18 +403,13 @@ 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
        int commanddepth;
 
-       /// Return a pointer on a new layout suitable to describe a caption.
-       /// FIXME: remove this eventually. This is only for tex2lyx
-       /// until it has proper support for the caption inset (JMarc)
-       static Layout * forCaption();
-
        /// Is this spellchecked?
        bool spellcheck;
        /**
@@ -512,6 +518,8 @@ private:
        ///    <item><label>...</label>...</item>
        /// The latter is the default.
        bool htmllabelfirst_;
+       /// Is this to be output with the toc?
+       bool htmlintoc_;
        /// CSS information needed by this layout.
        docstring htmlstyle_;
        /// DocBook tag corresponding to this layout.
@@ -572,6 +580,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