class MatchStringAdv {
public:
- MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const & opt);
+ MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt);
/** Tests if text starting at the supplied position matches with the one provided to the MatchStringAdv
** constructor as opt.search, under the opt.* options settings.
#endif
}
-MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const & opt)
+static void modifyRegexForMatchWord(string &t)
+{
+ string s("");
+ regex wordre("(\\\\)*((\\.|\\\\b))");
+ size_t lastpos = 0;
+ smatch sub;
+ for (sregex_iterator it(t.begin(), t.end(), wordre), end; it != end; ++it) {
+ sub = *it;
+ if ((sub.position(2) - sub.position(0)) % 2 == 1) {
+ continue;
+ }
+ else if (sub.str(2) == "\\\\b")
+ return;
+ if (lastpos < (size_t) sub.position(2))
+ s += t.substr(lastpos, sub.position(2) - lastpos);
+ s += "\\S";
+ lastpos = sub.position(2) + sub.length(2);
+ }
+ if (lastpos == 0)
+ return;
+ else if (lastpos < t.length())
+ s += t.substr(lastpos, t.length() - lastpos);
+ t = "\\b" + s + "\\b";
+}
+
+MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
: p_buf(&buf), p_first_buf(&buf), opt(opt)
{
static std::regex specialChars { R"([-[\]{}()*+?.,\^$|#\s\\])" };
string lead_as_regex_string = std::regex_replace(lead_as_string, specialChars, R"(\$&)" );
par_as_string_nolead = par_as_string.substr(lead_size, par_as_string.size() - lead_size);
string par_as_regex_string_nolead = std::regex_replace(par_as_string_nolead, specialChars, R"(\$&)" );
+ /* Handle whole words too in this case
+ */
+ if (opt.matchword) {
+ par_as_regex_string_nolead = "\\b" + par_as_regex_string_nolead + "\\b";
+ opt.matchword = false;
+ }
string regexp_str = "(" + lead_as_regex_string + ")()" + par_as_regex_string_nolead;
string regexp2_str = "(" + lead_as_regex_string + ")(.*?)" + par_as_regex_string_nolead;
CreateRegexp(opt, regexp_str, regexp2_str);
{
string lead_as_regexp;
if (lead_size > 0) {
- // @todo No need to search for \regexp{} insets in leading material
lead_as_regexp = std::regex_replace(par_as_string.substr(0, lead_size), specialChars, R"(\$&)" );
- // lead_as_regexp = escape_for_regex(par_as_string.substr(0, lead_size), !opt.ignoreformat);
par_as_string = par_as_string_nolead;
LYXERR(Debug::FIND, "lead_as_regexp is '" << lead_as_regexp << "'");
LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'");
}
if (lng < par_as_string.size())
par_as_string = par_as_string.substr(0,lng);
+ if ((lng > 0) && (par_as_string[0] == '^')) {
+ par_as_string = par_as_string.substr(1);
+ --lng;
+ opt.matchstart = true;
+ }
}
LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'");
LYXERR(Debug::FIND, "Open braces: " << open_braces);
string dest = "\\" + std::to_string(i+2);
while (regex_replace(par_as_string, par_as_string, orig, dest));
}
+ /* opt.matchword is ignored if using regex
+ so expanding par_as_string with "\\b" seems appropriate here
+ if regex contains for instance '.*' or '.+'
+ 1.) Nothing to do, if 'par_as_string' contains "\\b" already.
+ (Means, that the user knows how to handle whole words
+ 2.) else replace '.' with "\\S" and wrap the regex with "\\b"
+ */
+ if (opt.matchword) {
+ modifyRegexForMatchWord(par_as_string);
+ opt.matchword = false;
+ }
regexp_str = "(" + lead_as_regexp + ")()" + par_as_string;
regexp2_str = "(" + lead_as_regexp + ")(.*?)" + par_as_string;
}
int res = mres.match_len;
LYXERR(Debug::FIND,
"res=" << res << ", at_begin=" << at_begin
- << ", matchword=" << opt.matchword
+ << ", matchstart=" << opt.matchstart
<< ", inTexted=" << cur.inTexted());
+ if (opt.matchstart) {
+ if (cur.pos() != 0)
+ mres.match_len = 0;
+ else if (mres.match_prefix > 0)
+ mres.match_len = 0;
+ return mres;
+ }
+ else
+ return mres;
+ /* DEAD CODE follows
if (res == 0 || !at_begin || !opt.matchword || !cur.inTexted())
return mres;
if ((len > 0) && (res < len)) {
}
mres.match_len = 0;
return mres;
+ */
}
#if 0
/// Perform a FindAdv operation.
-bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
+bool findAdv(BufferView * bv, FindAndReplaceOptions & opt)
{
DocIterator cur;
int pos_len = 0;