Make members of FuncRequest private, per the FIXME there. Again, this is

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

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 6ebb916082144ce87cfda0982771998816a45ffd..3fdc17f8cecfb5f5036a77789b821d8cd061db86 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -65,6 +65,8 @@ public:
        ///
        docstring labelstring() const { return labelstring_; }
        ///
+       bool contentaslabel() const { return contentaslabel_; }
+       ///
        InsetDecoration decoration() const { return decoration_; }
        ///
        InsetLaTeXType latextype() const { return latextype_; }
@@ -82,43 +84,62 @@ public:
        docstring preamble() const { return preamble_; }
        ///
        docstring counter() const { return counter_; }
-       /// 
+       ///
+       docstring refprefix() const { return refprefix_; }
+       /// The tag enclosing all the material in this inset. Default is "span".
+       std::string const & htmltag() const;
+       /// Additional attributes for inclusion with the start tag. Default (if
+       /// a tag is provided) is: class="name".
+       std::string const & htmlattr() const;
+       /// Tag for individual paragraphs in the inset. Default is none.
        std::string const & htmlinnertag() const { return htmlinnertag_; }
-       /// 
-       std::string const & htmlinnerattr() const { return htmlinnerattr_; }
+       /// Attributes for that tag. Default (if a tag is provided) is: 
+       /// class="name_inner".
+       std::string const & htmlinnerattr() const;
+       /// A label for this environment, possibly including a reference
+       /// to a counter. E.g., for footnote, it might be:
+       ///    \arabic{footnote}
+       /// No default.
+       /// FIXME Could we get this from the layout?
+       std::string const & htmllabel() const { return htmllabel_; }
        ///
-       std::string const & htmltag() const { return htmltag_; }
-       /// 
-       std::string const & htmlattr() const { return htmlattr_; }
+       inline std::string htmllabeltag() const { return "span"; }
        ///
-       std::string const & htmllabel() const { return htmllabel_; }
-       /// 
+       std::string htmllabelattr() const 
+               { return "class=\"" + defaultCSSClass() + "_label\""; }
+       /// CSS associated with this inset.
        docstring htmlstyle() const;
-       /// 
+       /// Additional material for the header.
        docstring htmlpreamble() const { return htmlpreamble_; }
-       ///
+       /// Whether this inset represents a "block" of material, i.e., a set
+       /// of paragraphs of its own (true), or should be run into the previous
+       /// paragraph (false). Examples:
+       ///   For branches, this is false.
+       ///   For footnotes, this is true.
+       /// Defaults to true.
        bool htmlisblock() const { return htmlisblock_; }
        ///
-       std::set<std::string> requires() const { return requires_; };
+       std::set<std::string> requires() const { return requires_; }
        ///
-       bool isMultiPar() const { return multipar_; };
+       bool isMultiPar() const { return multipar_; }
        ///
        bool forcePlainLayout() const { return forceplain_; }
        ///
        bool allowParagraphCustomization() const { return custompars_; }
        ///
-       bool isPassThru() const { return passthru_; };
+       bool isPassThru() const { return passthru_; }
        ///
-       bool isNeedProtect() const { return needprotect_; };
+       bool isNeedProtect() const { return needprotect_; }
        ///
-       bool isFreeSpacing() const { return freespacing_; };
+       bool isFreeSpacing() const { return freespacing_; }
        ///
-       bool isKeepEmpty() const { return keepempty_; };
+       bool isKeepEmpty() const { return keepempty_; }
        ///
-       bool forceLTR() const { return forceltr_; };
+       bool forceLTR() const { return forceltr_; }
        ///
-       bool isInToc() const { return intoc_; };
+       bool isInToc() const { return intoc_; }
        ///
+       bool spellcheck() const { return spellcheck_; }
 private:
        ///
        void makeDefaultCSS() const;
@@ -137,6 +158,8 @@ private:
        ///
        docstring labelstring_;
        ///
+       bool contentaslabel_;
+       ///
        InsetDecoration decoration_;
        ///
        InsetLaTeXType latextype_;
@@ -154,39 +177,30 @@ private:
        docstring counter_;
        ///
        docstring preamble_;
-       /// The tag enclosing all the material in this inset. Default is none.
-       std::string htmltag_;
-       /// Additional attributes for inclusion with the start tag. Default (if
-       /// a tag is provided) is: class="name".
-       std::string htmlattr_;
-       /// Tag for individual paragraphs in the inset. Default is none.
+       ///
+       docstring refprefix_;
+       ///
+       mutable std::string htmltag_;
+       ///
+       mutable std::string htmlattr_;
+       ///
        std::string htmlinnertag_;
-       /// Attributes for that tag. Default (if a tag is provided) is: 
-       /// class="name_inner".
-       std::string htmlinnerattr_;
-       /// A label for this environment, possibly including a reference
-       /// to a counter. E.g., for footnote, it might be:
-       ///    <span class='notenum'>\arabic{footnote}</span>
-       /// No default.
-       /// FIXME Could we get this from the layout?
+       ///
+       mutable std::string htmlinnerattr_;
+       ///
        std::string htmllabel_;
-       /// CSS associated with this inset.
+       ///
        docstring htmlstyle_;
        /// Cache for default CSS info for this inset.
        mutable docstring htmldefaultstyle_;
-       /// 
+       /// Cache for default CSS class.
        mutable std::string defaultcssclass_;
        /// Whether to force generation of default CSS even if some is given.
        /// False by default.
        bool htmlforcecss_;
-       /// Additional material for the header.
+       ///
        docstring htmlpreamble_;
-       /// Whether this inset represents a "block" of material, i.e., a set
-       /// of paragraphs of its own (true), or should be run into the previous
-       /// paragraph (false). Examples:
-       ///   For branches, this is false.
-       ///   For footnotes, this is true.
-       /// Defaults to true.
+       ///
        bool htmlisblock_;
        ///
        std::set<std::string> requires_;
@@ -208,6 +222,8 @@ private:
        bool forceltr_;
        /// should the contents be written to TOC strings?
        bool intoc_;
+       /// check spelling of this inset?
+       bool spellcheck_;
 };
 
 ///