LaTeXFeatures.cpp: "wrapfig" has to be loaded after "float"

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 91850d10c4c6fec1ad20f04aca88ab6a27499a54..ee5905f141490de89a2050e5f765dfce626a3005 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -78,6 +78,13 @@ void operator|=(LyXAlignment & la1, LyXAlignment la2) {
 }
 
 
+///
+inline
+LyXAlignment operator|(LyXAlignment la1, LyXAlignment la2) {
+       return static_cast<LyXAlignment>(static_cast<int>(la1) | static_cast<int>(la2));
+}
+
+
 /// The different LaTeX-Types
 enum LYX_LATEX_TYPES {
        ///
@@ -198,9 +205,9 @@ public:
        ///
        std::string const & latexname() const { return latexname_; }
        ///
-       lyx::docstring const & labelstring() const { return labelstring_; }
+       docstring const & labelstring() const { return labelstring_; }
        ///
-       lyx::docstring const & endlabelstring() const { return endlabelstring_; }
+       docstring const & endlabelstring() const { return endlabelstring_; }
        ///
        docstring const & preamble() const { return preamble_; }
        ///
@@ -212,7 +219,7 @@ public:
        ///
        std::string const & itemtag() const { return itemtag_; }
        ///
-       lyx::docstring const & labelstring_appendix() const {
+       docstring const & labelstring_appendix() const {
                return labelstring_appendix_;
        }
        /** Default font for this layout/environment.
@@ -243,15 +250,15 @@ public:
        Font reslabelfont;
 
        /// Text that dictates how wide the left margin is on the screen
-       std::string leftmargin;
+       docstring leftmargin;
        /// Text that dictates how wide the right margin is on the screen
-       std::string rightmargin;
+       docstring rightmargin;
        /// Text that dictates how much space to leave after a potential label
-       std::string labelsep;
+       docstring labelsep;
        /// Text that dictates how much space to leave before a potential label
-       std::string labelindent;
+       docstring labelindent;
        /// Text that dictates the width of the indentation of indented pars
-       std::string parindent;
+       docstring parindent;
        ///
        double parskip;
        ///
@@ -334,7 +341,7 @@ public:
        /// Does this layout allow for an optional parameter?
        int optionalargs;
        /// Which counter to step
-       lyx::docstring counter;
+       docstring counter;
        /// Depth of XML command
        int commanddepth;
 
@@ -362,11 +369,11 @@ private:
        /// LaTeX name for environment
        std::string latexname_;
        /// Label string. "Abstract", "Reference", "Caption"...
-       lyx::docstring labelstring_;
+       docstring labelstring_;
        ///
-       lyx::docstring endlabelstring_;
+       docstring endlabelstring_;
        /// Label string inside appendix. "Appendix", ...
-       lyx::docstring labelstring_appendix_;
+       docstring labelstring_appendix_;
        /// LaTeX parameter for environment
        std::string latexparam_;
        /// Internal tag to use (e.g., <title></title> for sect header)