Fix bugs #2645 (export BIBINPUTS) and #6634 (Better support for external files in...

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index a3836a80c21695284d2fe4d793cf69fff4309438..b5ab65ecce3383abce504d80e90a4b30718b4892 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -77,12 +77,12 @@ public:
                support::FileName const & filepath);
 
        ///
-       void writeFile(std::ostream &) const;
+       void writeFile(std::ostream &, Buffer const *) const;
 
        /// check what features are implied by the buffer parameters.
        void validate(LaTeXFeatures &) const;
 
-       /** \returns true if the babel package is used (interogates
+       /** \returns true if the babel package is used (interrogates
         *  the BufferParams, a LyXRC variable, and the document class).
         *  This returned value can then be passed to the insets...
         */
@@ -110,8 +110,6 @@ public:
        ///
        InsetQuotes::QuoteLanguage quotes_language;
        ///
-       InsetQuotes::QuoteTimes quotes_times;
-       ///
        std::string fontsize;
        /// Get the LayoutFile this document is using.
        LayoutFile const * baseClass() const;
@@ -246,7 +244,7 @@ public:
        std::string bibtex_command;
        /// customized index processor
        std::string index_command;
-       /// font encoding
+       /// font encoding(s) requested for this document
        std::string fontenc;
        /// the rm font
        std::string fonts_roman;
@@ -307,6 +305,8 @@ public:
        /// Individual pieces of text can use different encodings.
        Encoding const & encoding() const;
        ///
+       std::string origin;
+       ///
        std::string preamble;
        ///
        std::string options;
@@ -385,8 +385,12 @@ public:
        /// map of the file's author IDs to AuthorList indexes
        typedef std::map<int, int> AuthorMap;
        AuthorMap author_map;
-       /// the buffer's font encoding
+       /// the buffer's active font encoding
        std::string const font_encoding() const;
+       /// all font encodings requested by the prefs/document/main language.
+       /// This does NOT include font encodings required by secondary languages
+       std::vector<std::string> const font_encodings() const;
+
        ///
        std::string const dvips_options() const;
        /** The return value of paperSizeName() depends on the