From f78ddc49ad696d626866224bc4cae86c38cc1bba Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sun, 27 Mar 2022 13:43:42 +0200 Subject: [PATCH] FindAdv: Amend 93b6fe2c, forgot about uppercase greek symbols --- src/lyxfind.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index ae9d965a74..cda2bf0508 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -838,7 +838,7 @@ string correctRegex(string t, bool withformat) * and \{, \}, \[, \] => {, }, [, ] */ string s(""); - regex wordre("(\\\\)*(\\\\(([a-z]+) ?|[\\[\\]\\{\\}]))"); + regex wordre("(\\\\)*(\\\\(([A-Za-z]+)( |\\{\\})?|[\\[\\]\\{\\}]))"); size_t lastpos = 0; smatch sub; bool backslashed = false; @@ -880,7 +880,7 @@ string correctRegex(string t, bool withformat) else { AccentsIterator it_ac = accents.find(sub.str(4)); if (it_ac == accents.end()) { - replace = sub.str(3); + replace = sub.str(2); } else { replace = it_ac->second; @@ -1092,7 +1092,7 @@ static docstring buffer_to_latex(Buffer & buffer) static string latexNamesToUtf8(docstring strIn) { string addtmp = to_utf8(strIn); - static regex const rmAcc("(\\\\)*(\\\\([a-z]+) ?)"); + static regex const rmAcc("(\\\\)*(\\\\([A-Za-z]+)( |\\{\\})?)"); size_t lastpos = 0; smatch sub; string replace; @@ -1943,9 +1943,15 @@ void Intervall::removeAccents() { if (accents.empty()) buildAccentsMap(); - static regex const accre("\\\\(([\\S]|grave|breve|ddot|dot|acute|dacute|mathring|check|hat|bar|tilde|subdot|ogonek|" - "cedilla|subring|textsubring|subhat|textsubcircum|subtilde|textsubtilde|dgrave|textdoublegrave|rcap|textroundcap|slashed)\\{[^\\{\\}]+\\}" - "|((i|imath|jmath|cdot|[a-z]+(space)?)|((backslash )?([lL]y[xX]|[tT]e[xX]|[lL]a[tT]e[xX]e?|lyxarrow))|(textquote|brace|guillemot)(left|right)|textasciicircum|mathcircumflex|sim)(?![a-zA-Z]))"); + static regex const accre("\\\\(" + "([\\S]|[a-z]+)\\{[^\\{\\}]+\\}" + "|(" + "(i|imath|jmath|cdot|[a-z]+(space)?)" + "|((backslash )?([lL]y[xX]|[tT]e[xX]|[lL]a[tT]e[xX]e?|lyxarrow))" + "|(textquote|brace|guillemot)(left|right)" + "|textasciicircum|mathcircumflex|sim|[A-Za-z]+" + ")" + "(?![a-zA-Z]))"); smatch sub; for (sregex_iterator itacc(par.begin(), par.end(), accre), end; itacc != end; ++itacc) { sub = *itacc; -- 2.39.2