Amend 9f04eeae032d

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 229d1be6a5de027d9d7bca7f9c5d01b93954f7b3..1e8b5b00f17205ca99c3c2b100d508cab2892ef8 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -324,18 +324,20 @@ public:
         * The encoding of the LyX file is always utf8 and has nothing to
         * do with this setting.
         * The difference between \c auto and \c default is that \c auto also
-        * causes loading of the inputenc package, while \c default does not.
+        * causes loading of the inputenc package and writes a \inputenc{} command
+        * to the file when switching to another encoding, while \c default does not.
         * \c default will not work unless the user takes additional measures
         * (such as using special environments like the CJK environment from
         * CJK.sty).
-        * \c default can be seen as an unspecified 8bit encoding, since LyX
+        * \c default can be seen as an unspecified mix of 8bit encodings, since LyX
         * does not interpret it in any way apart from display on screen.
         */
        std::string inputenc;
        /// The main encoding used by this buffer for LaTeX output.
-       /// Individual pieces of text can use different encodings.
+       /// If the main encoding is \c auto or \c default,
+       /// individual pieces of text can use different encodings.
        /// Output for XeTeX with 8-bit TeX fonts uses ASCII (set at runtime)
-       /// instead of the value returned by this function.
+       /// instead of the value returned by this function (cf. #10600).
        Encoding const & encoding() const;
        ///
        std::string origin;
@@ -364,6 +366,8 @@ public:
        ///
        std::string pagestyle;
        ///
+       std::string tablestyle;
+       ///
        RGBColor backgroundcolor;
        ///
        bool isbackgroundcolor;
@@ -505,6 +509,10 @@ public:
        void setBibEncoding(std::string const & s) { bib_encoding = s; }
        /// Get the bib file encoding (for biblatex)
        std::string const & bibEncoding() const { return bib_encoding; }
+       /// Set encoding for individual bib file (for biblatex)
+       void setBibFileEncoding(std::string const & file, std::string const & enc);
+       ///
+       std::string const bibFileEncoding(std::string const & file) const;
 
        /// options for pdf output
        PDFOptions & pdfoptions();
@@ -542,6 +550,10 @@ public:
        bool use_refstyle;
        /// use minted? or listings?
        bool use_minted;
+       //output line numbering
+       bool use_lineno;
+       //optional params for lineno package
+       std::string lineno_opts;
 
        /// Return true if language could be set to lang,
        /// otherwise return false and do not change language
@@ -582,11 +594,10 @@ private:
        CiteEngineType cite_engine_type_;
        /// the default BibTeX style file for the document
        std::string biblio_style;
-       /// The encoding of the bib files, for Biblatex
-       /// (only one supported currently)
-       // FIXME: biblatex 3.12 introduces per-file
-       // encoding options. Update once that's spread.
+       /// The main encoding of the bib files, for Biblatex
        std::string bib_encoding;
+       /// Individual file encodings, for Biblatex
+       std::map<std::string, std::string> bib_encodings;
        /// Split bibliography?
        bool use_bibtopic;
        ///