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

FindAdv: Amend ec387b6d: Handle search for '{' and '}'

Browse Source 
1) Take care of different input if changed the search-mode (with/without format)
	This amends ec387b6d
2) Make the braces used in text to be treated as single characters
	e.g. transform '\braceleft' to some unicode value
3) Try to use '$' as 'end of sequence' in regex
	We have to remove '}' and '\n' chars from the examined string
This commit is contained in:
Kornel Benko 2021-01-18 12:17:57 +01:00
parent 2225f0ed61
commit dacd2c45b7
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/lyxfind.cpp
View File

@ -71,6 +71,8 @@ using namespace lyx::support;
namespace lyx { namespace lyx {
typedef map<string, string> AccentsMap;
static AccentsMap accents = map<string, string>();
// Helper class for deciding what should be ignored // Helper class for deciding what should be ignored
class IgnoreFormats { class IgnoreFormats {
@ -758,7 +760,7 @@ string string2regex(string in)
return temp2; return temp2;
} }
string correctRegex(string t) string correctRegex(string t, bool withformat)
{ {
/* Convert \backslash => \ /* Convert \backslash => \
* and \{, \}, \[, \] => {, }, [, ] * and \{, \}, \[, \] => {, }, [, ]
@ -774,14 +776,24 @@ string correctRegex(string t)
continue; continue;
} }
else { else {
if (sub.str(4) == "backslash") if (sub.str(4) == "backslash") {
replace = "\\"; replace = "\\";
if (withformat) {
sregex_iterator it2 = it;
++it2;
smatch sub2 = *it2;
if (sub2.str(3) == "{")
replace = "";
else if (sub2.str(3) == "}")
replace = "";
}
}
else if (sub.str(4) == "mathcircumflex") else if (sub.str(4) == "mathcircumflex")
replace = "^"; replace = "^";
else if (sub.str(3) == "{") else if (withformat && (sub.str(3) == "{"))
replace = "\\braceleft"; replace = accents["braceleft"];
else if (sub.str(3) == "}") else if (withformat && (sub.str(3) == "}"))
replace = "\\braceright"; replace = accents["braceright"];
else else
replace = sub.str(3); replace = sub.str(3);
} }
@ -800,7 +812,7 @@ string correctRegex(string t)
/// Within \regexp{} apply get_lyx_unescapes() only (i.e., preserve regexp semantics of the string), /// Within \regexp{} apply get_lyx_unescapes() only (i.e., preserve regexp semantics of the string),
/// while outside apply get_lyx_unescapes()+get_regexp_escapes(). /// while outside apply get_lyx_unescapes()+get_regexp_escapes().
/// If match_latex is true, then apply regexp_latex_escapes() to \regexp{} contents as well. /// If match_latex is true, then apply regexp_latex_escapes() to \regexp{} contents as well.
string escape_for_regex(string s) string escape_for_regex(string s, bool withformat)
{ {
size_t lastpos = 0; size_t lastpos = 0;
string result = ""; string result = "";
@ -816,7 +828,7 @@ string escape_for_regex(string s)
break; break;
} }
size_t end_pos = s.find("\\endregexp{}}", regex_pos + 8); size_t end_pos = s.find("\\endregexp{}}", regex_pos + 8);
result += correctRegex(s.substr(regex_pos + 8, end_pos -(regex_pos + 8))); result += correctRegex(s.substr(regex_pos + 8, end_pos -(regex_pos + 8)), withformat);
lastpos = end_pos + 13; lastpos = end_pos + 13;
} }
return result; return result;
@ -1387,9 +1399,6 @@ void Intervall::addIntervall(int low, int upper)
} }
} }
typedef map<string, string> AccentsMap;
static AccentsMap accents = map<string, string>();
static void buildaccent(string n, string param, string values) static void buildaccent(string n, string param, string values)
{ {
stringstream s(n); stringstream s(n);
@ -1488,6 +1497,8 @@ static void buildAccentsMap()
accents["latexe"] = getutf8(0xf0013); accents["latexe"] = getutf8(0xf0013);
accents["LaTeXe"] = getutf8(0xf0013); accents["LaTeXe"] = getutf8(0xf0013);
accents["lyxarrow"] = getutf8(0xf0020); accents["lyxarrow"] = getutf8(0xf0020);
accents["braceleft"] = getutf8(0xf0030);
accents["braceright"] = getutf8(0xf0031);
accents["backslash lyx"] = getutf8(0xf0010); // Used logos inserted with starting \backslash accents["backslash lyx"] = getutf8(0xf0010); // Used logos inserted with starting \backslash
accents["backslash LyX"] = getutf8(0xf0010); accents["backslash LyX"] = getutf8(0xf0010);
accents["backslash tex"] = getutf8(0xf0011); accents["backslash tex"] = getutf8(0xf0011);
@ -1562,7 +1573,7 @@ void Intervall::removeAccents()
buildAccentsMap(); buildAccentsMap();
static regex const accre("\\\\(([\\S]|grave|breve|ddot|dot|acute|dacute|mathring|check|hat|bar|tilde|subdot|ogonek|" 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)\\{[^\\{\\}]+\\}" "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))|guillemot(left|right)|textasciicircum|mathcircumflex|sim)(?![a-zA-Z]))"); "|((i|imath|jmath|cdot|[a-z]+space)|((backslash )?([lL]y[xX]|[tT]e[xX]|[lL]a[tT]e[xX]e?|lyxarrow))|(brace|guillemot)(left|right)|textasciicircum|mathcircumflex|sim)(?![a-zA-Z]))");
smatch sub; smatch sub;
for (sregex_iterator itacc(par.begin(), par.end(), accre), end; itacc != end; ++itacc) { for (sregex_iterator itacc(par.begin(), par.end(), accre), end; itacc != end; ++itacc) {
sub = *itacc; sub = *itacc;
@ -2242,7 +2253,6 @@ void LatexInfo::buildKeys(bool isPatternString)
// Known charaters // Known charaters
// No split // No split
makeKey("backslash|textbackslash|slash", KeyInfo(KeyInfo::isChar, 0, false), isPatternString); makeKey("backslash|textbackslash|slash", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
makeKey("braceleft|braceright", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
makeKey("textasciicircum|textasciitilde", KeyInfo(KeyInfo::isChar, 0, false), isPatternString); makeKey("textasciicircum|textasciitilde", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
makeKey("textasciiacute|texemdash", KeyInfo(KeyInfo::isChar, 0, false), isPatternString); makeKey("textasciiacute|texemdash", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
makeKey("dots|ldots", KeyInfo(KeyInfo::isChar, 0, false), isPatternString); makeKey("dots|ldots", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
@ -3121,7 +3131,7 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'"); LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'");
} }
LYXERR(Debug::FIND, "par_as_string before escape_for_regex() is '" << par_as_string << "'"); LYXERR(Debug::FIND, "par_as_string before escape_for_regex() is '" << par_as_string << "'");
par_as_string = escape_for_regex(par_as_string); par_as_string = escape_for_regex(par_as_string, !opt.ignoreformat);
// Insert (.*?) before trailing closure of math, macros and environments, so to catch parts of them. // Insert (.*?) before trailing closure of math, macros and environments, so to catch parts of them.
LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'"); LYXERR(Debug::FIND, "par_as_string now is '" << par_as_string << "'");
LYXERR(Debug::FIND, "par_as_string after correctRegex is '" << par_as_string << "'"); LYXERR(Debug::FIND, "par_as_string after correctRegex is '" << par_as_string << "'");
@ -3258,6 +3268,13 @@ MatchResult MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_be
str = normalize(lowercase(docstr)); str = normalize(lowercase(docstr));
if (!opt.ignoreformat) { if (!opt.ignoreformat) {
str = correctlanguagesetting(str, false, !opt.ignoreformat); str = correctlanguagesetting(str, false, !opt.ignoreformat);
// remove closing '}' and '\n' to allow for use of '$' in regex
size_t lng = str.size();
while ((lng > 1) && ((str[lng -1] == '}') || (str[lng -1] == '\n')))
lng--;
if (lng != str.size()) {
str = str.substr(0, lng);
}
} }
if (str.empty()) { if (str.empty()) {
mres.match_len = -1; mres.match_len = -1;
@ -3322,7 +3339,7 @@ MatchResult MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_be
int matchend = match.capturedEnd(0); int matchend = match.capturedEnd(0);
while (mres.match_len > 0) { while (mres.match_len > 0) {
QChar c = qstr.at(matchend - 1); QChar c = qstr.at(matchend - 1);
if (c == '\n') { if ((c == '\n') || (c == '}') || (c == '{')) {
mres.match_len--; mres.match_len--;
matchend--; matchend--;
} }