Revert "Fixup 0cbe0d7a: avoid double redraw when completion is finished"

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 0588bc17a7355f731a0c8e17bd2fd97b8b95e49b..6efc5129f97ea97c5e1db94558868193b0e1d70e 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -183,7 +183,11 @@ public:
        ///
        std::string const & htmltag() const;
        ///
-       std::string const & htmlattr() const;
+       std::string const & htmlattr() const { return htmlattr_; }
+       ///
+       std::string const & htmlclass() const;
+       /// Returns a complete attribute string, including class, etc.
+       std::string const & htmlGetAttrString() const;
        ///
        std::string const & htmlitemtag() const;
        ///
@@ -193,6 +197,8 @@ public:
        ///
        std::string const & htmllabelattr() const;
        ///
+       bool htmlintoc() const { return htmlintoc_; }
+       ///
        std::string defaultCSSClass() const;
        ///
        bool htmllabelfirst() const { return htmllabelfirst_; }
@@ -259,6 +265,8 @@ public:
        ///
        bool docbooknofontinside() const { return docbooknofontinside_; }
        ///
+       bool docbookgeneratetitle() const { return docbookgeneratetitle_; }
+       ///
        bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
        ///
        bool isCommand() const { return latextype == LATEX_COMMAND; }
@@ -489,9 +497,13 @@ private:
        ///
        /// Defaults to "div".
        mutable std::string htmltag_;
-       /// Additional attributes for inclusion with the start tag. Defaults
-       /// to: class="layoutname".
-       mutable std::string htmlattr_;
+       /// Additional attributes for inclusion with the start tag.
+       /// Note that the CSS class is handled separately.
+       std::string htmlattr_;
+       /// The CSS class to use. Calculated from the layout name if not given.
+       mutable std::string htmlclass_;
+       /// cached
+       mutable std::string htmlfullattrs_;
        /// Tag for individual paragraphs in an environment. In lists, this
        /// would be something like "li". But it also needs to be set for
        /// quotation, e.g., since the paragraphs in a quote need to be
@@ -516,6 +528,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.
@@ -570,14 +584,19 @@ private:
        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.
+       /// Whether this paragraph should be considered as abstract. Such paragraphs are output as a part of the document
+       /// abstract element (corresponding to the root tag).
        bool docbookabstract_;
        /// Whether this element (root or not) does not accept text without a section (i.e. the first text that is met
        /// 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
+       /// held by this attribute.
        mutable std::string docbookforceabstracttag_;
        /// Whether font tags are allowed inside this tag.
        bool docbooknofontinside_ = false;
+       /// Whether LyX should create a title on its own, just after the wrapper tag. Typically, this parameter is required
+       /// because the wrapper tag requires a title (like a figure). The generated title will be similar to a LyXHTML label
+       /// (environment type and a number).
+       bool docbookgeneratetitle_ = 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