#include "mathed/InsetMathGrid.h"
#include "mathed/InsetMathHull.h"
#include "mathed/MathStream.h"
+#include "mathed/MathSupport.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/docstream.h"
+#include "support/FileName.h"
#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
int findForward(DocIterator & cur, MatchString const & match,
- bool find_del = true)
+ bool find_del = true)
{
for (; cur; cur.forwardChar())
if (cur.inTexted()) {
int findBackwards(DocIterator & cur, MatchString const & match,
- bool find_del = true)
+ bool find_del = true)
{
while (cur) {
cur.backwardChar();
}
-bool findChange(DocIterator & cur, bool next)
-{
- if (!next)
- cur.backwardPos();
- for (; cur; next ? cur.forwardPos() : cur.backwardPos())
- if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) {
- if (!next)
- // if we search backwards, take a step forward
- // to correctly set the anchor
- cur.forwardPos();
- return true;
- }
-
- return false;
-}
-
-
bool searchAllowed(docstring const & str)
{
if (str.empty()) {
bool findOne(BufferView * bv, docstring const & searchstr,
- bool case_sens, bool whole, bool forward, bool find_del = true)
+ bool case_sens, bool whole, bool forward, bool find_del = true)
{
if (!searchAllowed(searchstr))
return false;
- DocIterator cur = bv->cursor();
+ DocIterator cur = forward
+ ? bv->cursor().selectionEnd()
+ : bv->cursor().selectionBegin();
MatchString const match(searchstr, case_sens, whole);
- int match_len = forward ? findForward(cur, match, find_del) :
- findBackwards(cur, match, find_del);
+ int match_len = forward
+ ? findForward(cur, match, find_del)
+ : findBackwards(cur, match, find_del);
if (match_len > 0)
bv->putSelectionAt(cur, match_len, !forward);
pos_type const pos = cur.pos();
Font const font = cur.paragraph().getFontSettings(buf.params(), pos);
cur.recordUndo();
- int striked = ssize - cur.paragraph().eraseChars(pos, pos + match_len,
- buf.params().trackChanges);
+ int striked = ssize -
+ cur.paragraph().eraseChars(pos, pos + match_len,
+ buf.params().track_changes);
cur.paragraph().insert(pos, replacestr, font,
- Change(buf.params().trackChanges ?
- Change::INSERTED : Change::UNCHANGED));
+ Change(buf.params().track_changes
+ ? Change::INSERTED
+ : Change::UNCHANGED));
for (int i = 0; i < rsize + striked; ++i)
cur.forwardChar();
++num;
// returns the number of replacements made (one, if any) and
// whether anything at all was done.
pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
- docstring const & replacestr, bool case_sens,
- bool whole, bool forward)
+ docstring const & replacestr, bool case_sens,
+ bool whole, bool forward, bool findnext)
{
Cursor & cur = bv->cursor();
if (!cur.selection()) {
// no selection, non-empty search string: find it
if (!searchstr.empty()) {
findOne(bv, searchstr, case_sens, whole, forward);
- return pair<bool, int>(true, 0);
+ return make_pair(true, 0);
}
// empty search string
if (!cur.inTexted())
// bail in math
- return pair<bool, int>(false, 0);
- // select current word and treat it as the search string
+ return make_pair(false, 0);
+ // select current word and treat it as the search string.
+ // This causes a minor bug as undo will restore this selection,
+ // which the user did not create (#8986).
cur.innerText()->selectWord(cur, WHOLE_WORD);
searchstr = cur.selectionAsString(false);
}
// if we still don't have a search string, report the error
// and abort.
if (!searchAllowed(searchstr))
- return pair<bool, int>(false, 0);
+ return make_pair(false, 0);
bool have_selection = cur.selection();
docstring const selected = cur.selectionAsString(false);
bool match =
- case_sens ? searchstr == selected
- : compare_no_case(searchstr, selected) == 0;
+ case_sens
+ ? searchstr == selected
+ : compare_no_case(searchstr, selected) == 0;
// no selection or current selection is not search word:
// just find the search word
if (!have_selection || !match) {
findOne(bv, searchstr, case_sens, whole, forward);
- return pair<bool, int>(true, 0);
+ return make_pair(true, 0);
}
// we're now actually ready to replace. if the buffer is
// read-only, we can't, though.
if (bv->buffer().isReadonly())
- return pair<bool, int>(false, 0);
+ return make_pair(false, 0);
- cap::replaceSelectionWithString(cur, replacestr, forward);
+ cap::replaceSelectionWithString(cur, replacestr);
if (forward) {
cur.pos() += replacestr.length();
- LASSERT(cur.pos() <= cur.lastpos(), /* */);
- } else {
- cur.pos() -= replacestr.length();
- LASSERT(cur.pos() >= 0, /* */);
+ LASSERT(cur.pos() <= cur.lastpos(),
+ cur.pos() = cur.lastpos());
}
- findOne(bv, searchstr, case_sens, whole, forward, false);
+ if (findnext)
+ findOne(bv, searchstr, case_sens, whole, forward, false);
- return pair<bool, int>(true, 1);
+ return make_pair(true, 1);
}
} // namespace anon
docstring const find2string(docstring const & search,
- bool casesensitive, bool matchword, bool forward)
+ bool casesensitive, bool matchword, bool forward)
{
odocstringstream ss;
ss << search << '\n'
docstring const replace2string(docstring const & replace,
- docstring const & search, bool casesensitive, bool matchword,
- bool all, bool forward)
+ docstring const & search,
+ bool casesensitive, bool matchword,
+ bool all, bool forward, bool findnext)
{
odocstringstream ss;
ss << replace << '\n'
<< int(casesensitive) << ' '
<< int(matchword) << ' '
<< int(all) << ' '
- << int(forward);
+ << int(forward) << ' '
+ << int(findnext);
return ss.str();
}
// data is of the form
// "<search>
// <replace>
- // <casesensitive> <matchword> <all> <forward>"
+ // <casesensitive> <matchword> <all> <forward> <findnext>"
docstring search;
docstring rplc;
docstring howto = split(ev.argument(), rplc, '\n');
bool matchword = parse_bool(howto);
bool all = parse_bool(howto);
bool forward = parse_bool(howto);
+ bool findnext = howto.empty() ? true : parse_bool(howto);
int replace_count = 0;
bool update = false;
replace_count = replaceAll(bv, search, rplc, casesensitive, matchword);
update = replace_count > 0;
} else {
- pair<bool, int> rv =
- replaceOne(bv, search, rplc, casesensitive, matchword, forward);
+ pair<bool, int> rv =
+ replaceOne(bv, search, rplc, casesensitive, matchword, forward, findnext);
update = rv.first;
replace_count = rv.second;
}
Buffer const & buf = bv->buffer();
if (!update) {
// emit message signal.
- buf.message(_("String not found!"));
+ buf.message(_("String not found."));
} else {
if (replace_count == 0) {
buf.message(_("String found."));
buf.message(str);
}
}
- } else {
+ } else if (findnext) {
// if we have deleted characters, we do not replace at all, but
// rather search for the next occurence
if (findOne(bv, search, casesensitive, matchword, forward))
update = true;
else
- bv->message(_("String not found!"));
+ bv->message(_("String not found."));
}
return update;
}
-bool findNextChange(BufferView * bv)
+bool findNextChange(DocIterator & cur)
{
- return findChange(bv, true);
+ for (; cur; cur.forwardPos())
+ if (cur.inTexted() && cur.paragraph().isChanged(cur.pos()))
+ return true;
+ return false;
}
-bool findPreviousChange(BufferView * bv)
+bool findPreviousChange(DocIterator & cur)
{
- return findChange(bv, false);
+ for (cur.backwardPos(); cur; cur.backwardPos()) {
+ if (cur.inTexted() && cur.paragraph().isChanged(cur.pos()))
+ return true;
+ }
+ return false;
}
-bool findChange(BufferView * bv, bool next)
+bool selectChange(Cursor & cur, bool forward)
{
- if (bv->cursor().selection()) {
- // set the cursor at the beginning or at the end of the selection
- // before searching. Otherwise, the current change will be found.
- if (next != (bv->cursor().top() > bv->cursor().normalAnchor()))
- bv->cursor().setCursorToAnchor();
- }
+ if (!cur.inTexted() || !cur.paragraph().isChanged(cur.pos()))
+ return false;
+ Change ch = cur.paragraph().lookupChange(cur.pos());
- DocIterator cur = bv->cursor();
-
- // Are we within a change ? Then first search forward (backward),
- // clear the selection and search the other way around (see the end
- // of this function). This will avoid changes to be selected half.
- bool search_both_sides = false;
- DocIterator tmpcur = cur;
- // Leave math first
- while (tmpcur.inMathed())
- tmpcur.pop_back();
- Change change_next_pos
- = tmpcur.paragraph().lookupChange(tmpcur.pos());
- if (change_next_pos.changed() && cur.inMathed()) {
- cur = tmpcur;
- search_both_sides = true;
- } else if (tmpcur.pos() > 0 && tmpcur.inTexted()) {
- Change change_prev_pos
- = tmpcur.paragraph().lookupChange(tmpcur.pos() - 1);
- if (change_next_pos.isSimilarTo(change_prev_pos))
- search_both_sides = true;
+ CursorSlice tip1 = cur.top();
+ for (; tip1.pit() < tip1.lastpit() || tip1.pos() < tip1.lastpos(); tip1.forwardPos()) {
+ Change ch2 = tip1.paragraph().lookupChange(tip1.pos());
+ if (!ch2.isSimilarTo(ch))
+ break;
}
+ CursorSlice tip2 = cur.top();
+ for (; tip2.pit() > 0 || tip2.pos() > 0;) {
+ tip2.backwardPos();
+ Change ch2 = tip2.paragraph().lookupChange(tip2.pos());
+ if (!ch2.isSimilarTo(ch)) {
+ // take a step forward to correctly set the selection
+ tip2.forwardPos();
+ break;
+ }
+ }
+ if (forward)
+ swap(tip1, tip2);
+ cur.top() = tip1;
+ cur.bv().mouseSetCursor(cur, false);
+ cur.top() = tip2;
+ cur.bv().mouseSetCursor(cur, true);
+ return true;
+}
- if (!findChange(cur, next))
- return false;
- bv->cursor().setCursor(cur);
- bv->cursor().resetAnchor();
+namespace {
- if (!next)
- // take a step into the change
- cur.backwardPos();
- Change orig_change = cur.paragraph().lookupChange(cur.pos());
+bool findChange(BufferView * bv, bool forward)
+{
+ Cursor cur(*bv);
+ cur.setCursor(forward ? bv->cursor().selectionEnd()
+ : bv->cursor().selectionBegin());
+ forward ? findNextChange(cur) : findPreviousChange(cur);
+ return selectChange(cur, forward);
+}
- CursorSlice & tip = cur.top();
- if (next) {
- for (; !tip.at_end(); tip.forwardPos()) {
- Change change = tip.paragraph().lookupChange(tip.pos());
- if (!change.isSimilarTo(orig_change))
- break;
- }
- } else {
- for (; !tip.at_begin();) {
- tip.backwardPos();
- Change change = tip.paragraph().lookupChange(tip.pos());
- if (!change.isSimilarTo(orig_change)) {
- // take a step forward to correctly set the selection
- tip.forwardPos();
- break;
- }
- }
- }
+}
- // Now put cursor to end of selection:
- bv->cursor().setCursor(cur);
- bv->cursor().setSelection();
+bool findNextChange(BufferView * bv)
+{
+ return findChange(bv, true);
+}
- if (search_both_sides) {
- bv->cursor().setSelection(false);
- findChange(bv, !next);
- }
- return true;
+bool findPreviousChange(BufferView * bv)
+{
+ return findChange(bv, false);
}
+
+
namespace {
typedef vector<pair<string, string> > Escapes;
/// A map of symbols and their escaped equivalent needed within a regex.
+/// @note Beware of order
Escapes const & get_regexp_escapes()
{
+ typedef std::pair<std::string, std::string> P;
+
static Escapes escape_map;
if (escape_map.empty()) {
- escape_map.push_back(pair<string, string>("\\", "\\\\"));
- escape_map.push_back(pair<string, string>("^", "\\^"));
- escape_map.push_back(pair<string, string>("$", "\\$"));
- escape_map.push_back(pair<string, string>("{", "\\{"));
- escape_map.push_back(pair<string, string>("}", "\\}"));
- escape_map.push_back(pair<string, string>("[", "\\["));
- escape_map.push_back(pair<string, string>("]", "\\]"));
- escape_map.push_back(pair<string, string>("(", "\\("));
- escape_map.push_back(pair<string, string>(")", "\\)"));
- escape_map.push_back(pair<string, string>("+", "\\+"));
- escape_map.push_back(pair<string, string>("*", "\\*"));
- escape_map.push_back(pair<string, string>(".", "\\."));
+ escape_map.push_back(P("$", "_x_$"));
+ escape_map.push_back(P("{", "_x_{"));
+ escape_map.push_back(P("}", "_x_}"));
+ escape_map.push_back(P("[", "_x_["));
+ escape_map.push_back(P("]", "_x_]"));
+ escape_map.push_back(P("(", "_x_("));
+ escape_map.push_back(P(")", "_x_)"));
+ escape_map.push_back(P("+", "_x_+"));
+ escape_map.push_back(P("*", "_x_*"));
+ escape_map.push_back(P(".", "_x_."));
+ escape_map.push_back(P("\\", "(?:\\\\|\\\\backslash)"));
+ escape_map.push_back(P("~", "(?:\\\\textasciitilde|\\\\sim)"));
+ escape_map.push_back(P("^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\mathcircumflex)"));
+ escape_map.push_back(P("_x_", "\\"));
}
return escape_map;
}
/// A map of lyx escaped strings and their unescaped equivalent.
-Escapes const & get_lyx_unescapes() {
+Escapes const & get_lyx_unescapes()
+{
+ typedef std::pair<std::string, std::string> P;
+
+ static Escapes escape_map;
+ if (escape_map.empty()) {
+ escape_map.push_back(P("\\%", "%"));
+ escape_map.push_back(P("\\mathcircumflex ", "^"));
+ escape_map.push_back(P("\\mathcircumflex", "^"));
+ escape_map.push_back(P("\\backslash ", "\\"));
+ escape_map.push_back(P("\\backslash", "\\"));
+ escape_map.push_back(P("\\\\{", "_x_<"));
+ escape_map.push_back(P("\\\\}", "_x_>"));
+ escape_map.push_back(P("\\sim ", "~"));
+ escape_map.push_back(P("\\sim", "~"));
+ }
+ return escape_map;
+}
+
+/// A map of escapes turning a regexp matching text to one matching latex.
+Escapes const & get_regexp_latex_escapes()
+{
+ typedef std::pair<std::string, std::string> P;
+
static Escapes escape_map;
if (escape_map.empty()) {
- escape_map.push_back(pair<string, string>("{*}", "*"));
- escape_map.push_back(pair<string, string>("{[}", "["));
- escape_map.push_back(pair<string, string>("\\$", "$"));
- escape_map.push_back(pair<string, string>("\\backslash{}", "\\"));
- escape_map.push_back(pair<string, string>("\\backslash", "\\"));
- escape_map.push_back(pair<string, string>("\\sim ", "~"));
- escape_map.push_back(pair<string, string>("\\^", "^"));
+ escape_map.push_back(P("\\\\", "(?:\\\\\\\\|\\\\backslash|\\\\textbackslash\\{\\})"));
+ escape_map.push_back(P("(<?!\\\\\\\\textbackslash)\\{", "\\\\\\{"));
+ escape_map.push_back(P("(<?!\\\\\\\\textbackslash\\\\\\{)\\}", "\\\\\\}"));
+ escape_map.push_back(P("\\[", "\\{\\[\\}"));
+ escape_map.push_back(P("\\]", "\\{\\]\\}"));
+ escape_map.push_back(P("\\^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\mathcircumflex)"));
+ escape_map.push_back(P("%", "\\\\\\%"));
}
return escape_map;
}
unsigned int pos = 0;
while (pos < s.length() && (pos = s.find(it->first, pos)) < s.length()) {
s.replace(pos, it->first.length(), it->second);
-// LYXERR(Debug::FIND, "After escape: " << s);
+ LYXERR(Debug::FIND, "After escape: " << s);
pos += it->second.length();
// LYXERR(Debug::FIND, "pos: " << pos);
}
return s;
}
-/** Return the position of the closing brace matching the open one at s[pos],
- ** or s.size() if not found.
- **/
-size_t find_matching_brace(string const & s, size_t pos)
-{
- LASSERT(s[pos] == '{', /* */);
- int open_braces = 1;
- for (++pos; pos < s.size(); ++pos) {
- if (s[pos] == '\\')
- ++pos;
- else if (s[pos] == '{')
- ++open_braces;
- else if (s[pos] == '}') {
- --open_braces;
- if (open_braces == 0)
- return pos;
- }
- }
- return s.size();
-}
-/// Within \regexp{} apply get_regex_escapes(), while outside apply get_lyx_unescapes().
-string escape_for_regex(string s)
+/// Within \regexp{} apply get_lyx_unescapes() only (i.e., preserve regexp semantics of the string),
+/// while outside apply get_lyx_unescapes()+get_regexp_escapes().
+/// If match_latex is true, then apply regexp_latex_escapes() to \regexp{} contents as well.
+string escape_for_regex(string s, bool match_latex)
{
size_t pos = 0;
while (pos < s.size()) {
- size_t new_pos = s.find("\\regexp{{{", pos);
+ size_t new_pos = s.find("\\regexp{", pos);
if (new_pos == string::npos)
new_pos = s.size();
LYXERR(Debug::FIND, "new_pos: " << new_pos);
string t = apply_escapes(s.substr(pos, new_pos - pos), get_lyx_unescapes());
- LYXERR(Debug::FIND, "t : " << t);
+ LYXERR(Debug::FIND, "t [lyx]: " << t);
t = apply_escapes(t, get_regexp_escapes());
- LYXERR(Debug::FIND, "t : " << t);
+ LYXERR(Debug::FIND, "t [rxp]: " << t);
s.replace(pos, new_pos - pos, t);
new_pos = pos + t.size();
LYXERR(Debug::FIND, "Regexp after escaping: " << s);
LYXERR(Debug::FIND, "new_pos: " << new_pos);
if (new_pos == s.size())
break;
- size_t end_pos = s.find("}}}", new_pos + 10); // find_matching_brace(s, new_pos + 7);
+ // Might fail if \\endregexp{} is preceeded by unexpected stuff (weird escapes)
+ size_t end_pos = s.find("\\endregexp{}}", new_pos + 8);
LYXERR(Debug::FIND, "end_pos: " << end_pos);
- t = apply_escapes(s.substr(new_pos + 10, end_pos - (new_pos + 10)), get_lyx_unescapes());
- LYXERR(Debug::FIND, "t : " << t);
+ t = s.substr(new_pos + 8, end_pos - (new_pos + 8));
+ LYXERR(Debug::FIND, "t in regexp : " << t);
+ t = apply_escapes(t, get_lyx_unescapes());
+ LYXERR(Debug::FIND, "t in regexp [lyx]: " << t);
+ if (match_latex) {
+ t = apply_escapes(t, get_regexp_latex_escapes());
+ LYXERR(Debug::FIND, "t in regexp [ltx]: " << t);
+ }
if (end_pos == s.size()) {
s.replace(new_pos, end_pos - new_pos, t);
pos = s.size();
LYXERR(Debug::FIND, "Regexp after \\regexp{} removal: " << s);
break;
}
- s.replace(new_pos, end_pos + 3 - new_pos, t);
- LYXERR(Debug::FIND, "Regexp after \\regexp{} removal: " << s);
+ s.replace(new_pos, end_pos + 13 - new_pos, t);
+ LYXERR(Debug::FIND, "Regexp after \\regexp{...\\endregexp{}} removal: " << s);
pos = new_pos + t.size();
LYXERR(Debug::FIND, "pos: " << pos);
}
return s;
}
+
/// Wrapper for lyx::regex_replace with simpler interface
bool regex_replace(string const & s, string & t, string const & searchstr,
- string const & replacestr)
+ string const & replacestr)
{
lyx::regex e(searchstr);
ostringstream oss;
return rv;
}
+
/** Checks if supplied string segment is well-formed from the standpoint of matching open-closed braces.
**
** Verify that closed braces exactly match open braces. This avoids that, for example,
}
}
if (open_pars != unmatched) {
- LYXERR(Debug::FIND, "Found " << open_pars
- << " instead of " << unmatched
- << " unmatched open braces at the end of count");
- return false;
+ LYXERR(Debug::FIND, "Found " << open_pars
+ << " instead of " << unmatched
+ << " unmatched open braces at the end of count");
+ return false;
}
LYXERR(Debug::FIND, "Braces match as expected");
return true;
}
+
/** The class performing a match between a position in the document and the FindAdvOptions.
**/
class MatchStringAdv {
** @todo Normalization should also expand macros, if the corresponding
** search option was checked.
**/
- string normalize(docstring const & s) const;
+ string normalize(docstring const & s, bool hack_braces) const;
// normalized string to search
string par_as_string;
// regular expression to use for searching
lyx::regex regexp;
// same as regexp, but prefixed with a ".*"
lyx::regex regexp2;
+ // leading format material as string
+ string lead_as_string;
+ // par_as_string after removal of lead_as_string
+ string par_as_string_nolead;
// unmatched open braces in the search string/regexp
int open_braces;
// number of (.*?) subexpressions added at end of search regexp for closing
}
-static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions const & opt) {
+static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions const & opt)
+{
docstring str;
if (!opt.ignoreformat) {
str = buffer_to_latex(buffer);
} else {
- ParIterator it = buffer.par_iterator_begin();
- ParIterator end = buffer.par_iterator_end();
OutputParams runparams(&buffer.params().encoding());
- odocstringstream os;
runparams.nice = true;
runparams.flavor = OutputParams::LATEX;
runparams.linelen = 100000; //lyxrc.plaintext_linelen;
runparams.dryrun = true;
- for (; it != end; ++it) {
+ runparams.for_search = true;
+ for (pos_type pit = pos_type(0); pit < (pos_type)buffer.paragraphs().size(); ++pit) {
+ Paragraph const & par = buffer.paragraphs().at(pit);
LYXERR(Debug::FIND, "Adding to search string: '"
- << it->asString(false)
- << "'");
- str +=
- it->stringify(pos_type(0), it->size(),
- AS_STR_INSETS, runparams);
+ << par.asString(pos_type(0), par.size(),
+ AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+ &runparams)
+ << "'");
+ str += par.asString(pos_type(0), par.size(),
+ AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+ &runparams);
}
}
return str;
/// Return separation pos between the leading material and the rest
-static size_t identifyLeading(string const & s) {
+static size_t identifyLeading(string const & s)
+{
string t = s;
// @TODO Support \item[text]
- while (regex_replace(t, t, "\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)\\{", "")
+ while (regex_replace(t, t, "^\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{", "")
|| regex_replace(t, t, "^\\$", "")
|| regex_replace(t, t, "^\\\\\\[ ", "")
- || regex_replace(t, t, "^\\\\item ", ""))
- LYXERR(Debug::FIND, " after removing leading $, \\[ , \\emph{, \\textbf{, etc.: " << t);
+ || regex_replace(t, t, "^\\\\item ", "")
+ || regex_replace(t, t, "^\\\\begin\\{[a-zA-Z_]*\\*?\\} ", ""))
+ LYXERR(Debug::FIND, " after removing leading $, \\[ , \\emph{, \\textbf{, etc.: '" << t << "'");
return s.find(t);
}
+// Remove trailing closure of math, macros and environments, so to catch parts of them.
+static int identifyClosing(string & t)
+{
+ int open_braces = 0;
+ do {
+ LYXERR(Debug::FIND, "identifyClosing(): t now is '" << t << "'");
+ if (regex_replace(t, t, "(.*[^\\\\])\\$\\'", "$1"))
+ continue;
+ if (regex_replace(t, t, "(.*[^\\\\]) \\\\\\]\\'", "$1"))
+ continue;
+ if (regex_replace(t, t, "(.*[^\\\\]) \\\\end\\{[a-zA-Z_]*\\*?\\}\\'", "$1"))
+ continue;
+ if (regex_replace(t, t, "(.*[^\\\\])\\}\\'", "$1")) {
+ ++open_braces;
+ continue;
+ }
+ break;
+ } while (true);
+ return open_braces;
+}
+
+
MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const & opt)
: p_buf(&buf), p_first_buf(&buf), opt(opt)
{
Buffer & find_buf = *theBufferList().getBuffer(FileName(to_utf8(opt.find_buf_name)), true);
- par_as_string = normalize(stringifySearchBuffer(find_buf, opt));
+ docstring const & ds = stringifySearchBuffer(find_buf, opt);
+ use_regexp = lyx::to_utf8(ds).find("\\regexp{") != std::string::npos;
+ // When using regexp, braces are hacked already by escape_for_regex()
+ par_as_string = normalize(ds, !use_regexp);
open_braces = 0;
close_wildcards = 0;
- use_regexp = !opt.ignoreformat || par_as_string.find("\\regexp") != std::string::npos;
+ size_t lead_size = 0;
+ if (opt.ignoreformat) {
+ if (!use_regexp) {
+ // if par_as_string_nolead were emty,
+ // the following call to findAux will always *find* the string
+ // in the checked data, and thus always using the slow
+ // examining of the current text part.
+ par_as_string_nolead = par_as_string;
+ }
+ }
+ else {
+ lead_size = identifyLeading(par_as_string);
+ lead_as_string = par_as_string.substr(0, lead_size);
+ par_as_string_nolead = par_as_string.substr(lead_size, par_as_string.size() - lead_size);
+ }
if (!use_regexp) {
- // Remove trailing closure of math, macros and environments, so to catch parts of them.
- do {
- LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'");
- if (regex_replace(par_as_string, par_as_string, "(.*)[[:blank:]]\\'", "$1"))
- continue;
- if (regex_replace(par_as_string, par_as_string, "(.*[^\\\\]) ?\\$\\'", "$1"))
- continue;
- // @todo need to account for open square braces as well ?
- if (regex_replace(par_as_string, par_as_string, "(.*[^\\\\]) ?\\\\\\]\\'", "$1"))
- continue;
- if (regex_replace(par_as_string, par_as_string, "(.*[^\\\\]) ?\\\\end\\{[a-zA-Z_]*\\}\\'", "$1"))
- continue;
- if (regex_replace(par_as_string, par_as_string, "(.*[^\\\\]) ?\\}\\'", "$1")) {
- ++open_braces;
- continue;
- }
- break;
- } while (true);
+ open_braces = identifyClosing(par_as_string);
+ identifyClosing(par_as_string_nolead);
LYXERR(Debug::FIND, "Open braces: " << open_braces);
LYXERR(Debug::FIND, "Built MatchStringAdv object: par_as_string = '" << par_as_string << "'");
} else {
- size_t lead_size = identifyLeading(par_as_string);
string lead_as_regexp;
if (lead_size > 0) {
- lead_as_regexp = escape_for_regex(par_as_string.substr(0, lead_size));
- par_as_string = par_as_string.substr(lead_size, par_as_string.size() - lead_size);
+ // @todo No need to search for \regexp{} insets in leading material
+ 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 << "'");
}
- par_as_string = escape_for_regex(par_as_string);
+ par_as_string = escape_for_regex(par_as_string, !opt.ignoreformat);
// Insert (.*?) before trailing closure of math, macros and environments, so to catch parts of them.
LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'");
if (
// Insert .* before trailing '\$' ('$' has been escaped by escape_for_regex)
regex_replace(par_as_string, par_as_string, "(.*[^\\\\])(\\\\\\$)\\'", "$1(.*?)$2")
- // Insert .* before trailing '\\\]' ('\]' has been escaped by escape_for_regex)
- || regex_replace(par_as_string, par_as_string, "(.*[^\\\\])(\\\\\\\\\\\\\\])\\'", "$1(.*?)$2")
- // Insert .* before trailing '\\end\{...}' ('\end{...}' has been escaped by escape_for_regex)
- || regex_replace(par_as_string, par_as_string,
- "(.*[^\\\\])(\\\\\\\\end\\\\\\{[a-zA-Z_]*\\\\\\})\\'", "$1(.*?)$2")
- // Insert .* before trailing '\}' ('}' has been escaped by escape_for_regex)
- || regex_replace(par_as_string, par_as_string, "(.*[^\\\\])(\\\\\\})\\'", "$1(.*?)$2")
- ) {
+ // Insert .* before trailing '\\\]' ('\]' has been escaped by escape_for_regex)
+ || regex_replace(par_as_string, par_as_string, "(.*[^\\\\])( \\\\\\\\\\\\\\])\\'", "$1(.*?)$2")
+ // Insert .* before trailing '\\end\{...}' ('\end{...}' has been escaped by escape_for_regex)
+ || regex_replace(par_as_string, par_as_string,
+ "(.*[^\\\\])( \\\\\\\\end\\\\\\{[a-zA-Z_]*)(\\\\\\*)?(\\\\\\})\\'", "$1(.*?)$2$3$4")
+ // Insert .* before trailing '\}' ('}' has been escaped by escape_for_regex)
+ || regex_replace(par_as_string, par_as_string, "(.*[^\\\\])(\\\\\\})\\'", "$1(.*?)$2")
+ ) {
++close_wildcards;
}
LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'");
LYXERR(Debug::FIND, "Replaced text (to be used as regex): " << par_as_string);
// If entered regexp must match at begin of searched string buffer
string regexp_str = string("\\`") + lead_as_regexp + par_as_string;
- LYXERR(Debug::FIND, "Setting regexp to : " << regexp_str << endl);
+ LYXERR(Debug::FIND, "Setting regexp to : '" << regexp_str << "'");
regexp = lyx::regex(regexp_str);
// If entered regexp may match wherever in searched string buffer
string regexp2_str = string("\\`.*") + lead_as_regexp + ".*" + par_as_string;
- LYXERR(Debug::FIND, "Setting regexp2 to: " << regexp2_str << endl);
+ LYXERR(Debug::FIND, "Setting regexp2 to: '" << regexp2_str << "'");
regexp2 = lyx::regex(regexp2_str);
}
}
int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) const
{
+ if (at_begin &&
+ (opt.restr == FindAndReplaceOptions::R_ONLY_MATHS && !cur.inMathed()) )
+ return 0;
docstring docstr = stringifyFromForSearch(opt, cur, len);
LYXERR(Debug::FIND, "Matching against '" << lyx::to_utf8(docstr) << "'");
- string str = normalize(docstr);
+ string str = normalize(docstr, true);
LYXERR(Debug::FIND, "After normalization: '" << str << "'");
if (! use_regexp) {
LYXERR(Debug::FIND, "Searching in normal mode: par_as_string='" << par_as_string << "', str='" << str << "'");
+ LYXERR(Debug::FIND, "Searching in normal mode: lead_as_string='" << lead_as_string << "', par_as_string_nolead='" << par_as_string_nolead << "'");
if (at_begin) {
LYXERR(Debug::FIND, "size=" << par_as_string.size() << ", substr='" << str.substr(0, par_as_string.size()) << "'");
if (str.substr(0, par_as_string.size()) == par_as_string)
return par_as_string.size();
} else {
- string t = par_as_string;
- while (regex_replace(t, t, "\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)\\{", "")
- || regex_replace(t, t, "^\\$", "")
- || regex_replace(t, t, "^\\\\\\[ ", ""))
- LYXERR(Debug::FIND, " after removing leading $, \\[ , \\emph{, \\textbf{, etc.: " << t);
- size_t pos = str.find(t);
+ size_t pos = str.find(par_as_string_nolead);
if (pos != string::npos)
return par_as_string.size();
}
{
int res = findAux(cur, len, at_begin);
LYXERR(Debug::FIND,
- "res=" << res << ", at_begin=" << at_begin << ", matchword=" << opt.matchword << ", inTexted=" << cur.inTexted());
+ "res=" << res << ", at_begin=" << at_begin
+ << ", matchword=" << opt.matchword
+ << ", inTexted=" << cur.inTexted());
if (res == 0 || !at_begin || !opt.matchword || !cur.inTexted())
return res;
Paragraph const & par = cur.paragraph();
- bool ws_left = cur.pos() > 0 ?
- par.isWordSeparator(cur.pos() - 1) : true;
- bool ws_right = cur.pos() + res < par.size() ?
- par.isWordSeparator(cur.pos() + res) : true;
+ bool ws_left = (cur.pos() > 0)
+ ? par.isWordSeparator(cur.pos() - 1)
+ : true;
+ bool ws_right = (cur.pos() + res < par.size())
+ ? par.isWordSeparator(cur.pos() + res)
+ : true;
LYXERR(Debug::FIND,
"cur.pos()=" << cur.pos() << ", res=" << res
<< ", separ: " << ws_left << ", " << ws_right
}
-string MatchStringAdv::normalize(docstring const & s) const
+string MatchStringAdv::normalize(docstring const & s, bool hack_braces) const
{
string t;
if (! opt.casesensitive)
else
t = lyx::to_utf8(s);
// Remove \n at begin
- while (t.size() > 0 && t[0] == '\n')
+ while (!t.empty() && t[0] == '\n')
t = t.substr(1);
// Remove \n at end
- while (t.size() > 0 && t[t.size() - 1] == '\n')
+ while (!t.empty() && t[t.size() - 1] == '\n')
t = t.substr(0, t.size() - 1);
size_t pos;
// Replace all other \n with spaces
LYXERR(Debug::FIND, "Removing stale empty \\emph{}, \\textbf{}, \\*section{} macros from: " << t);
while (regex_replace(t, t, "\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)(\\{\\})+", ""))
LYXERR(Debug::FIND, " further removing stale empty \\emph{}, \\textbf{} macros from: " << t);
+
+ // FIXME - check what preceeds the brace
+ if (hack_braces) {
+ if (opt.ignoreformat)
+ while (regex_replace(t, t, "\\{", "_x_<")
+ || regex_replace(t, t, "\\}", "_x_>"))
+ LYXERR(Debug::FIND, "After {} replacement: '" << t << "'");
+ else
+ while (regex_replace(t, t, "\\\\\\{", "_x_<")
+ || regex_replace(t, t, "\\\\\\}", "_x_>"))
+ LYXERR(Debug::FIND, "After {} replacement: '" << t << "'");
+ }
+
return t;
}
{
LYXERR(Debug::FIND, "Stringifying with len=" << len << " from cursor at pos: " << cur);
if (cur.inTexted()) {
- Paragraph const & par = cur.paragraph();
- // TODO what about searching beyond/across paragraph breaks ?
- // TODO Try adding a AS_STR_INSERTS as last arg
- pos_type end = ( len == -1 || cur.pos() + len > int(par.size()) ) ?
- int(par.size()) : cur.pos() + len;
- OutputParams runparams(&cur.buffer()->params().encoding());
- odocstringstream os;
- runparams.nice = true;
- runparams.flavor = OutputParams::LATEX;
- runparams.linelen = 100000; //lyxrc.plaintext_linelen;
- // No side effect of file copying and image conversion
- runparams.dryrun = true;
- LYXERR(Debug::FIND, "Stringifying with cur: "
- << cur << ", from pos: " << cur.pos() << ", end: " << end);
- return par.stringify(cur.pos(), end, AS_STR_INSETS, runparams);
+ Paragraph const & par = cur.paragraph();
+ // TODO what about searching beyond/across paragraph breaks ?
+ // TODO Try adding a AS_STR_INSERTS as last arg
+ pos_type end = ( len == -1 || cur.pos() + len > int(par.size()) ) ?
+ int(par.size()) : cur.pos() + len;
+ OutputParams runparams(&cur.buffer()->params().encoding());
+ odocstringstream os;
+ runparams.nice = true;
+ runparams.flavor = OutputParams::LATEX;
+ runparams.linelen = 100000; //lyxrc.plaintext_linelen;
+ // No side effect of file copying and image conversion
+ runparams.dryrun = true;
+ LYXERR(Debug::FIND, "Stringifying with cur: "
+ << cur << ", from pos: " << cur.pos() << ", end: " << end);
+ return par.asString(cur.pos(), end,
+ AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+ &runparams);
} else if (cur.inMathed()) {
- odocstringstream os;
- CursorSlice cs = cur.top();
- MathData md = cs.cell();
- MathData::const_iterator it_end =
- ( ( len == -1 || cs.pos() + len > int(md.size()) )
- ? md.end() : md.begin() + cs.pos() + len );
- for (MathData::const_iterator it = md.begin() + cs.pos(); it != it_end; ++it)
- os << *it;
- return os.str();
+ docstring s;
+ CursorSlice cs = cur.top();
+ MathData md = cs.cell();
+ MathData::const_iterator it_end =
+ (( len == -1 || cs.pos() + len > int(md.size()))
+ ? md.end()
+ : md.begin() + cs.pos() + len );
+ for (MathData::const_iterator it = md.begin() + cs.pos();
+ it != it_end; ++it)
+ s = s + asString(*it);
+ LYXERR(Debug::FIND, "Stringified math: '" << s << "'");
+ return s;
}
LYXERR(Debug::FIND, "Don't know how to stringify from here: " << cur);
return docstring();
{
LYXERR(Debug::FIND, "Latexifying with len=" << len << " from cursor at pos: " << cur);
LYXERR(Debug::FIND, " with cur.lastpost=" << cur.lastpos() << ", cur.lastrow="
- << cur.lastrow() << ", cur.lastcol=" << cur.lastcol());
+ << cur.lastrow() << ", cur.lastcol=" << cur.lastcol());
Buffer const & buf = *cur.buffer();
- LASSERT(buf.isLatex(), /* */);
+ LBUFERR(buf.params().isLatex());
TexRow texrow;
odocstringstream ods;
if (len != -1 && endpos > cur.pos() + len)
endpos = cur.pos() + len;
TeXOnePar(buf, *cur.innerText(), cur.pit(), os, runparams,
- string(), cur.pos(), endpos);
+ string(), cur.pos(), endpos);
LYXERR(Debug::FIND, "Latexified text: '" << lyx::to_utf8(ods.str()) << "'");
} else if (cur.inMathed()) {
// Retrieve the math environment type, and add '$' or '$[' or others (\begin{equation}) accordingly
for (int s = cur.depth() - 1; s >= 0; --s) {
- CursorSlice const & cs = cur[s];
- if (cs.asInsetMath() && cs.asInsetMath() && cs.asInsetMath()->asHullInset()) {
- WriteStream ws(ods);
- cs.asInsetMath()->asHullInset()->header_write(ws);
- break;
- }
+ CursorSlice const & cs = cur[s];
+ if (cs.asInsetMath() && cs.asInsetMath() && cs.asInsetMath()->asHullInset()) {
+ WriteStream ws(ods);
+ cs.asInsetMath()->asHullInset()->header_write(ws);
+ break;
+ }
}
CursorSlice const & cs = cur.top();
MathData md = cs.cell();
- MathData::const_iterator it_end = ( ( len == -1 || cs.pos() + len > int(md.size()) )
- ? md.end() : md.begin() + cs.pos() + len );
- for (MathData::const_iterator it = md.begin() + cs.pos(); it != it_end; ++it)
- ods << *it;
+ MathData::const_iterator it_end =
+ ((len == -1 || cs.pos() + len > int(md.size()))
+ ? md.end()
+ : md.begin() + cs.pos() + len);
+ for (MathData::const_iterator it = md.begin() + cs.pos();
+ it != it_end; ++it)
+ ods << asString(*it);
// Retrieve the math environment type, and add '$' or '$]'
// or others (\end{equation}) accordingly
cur.forwardPos();
} while (cur && cur.depth() > d && match(cur) > 0);
cur = old_cur;
- LASSERT(match(cur) > 0, /* */);
+ LASSERT(match(cur) > 0, return 0);
LYXERR(Debug::FIND, "Ok");
// Compute the match length
{
if (!cur)
return 0;
- while (cur) {
+ while (!theApp()->longOperationCancelled() && cur) {
LYXERR(Debug::FIND, "findForwardAdv() cur: " << cur);
- if (match(cur, -1, false)) {
- for (; cur; cur.forwardPos()) {
+ int match_len = match(cur, -1, false);
+ LYXERR(Debug::FIND, "match_len: " << match_len);
+ if (match_len) {
+ for (; !theApp()->longOperationCancelled() && cur; cur.forwardPos()) {
LYXERR(Debug::FIND, "Advancing cur: " << cur);
- if (match(cur)) {
+ int match_len = match(cur);
+ LYXERR(Debug::FIND, "match_len: " << match_len);
+ if (match_len) {
// Sometimes in finalize we understand it wasn't a match
// and we need to continue the outest loop
int len = findAdvFinalize(cur, match);
/// Finds backwards
-int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) {
+int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match)
+{
if (! cur)
return 0;
// Backup of original position
else
cur.backwardPos();
pit_changed = true;
- } while (true);
+ } while (!theApp()->longOperationCancelled());
return 0;
}
docstring stringifyFromForSearch(FindAndReplaceOptions const & opt,
- DocIterator const & cur, int len)
+ DocIterator const & cur, int len)
{
- LASSERT(cur.pos() >= 0 && cur.pos() <= cur.lastpos(), /* */);
+ LASSERT(cur.pos() >= 0 && cur.pos() <= cur.lastpos(),
+ return docstring());
if (!opt.ignoreformat)
return latexifyFromCursor(cur, len);
else
}
-FindAndReplaceOptions::FindAndReplaceOptions(docstring const & find_buf_name, bool casesensitive,
+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)
+ SearchScope scope, SearchRestriction restr)
: 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)
+ forward(forward), expandmacros(expandmacros), ignoreformat(ignoreformat),
+ repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope), restr(restr)
{
}
/** Check if 'len' letters following cursor are all non-lowercase */
-static bool allNonLowercase(DocIterator const & cur, int len) {
- pos_type end_pos = cur.pos() + len;
- for (pos_type pos = cur.pos(); pos != end_pos; ++pos)
+static bool allNonLowercase(Cursor const & cur, int len)
+{
+ pos_type beg_pos = cur.selectionBegin().pos();
+ pos_type end_pos = cur.selectionBegin().pos() + len;
+ if (len > cur.lastpos() + 1 - beg_pos) {
+ LYXERR(Debug::FIND, "This should not happen, more debug needed");
+ len = cur.lastpos() + 1 - beg_pos;
+ }
+ for (pos_type pos = beg_pos; pos != end_pos; ++pos)
if (isLowerCase(cur.paragraph().getChar(pos)))
return false;
return true;
/** Check if first letter is upper case and second one is lower case */
-static bool firstUppercase(DocIterator const & cur) {
+static bool firstUppercase(Cursor const & cur)
+{
char_type ch1, ch2;
- if (cur.pos() >= cur.lastpos() - 1) {
+ pos_type pos = cur.selectionBegin().pos();
+ if (pos >= cur.lastpos() - 1) {
LYXERR(Debug::FIND, "No upper-case at cur: " << cur);
return false;
}
- ch1 = cur.paragraph().getChar(cur.pos());
- ch2 = cur.paragraph().getChar(cur.pos()+1);
+ ch1 = cur.paragraph().getChar(pos);
+ ch2 = cur.paragraph().getChar(pos + 1);
bool result = isUpperCase(ch1) && isLowerCase(ch2);
LYXERR(Debug::FIND, "firstUppercase(): "
<< "ch1=" << ch1 << "(" << char(ch1) << "), ch2="
**
** \fixme What to do with possible further paragraphs in replace buffer ?
**/
-static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case) {
+static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case)
+{
ParagraphList::iterator pit = buffer.paragraphs().begin();
+ LASSERT(pit->size() >= 1, /**/);
pos_type right = pos_type(1);
pit->changeCase(buffer.params(), pos_type(0), right, first_case);
- right = pit->size() + 1;
- pit->changeCase(buffer.params(), right, right, others_case);
+ right = pit->size();
+ pit->changeCase(buffer.params(), pos_type(1), right, others_case);
}
+
} // anon namespace
///
DocIterator sel_beg = cur.selectionBegin();
DocIterator sel_end = cur.selectionEnd();
if (&sel_beg.inset() != &sel_end.inset()
- || sel_beg.pit() != sel_end.pit())
+ || sel_beg.pit() != sel_end.pit()
+ || sel_beg.idx() != sel_end.idx())
return;
int sel_len = sel_end.pos() - sel_beg.pos();
LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end
<< ", sel_len: " << sel_len << endl);
if (sel_len == 0)
return;
- LASSERT(sel_len > 0, /**/);
+ LASSERT(sel_len > 0, return);
if (!matchAdv(sel_beg, sel_len))
return;
string lyx = oss.str();
Buffer repl_buffer("", false);
repl_buffer.setUnnamed(true);
- LASSERT(repl_buffer.readString(lyx), /**/);
+ LASSERT(repl_buffer.readString(lyx), return);
if (opt.keep_case && sel_len >= 2) {
+ LYXERR(Debug::FIND, "keep_case true: cur.pos()=" << cur.pos() << ", sel_len=" << sel_len);
if (cur.inTexted()) {
if (firstUppercase(cur))
changeFirstCase(repl_buffer, text_uppercase, text_lowercase);
}
}
cap::cutSelection(cur, false, false);
- if (!cur.inMathed()) {
+ if (cur.inTexted()) {
repl_buffer.changeLanguage(
repl_buffer.language(),
cur.getFont().language());
bv->buffer().errorList("Paste"));
LYXERR(Debug::FIND, "After pasteParagraphList() cur=" << cur << endl);
sel_len = repl_buffer.paragraphs().begin()->size();
- } else {
+ } else if (cur.inMathed()) {
TexRow texrow;
odocstringstream ods;
otexstream os(ods, texrow);
regex_replace(to_utf8(repl_latex), s, "\\$(.*)\\$", "$1");
regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1");
repl_latex = from_utf8(s);
- LYXERR(Debug::FIND, "Replacing by niceInsert()ing latex: '" << repl_latex << "'");
- sel_len = cur.niceInsert(repl_latex);
+ LYXERR(Debug::FIND, "Replacing by insert()ing latex: '" << repl_latex << "' cur=" << cur << " with depth=" << cur.depth());
+ MathData ar(cur.buffer());
+ asArray(repl_latex, ar, Parse::NORMAL);
+ cur.insert(ar);
+ sel_len = ar.size();
+ LYXERR(Debug::FIND, "After insert() cur=" << cur << " with depth: " << cur.depth() << " and len: " << sel_len);
}
- cur.pos() -= sel_len;
- if (cur.pos() < 0)
+ if (cur.pos() >= sel_len)
+ cur.pos() -= sel_len;
+ else
cur.pos() = 0;
- LYXERR(Debug::FIND, "Putting selection at cur=" << cur << " with len: " << sel_len);
+ LYXERR(Debug::FIND, "After pos adj cur=" << cur << " with depth: " << cur.depth() << " and len: " << sel_len);
bv->putSelectionAt(DocIterator(cur), sel_len, !opt.forward);
bv->processUpdateFlags(Update::Force);
bv->buffer().updatePreviews();
try {
MatchStringAdv matchAdv(bv->buffer(), opt);
+ int length = bv->cursor().selectionEnd().pos() - bv->cursor().selectionBegin().pos();
+ if (length > 0)
+ bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward);
findAdvReplace(bv, opt, matchAdv);
cur = bv->cursor();
if (opt.forward)
- match_len = findForwardAdv(cur, matchAdv);
+ match_len = findForwardAdv(cur, matchAdv);
else
- match_len = findBackwardsAdv(cur, matchAdv);
+ match_len = findBackwardsAdv(cur, matchAdv);
} catch (...) {
// This may only be raised by lyx::regex()
bv->message(_("Invalid regular expression!"));
<< opt.ignoreformat << ' '
<< to_utf8(opt.repl_buf_name) << "\nEOSS\n"
<< opt.keep_case << ' '
- << int(opt.scope);
+ << int(opt.scope) << ' '
+ << int(opt.restr);
LYXERR(Debug::FIND, "built: " << os.str());
getline(is, line);
while (line != "EOSS") {
if (! s.empty())
- s = s + "\n";
+ s = s + "\n";
s = s + line;
if (is.eof()) // Tolerate malformed request
- break;
+ break;
getline(is, line);
}
LYXERR(Debug::FIND, "file_buf_name: '" << s << "'");
getline(is, line);
while (line != "EOSS") {
if (! s.empty())
- s = s + "\n";
+ s = s + "\n";
s = s + line;
if (is.eof()) // Tolerate malformed request
- break;
+ break;
getline(is, line);
}
LYXERR(Debug::FIND, "repl_buf_name: '" << s << "'");
int i;
is >> i;
opt.scope = FindAndReplaceOptions::SearchScope(i);
+ is >> i;
+ opt.restr = FindAndReplaceOptions::SearchRestriction(i);
+
LYXERR(Debug::FIND, "parsed: " << opt.casesensitive << ' ' << opt.matchword << ' ' << opt.forward << ' '
- << opt.expandmacros << ' ' << opt.ignoreformat << ' ' << opt.keep_case);
+ << opt.expandmacros << ' ' << opt.ignoreformat << ' ' << opt.keep_case << ' '
+ << opt.scope << ' ' << opt.restr);
return is;
}
projects / lyx.git / blobdiff