Reorder a bit status messages, but they are still cleared at the end of LyXFunc

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 60cc25a83020f475ef352bf69389fef05465cbd6..67acd5848c4a1a913dd21b9a5795b4c714b37b64 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -48,7 +48,7 @@ class ProtectCopy
 protected:
        ProtectCopy() {}
        ~ProtectCopy() {}
-       ProtectCopy(const ProtectCopy &) {};
+       ProtectCopy(const ProtectCopy &) {}
 private:
        const ProtectCopy & operator=(const ProtectCopy &);
 };
@@ -77,7 +77,7 @@ private:
 class TextClass : protected ProtectCopy {
 public:
        ///
-       virtual ~TextClass() {};
+       virtual ~TextClass() {}
        ///////////////////////////////////////////////////////////////////
        // typedefs
        ///////////////////////////////////////////////////////////////////
@@ -126,7 +126,7 @@ public:
        /// returns a special layout for use when we don't really want one,
        /// e.g., in table cells
        Layout const & plainLayout() const 
-                       { return operator[](plain_layout_); };
+                       { return operator[](plain_layout_); }
        /// the name of the plain layout
        docstring const & plainLayoutName() const 
                        { return plain_layout_; }
@@ -139,7 +139,7 @@ public:
        ///
        Layout const & operator[](docstring const & vname) const;
        /// Inset layouts of this doc class
-       InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
+       InsetLayouts const & insetLayouts() const { return insetlayoutlist_; }
 
        ///////////////////////////////////////////////////////////////////
        // reading routines
@@ -184,11 +184,15 @@ 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_; }
+       /// Can be latex, docbook ... (the name of a format)
+       std::string outputFormat() const { return outputFormat_; }
 protected:
        /// Protect construction
        TextClass();
@@ -250,6 +254,9 @@ protected:
        static const docstring plain_layout_;
        /// preamble text to support layout styles
        docstring preamble_;
+       /// same, but for HTML output
+       /// this is output as is to the header
+       docstring htmlpreamble_;
        /// latex packages loaded by document class.
        std::set<std::string> provides_;
        /// latex packages requested by document class.
@@ -270,6 +277,8 @@ protected:
        int tocdepth_;
        /// Can be LaTeX, DocBook, etc.
        OutputType outputType_;
+       /// Can be latex, docbook ... (the name of a format)
+       std::string outputFormat_;
        /** Base font. The paragraph and layout fonts are resolved against
            this font. This has to be fully instantiated. Attributes
            FONT_INHERIT, FONT_IGNORE, and FONT_TOGGLE are
@@ -374,6 +383,8 @@ public:
        std::string const & pagestyle() const { return pagestyle_; }
        ///
        docstring const & preamble() const { return preamble_; }
+       ///
+       docstring const & htmlpreamble() const { return htmlpreamble_; }
        /// is this feature already provided by the class?
        bool provides(std::string const & p) const;
        /// features required by the class?
@@ -393,9 +404,9 @@ public:
        /// Text that dictates how wide the right margin is on the screen
        docstring const & rightmargin() const { return rightmargin_; }
        /// The type of command used to produce a title
-       TitleLatexType titletype() const { return titletype_; };
+       TitleLatexType titletype() const { return titletype_; }
        /// The name of the title command
-       std::string const & titlename() const { return titlename_; };
+       std::string const & titlename() const { return titlename_; }
        ///
        int size() const { return layoutlist_.size(); }
        /// The minimal TocLevel of sectioning layouts
@@ -404,8 +415,6 @@ public:
        int max_toclevel() const { return max_toclevel_; }
        /// returns true if the class has a ToC structure
        bool hasTocLevels() const;
-       /// Can be LaTeX, DocBook, etc.
-       OutputType outputType() const { return outputType_; }
 protected:
        /// Constructs a DocumentClass based upon a LayoutFile.
        DocumentClass(LayoutFile const & tc);