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

FindAdv: Add handling of regex char '^' at start also for search with disabled format

Browse Source 
lyxfind.cpp:
	handle \mathcircumflex inside regex
output_latex.cpp:
	don't mark extra end of parameters if no options involved
This commit is contained in:
Kornel Benko 2021-01-14 14:44:21 +01:00
parent 9bdd0b31db
commit a7590d33e3
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/lyxfind.cpp
View File

@ -763,32 +763,34 @@ string correctRegex(string t)
/* Convert \backslash => \ /* Convert \backslash => \
* and \{, \}, \[, \] => {, }, [, ] * and \{, \}, \[, \] => {, }, [, ]
*/ */
string s(""); string s("");
regex wordre("(\\\\)*(\\\\((backslash) ?|[\\[\\]\\{\\}]))"); regex wordre("(\\\\)*(\\\\((backslash|mathcircumflex) ?|[\\[\\]\\{\\}]))");
size_t lastpos = 0; size_t lastpos = 0;
smatch sub; smatch sub;
for (sregex_iterator it(t.begin(), t.end(), wordre), end; it != end; ++it) { for (sregex_iterator it(t.begin(), t.end(), wordre), end; it != end; ++it) {
sub = *it; sub = *it;
string replace; string replace;
if ((sub.position(2) - sub.position(0)) % 2 == 1) { if ((sub.position(2) - sub.position(0)) % 2 == 1) {
continue; continue;
} }
else { else {
if (sub.str(4) == "backslash") if (sub.str(4) == "backslash")
replace = "\\"; replace = "\\";
else else if (sub.str(4) == "mathcircumflex")
replace = sub.str(3); replace = "^";
} else
if (lastpos < (size_t) sub.position(2)) replace = sub.str(3);
s += t.substr(lastpos, sub.position(2) - lastpos); }
s += replace; if (lastpos < (size_t) sub.position(2))
lastpos = sub.position(2) + sub.length(2); s += t.substr(lastpos, sub.position(2) - lastpos);
} s += replace;
if (lastpos == 0) lastpos = sub.position(2) + sub.length(2);
return t; }
else if (lastpos < t.length()) if (lastpos == 0)
s += t.substr(lastpos, t.length() - lastpos); return t;
return s; else if (lastpos < t.length())
s += t.substr(lastpos, t.length() - lastpos);
return s;
} }
/// 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),
@ -2121,7 +2123,7 @@ void LatexInfo::buildEntries(bool isPatternString)
} }
closings = 0; closings = 0;
} }
if (interval_.par.substr(found._dataStart-1, 15).compare("\\endarguments{}") == 0) { if (interval_.par.substr(found._dataStart, 15).compare("\\endarguments{}") == 0) {
found._dataStart += 15; found._dataStart += 15;
} }
size_t endpos; size_t endpos;
@ -3120,9 +3122,9 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
++close_wildcards; ++close_wildcards;
} }
*/ */
size_t lng = par_as_string.size();
if (!opt.ignoreformat) { if (!opt.ignoreformat) {
// Remove extra '\}' at end if not part of \{\.\} // Remove extra '\}' at end if not part of \{\.\}
size_t lng = par_as_string.size();
while(lng > 2) { while(lng > 2) {
if (par_as_string.substr(lng-2, 2).compare("\\}") == 0) { if (par_as_string.substr(lng-2, 2).compare("\\}") == 0) {
if (lng >= 6) { if (lng >= 6) {
@ -3137,11 +3139,11 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
} }
if (lng < par_as_string.size()) if (lng < par_as_string.size())
par_as_string = par_as_string.substr(0,lng); par_as_string = par_as_string.substr(0,lng);
if ((lng > 0) && (par_as_string[0] == '^')) { }
par_as_string = par_as_string.substr(1); if ((lng > 0) && (par_as_string[0] == '^')) {
--lng; par_as_string = par_as_string.substr(1);
opt.matchstart = true; --lng;
} opt.matchstart = true;
} }
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, "Open braces: " << open_braces); LYXERR(Debug::FIND, "Open braces: " << open_braces);

2
src/output_latex.cpp
View File

@ -549,7 +549,7 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX
} }
} }
} }
if (runparams.for_search) { if (runparams.for_search && argnr > 1) {
// Mark end of arguments for findadv() only // Mark end of arguments for findadv() only
os << "\\endarguments{}"; os << "\\endarguments{}";
} }