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

FindAdv: Handle normal and protected space also inside regular expression

Browse Source
This commit is contained in:
Kornel Benko 2022-05-08 20:24:43 +02:00
parent 286dcfc9c7
commit 64af721adc
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lyxfind.cpp
View File

@ -872,7 +872,8 @@ string correctRegex(string t, bool withformat)
* and \{, \}, \[, \] => {, }, [, ] * and \{, \}, \[, \] => {, }, [, ]
*/ */
string s(""); string s("");
regex wordre("(\\\\)*(\\\\(([A-Za-z]+|[\\{\\}%])( |\\{\\})?|[\\[\\]\\{\\}]))"); static std::regex wordre("(\\\\)*(\\\\(( |[A-Za-z]+|[\\{\\}%])( |\\{\\})?|[\\[\\]\\{\\}]))");
static std::regex protectedSpace { R"(~)" };
size_t lastpos = 0; size_t lastpos = 0;
smatch sub; smatch sub;
bool backslashed = false; bool backslashed = false;
@ -892,7 +893,7 @@ string correctRegex(string t, bool withformat)
{ {
// transforms '\backslash \{' into '\{' // transforms '\backslash \{' into '\{'
string next = t.substr(sub.position(2) + sub.str(2).length(), 2); string next = t.substr(sub.position(2) + sub.str(2).length(), 2);
if ((next == "\\{") || (next == "\\}")) { if ((next == "\\{") || (next == "\\}") || (next == "\\ ")) {
replace = ""; replace = "";
backslashed = true; backslashed = true;
} }
@ -907,6 +908,8 @@ string correctRegex(string t, bool withformat)
replace = accents["braceleft"]; replace = accents["braceleft"];
else if (sub.str(3) == "}") else if (sub.str(3) == "}")
replace = accents["braceright"]; replace = accents["braceright"];
else if (sub.str(3) == " ")
replace = "\\ ";
else { else {
// else part should not exist // else part should not exist
LASSERT(0, /**/); LASSERT(0, /**/);
@ -917,6 +920,8 @@ string correctRegex(string t, bool withformat)
replace = "\\{"; replace = "\\{";
else if (sub.str(3) == "}") else if (sub.str(3) == "}")
replace = "\\}"; replace = "\\}";
else if (sub.str(3) == " ")
replace = "\\ ";
else { else {
// else part should not exist // else part should not exist
LASSERT(0, /**/); LASSERT(0, /**/);
@ -929,6 +934,8 @@ string correctRegex(string t, bool withformat)
replace = "}"; replace = "}";
else if (sub.str(4) == "%") else if (sub.str(4) == "%")
replace = "%"; replace = "%";
else if (sub.str(4) == " ")
replace = " ";
else { else {
AccentsIterator it_ac = accents.find(sub.str(4)); AccentsIterator it_ac = accents.find(sub.str(4));
if (it_ac == accents.end()) { if (it_ac == accents.end()) {
@ -940,14 +947,14 @@ string correctRegex(string t, bool withformat)
} }
} }
if (lastpos < (size_t) sub.position(2)) if (lastpos < (size_t) sub.position(2))
s += t.substr(lastpos, sub.position(2) - lastpos); s += std::regex_replace(t.substr(lastpos, sub.position(2) - lastpos), protectedSpace, R"( )");
s += replace; s += replace;
lastpos = sub.position(2) + sub.length(2); lastpos = sub.position(2) + sub.length(2);
} }
if (lastpos == 0) if (lastpos == 0)
s = t; s = std::regex_replace(t, protectedSpace, R"( )");
else if (lastpos < t.length()) else if (lastpos < t.length())
s += t.substr(lastpos, t.length() - lastpos); s += std::regex_replace(t.substr(lastpos, t.length() - lastpos), protectedSpace, R"( )");
// Handle quotes in regex // Handle quotes in regex
// substitute all '„', '“', '»', '«' with '"' // substitute all '„', '“', '»', '«' with '"'
// and all '‚', '‘', '›', '‹' with "\'" // and all '‚', '‘', '›', '‹' with "\'"