X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=5c80670a8a87332868b372cca9590295527f2547;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=14935a9370ceda7c0acb2fb1311ab68d4a59ee52;hpb=d86954eb815b8018eb216bfbc1ab344c45e18ebe;p=lyx.git diff --git a/src/BufferParams.h b/src/BufferParams.h index 14935a9370..5c80670a8a 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -39,7 +39,6 @@ class Bullet; class DocumentClass; class Encoding; class Font; -class HSpace; class IndicesList; class Language; class LayoutFile; @@ -103,15 +102,21 @@ public: void setDefSkip(VSpace const & vs); /// - HSpace const & getMathIndentation() const; + Length const & getMathIndent() const; /// - void setMathIndentation(HSpace const & indent); + void setMathIndent(Length const & indent); /// Whether formulas are indented bool is_math_indent; - /// the indentation of formulas - std::string math_indentation; + + enum MathNumber { DEFAULT, LEFT, RIGHT }; + /// number formulas on left/right/default + 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. @@ -131,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 @@ -156,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); } @@ -319,18 +324,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; @@ -347,6 +354,8 @@ public: /// std::string float_placement; /// + std::string float_alignment; + /// unsigned int columns; /// bool justification; @@ -357,6 +366,8 @@ public: /// std::string pagestyle; /// + std::string tablestyle; + /// RGBColor backgroundcolor; /// bool isbackgroundcolor; @@ -458,21 +469,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 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 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; } @@ -503,6 +505,14 @@ 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; } + /// 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(); @@ -530,18 +540,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: /// @@ -566,12 +584,16 @@ private: typedef std::map 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 main encoding of the bib files, for Biblatex + std::string bib_encoding; + /// Individual file encodings, for Biblatex + std::map bib_encodings; /// Split bibliography? bool use_bibtopic; /// @@ -605,7 +627,6 @@ private: static void destroy(Impl *); }; support::copied_ptr pimpl_; - }; } // namespace lyx