Seems boost also includes all std headers. Not including boost therefore produces...

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 19436815c1954a032dd08f52b96666e4d823d437..73edd052fcd1698e6dd8ef90fe0e8f0ae209d616 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -73,7 +73,7 @@ public:
        ///
        void readSpacing(Lexer &);
        ///
-       docstring const & name() const { return name_; };
+       docstring const & name() const { return name_; }
        ///
        void setName(docstring const & n) { name_ = n; }
        ///
@@ -122,12 +122,16 @@ public:
        /// 
        std::string const & htmllabelattr() const;
        ///
+       std::string defaultCSSClass() const;
+       ///
        bool htmllabelfirst() const { return htmllabelfirst_; }
        /// 
        docstring htmlstyle() const;
        /// 
        docstring const & htmlpreamble() const { return htmlpreamble_; }
        ///
+       bool htmltitle() const { return htmltitle_; }
+       ///
        bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
        ///
        bool isCommand() const { return latextype == LATEX_COMMAND; }
@@ -235,10 +239,14 @@ public:
        LatexType latextype;
        /// Does this object belong in the title part of the document?
        bool intitle;
+       /// Is the content to go in the preamble rather than the body?
+       bool inpreamble;
        /// Does this layout allow for an optional parameter?
        int optionalargs;
        /// Which counter to step
        docstring counter;
+       /// Prefix to use when creating labels
+       docstring refprefix;
        /// Depth of XML command
        int commanddepth;
 
@@ -247,13 +255,14 @@ public:
        /// until it has proper support for the caption inset (JMarc)
        static Layout * forCaption();
 
+       /// Is this spellchecked?
+       bool spellcheck;
+
 
 private:
        /// generates the default CSS for this layout
        void makeDefaultCSS() const;
        ///
-       std::string defaultCSSClass() const;
-       ///
        std::string defaultCSSItemClass() const { return defaultCSSClass() + "_item"; }
        ///
        std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
@@ -345,6 +354,8 @@ private:
        mutable docstring htmldefaultstyle_;
        /// Any other info for the HTML header.
        docstring htmlpreamble_;
+       /// Whether this is the <title> paragraph.
+       bool htmltitle_;
        /// calculating this is expensive, so we cache it.
        mutable std::string defaultcssclass_;
        /// This is the `category' for this layout. The following are