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

FindAdv: Amend f78ddc49, Added handling of accented chars like \ddot{a}

Browse Source 
Only important for search without format. The format search was already OK.
This commit is contained in:
Kornel Benko 2022-03-29 17:22:22 +02:00
parent 77fd682acb
commit 23fe87bfc9
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lyxfind.cpp
View File

@ -1092,7 +1092,11 @@ static docstring buffer_to_latex(Buffer & buffer)
static string latexNamesToUtf8(docstring strIn) static string latexNamesToUtf8(docstring strIn)
{ {
string addtmp = to_utf8(strIn); string addtmp = to_utf8(strIn);
static regex const rmAcc("(\\\\)*(\\\\([A-Za-z]+)( |\\{\\})?)"); static regex const rmAcc("(\\\\)*("
"\\\\([A-Za-z]+\\{.\\})" // e.g. "ddot{A}" == sub.str(3)
"|\\\\([A-Za-z]+)( |\\{\\})?" // e.g. "LyX", "LyX{}", "LyX " == sub.str(5)
")"
);
size_t lastpos = 0; size_t lastpos = 0;
smatch sub; smatch sub;
string replace; string replace;
@ -1101,11 +1105,15 @@ static string latexNamesToUtf8(docstring strIn)
buildAccentsMap(); buildAccentsMap();
for (sregex_iterator it_add(addtmp.begin(), addtmp.end(), rmAcc), end; it_add != end; ++it_add) { for (sregex_iterator it_add(addtmp.begin(), addtmp.end(), rmAcc), end; it_add != end; ++it_add) {
sub = *it_add; sub = *it_add;
if ((sub.position(2) - sub.position(0)) % 3 == 1) { if ((sub.position(2) - sub.position(0)) % 2 == 1) {
continue; continue;
} }
else { else {
string key = sub.str(3); string key;
if (sub.length(3) > 0)
key = sub.str(3);
else
key = sub.str(5);
AccentsIterator it_ac = accents.find(key); AccentsIterator it_ac = accents.find(key);
if (it_ac == accents.end()) { if (it_ac == accents.end()) {
replace = sub.str(2); replace = sub.str(2);