X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=3258b822fd54b63fc91d9fdcc96ec448e08919b4;hb=b8f04ae29ad0e484ae010dd2364f61164cffca56;hp=0825616cffda3c0d83f308b128b2bad8b1fa3fbd;hpb=fa6b388cb3b77995a88ef98987b542ee7bf5d98f;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 0825616cff..3258b822fd 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -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;
@@ -120,7 +118,7 @@ public:
 	/// Set the LyX layout file this document is using.
 	/// NOTE: This does not call makeDocumentClass() to update the local
 	/// DocumentClass. That needs to be done manually.
-	/// \param filename the name of the layout file
+	/// \param classname: the name of the layout file
 	bool setBaseClass(std::string const & classname);
 	/// Adds the module information to the baseClass information to
 	/// create our local DocumentClass.
@@ -180,7 +178,7 @@ public:
 	std::string getDefaultOutputFormat() const;
 	/// return the output flavor of \p format or the default
 	OutputParams::FLAVOR getOutputFlavor(
-		  std::string const format = std::string()) const;
+		  std::string const & format = std::string()) const;
 	///
 	bool isExportable(std::string const & format) const;
 	///
@@ -207,7 +205,7 @@ public:
 	Font const getFont() const;
 
 	/// translate quote style string to enum value
-	InsetQuotes::QuoteLanguage getQuoteStyle(std::string const qs) const;
+	InsetQuotes::QuoteLanguage getQuoteStyle(std::string const & qs) const;
 
 	/* these are for the PaperLayout */
 	/// the papersize
@@ -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;
@@ -369,12 +367,12 @@ public:
 	/// Split the index?
 	bool use_indices;
 	/// revision tracking for this buffer ?
-	bool trackChanges;
+	bool track_changes;
 	/** This param decides whether change tracking marks should be used
 	 *  in output (irrespective of how these marks are actually defined;
 	 *  for instance, they may differ for DVI and PDF generation)
 	 */
-	bool outputChanges;
+	bool output_changes;
 	///
 	bool compressed;
 
@@ -385,8 +383,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
@@ -465,6 +467,8 @@ public:
 	///
 	double html_math_img_scale;
 	///
+	double display_pixel_ratio;
+	///
 	std::string html_latex_start;
 	///
 	std::string html_latex_end;