X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=d7038dedcb1e66d4bc96bb8e328e81dd26f295c1;hb=044933b0d929e759d0c7badf55eafc471623cc0c;hp=f3b3eef4846bf7c7a2778cdcc07636a6c9ed23ff;hpb=8f821dba70647b1547473aa44926eb1e6819b7a0;p=lyx.git diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index f3b3eef484..d7038dedcb 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -51,7 +51,6 @@ #include "support/lstrings.h" #include "support/regex.h" -#include using namespace std; using namespace lyx::support; @@ -138,8 +137,8 @@ bool findOne(BufferView * bv, docstring const & searchstr, 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); @@ -203,19 +202,19 @@ int replaceAll(BufferView * bv, // 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 replaceOne(BufferView * bv, docstring searchstr, docstring const & replacestr, bool case_sens, @@ -238,15 +237,15 @@ pair replaceOne(BufferView * bv, docstring searchstr, 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; @@ -328,7 +327,7 @@ bool lyxfind(BufferView * bv, FuncRequest const & ev) } -bool lyxreplace(BufferView * bv, +bool lyxreplace(BufferView * bv, FuncRequest const & ev, bool has_deleted) { if (!bv || ev.action() != LFUN_WORD_REPLACE) @@ -349,10 +348,10 @@ bool lyxreplace(BufferView * bv, 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; @@ -373,7 +372,7 @@ bool lyxreplace(BufferView * bv, } 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); } @@ -592,7 +591,6 @@ string escape_for_regex(string s, bool match_latex) } 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; } @@ -652,8 +650,8 @@ bool braces_match(string::const_iterator const & beg, } } 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; } @@ -726,10 +724,10 @@ private: }; -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; @@ -824,15 +822,14 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const & 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); @@ -908,7 +905,7 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con } } 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); @@ -924,7 +921,7 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con 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; @@ -1010,7 +1007,6 @@ docstring stringifyFromCursor(DocIterator const & cur, int len) 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; @@ -1052,7 +1048,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) Buffer const & buf = *cur.buffer(); LBUFERR(buf.params().isLatex()); - TexRow texrow; + TexRow texrow(false); odocstringstream ods; otexstream os(ods, texrow); OutputParams runparams(&buf.params().encoding()); @@ -1074,8 +1070,8 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) // 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; } @@ -1097,7 +1093,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) 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; } @@ -1225,12 +1221,10 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) 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) @@ -1241,7 +1235,7 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) 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); @@ -1303,6 +1297,7 @@ static bool allNonLowercase(Cursor const & cur, int 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))) @@ -1324,7 +1319,7 @@ static bool firstUppercase(Cursor const & cur) 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; @@ -1400,7 +1395,7 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M 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()); @@ -1430,7 +1425,6 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M 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(); }