}
+///
+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 {
///
///
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_; }
///
/// Depth of XML command
int commanddepth;
+ /// Return a pointer on a new layout suitable to describe a caption.
+ /// FIXME: remove this eventually. This is only for tex2lyx
+ /// until it has proper support for the caption inset (JMarc)
+ static Layout * forCaption();
+
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_;