X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=ee5905f141490de89a2050e5f765dfce626a3005;hb=1f83c98eb46b8c383714e69ee0e61592dd402aab;hp=8776a66e821a137e1e83e8f9c27d0b5884881a4a;hpb=a6f32927ea9d05a997d41057b368b6ae60c51165;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 8776a66e82..ee5905f141 100644
--- 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 {
 	///
@@ -188,19 +195,19 @@ public:
 	///
 	void readSpacing(Lexer &);
 	///
-	std::string const & name() const;
+	docstring const & name() const;
 	///
-	void setName(std::string const & n);
+	void setName(docstring const & n);
 	///
-	std::string const & obsoleted_by() const;
+	docstring const & obsoleted_by() const;
 	///
-	std::string const & depends_on() const;
+	docstring const & depends_on() const;
 	///
 	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;
 
@@ -345,28 +352,28 @@ public:
 
 private:
 	/// Name of the layout/paragraph environment
-	std::string name_;
+	docstring name_;
 
 	/** Name of an layout that has replaced this layout.
 	    This is used to rename a layout, while keeping backward
 	    compatibility
 	*/
-	std::string obsoleted_by_;
+	docstring obsoleted_by_;
 
 	/** Name of an layout which preamble must come before this one
 	    This is used when the preamble snippet uses macros defined in
 	    another preamble
 	 */
-	std::string depends_on_;
+	docstring depends_on_;
 
 	/// 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)