Routines for calculating numerical labels for BibTeX citations.

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

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 6edbb331fd13b383f19f491e0c82328cdd99d517..533b62d0e8202452a644db9b97239bdbbdbab675 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -66,6 +66,8 @@ public:
        ///
        docstring labelstring() const { return labelstring_; }
        ///
+       bool contentaslabel() const { return contentaslabel_; }
+       ///
        InsetDecoration decoration() const { return decoration_; }
        ///
        InsetLaTeXType latextype() const { return latextype_; }
@@ -84,7 +86,7 @@ public:
        ///
        docstring counter() const { return counter_; }
        ///
-       std::string const & htmltag() const { return htmltag_; }
+       std::string const & htmltag() const;
        /// 
        std::string const & htmlattr() const;
        /// 
@@ -105,25 +107,25 @@ public:
        ///
        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_; }
        ///
 private:
        ///
@@ -143,6 +145,8 @@ private:
        ///
        docstring labelstring_;
        ///
+       bool contentaslabel_;
+       ///
        InsetDecoration decoration_;
        ///
        InsetLaTeXType latextype_;
@@ -160,8 +164,8 @@ private:
        docstring counter_;
        ///
        docstring preamble_;
-       /// The tag enclosing all the material in this inset. Default is none.
-       std::string htmltag_;
+       /// The tag enclosing all the material in this inset. Default is "span".
+       mutable std::string htmltag_;
        /// Additional attributes for inclusion with the start tag. Default (if
        /// a tag is provided) is: class="name".
        mutable std::string htmlattr_;
@@ -172,7 +176,7 @@ private:
        mutable 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>
+       ///    \arabic{footnote}
        /// No default.
        /// FIXME Could we get this from the layout?
        std::string htmllabel_;