X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=1e8b5b00f17205ca99c3c2b100d508cab2892ef8;hb=29d80772fc832a914c73b4de3010b7f4c108a5e3;hp=37041edfa905cd0e2438c73a8ead83a5b17fd4bf;hpb=5064c09e9f57a7ffb6082a7f8ec06c03ee9a0cef;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 37041edfa9..1e8b5b00f1 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -136,7 +136,9 @@ public:
 	/// NOTE: This does not call makeDocumentClass() to update the local
 	/// DocumentClass. That needs to be done manually.
 	/// \param classname: the name of the layout file
-	bool setBaseClass(std::string const & classname);
+	/// \param path: non-empty only for local layout files
+	bool setBaseClass(std::string const & classname,
+	                  std::string const & path = std::string());
 	/// Adds the module information to the baseClass information to
 	/// create our local DocumentClass.
 	/// NOTE: This should NEVER be called externally unless one immediately goes
@@ -322,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;
@@ -362,6 +366,8 @@ public:
 	///
 	std::string pagestyle;
 	///
+	std::string tablestyle;
+	///
 	RGBColor backgroundcolor;
 	///
 	bool isbackgroundcolor;
@@ -503,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();
@@ -540,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
@@ -580,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;
 	///