#include <string>
#include <vector>
+#ifdef ERROR
+#undef ERROR
+#endif
+
namespace lyx {
namespace support { class FileName; }
ReturnValues read(Lexer & lex, ReadType rt = BASECLASS);
/// validates the layout information passed in str
static ReturnValues validate(std::string const & str);
- ///
+ /// \return the conversion of \param str to the latest layout format
+ /// compatible with the lyx format.
static std::string convert(std::string const & str);
///////////////////////////////////////////////////////////////////
/// happen). -- Idea JMarc, comment MV
InsetLayout const & insetLayout(docstring const & name) const;
/// a plain inset layout for use as a default
- static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
+ static InsetLayout const & plainInsetLayout();
/// add a new layout \c name if it does not exist in layoutlist_
/// \return whether we had to add one.
bool addLayoutIfNeeded(docstring const & name) const;
friend DocumentClassPtr
getDocumentClass(LayoutFile const &, LayoutModuleList const &,
bool const clone);
- ///
- static InsetLayout plain_insetlayout_;
};
/// current format of layout files
extern int const LAYOUT_FORMAT;
+/// layout format for the current lyx file format (usually equal to
+/// LAYOUT_FORMAT)
+extern int const LYXFILE_LAYOUT_FORMAT;
} // namespace lyx