Amend 6c3447c8: FindAdv: sometimes a space is added on some math symbols

[lyx.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index d00ec02d88a5d2cee665ddbb41dbec82546bd4b5..671bc23892bb5588b7816823bcdb9331d9e5fcf4 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -83,8 +83,6 @@ public:
        bool isLaTeX() const;
        /// does this flavour support full unicode?
        bool isFullUnicode() const;
-       /// Do we use the bidi package (which does some reordering and stuff)?
-       bool useBidiPackage() const;
 
        /// Same, but for math output, which only matter is XHTML output.
        MathFlavor math_flavor = NotApplicable;
@@ -110,6 +108,11 @@ public:
        */
        bool moving_arg = false;
 
+       /** no_cprotect == true means that the layout in which this is
+        *  does not allow \cprotect'ing.
+       */
+       bool no_cprotect = false;
+
        /** intitle == true means that the environment in which the
            inset is typeset is part of a title (before a \\maketitle).
            Footnotes in such environments have moving arguments.
@@ -291,6 +294,10 @@ public:
         */
        bool inInclude = false;
 
+       /** Whether we are inside a footnote. 
+        */
+       mutable bool inFootnote = false;
+
        /** Whether a btUnit (for multiple biblographies) is open.
         */
        mutable bool openbtUnit = false;
@@ -370,6 +377,10 @@ public:
        /// Should we output verbatim specific chars?
        docstring pass_thru_chars;
 
+       /// Do not output verbatim specific chars even
+       /// if normally requested
+       docstring no_pass_thru_chars;
+
        /// A specific newline macro
        std::string newlinecmd;
 
@@ -429,10 +440,16 @@ public:
                NoSearch = 0,
                SearchWithDeleted = 1,
                SearchWithoutDeleted = 2,
+               SearchQuick = 4,
                SearchNonOutput = 8
        };
                
-       int for_searchAdv = NoSearch;
+       inline bool find_effective(void) const { return (for_search != OutputParams::NoSearch); }
+       inline bool find_with_non_output() const { return ((for_search & OutputParams::SearchNonOutput) != 0); }
+       inline bool find_with_deleted() const { return ((for_search & OutputParams::SearchWithDeleted) != 0); }
+       inline void find_set_feature(enum Search set_) { for_search = set_; }
+       inline void find_add_feature(enum Search add_) { for_search |= add_; }
+       inline void find_clean_features(void) { for_search = OutputParams::NoSearch; }
 
        /// Are we generating this material for instant preview?
        bool for_preview = false;
@@ -445,6 +462,8 @@ public:
 
        /// A postponed \\noindent (after VSpace)
        mutable bool need_noindent = false;
+private:
+       int for_search = NoSearch;
 };