X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=70de6c96a816164aadd5da2ddb6fa88b1243a71a;hb=eeaea7cbbb98141c98c189751907a8fc0b10f7d4;hp=4c8386c3bae4a864c9fe9234afd2977314d6ca72;hpb=714113655ad434f9a73d0101038568d59311af72;p=lyx.git

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 4c8386c3ba..70de6c96a8 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -178,11 +178,11 @@ bool parse_bool(docstring & howto)
 }
 
 
-class MatchString : public binary_function<Paragraph, pos_type, int>
+class MatchString
 {
 public:
-	MatchString(docstring const & str, bool cs, bool mw)
-		: str(str), case_sens(cs), whole_words(mw)
+	MatchString(docstring const & s, bool cs, bool mw)
+		: str(s), case_sens(cs), whole_words(mw)
 	{}
 
 	// returns true if the specified string is at the specified position
@@ -968,9 +968,9 @@ static size_t identifyLeading(string const & s)
 	// + allow to search for colored text too
 	while (regex_replace(t, t, REGEX_BOS "\\\\(((footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge|emph|noun|minisec|text(bf|md|sl|sf|it|tt))|((textcolor|foreignlanguage|latexenvironment)\\{[a-z]+\\*?\\})|(u|uu)line|(s|x)out|uwave)|((sub)?(((sub)?section)|paragraph)|part|chapter)\\*?)\\{", "")
 	       || regex_replace(t, t, REGEX_BOS "\\$", "")
-	       || regex_replace(t, t, REGEX_BOS "\\\\\\[ ", "")
+	       || regex_replace(t, t, REGEX_BOS "\\\\\\[", "")
 	       || regex_replace(t, t, REGEX_BOS " ?\\\\item\\{[a-z]+\\}", "")
-	       || regex_replace(t, t, REGEX_BOS "\\\\begin\\{[a-zA-Z_]*\\*?\\} ", ""))
+	       || regex_replace(t, t, REGEX_BOS "\\\\begin\\{[a-zA-Z_]*\\*?\\}", ""))
 	       ;
 	LYXERR(Debug::FIND, "  after removing leading $, \\[ , \\emph{, \\textbf{, etc.: '" << t << "'");
 	return s.find(t);
@@ -1114,8 +1114,8 @@ class Intervall {
   bool isPatternString_;
 public:
   explicit Intervall(bool isPattern, string const & p) :
-  	isPatternString_(isPattern), par(p), ignoreidx(-1), actualdeptindex(0),
-  	hasTitle(false)
+        isPatternString_(isPattern), par(p), ignoreidx(-1), actualdeptindex(0),
+        hasTitle(false), langcount(0)
   {
     depts[0] = 0;
     closes[0] = 0;
@@ -1139,6 +1139,7 @@ public:
   int findclosing(int start, int end, char up, char down, int repeat);
   void handleParentheses(int lastpos, bool closingAllowed);
   bool hasTitle;
+  int langcount;	// Number of disabled language specs up to current position in actual interval
   int isOpeningPar(int pos);
   string titleValue;
   void output(ostringstream &os, int lastpos);
@@ -1181,12 +1182,12 @@ static void checkDepthIndex(int val)
   static int maxdepthidx = MAXOPENED-2;
   static int lastmaxdepth = 0;
   if (val > lastmaxdepth) {
-    LYXERR0("Depth reached " << val);
+    LYXERR(Debug::INFO, "Depth reached " << val);
     lastmaxdepth = val;
   }
   if (val > maxdepthidx) {
     maxdepthidx = val;
-    LYXERR0("maxdepthidx now " << val);
+    LYXERR(Debug::INFO, "maxdepthidx now " << val);
   }
 }
 
@@ -1196,7 +1197,7 @@ static void checkIgnoreIdx(int val)
 {
   static int lastmaxignore = -1;
   if ((lastmaxignore < val) && (size_t(val+1) >= borders.size())) {
-    LYXERR0("IgnoreIdx reached " << val);
+    LYXERR(Debug::INFO, "IgnoreIdx reached " << val);
     lastmaxignore = val;
   }
 }
@@ -1292,7 +1293,7 @@ static void buildaccent(string n, string param, string values)
         if ((values[start] & 0x80) == 0) {
           // is ascii
           accents[key] = values.substr(start, 1);
-          // LYXERR0("" << key << "=" << accents[key]);
+          // LYXERR(Debug::INFO, "" << key << "=" << accents[key]);
         }
         start++;
         continue;
@@ -1307,7 +1308,7 @@ static void buildaccent(string n, string param, string values)
           // This is the first byte of following utf8 char
           accents[key] = values.substr(start, j);
           start += j;
-          // LYXERR0("" << key << "=" << accents[key]);
+          // LYXERR(Debug::INFO, "" << key << "=" << accents[key]);
           break;
         }
       }
@@ -1403,7 +1404,7 @@ void Intervall::removeAccents()
       }
     }
     else {
-      LYXERR0("Not added accent for \"" << key << "\"");
+      LYXERR(Debug::INFO, "Not added accent for \"" << key << "\"");
     }
   }
 }
@@ -1555,7 +1556,6 @@ int Intervall::findclosing(int start, int end, char up = '{', char down = '}', i
 {
   int skip = 0;
   int depth = 0;
-  repeat--;
   for (int i = start; i < end; i += 1 + skip) {
     char c;
     c = par[i];
@@ -1566,6 +1566,7 @@ int Intervall::findclosing(int start, int end, char up = '{', char down = '}', i
     }
     else if (c == down) {
       if (depth == 0) {
+        repeat--;
         if ((repeat <= 0) || (par[i+1] != up))
           return i;
       }
@@ -1906,10 +1907,20 @@ void LatexInfo::buildEntries(bool isPatternString)
         }
         found._tokensize = found.head.length();
         found._dataStart = found._tokenstart + found.head.length();
+        if (found.keytype == KeyInfo::doRemove) {
+          int endpar = 2 + interval_.findclosing(found._dataStart, interval_.par.length(), '{', '}', closings);
+          found._dataStart = endpar;
+          found._tokensize = found._dataStart - found._tokenstart;
+          closings = 0;
+        }
         if (interval_.par.substr(found._dataStart-1, 15).compare("\\endarguments{}") == 0) {
           found._dataStart += 15;
         }
-        size_t endpos = interval_.findclosing(found._dataStart, interval_.par.length(), '{', '}', closings);
+        size_t endpos;
+        if (closings < 1)
+          endpos = found._dataStart - 1;
+        else
+          endpos = interval_.findclosing(found._dataStart, interval_.par.length(), '{', '}', closings);
         if (found.keytype == KeyInfo::isList) {
           // Check if it really is list env
           static regex const listre("^([a-z]+)$");
@@ -2033,6 +2044,11 @@ void LatexInfo::buildKeys(bool isPatternString)
   // handle like standard keys with 1 parameter.
   makeKey("url|href|vref|thanks", KeyInfo(KeyInfo::isStandard, 1, false), isPatternString);
 
+  // Ignore deleted text
+  makeKey("lyxdeleted", KeyInfo(KeyInfo::doRemove, 3, false), isPatternString);
+  // but preserve added text
+  makeKey("lyxadded", KeyInfo(KeyInfo::doRemove, 2, false), isPatternString);
+
   // Macros to remove, but let the parameter survive
   // No split
   makeKey("menuitem|textmd|textrm", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
@@ -2174,7 +2190,12 @@ void Intervall::output(ostringstream &os, int lastpos)
     printed += lastpos-i;
   }
   handleParentheses(lastpos, false);
-  for (int i = actualdeptindex; i > 0; --i) {
+  int startindex;
+  if (keys["foreignlanguage"].disabled)
+    startindex = actualdeptindex-langcount;
+  else
+    startindex = actualdeptindex;
+  for (int i = startindex; i > 0; --i) {
     os << "}";
   }
   if (hasTitle && (printed > 0))
@@ -2329,7 +2350,25 @@ int LatexInfo::dispatch(ostringstream &os, int previousStart, KeyInfo &actual)
         if ((interval_.par[pos] != ' ') && (interval_.par[pos] != '%'))
           break;
       }
-      interval_.addIntervall(actual._tokenstart, pos);
+      // Remove also enclosing parentheses [] and {}
+      int numpars = 0;
+      int spaces = 0;
+      while (actual._tokenstart > numpars) {
+        if (pos+numpars >= interval_.par.size())
+          break;
+        else if (interval_.par[pos+numpars] == ']' && interval_.par[actual._tokenstart-numpars-1] == '[')
+          numpars++;
+        else if (interval_.par[pos+numpars] == '}' && interval_.par[actual._tokenstart-numpars-1] == '{')
+          numpars++;
+        else
+          break;
+      }
+      if (numpars > 0) {
+        if (interval_.par[pos+numpars] == ' ')
+          spaces++;
+      }
+
+      interval_.addIntervall(actual._tokenstart-numpars, pos+numpars+spaces);
       nextKeyIdx = getNextKey();
       break;
     }
@@ -2395,7 +2434,7 @@ int LatexInfo::dispatch(ostringstream &os, int previousStart, KeyInfo &actual)
       int val = actual._tokenstart;
       for (count = 0; count < actual._tokenstart;) {
         val = interval_.previousNotIgnored(val-1);
-        if (interval_.par[val] != ' ')
+        if (val < 0 || interval_.par[val] != ' ')
           break;
         else {
           count = actual._tokenstart - val;
@@ -2436,6 +2475,7 @@ int LatexInfo::dispatch(ostringstream &os, int previousStart, KeyInfo &actual)
       }
       if (actual.disabled) {
         removeHead(actual);
+        interval_.langcount++;
         if ((interval_.par.substr(actual._dataStart, 3) == " \\[") ||
             (interval_.par.substr(actual._dataStart, 8) == " \\begin{")) {
           // Discard also the space before math-equation
@@ -2457,7 +2497,7 @@ int LatexInfo::dispatch(ostringstream &os, int previousStart, KeyInfo &actual)
       // This cannot happen, already handled
       // fall through
     default: {
-      // LYXERR0("Unhandled keytype");
+      // LYXERR(Debug::INFO, "Unhandled keytype");
       nextKeyIdx = getNextKey();
       break;
     }
@@ -2497,7 +2537,7 @@ int LatexInfo::process(ostringstream &os, KeyInfo &actual )
   if (oldStart <= end) {
     processRegion(oldStart, end);
   }
-  if (interval_.par[end] == '}') {
+  if (interval_.par.size() > (size_t) end && interval_.par[end] == '}') {
     end += 1;
     // This is the normal case.
     // But if using the firstlanguage, the closing may be missing
@@ -2529,7 +2569,7 @@ string splitOnKnownMacros(string par, bool isPatternString)
 {
   ostringstream os;
   LatexInfo li(par, isPatternString);
-  // LYXERR0("Berfore split: " << par);
+  // LYXERR(Debug::INFO, "Berfore split: " << par);
   KeyInfo DummyKey = KeyInfo(KeyInfo::KeyType::isMain, 2, true);
   DummyKey.head = "";
   DummyKey._tokensize = 0;
@@ -2596,7 +2636,7 @@ string splitOnKnownMacros(string par, bool isPatternString)
   }
   else
     s = par;                            /* no known macros found */
-  // LYXERR0("After split: " << s);
+  // LYXERR(Debug::INFO, "After split: " << s);
   return s;
 }
 
@@ -2639,7 +2679,7 @@ static string correctlanguagesetting(string par, bool isPatternString, bool with
 				string a = it->first;
 				regex_with_format = true;
 				features += " " + a;
-				// LYXERR0("Identified regex format:" << a);
+				// LYXERR(Debug::INFO, "Identified regex format:" << a);
 			}
 			LYXERR(Debug::FIND, "Identified Features" << features);
 
@@ -2657,7 +2697,7 @@ static string correctlanguagesetting(string par, bool isPatternString, bool with
 		}
 	}
 	else {
-		// LYXERR0("No regex formats");
+		// LYXERR(Debug::INFO, "No regex formats");
 	}
 	return result;
 }
@@ -2671,9 +2711,9 @@ static int identifyClosing(string & t)
 		LYXERR(Debug::FIND, "identifyClosing(): t now is '" << t << "'");
 		if (regex_replace(t, t, "(.*[^\\\\])\\$" REGEX_EOS, "$1"))
 			continue;
-		if (regex_replace(t, t, "(.*[^\\\\]) \\\\\\]" REGEX_EOS, "$1"))
+		if (regex_replace(t, t, "(.*[^\\\\])\\\\\\]" REGEX_EOS, "$1"))
 			continue;
-		if (regex_replace(t, t, "(.*[^\\\\]) \\\\end\\{[a-zA-Z_]*\\*?\\}" REGEX_EOS, "$1"))
+		if (regex_replace(t, t, "(.*[^\\\\])\\\\end\\{[a-zA-Z_]*\\*?\\}" REGEX_EOS, "$1"))
 			continue;
 		if (regex_replace(t, t, "(.*[^\\\\])\\}" REGEX_EOS, "$1")) {
 			++open_braces;
@@ -2766,9 +2806,9 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const &
 					lng -= 2;
 					open_braces++;
 				}
-				else
+	else
 					break;
-			}
+}
 			if (lng < par_as_string.size())
 				par_as_string = par_as_string.substr(0,lng);
 			/*
@@ -2925,9 +2965,9 @@ MatchResult MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_be
 		if (m.size() > 1)
 			leadingsize = m[1].second - m[1].first;
 		int result;
-                for (size_t i = 0; i < m.size(); i++) {
-                  LYXERR(Debug::FIND, "Match " << i << " is " << m[i].second - m[i].first << " long");
-                }
+		for (size_t i = 0; i < m.size(); i++) {
+			LYXERR(Debug::FIND, "Match " << i << " is " << m[i].second - m[i].first << " long");
+		}
 		if (close_wildcards == 0)
 			result = m[0].second - m[0].first;
 
@@ -2992,32 +3032,37 @@ MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, bool at
 	       << ", inTexted=" << cur.inTexted());
 	if (res == 0 || !at_begin || !opt.matchword || !cur.inTexted())
 		return mres;
-        if ((len > 0) && (res < len)) {
+	if ((len > 0) && (res < len)) {
 	  mres.match_len = 0;
-          return mres;
+	  return mres;
 	}
 	Paragraph const & par = cur.paragraph();
 	bool ws_left = (cur.pos() > 0)
 		? par.isWordSeparator(cur.pos() - 1)
 		: true;
-	bool ws_right = (cur.pos() + len < par.size())
+	bool ws_right;
+	if (len < 0)
+		ws_right = true;
+	else {
+		ws_right = (cur.pos() + len < par.size())
 		? par.isWordSeparator(cur.pos() + len)
 		: true;
+	}
 	LYXERR(Debug::FIND,
 	       "cur.pos()=" << cur.pos() << ", res=" << res
 	       << ", separ: " << ws_left << ", " << ws_right
-               << ", len: " << len
+	       << ", len: " << len
 	       << endl);
 	if (ws_left && ws_right) {
-          // Check for word separators inside the found 'word'
-          for (int i = 0; i < len; i++) {
-            if (par.isWordSeparator(cur.pos() + i)) {
+	  // Check for word separators inside the found 'word'
+	  for (int i = 0; i < len; i++) {
+	    if (par.isWordSeparator(cur.pos() + i)) {
 	      mres.match_len = 0;
-              return mres;
+	      return mres;
 	    }
-          }
-          return mres;
-        }
+	  }
+	  return mres;
+	}
 	mres.match_len = 0;
 	return mres;
 }
@@ -3275,7 +3320,7 @@ int findAdvFinalize(DocIterator & cur, MatchStringAdv const & match)
             } while (cur.depth() > old_cur.depth()); /* Skip inner insets */
             if (cur.depth() < old_cur.depth()) {
               // Outer inset?
-              LYXERR0("cur.depth() < old_cur.depth(), this should never happen");
+              LYXERR(Debug::INFO, "cur.depth() < old_cur.depth(), this should never happen");
               break;
             }
             if (cur.pos() != old_cur.pos()) {
@@ -3293,7 +3338,7 @@ int findAdvFinalize(DocIterator & cur, MatchStringAdv const & match)
               }
             }
             else {
-              LYXERR0("cur.pos() == old_cur.pos(), this should never happen");
+              LYXERR(Debug::INFO, "cur.pos() == old_cur.pos(), this should never happen");
               actual_match = match(cur, len).match_len;
               if (actual_match == max_match)
                 old_cur = cur;
@@ -3315,7 +3360,7 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match)
 		int match_len = mres.match_len;
 		LYXERR(Debug::FIND, "match_len: " << match_len);
 		if ((mres.pos > 100000) || (mres.match2end > 100000) || (match_len > 100000)) {
-			LYXERR0("BIG LENGTHS: " << mres.pos << ", " << match_len << ", " << mres.match2end);
+			LYXERR(Debug::INFO, "BIG LENGTHS: " << mres.pos << ", " << match_len << ", " << mres.match2end);
 			match_len = 0;
 		}
 		if (match_len > 0) {
@@ -3379,10 +3424,9 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match)
 						match_len_zero_count = 0;
 				}
 				else {
-                                        if (++match_len_zero_count > 3) {
-                                                LYXERR(Debug::FIND, "match_len2_zero_count: " << match_len_zero_count << ", match_len was " << match_len);
-                                                match_len_zero_count = 0;
-                                        }
+					if (++match_len_zero_count > 3) {
+						LYXERR(Debug::FIND, "match_len2_zero_count: " << match_len_zero_count << ", match_len was " << match_len);
+					}
 					break;
 				}
 			}
@@ -3491,13 +3535,13 @@ docstring stringifyFromForSearch(FindAndReplaceOptions const & opt,
 
 
 FindAndReplaceOptions::FindAndReplaceOptions(
-	docstring const & find_buf_name, bool casesensitive,
-	bool matchword, bool forward, bool expandmacros, bool ignoreformat,
-	docstring const & repl_buf_name, bool keep_case,
-	SearchScope scope, SearchRestriction restr, bool replace_all)
-	: find_buf_name(find_buf_name), casesensitive(casesensitive), matchword(matchword),
-	  forward(forward), expandmacros(expandmacros), ignoreformat(ignoreformat),
-	  repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope), restr(restr), replace_all(replace_all)
+	docstring const & _find_buf_name, bool _casesensitive,
+	bool _matchword, bool _forward, bool _expandmacros, bool _ignoreformat,
+	docstring const & _repl_buf_name, bool _keep_case,
+	SearchScope _scope, SearchRestriction _restr, bool _replace_all)
+	: find_buf_name(_find_buf_name), casesensitive(_casesensitive), matchword(_matchword),
+	  forward(_forward), expandmacros(_expandmacros), ignoreformat(_ignoreformat),
+	  repl_buf_name(_repl_buf_name), keep_case(_keep_case), scope(_scope), restr(_restr), replace_all(_replace_all)
 {
 }