X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=79af8f21a678bd60a28c5fd625fa5fbf8ff6e900;hb=12faf2b161e9d8ee0c62bfa421e1988ee80c44c0;hp=a3836a80c21695284d2fe4d793cf69fff4309438;hpb=f9bff2d9b1e34a82e77e7f1041755b71045c7006;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index a3836a80c2..79af8f21a6 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -15,6 +15,7 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
+#include "Author.h"
 #include "Citation.h"
 #include "DocumentClassPtr.h"
 #include "Format.h"
@@ -33,7 +34,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-class AuthorList;
 class BranchList;
 class Bullet;
 class DocumentClass;
@@ -48,7 +48,6 @@ class LayoutFileIndex;
 class Lexer;
 class PDFOptions;
 class Spacing;
-class TexRow;
 class VSpace;
 
 /** Buffer parameters.
@@ -77,12 +76,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 +109,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,16 +243,24 @@ 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: [0] for TeX fonts, [1] for non-TeX fonts
+	std::string fonts_roman[2];
 	/// the rm font
-	std::string fonts_roman;
+	std::string const & fontsRoman() const { return fonts_roman[useNonTeXFonts]; }
+	/// the sf font: [0] for TeX fonts, [1] for non-TeX fonts
+	std::string fonts_sans[2];
 	/// the sf font
-	std::string fonts_sans;
+	std::string const & fontsSans() const { return fonts_sans[useNonTeXFonts]; }
+	/// the tt font: [0] for TeX fonts, [1] for non-TeX fonts
+	std::string fonts_typewriter[2];
 	/// the tt font
-	std::string fonts_typewriter;
+	std::string const & fontsTypewriter() const { return fonts_typewriter[useNonTeXFonts]; }
+	/// the math font: [0] for TeX fonts, [1] for non-TeX fonts
+	std::string fonts_math[2];
 	/// the math font
-	std::string fonts_math;
+	std::string const & fontsMath() const { return fonts_math[useNonTeXFonts]; }
 	/// the default family (rm, sf, tt)
 	std::string fonts_default_family;
 	/// use the fonts of the OS (OpenType, True Type) directly
@@ -264,10 +269,14 @@ public:
 	bool fonts_expert_sc;
 	/// use Old Style Figures
 	bool fonts_old_figures;
+	/// the scale factor of the sf font: [0] for TeX fonts, [1] for non-TeX fonts
+	int fonts_sans_scale[2];
 	/// the scale factor of the sf font
-	int fonts_sans_scale;
+	int fontsSansScale() const { return fonts_sans_scale[useNonTeXFonts]; }
+	/// the scale factor of the tt font: [0] for TeX fonts, [1] for non-TeX fonts
+	int fonts_typewriter_scale[2];
 	/// the scale factor of the tt font
-	int fonts_typewriter_scale;
+	int fontsTypewriterScale() const { return fonts_typewriter_scale[useNonTeXFonts]; }
 	/// the font used by the CJK command
 	std::string fonts_cjk;
 	///
@@ -305,8 +314,12 @@ public:
 	std::string inputenc;
 	/// The main encoding used by this buffer for LaTeX output.
 	/// 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.
 	Encoding const & encoding() const;
 	///
+	std::string origin;
+	///
 	std::string preamble;
 	///
 	std::string options;
@@ -381,12 +394,18 @@ public:
 	/// the author list for the document
 	AuthorList & authors();
 	AuthorList const & authors() const;
+	void addAuthor(Author a);
 
 	/// map of the file's author IDs to AuthorList indexes
 	typedef std::map<int, int> AuthorMap;
-	AuthorMap author_map;
-	/// the buffer's font encoding
+	AuthorMap author_map_;
+
+	/// 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