mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
FindAdv: Omitting cursor advance at start of search if in mathed.
Fixes #13070 Advanced S&R does not find math symbols at start of document
This commit is contained in:
parent
a5749b9c1f
commit
8c501308c3
@ -4114,7 +4114,13 @@ string MatchStringAdv::convertLF2Space(docstring const &s, bool ignore_format) c
|
|||||||
static string showPos(DocIterator const & cur)
|
static string showPos(DocIterator const & cur)
|
||||||
{
|
{
|
||||||
stringstream a;
|
stringstream a;
|
||||||
a << "[idx(" << cur.idx() << "),pit(" << cur.pit() << "),pos(" << cur.pos() << "),depth(" << cur.depth() << ")]";
|
string inmath;
|
||||||
|
if (cur.inMathed())
|
||||||
|
inmath = "inMath";
|
||||||
|
else
|
||||||
|
inmath = "inText";
|
||||||
|
|
||||||
|
a << "[idx(" << cur.idx() << "),pit(" << cur.pit() << "),pos(" << cur.pos() << "),depth(" << cur.depth() << ") " << inmath << ")]";
|
||||||
return(a.str());
|
return(a.str());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4147,7 +4153,7 @@ docstring stringifyFromCursor(DocIterator const & cur, int len)
|
|||||||
docstring res = from_utf8(latexNamesToUtf8(par.asString(cur.pos(), end,
|
docstring res = from_utf8(latexNamesToUtf8(par.asString(cur.pos(), end,
|
||||||
option,
|
option,
|
||||||
&runparams), false));
|
&runparams), false));
|
||||||
LYXERR(Debug::FINDVERBOSE|Debug::FIND, "Stringified text from pos(" << cur.pos() << ") len(" << len << "): " << res);
|
LYXERR(Debug::FINDVERBOSE|Debug::FIND, "Stringified text from " << showPos(cur) << " len(" << len << "): " << res);
|
||||||
return res;
|
return res;
|
||||||
} else if (cur.inMathed()) {
|
} else if (cur.inMathed()) {
|
||||||
CursorSlice cs = cur.top();
|
CursorSlice cs = cur.top();
|
||||||
@ -4203,7 +4209,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
|
|||||||
endpos = cur.pos() + len;
|
endpos = cur.pos() + len;
|
||||||
TeXOnePar(buf, *cur.innerText(), cur.pit(), os, runparams,
|
TeXOnePar(buf, *cur.innerText(), cur.pit(), os, runparams,
|
||||||
string(), cur.pos(), endpos, true);
|
string(), cur.pos(), endpos, true);
|
||||||
LYXERR(Debug::FINDVERBOSE|Debug::FIND, "Latexified text from pos(" << cur.pos() << ") len(" << len << "): " << ods.str());
|
LYXERR(Debug::FINDVERBOSE|Debug::FIND, "Latexified text from " << showPos(cur) << ods.str());
|
||||||
return(ods.str());
|
return(ods.str());
|
||||||
} else if (cur.inMathed()) {
|
} else if (cur.inMathed()) {
|
||||||
// Retrieve the math environment type, and add '$' or '$[' or others (\begin{equation}) accordingly
|
// Retrieve the math environment type, and add '$' or '$[' or others (\begin{equation}) accordingly
|
||||||
@ -4441,7 +4447,7 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match)
|
|||||||
do {
|
do {
|
||||||
orig_cur = cur;
|
orig_cur = cur;
|
||||||
cur.forwardPos();
|
cur.forwardPos();
|
||||||
} while (cur.depth() > orig_cur.depth());
|
} while (cur.depth() > orig_cur.depth() && !cur.inMathed());
|
||||||
cur = orig_cur;
|
cur = orig_cur;
|
||||||
while (!theApp()->longOperationCancelled() && cur) {
|
while (!theApp()->longOperationCancelled() && cur) {
|
||||||
//(void) findAdvForwardInnermost(cur);
|
//(void) findAdvForwardInnermost(cur);
|
||||||
|
Loading…
Reference in New Issue
Block a user