#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"
#include "support/regex.h"
-#include <boost/next_prior.hpp>
using namespace std;
using namespace lyx::support;
}
-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()) {
if (!searchAllowed(searchstr))
return false;
- DocIterator cur = forward
- ? bv->cursor().selectionEnd()
+ DocIterator cur = forward
+ ? bv->cursor().selectionEnd()
: bv->cursor().selectionBegin();
MatchString const match(searchstr, case_sens, whole);
cur.recordUndo();
int striked = ssize -
cur.paragraph().eraseChars(pos, pos + match_len,
- buf.params().trackChanges);
+ buf.params().track_changes);
cur.paragraph().insert(pos, replacestr, font,
- Change(buf.params().trackChanges
+ Change(buf.params().track_changes
? Change::INSERTED
: Change::UNCHANGED));
for (int i = 0; i < rsize + striked; ++i)
// the idea here is that we are going to replace the string that
-// is selected IF it is the search string.
+// is selected IF it is the search string.
// if there is a selection, but it is not the search string, then
// we basically ignore it. (FIXME We ought to replace only within
// the selection.)
// if there is no selection, then:
// (i) if some search string has been provided, then we find it.
// (think of how the dialog works when you hit "replace" the
-// first time.)
+// first time.)
// (ii) if no search string has been provided, then we treat the
// word the cursor is in as the search string. (why? i have no
// idea.) but this only works in text?
//
-// returns the number of replacements made (one, if any) and
+// 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,
if (!cur.inTexted())
// bail in math
return make_pair(false, 0);
- // select current word and treat it as the search string
+ // 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 make_pair(false, 0);
-
+
bool have_selection = cur.selection();
docstring const selected = cur.selectionAsString(false);
- bool match =
+ bool match =
case_sens
? searchstr == selected
: compare_no_case(searchstr, selected) == 0;
cap::replaceSelectionWithString(cur, replacestr);
if (forward) {
cur.pos() += replacestr.length();
- LASSERT(cur.pos() <= cur.lastpos(), /* */);
+ LASSERT(cur.pos() <= cur.lastpos(),
+ cur.pos() = cur.lastpos());
}
if (findnext)
findOne(bv, searchstr, case_sens, whole, forward, false);
}
-bool lyxreplace(BufferView * bv,
+bool lyxreplace(BufferView * bv,
FuncRequest const & ev, bool has_deleted)
{
if (!bv || ev.action() != LFUN_WORD_REPLACE)
bool forward = parse_bool(howto);
bool findnext = howto.empty() ? true : parse_bool(howto);
- int replace_count = 0;
bool update = false;
if (!has_deleted) {
+ int replace_count = 0;
if (all) {
replace_count = replaceAll(bv, search, rplc, casesensitive, matchword);
update = replace_count > 0;
} else if (replace_count == 1) {
buf.message(_("String has been replaced."));
} else {
- docstring const str =
+ docstring const str =
bformat(_("%1$d strings have been replaced."), replace_count);
buf.message(str);
}
else
bv->message(_("String not found."));
}
+ bv->buffer().updatePreviews();
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)
{
- Cursor cur(*bv);
- cur.setCursor(next ? bv->cursor().selectionEnd()
- : bv->cursor().selectionBegin());
+ if (!cur.inTexted() || !cur.paragraph().isChanged(cur.pos()))
+ return false;
+ Change ch = cur.paragraph().lookupChange(cur.pos());
- // 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;
- Cursor 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->mouseSetCursor(cur, false);
+namespace {
- CursorSlice & tip = cur.top();
- if (!next)
- // take a step into the change
- tip.backwardPos();
+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);
+}
- Change orig_change = tip.paragraph().lookupChange(tip.pos());
+}
- 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;
- }
- }
- }
+bool findNextChange(BufferView * bv)
+{
+ return findChange(bv, true);
+}
- if (!search_both_sides) {
- // Now set the selection.
- bv->mouseSetCursor(cur, true);
- } else {
- bv->mouseSetCursor(cur, false);
- findChange(bv, !next);
- }
- return true;
+bool findPreviousChange(BufferView * bv)
+{
+ return findChange(bv, false);
}
+
+
namespace {
typedef vector<pair<string, string> > Escapes;
}
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;
}
}
}
if (open_pars != unmatched) {
- LYXERR(Debug::FIND, "Found " << open_pars
- << " instead of " << unmatched
+ LYXERR(Debug::FIND, "Found " << open_pars
+ << " instead of " << unmatched
<< " unmatched open braces at the end of count");
return false;
}
};
-static docstring buffer_to_latex(Buffer & buffer)
+static docstring buffer_to_latex(Buffer & buffer)
{
OutputParams runparams(&buffer.params().encoding());
- TexRow texrow;
+ TexRow texrow(false);
odocstringstream ods;
otexstream os(ods, texrow);
runparams.nice = true;
runparams.flavor = OutputParams::LATEX;
runparams.linelen = 100000; //lyxrc.plaintext_linelen;
runparams.dryrun = true;
+ 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: '"
- << par.stringify(pos_type(0), par.size(),
- AS_STR_INSETS, runparams)
+ << par.asString(pos_type(0), par.size(),
+ AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+ &runparams)
<< "'");
- str += par.stringify(pos_type(0), par.size(),
- AS_STR_INSETS, runparams);
+ str += par.asString(pos_type(0), par.size(),
+ AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+ &runparams);
}
}
return str;
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 {
+ 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);
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, true);
}
} else {
LYXERR(Debug::FIND, "Searching in regexp mode: at_begin=" << at_begin);
- // Try all possible regexp matches,
+ // Try all possible regexp matches,
//until one that verifies the braces match test is found
regex const *p_regexp = at_begin ? ®exp : ®exp2;
sregex_iterator re_it(str.begin(), str.end(), *p_regexp);
for (size_t i = 1; i < m.size() - 1; ++i)
if (!braces_match(m[i].first, m[i].second))
return false;
- // Exclude from the returned match length any length
+ // Exclude from the returned match length any length
// due to close wildcards added at end of regexp
if (close_wildcards == 0)
return m[0].second - m[0].first;
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;
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);
+ return par.asString(cur.pos(), end,
+ AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+ &runparams);
} else if (cur.inMathed()) {
docstring s;
CursorSlice cs = cur.top();
LYXERR(Debug::FIND, " with cur.lastpost=" << cur.lastpos() << ", cur.lastrow="
<< cur.lastrow() << ", cur.lastcol=" << cur.lastcol());
Buffer const & buf = *cur.buffer();
- LASSERT(buf.params().isLatex(), /* */);
+ LBUFERR(buf.params().isLatex());
- TexRow texrow;
+ TexRow texrow(false);
odocstringstream ods;
otexstream os(ods, texrow);
OutputParams runparams(&buf.params().encoding());
// 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);
+ if (cs.asInsetMath() && cs.asInsetMath()->asHullInset()) {
+ WriteStream ws(os);
cs.asInsetMath()->asHullInset()->header_write(ws);
break;
}
CursorSlice const & cs = cur[s];
InsetMath * inset = cs.asInsetMath();
if (inset && inset->asHullInset()) {
- WriteStream ws(ods);
+ WriteStream ws(os);
inset->asHullInset()->footer_write(ws);
break;
}
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
return 0;
cur.backwardPos();
DocIterator cur_orig(cur);
- bool found_match;
bool pit_changed = false;
- found_match = false;
do {
cur.pos() = 0;
- found_match = match(cur, -1, false);
+ bool found_match = match(cur, -1, false);
if (found_match) {
if (pit_changed)
DocIterator cur_prev_iter;
do {
found_match = match(cur);
- LYXERR(Debug::FIND, "findBackAdv3: found_match="
+ LYXERR(Debug::FIND, "findBackAdv3: found_match="
<< found_match << ", cur: " << cur);
if (found_match)
return findMostBackwards(cur, match);
docstring stringifyFromForSearch(FindAndReplaceOptions const & opt,
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
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)
+ 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)
+static bool allNonLowercase(Cursor const & cur, int len)
{
- pos_type end_pos = cur.pos() + len;
- for (pos_type pos = cur.pos(); pos != end_pos; ++pos)
+ 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;
+ end_pos = beg_pos + len;
+ }
+ 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="
+ << "ch1=" << ch1 << "(" << char(ch1) << "), ch2="
<< ch2 << "(" << char(ch2) << ")"
<< ", result=" << result << ", cur=" << cur);
return result;
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);
LYXERR(Debug::FIND, "After pasteParagraphList() cur=" << cur << endl);
sel_len = repl_buffer.paragraphs().begin()->size();
} else if (cur.inMathed()) {
- TexRow texrow;
+ TexRow texrow(false);
odocstringstream ods;
otexstream os(ods, texrow);
OutputParams runparams(&repl_buffer.params().encoding());
<< 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());
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;
}