X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FOutputParams.h;h=9d9a7ae8f83248bb449bb18fd1b7c421cb10fce6;hb=71d9f6e90d52d8f85c9e8b530027a9fd59c697e8;hp=a909ddd925aae523ec8218fe7d284372610d1dad;hpb=0789f2f2ae43742da200a27f10403f4c6a68713d;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index a909ddd925..9d9a7ae8f8 100644
--- 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;
@@ -291,6 +289,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;
@@ -426,12 +428,19 @@ public:
 
 	/// Are we generating this material for use by advanced search?
 	enum Search {
-		NoSearch,
-		SearchWithDeleted,
-		SearchWithoutDeleted
+		NoSearch = 0,
+		SearchWithDeleted = 1,
+		SearchWithoutDeleted = 2,
+		SearchQuick = 4,
+		SearchNonOutput = 8
 	};
 		
-	enum Search 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;
@@ -444,6 +453,8 @@ public:
 
 	/// A postponed \\noindent (after VSpace)
 	mutable bool need_noindent = false;
+private:
+	int for_search = NoSearch;
 };