X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.h;h=6b53da5474829d2a8be41b042b058d84df32aff4;hb=fa6b388cb3b77995a88ef98987b542ee7bf5d98f;hp=f7a85ccdb94f94a7e66b375c12a7c8ad85078654;hpb=fd6679bd345da445495ccb430d8d93cb90faf10c;p=lyx.git

diff --git a/src/lyxfind.h b/src/lyxfind.h
index f7a85ccdb9..6b53da5474 100644
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -43,61 +43,81 @@ docstring const find2string(docstring const & search,
  *  as a string that can be dispatched to the LyX core in a FuncRequest
  *  wrapper.
  */
-docstring const replace2string(docstring const & search,
-				 docstring const & replace,
+docstring const replace2string(docstring const & replace,
+				 docstring const & search,
 				 bool casesensitive,
 				 bool matchword,
 				 bool all,
-				 bool forward);
+				 bool forward,
+				 bool findnext = true);
 
 /** Parse the string encoding of the find request that is found in
  *  \c ev.argument and act on it.
  * The string is encoded by \c find2string.
  * \return true if the string was found.
  */
-bool find(BufferView * bv, FuncRequest const & ev);
+bool lyxfind(BufferView * bv, FuncRequest const & ev);
 
 /** Parse the string encoding of the replace request that is found in
  *  \c ev.argument and act on it.
  * The string is encoded by \c replace2string.
+ * \return whether we did anything
  */
-void replace(BufferView * bv, FuncRequest const &, bool has_deleted = false);
+bool lyxreplace(BufferView * bv, 
+		FuncRequest const &, bool has_deleted = false);
 
 /// find the next change in the buffer
 bool findNextChange(BufferView * bv);
 
-class FindAdvOptions {
+/// find the previous change in the buffer
+bool findPreviousChange(BufferView * bv);
+
+class FindAndReplaceOptions {
 public:
-	FindAdvOptions(
-		docstring const & search,
+	typedef enum {
+		S_BUFFER,
+		S_DOCUMENT,
+		S_OPEN_BUFFERS,
+		S_ALL_MANUALS
+	} SearchScope;
+	typedef enum {
+		R_EVERYTHING,
+		R_ONLY_MATHS
+	} SearchRestriction;
+	FindAndReplaceOptions(
+		docstring const & find_buf_name,
 		bool casesensitive,
 		bool matchword,
 		bool forward,
 		bool expandmacros,
 		bool ignoreformat,
-		bool regexp
+		docstring const & repl_buf_name,
+		bool keep_case,
+		SearchScope scope = S_BUFFER,
+		SearchRestriction restr = R_EVERYTHING
 	);
-	FindAdvOptions() {  }
-	docstring search;
+	FindAndReplaceOptions() {  }
+	docstring find_buf_name;
 	bool casesensitive;
 	bool matchword;
 	bool forward;
 	bool expandmacros;
 	bool ignoreformat;
-	bool regexp;
+	/// This is docstring() if no replace was requested
+	docstring repl_buf_name;
+	bool keep_case;
+	SearchScope scope;
+	SearchRestriction restr;
 };
 
 /// Write a FindAdvOptions instance to a stringstream
-std::ostringstream & operator<<(std::ostringstream & os, lyx::FindAdvOptions const & opt);
+std::ostringstream & operator<<(std::ostringstream & os, lyx::FindAndReplaceOptions const & opt);
 
 /// Read a FindAdvOptions instance from a stringstream
-std::istringstream & operator>>(std::istringstream & is, lyx::FindAdvOptions & opt);
-
-/// Dispatch a LFUN_WORD_FINDADV command request
-void findAdv(BufferView * bv, FuncRequest const & ev);
+std::istringstream & operator>>(std::istringstream & is, lyx::FindAndReplaceOptions & opt);
 
 /// Perform a FindAdv operation.
-bool findAdv(BufferView * bv, FindAdvOptions const & opt);
+bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt);
 	
 /** Computes the simple-text or LaTeX export (depending on opt) of buf starting
  ** from cur and ending len positions after cur, if len is positive, or at the
@@ -107,7 +127,7 @@ bool findAdv(BufferView * bv, FindAdvOptions const & opt);
  ** Ideally, this should not be needed, and the opt.search field should become a Text const &.
  **/
 docstring stringifyFromForSearch(
-	FindAdvOptions const & opt,
+	FindAndReplaceOptions const & opt,
 	DocIterator const & cur,
 	int len = -1);