Update status

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 0258cc857644b2ab3cf4c64c053b0867f580df8a..23cd43546a08f168dc142bd96b7ba28bd4621dd7 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -39,11 +39,11 @@ class Bullet;
 class DocumentClass;
 class Encoding;
 class Font;
-class HSpace;
 class IndicesList;
 class Language;
 class LayoutFile;
 class LayoutFileIndex;
+class Length;
 class Lexer;
 class PDFOptions;
 class Spacing;
@@ -93,24 +93,30 @@ public:
        bool hasClassDefaults() const;
 
        ///
-       HSpace const & getIndentation() const;
+       Length const & getParIndent() const;
        ///
-       void setIndentation(HSpace const & indent);
+       void setParIndent(Length const & indent);
        ///
        VSpace const & getDefSkip() const;
        ///
        void setDefSkip(VSpace const & vs);
 
        ///
-       HSpace const & getFormulaIndentation() const;
+       Length const & getMathIndent() const;
        ///
-       void setFormulaIndentation(HSpace const & indent);
+       void setMathIndent(Length const & indent);
 
        /// Whether formulas are indented
-       bool is_formula_indent;
+       bool is_math_indent;
 
-       /// the indentation of formulas
-       std::string formula_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.
@@ -130,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
@@ -155,7 +163,7 @@ 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);
@@ -529,18 +537,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:
        ///
@@ -604,7 +620,6 @@ private:
                static void destroy(Impl *);
        };
        support::copied_ptr<Impl, MemoryTraits> pimpl_;
-
 };
 
 } // namespace lyx