anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-12 22:14:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

After replacing with multi-cell contents inside maths, now advanced find and replace leaves the cursor after the inserted material.

Browse Source 
Addressing #7675.
Added accompanying regression test.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39282 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2011-07-12 15:58:53 +00:00
parent 9d3947f107
commit 604b07c4d1
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
development/autotests/findadv-20-in.txt Normal file
View File

@ -0,0 +1,26 @@
# Avoiding recursive replacements when replaced text matches search pattern
# Addresses #7675.
#
Lang it_IT.utf8
TestBegin test.lyx -dbg find > lyx-log.txt 2>&1
KK: a a a\C\[Home]
KK: \CF
KK: a\[Tab]
KK: \Cm\\frac 1\[Down]a\[Return]\[Return]\[Return]
KK: \Cs
KK: \Ax
KK: buffer-export latex\[Return]
TestEnd
Assert pcregrep -M '^\$\\frac\{1\}\{a\}\$ \$\\frac\{1\}\{a\}\$ a' test.tex
TestBegin test2.lyx -dbg find > lyx-log.txt 2>&1
KK: \Cma \Cma \Cma \C\[Home]
KK: \CF
KK: a\[Tab]
KK: \Cm\\frac 1\[Down]a\[Return]\[Return]\[Return]
KK: \Cs
KK: \Ax
KK: buffer-export latex\[Return]
TestEnd
Assert pcregrep -M '^\$\\frac\{1\}\{a\}\$ \$\\frac\{1\}\{a\}\$ \$a\$' test2.tex

10
src/lyxfind.cpp
View File

@ -1377,14 +1377,18 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
regex_replace(to_utf8(repl_latex), s, "\\$(.*)\\$", "$1"); regex_replace(to_utf8(repl_latex), s, "\\$(.*)\\$", "$1");
regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1"); regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1");
repl_latex = from_utf8(s); repl_latex = from_utf8(s);
LYXERR(Debug::FIND, "Replacing by niceInsert()ing latex: '" << repl_latex << "'"); LYXERR(Debug::FIND, "Replacing by insert()ing latex: '" << repl_latex << "' cur=" << cur << " with depth=" << cur.depth());
sel_len = cur.niceInsert(repl_latex); 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);
} }
if (cur.pos() >= sel_len) if (cur.pos() >= sel_len)
cur.pos() -= sel_len; cur.pos() -= sel_len;
else else
cur.pos() = 0; 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->putSelectionAt(DocIterator(cur), sel_len, !opt.forward);
bv->processUpdateFlags(Update::Force); bv->processUpdateFlags(Update::Force);
bv->buffer().updatePreviews(); bv->buffer().updatePreviews();