More related to #7224: It's OK for layouts not to provide a ListCommand

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 8cea104193f8b1e6529b9da24cf023f6bd536f21..5b22f90cc3d291da37404f7582da0b6dd23974d1 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -95,10 +95,10 @@ public:
        docstring const & preamble() const { return preamble_; }
        /// Get language dependent macro definitions needed for this layout
        /// for language \p lang
-       docstring const langpreamble(Language const * lang) const;
+       docstring const langpreamble(Language const * lang, bool const polyglossia) const;
        /// Get language and babel dependent macro definitions needed for
        /// this layout for language \p lang
-       docstring const babelpreamble(Language const * lang) const;
+       docstring const babelpreamble(Language const * lang, bool const polyglossia) const;
        ///
        std::set<std::string> const & requires() const { return requires_; }
        ///
@@ -225,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
@@ -241,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;