Remove special code for CJK that is no longer required (amends e665715fc4).

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index c913031ef83da3ffd3a9c97c380679ea2655861e..229d1be6a5de027d9d7bca7f9c5d01b93954f7b3 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -112,7 +112,11 @@ public:
 
        enum  MathNumber { DEFAULT, LEFT, RIGHT };
        /// number formulas on left/right/default
-       MathNumber math_number;
+       MathNumber math_numbering_side;
+
+       /// Convenience function for display: like math_number, but
+       /// DEFAULT is replaced by the best guess we have.
+       MathNumber getMathNumber() const;
 
        /** Whether paragraphs are separated by using a indent like in
         *  articles or by using a little skip like in letters.
@@ -132,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
@@ -157,15 +163,13 @@ public:
                        { return removed_modules_; }
        ///
        /// Add a module to the list of modules in use. This checks only that the
-       /// module is not already in the list, so use layoutModuleCanBeAdeed first 
+       /// module is not already in the list, so use layoutModuleCanBeAdeed first
        /// if you want to check for compatibility.
        /// \return true if module was successfully added.
        bool addLayoutModule(std::string const & modName);
        /// checks to make sure module's requriements are satisfied, that it does
        /// not conflict with already-present modules, isn't already loaded, etc.
        bool layoutModuleCanBeAdded(std::string const & modName) const;
-       /// same, but for citaton modules.
-       bool citationModuleCanBeAdded(std::string const & modName) const;
        ///
        void addRemovedModule(std::string const & modName)
                        { removed_modules_.push_back(modName); }
@@ -348,6 +352,8 @@ public:
        ///
        std::string float_placement;
        ///
+       std::string float_alignment;
+       ///
        unsigned int columns;
        ///
        bool justification;
@@ -459,21 +465,12 @@ public:
        std::string const loadFonts(LaTeXFeatures & features) const;
 
        /// the cite engine modules
-       LayoutModuleList const & citeEngine() const
-               { return cite_engine_; }
+       std::string const & citeEngine() const { return cite_engine_; }
        /// the type of cite engine (authoryear or numerical)
        CiteEngineType const & citeEngineType() const
                { return cite_engine_type_; }
        /// add the module to the cite engine modules
-       bool addCiteEngine(std::string const &);
-       /// add the modules to the cite engine modules
-       bool addCiteEngine(std::vector<std::string> const &);
-       /// clear the list of cite engine modules
-       void clearCiteEngine() { cite_engine_.clear(); }
-       /// set the cite engine module
-       void setCiteEngine(std::string const &);
-       /// set the cite engine modules
-       void setCiteEngine(std::vector<std::string> const &);
+       void setCiteEngine(std::string const & eng) { cite_engine_ = eng; }
        /// set the cite engine type
        void setCiteEngineType(CiteEngineType const & engine_type)
                { cite_engine_type_ = engine_type; }
@@ -504,6 +501,10 @@ public:
        std::string biblatex_bibstyle;
        /// The biblatex citation style
        std::string biblatex_citestyle;
+       /// Set the bib file encoding (for biblatex)
+       void setBibEncoding(std::string const & s) { bib_encoding = s; }
+       /// Get the bib file encoding (for biblatex)
+       std::string const & bibEncoding() const { return bib_encoding; }
 
        /// options for pdf output
        PDFOptions & pdfoptions();
@@ -531,18 +532,26 @@ public:
        std::string html_latex_end;
        ///
        bool html_css_as_file;
+       /// allow the LaTeX backend to run external programs
+       bool shell_escape;
        /// generate output usable for reverse/forward search
        bool output_sync;
        /// custom LaTeX macro from user instead our own
        std::string output_sync_macro;
        /// use refstyle? or prettyref?
        bool use_refstyle;
+       /// use minted? or listings?
+       bool use_minted;
 
        /// Return true if language could be set to lang,
        /// otherwise return false and do not change language
        bool setLanguage(std::string const & lang);
        ///
        void invalidateConverterCache() const;
+       /// Copies over some of the settings from \param bp,
+       /// namely the ones need by Advanced F&R. We don't want
+       /// to copy them all, e.g., not the default master.
+       void copyForAdvFR(BufferParams const & bp);
 
 private:
        ///
@@ -567,12 +576,17 @@ private:
        typedef std::map<std::string, OutputParams::FLAVOR> DefaultFlavorCache;
        ///
        mutable DefaultFlavorCache default_flavors_;
-       /// the cite engine modules
-       LayoutModuleList cite_engine_;
+       /// the cite engine
+       std::string cite_engine_;
        /// the type of cite engine (authoryear or numerical)
        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.
+       std::string bib_encoding;
        /// Split bibliography?
        bool use_bibtopic;
        ///
@@ -606,7 +620,6 @@ private:
                static void destroy(Impl *);
        };
        support::copied_ptr<Impl, MemoryTraits> pimpl_;
-
 };
 
 } // namespace lyx