anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindAdv: Do not search for accents if the command-parameter contains '\\'

Browse Source 
The only exception are command-parameters '\\i', '\\imath' or '\\jmath'.

Example '\ddot{\\imath}'
This commit is contained in:
Kornel Benko 2022-05-20 12:46:26 +02:00
parent c6725df2db
commit 9e19258478
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lyxfind.cpp
View File

@ -2049,7 +2049,8 @@ void Intervall::removeAccents()
if (accents.empty())
buildAccentsMap();
static regex const accre("\\\\("
"([\\S]|[A-Za-z]+)\\{[^\\{\\}]+\\}"
"([\\S]|[A-Za-z]+)\\{[^\\\\\\{\\}]+\\}"
"|([\\S]|[A-Za-z]+)\\{\\\\[ij](math)?\\}"
"|("
"(backslash ([lL]y[xX]|[tT]e[xX]|[lL]a[tT]e[xX]e?|lyxarrow))"
"|[A-Za-z]+"
@ -3641,7 +3642,7 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
CreateRegexp(opt, "", "", "");
return;
}
use_regexp = lyx::to_utf8(ds).find("\\regexp{") != std::string::npos;
use_regexp = ds.find(from_utf8("\\regexp{")) != std::string::npos;
if (opt.replace_all && previous_single_replace) {
previous_single_replace = false;
num_replaced = 0;
@ -3730,7 +3731,7 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
break;
}
if (lng < par_as_string.size())
par_as_string = par_as_string.substr(0,lng);
par_as_string.resize(lng);
}
LYXERR(Debug::FINDVERBOSE, "par_as_string after correctRegex is '" << par_as_string << "'");
if ((lng > 0) && (par_as_string[0] == '^')) {
@ -4010,7 +4011,7 @@ static string convertLF2Space(docstring const &s, bool ignore_format)
if ((pos > start + 2) &&
(s[pos+1] == '~' || isSpace(s[pos+1]) ||
s[pos-3] == '~' || isSpace(s[pos-3]))) {
// discard '\n'
// discard "\\\\\n", do not replace with space
dospace = false;
}
}