Provide option to force a local language switch where a global is not allowed (fixes...

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 08c049d8d6ac054140e2005cf49a867091a59696..b0c3ac5bad36eab221f67dc81bbaa0a504bff0cd 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -17,8 +17,10 @@
 #include "FontInfo.h"
 #include "LayoutEnums.h"
 #include "Spacing.h"
+#include "support/debug.h"
 #include "support/docstring.h"
 
+#include <map>
 #include <set>
 #include <string>
 
@@ -72,6 +74,8 @@ public:
        ///
        void readSpacing(Lexer &);
        ///
+       void readArgument(Lexer &);
+       ///
        docstring const & name() const { return name_; }
        ///
        void setName(docstring const & n) { name_ = n; }
@@ -83,6 +87,26 @@ public:
        std::string const & latexname() const { return latexname_; }
        ///
        void setLatexName(std::string const & n) { latexname_ = n; }
+       /// The arguments of this layout
+       struct latexarg {
+               docstring labelstring;
+               bool mandatory;
+               docstring ldelim;
+               docstring rdelim;
+               docstring tooltip;
+               std::string requires;
+               std::string decoration;
+               FontInfo font;
+               FontInfo labelfont;
+       };
+       ///
+       typedef std::map<unsigned int, latexarg> LaTeXArgMap;
+       ///
+       LaTeXArgMap const & latexargs() const { return latexargs_; }
+       ///
+       int optArgs() const;
+       ///
+       int requiredArgs() const;
        ///
        docstring const & labelstring(bool in_appendix) const 
        { return in_appendix ? labelstring_appendix_ : labelstring_; }
@@ -103,6 +127,10 @@ public:
        ///
        std::string const & latexparam() const { return latexparam_; }
        ///
+       docstring leftdelim() const { return leftdelim_; }
+       ///
+       docstring rightdelim() const { return rightdelim_; }
+       ///
        std::string const & innertag() const { return innertag_; }
        ///
        std::string const & labeltag() const { return labeltag_; }
@@ -238,15 +266,6 @@ public:
        bool intitle;
        /// Is the content to go in the preamble rather than the body?
        bool inpreamble;
-       /// 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
@@ -302,6 +321,10 @@ private:
        docstring labelstring_appendix_;
        /// LaTeX parameter for environment
        std::string latexparam_;
+       /// Left delimiter of the content
+       docstring leftdelim_;
+       /// Right delimiter of the content
+       docstring rightdelim_;
        /// Internal tag to use (e.g., <title></title> for sect header)
        std::string innertag_;
        /// Internal tag to use (e.g. to surround varentrylist label)
@@ -374,6 +397,8 @@ private:
        docstring babelpreamble_;
        /// Packages needed for this layout
        std::set<std::string> requires_;
+       ///
+       LaTeXArgMap latexargs_;
 };
 
 } // namespace lyx