Properly determine active font encoding

[features.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 37063995844ad8d3a94fe8267b0229aa97750a4a..3258b822fd54b63fc91d9fdcc96ec448e08919b4 100644 (file)
--- 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;
@@ -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;
@@ -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;