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

FindAdv: Don't check on '\\\\\n' if ignoring format

Browse Source 
Since it can only happen if the lyx source contains two backslasches before
the inserted newline. And here it is the wrong case.
This commit is contained in:
Kornel Benko 2022-05-14 08:56:00 +02:00
parent b0323628af
commit 115d6ceedd
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lyxfind.cpp
View File

@ -4000,31 +4000,29 @@ static string convertLF2Space(docstring const &s, bool ignore_format)
t << lyx::to_utf8(s.substr(start, end + 1 - start));
break;
}
if ((pos > start+2) &&
s[pos-1] == '\\' &&
s[pos-2] == '\\') {
if (s[pos-1] == '\\' && s[pos-2] == '\\') {
if (!ignore_format) {
if ((pos > start + 1) &&
s[pos-1] == '\\' &&
s[pos-2] == '\\') {
skip = 2;
if ((pos > start+3) &&
if ((pos > start + 2) &&
(s[pos+1] == '~' || isSpace(s[pos+1]) ||
s[pos-3] == '~' || isSpace(s[pos-3]))) {
// discard '\n'
dospace = false;
}
}
else if (s[pos-1] == '\\' && s[pos-2] == '\\')
skip = 2;
}
else if (!ignore_format && (pos > start) &&
s[pos-1] == '%') {
skip = 1;
while ((pos > start+skip) && (s[pos-1-skip] == '%'))
skip++;
if ((pos > start+skip) &&
(s[pos+1] == '~' || isSpace(s[pos+1]) ||
s[pos-1-skip] == '~' || isSpace(s[pos-1-skip]))) {
// discard '%%%%%\n'
dospace = false;
else if ((pos > start) &&
s[pos-1] == '%') {
skip = 1;
while ((pos > start+skip) && (s[pos-1-skip] == '%'))
skip++;
if ((pos > start+skip) &&
(s[pos+1] == '~' || isSpace(s[pos+1]) ||
s[pos-1-skip] == '~' || isSpace(s[pos-1-skip]))) {
// discard '%%%%%\n'
dospace = false;
}
}
}
else {