anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindAdv: Amend 6c735efb: Resolve some conflicts regex vs. math meaning of '$'

Browse Source
This commit is contained in:
Kornel Benko 2022-05-13 12:00:47 +02:00
parent 6c735efb1f
commit b0323628af
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lyxfind.cpp
View File

@ -892,6 +892,7 @@ string correctRegex(string t, bool withformat)
buildAccentsMap();
//LYXERR0("correctRegex input '" << t << "'");
int skip = 0;
for (sregex_iterator it(t.begin(), t.end(), wordre), end; it != end; ++it) {
sub = *it;
string replace;
@ -908,6 +909,10 @@ string correctRegex(string t, bool withformat)
replace = "";
backslashed = true;
}
else if (withformat && next[0] == '$') {
replace = accents["lyxdollar"];
skip = 1; // Skip following '$'
}
}
}
else if (sub.str(4) == "mathcircumflex")
@ -960,7 +965,8 @@ string correctRegex(string t, bool withformat)
if (lastpos < (size_t) sub.position(2))
s += std::regex_replace(t.substr(lastpos, sub.position(2) - lastpos), protectedSpace, R"( )");
s += replace;
lastpos = sub.position(2) + sub.length(2);
lastpos = sub.position(2) + sub.length(2) + skip;
skip = 0;
}
if (lastpos == 0)
s = std::regex_replace(t, protectedSpace, R"( )");
@ -4069,14 +4075,14 @@ static string convertLF2Space(docstring const & s, bool ignore_format)
// Replace all other \n with spaces
t.replace(pos, 1, " ");
}
}
if (!ignore_format) {
size_t count = 0;
while ((pos > count + 1) && (t[pos - 1 -count] == '%')) {
count++;
}
if (count > 0) {
t.replace(pos - count, count, "");
if (!ignore_format) {
size_t count = 0;
while ((pos > count + 1) && (t[pos - 1 -count] == '%')) {
count++;
}
if (count > 0) {
t.replace(pos - count, count, "");
}
}
}
}