More requires --> required, for C++2a.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 37041edfa905cd0e2438c73a8ead83a5b17fd4bf..c66dd6185a3c38c60eb104ce79bcad2e346bbb6c 100644 (file)
--- 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
@@ -281,16 +283,26 @@ public:
        bool useNonTeXFonts;
        /// use expert Small Caps
        bool fonts_expert_sc;
-       /// use Old Style Figures
-       bool fonts_old_figures;
+       /// use Old Style Figures (rm)
+       bool fonts_roman_osf;
+       /// use Old Style Figures (sf)
+       bool fonts_sans_osf;
+       /// use Old Style Figures (tt)
+       bool fonts_typewriter_osf;
+       /// the options for the roman font
+       std::string font_roman_opts;
        /// 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 fontsSansScale() const { return fonts_sans_scale[useNonTeXFonts]; }
+       // the options for the sans font
+       std::string font_sans_opts;
        /// 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 fontsTypewriterScale() const { return fonts_typewriter_scale[useNonTeXFonts]; }
+       // the options for the typewriter font
+       std::string font_typewriter_opts;
        /// the font used by the CJK command
        std::string fonts_cjk;
        /// use LaTeX microtype package
@@ -322,18 +334,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 +376,8 @@ public:
        ///
        std::string pagestyle;
        ///
+       std::string tablestyle;
+       ///
        RGBColor backgroundcolor;
        ///
        bool isbackgroundcolor;
@@ -418,7 +434,11 @@ public:
         */
        bool output_changes;
        ///
+       bool change_bars;
+       ///
        bool compressed;
+       ///
+       bool postpone_fragile_content;
 
        /// the author list for the document
        AuthorList & authors();
@@ -450,7 +470,8 @@ public:
                XDVI
        };
        ///
-       std::string paperSizeName(PapersizePurpose purpose) const;
+       std::string paperSizeName(PapersizePurpose purpose,
+                                 std::string const & psize = std::string()) const;
        /// set up if and how babel is called
        std::string babelCall(std::string const & lang_opts, bool const langoptions) const;
        /// return supported drivers for specific packages
@@ -503,6 +524,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 +565,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 +609,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;
        ///