revert r35282

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 54d44df8e8f261e903e06413efc77db61051b37d..a80999701814bf3e75e8e31c475619bbc8c55775 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -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; }
@@ -221,6 +225,8 @@ public:
        bool free_spacing;
        ///
        bool pass_thru;
+       ///
+       bool parbreak_is_newline;
        /// show this in toc
        int toclevel;
        /// special value of toclevel for non-section layouts
@@ -237,10 +243,19 @@ public:
        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;
+       /// Number of requried arguments for this command or environment
+       unsigned int reqargs;
+       /// Number of optional arguments for this command or environment
+       /// These MUST come at the beginning, so:
+       ///  \cmd[opt1][opt2]{req1}{here is the text from LyX}
+       /// is fine. But:
+       ///  \cmd[opt1]{req1}[opt2]{here is the text from LyX}
+       /// is not.
+       unsigned int optargs;
        /// Which counter to step
        docstring counter;
+       /// Prefix to use when creating labels
+       docstring refprefix;
        /// Depth of XML command
        int commanddepth;
 
@@ -249,13 +264,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"; }
@@ -347,6 +363,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