Rework default bibliography style UI

[features.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 0a075dd6c588c778f5ff8ec407729072c64a3513..3f83216aaf44d6efc24c11b4ca78a4d85bb53c40 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -30,6 +30,10 @@
 #include <string>
 #include <vector>
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace lyx {
 
 namespace support { class FileName; }
@@ -147,6 +151,7 @@ public:
                BASECLASS, //>This is a base class, i.e., top-level layout file
                MERGE, //>This is a file included in a layout file
                MODULE, //>This is a layout module
+               CITE_ENGINE, //>This is a cite engine
                VALIDATION //>We're just validating
        };
        /// return values for read()
@@ -167,7 +172,8 @@ public:
        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);
 
        ///////////////////////////////////////////////////////////////////
@@ -199,6 +205,8 @@ public:
        OutputType outputType() const { return outputType_; }
        /// Can be latex, docbook ... (the name of a format)
        std::string outputFormat() const { return outputFormat_; }
+       ///
+       docstring outlinerName(std::string const & type) const;
 protected:
        /// Protect construction
        TextClass();
@@ -322,11 +330,13 @@ protected:
        /// Citation macros
        std::map<CiteEngineType, std::map<std::string, std::string> > cite_macros_;
        /// The default BibTeX bibliography style file
-       std::string cite_default_biblio_style_;
+       std::map<std::string, std::string> cite_default_biblio_style_;
        /// Whether full author lists are supported
        bool cite_full_author_list_;
        /// The possible citation styles
        std::map<CiteEngineType, std::vector<CitationStyle> > cite_styles_;
+       ///
+       std::map<std::string, docstring> outliner_names_;
 private:
        ///////////////////////////////////////////////////////////////////
        // helper routines for reading layout files
@@ -359,6 +369,8 @@ private:
        int readCiteEngineType(Lexer &) const;
        ///
        bool readCiteFormat(Lexer &);
+       ///
+       bool readOutlinerName(Lexer &);
 };
 
 
@@ -392,7 +404,7 @@ public:
        /// 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;
@@ -475,7 +487,8 @@ public:
        ///
        std::vector<CitationStyle> const & citeStyles(CiteEngineType const &) const;
        ///
-       std::string const & defaultBiblioStyle() const { return cite_default_biblio_style_; }
+       std::map<std::string, std::string> const & defaultBiblioStyle() const
+       { return cite_default_biblio_style_; }
        ///
        bool const & fullAuthorList() const { return cite_full_author_list_; }
 protected:
@@ -487,9 +500,8 @@ private:
        /// The only way to make a DocumentClass is to call this function.
        friend DocumentClassPtr
                getDocumentClass(LayoutFile const &, LayoutModuleList const &,
+                                LayoutModuleList const &,
                                 bool const clone);
-       ///
-       static InsetLayout plain_insetlayout_;
 };
 
 
@@ -499,6 +511,7 @@ private:
 /// on the CutStack.
 DocumentClassPtr getDocumentClass(LayoutFile const & baseClass,
                        LayoutModuleList const & modlist,
+                       LayoutModuleList const & celist,
                        bool const clone = false);
 
 /// convert page sides option to text 1 or 2
@@ -506,6 +519,9 @@ std::ostream & operator<<(std::ostream & os, PageSides p);
 
 /// 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