Merge remote-tracking branch 'features/properpaint' into 2.3.2-staging

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 14935a9370ceda7c0acb2fb1311ab68d4a59ee52..bc5c10d194a9c70d9af0b7ed1b8beca8817a7230 100644 (file)
--- 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.
@@ -156,7 +161,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);
@@ -530,12 +535,16 @@ 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