Don try to be smart and always protect the preamble with \makeatletter

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index e88b01aba89a33b55f872c25d9ca393e10846100..7255165c235c40a8afbb6cdbc8bc2ed3cd3f8ca1 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -184,11 +184,13 @@ public:
        // accessors
        ///////////////////////////////////////////////////////////////////
        ///
-       std::string const & name() const { return name_; };
+       std::string const & name() const { return name_; }
        ///
-       std::string const & description() const {       return description_; };
+       std::string const & description() const { return description_; }
        ///
        std::string const & latexname() const { return latexname_; }
+       /// Can be LaTeX, DocBook, etc.
+       OutputType outputType() const { return outputType_; }
 protected:
        /// Protect construction
        TextClass();
@@ -298,6 +300,8 @@ private:
        bool deleteLayout(docstring const &);
        ///
        bool convertLayoutFormat(support::FileName const &, ReadType);
+       /// Reads the layout file without running layout2layout.
+       ReturnValues readWithoutConv(support::FileName const & filename, ReadType rt);
        /// \return true for success.
        bool readStyle(Lexer &, Layout &) const;
        ///