LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / lyxtextclass.h

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 1204e5215c0b619b7a7de313d3e4f4a15b6f2095..e2b05c06bcefdd156db00685c50e29db826a1028 100644 (file)
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -17,6 +17,9 @@
 
 #include <vector>
 
+
+namespace lyx {
+
 class LyXLex;
 class Counters;
 class FloatList;
@@ -62,7 +65,7 @@ public:
        const_iterator end() const { return layoutlist_.end(); }
 
        /// Performs the read of the layout file.
-       bool Read(std::string const & filename, bool merge = false);
+       bool read(std::string const & filename, bool merge = false);
        ///
        void readOutputType(LyXLex &);
        ///
@@ -84,7 +87,7 @@ public:
        LyXLayout_ptr const & operator[](std::string const & vname) const;
 
        /// Sees to that the textclass structure has been loaded
-       bool load() const;
+       bool load(std::string const & path = std::string()) const;
        /// Has this layout file been loaded yet?
        bool loaded() const { return loaded_; }
 
@@ -153,7 +156,7 @@ public:
        ///
        int tocdepth() const;
 
-       /// Can be LaTeX, LinuxDoc, etc.
+       /// Can be LaTeX, DocBook, etc.
        OutputType outputType() const;
 
        ///
@@ -213,7 +216,7 @@ private:
        int secnumdepth_;
        /// header depth to appear in table of contents
        int tocdepth_;
-       /// Can be LaTeX, LinuxDoc, etc.
+       /// Can be LaTeX, DocBook, etc.
        OutputType outputType_;
        /** Base font. The paragraph and layout fonts are resolved against
            this font. This has to be fully instantiated. Attributes
@@ -267,4 +270,7 @@ void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
+
+} // namespace lyx
+
 #endif