X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=3258b822fd54b63fc91d9fdcc96ec448e08919b4;hb=73460423ad684b8728fe7bdf51f27dbc5cae5ea9;hp=1bff132187d287966dc28dad9404d2cf4a733277;hpb=56ece75ad9becba27ff1eaa12a0b8e3c68bb317b;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 1bff132187..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.
@@ -128,7 +126,7 @@ public:
 	/// on to class BufferView::updateDocumentClass(). The exception, of course,
 	/// is in GuiDocument, where we use a BufferParams simply to hold a copy of
 	/// the parameters from the active Buffer.
-	void makeDocumentClass();
+	void makeDocumentClass(bool const clone = false);
 	/// Returns the DocumentClass currently in use: the BaseClass as modified
 	/// by modules.
 	DocumentClass const & documentClass() const;
@@ -162,6 +160,10 @@ public:
 	void clearLayoutModules() { layout_modules_.clear(); }
 	/// Clear the removed module list
 	void clearRemovedModules() { removed_modules_.clear(); }
+	/// Get the local layouts
+	std::string getLocalLayout(bool) const;
+	/// Set the local layouts
+	void setLocalLayout(std::string const &, bool);
 
 	/// returns \c true if the buffer contains a LaTeX document
 	bool isLatex() const;
@@ -176,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;
 	///
@@ -203,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
@@ -242,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;
@@ -284,10 +286,10 @@ public:
 	IndicesList & indiceslist();
 	IndicesList const & indiceslist() const;
 	/**
-	 * The input encoding for LaTeX. This can be one of
+	 * The LyX name of the input encoding for LaTeX. This can be one of
 	 * - \c auto: find out the input encoding from the used languages
 	 * - \c default: ditto
-	 * - any encoding supported by the inputenc package
+	 * - any encoding defined in the file lib/encodings
 	 * 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
@@ -305,8 +307,6 @@ public:
 	///
 	std::string preamble;
 	///
-	std::string local_layout;
-	///
 	std::string options;
 	/// use the class options defined in the layout?
 	bool use_default_options;
@@ -361,18 +361,18 @@ public:
 	/// Set whether to load a package such as amsmath or esint.
 	void use_package(std::string const & p, Package u);
 	/// All packages that can be switched on or off
-	static std::vector<std::string> const & auto_packages();
+	static std::map<std::string, std::string> const & auto_packages();
 	/// Split bibliography?
 	bool use_bibtopic;
 	/// 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;
 
@@ -383,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
@@ -463,6 +467,8 @@ public:
 	///
 	double html_math_img_scale;
 	///
+	double display_pixel_ratio;
+	///
 	std::string html_latex_start;
 	///
 	std::string html_latex_end;
@@ -483,7 +489,7 @@ private:
 	///
 	void readPreamble(Lexer &);
 	///
-	void readLocalLayout(Lexer &);
+	void readLocalLayout(Lexer &, bool);
 	///
 	void readLanguage(Lexer &);
 	///
@@ -513,6 +519,10 @@ private:
 	/// this is for modules that are required by the document class but that
 	/// the user has chosen not to use
 	std::list<std::string> removed_modules_;
+	/// The local layouts without the forced ones
+	std::string local_layout_;
+	/// Forced local layouts only for reading (use getLocalLayout() instead)
+	std::string forced_local_layout_;
 
 	/// the list of included children (for includeonly)
 	std::list<std::string> included_children_;