anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend 74c849d, Advanced search with format

Browse Source 
Remove macros like '\tiny ' or '\tiny{}' or '\tiny' followed by
any other non-alpha char correctly
This commit is contained in:
Kornel Benko 2018-10-23 19:59:08 +02:00
parent 73b1c658a2
commit ff9c32b382
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lyxfind.cpp
View File

@ -1221,7 +1221,7 @@ int Intervall::findclosing(int start, int end)
void LatexInfo::buildEntries()
{
static regex const rmath("\\\\(begin|end)\\{((eqnarray|equation|flalign|gather|multiline|align)\\*?)\\}");
static regex const rkeys("\\\\((([a-z]+\\*?)(\\{([a-z]+)\\})?))([\\{ ])");
static regex const rkeys("\\\\((([a-z]+\\*?)(\\{([a-z]+\\*?)\\})?))");
smatch sub, submath;
bool evaluatingRegexp = false;
KeyInfo found;
@ -1297,7 +1297,7 @@ void LatexInfo::buildEntries()
}
if (found.parenthesiscount == 0) {
// Probably to be discarded
if (interval.par[sub.position(0) + sub.str(3).length()] == ' ')
if (interval.par[sub.position(0) + sub.str(3).length() + 1] == ' ')
found.head = "\\" + sub.str(3) + " ";
else
found.head = "\\" + sub.str(3);
@ -1310,7 +1310,7 @@ void LatexInfo::buildEntries()
found.head = "\\" + sub.str(3) + "{";
}
else if (found.parenthesiscount == 2) {
found.head = sub.str(0);
found.head = sub.str(0) + "{";
found._tokensize = found.head.length();
}
found._tokensize = found.head.length();
@ -1388,13 +1388,16 @@ void LatexInfo::buildKeys()
// Same effect as previous, parameter will survive (because there is no one anyway)
// No split
makeKey("noindent", KeyInfo(KeyInfo::isStandard, 0, true));
// like (tiny{} ... }
// like ('tiny{}' or '\tiny ' ... }
makeKey("footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge", KeyInfo(KeyInfo::isSize, 0, true));
// Survives, like known character
makeKey("lyx", KeyInfo(KeyInfo::isIgnored, 0, false));
makeKey("begin", KeyInfo(KeyInfo::isMath, 1, false));
makeKey("end", KeyInfo(KeyInfo::isMath, 1, false));
makeKey("par", KeyInfo(KeyInfo::doRemove, 0, true));
keysBuilt = true;
}
@ -1493,7 +1496,8 @@ void LatexInfo::processRegion(int start, int region_end)
{
while (start < region_end) {
if (interval.par[start] == '{') {
int closing = interval.findclosing(start+1, region_end);
// Closing is allowed past the region
int closing = interval.findclosing(start+1, interval.par.length());
interval.addIntervall(start, start+1);
interval.addIntervall(closing, closing+1);
}
@ -1675,7 +1679,7 @@ string splitOnKnownMacros(string par) {
ostringstream os;
LatexInfo li(par);
KeyInfo DummyKey = KeyInfo(KeyInfo::KeyType::isMain, 2, true);
DummyKey.head="";
DummyKey.head = "";
DummyKey._tokensize = 0;
DummyKey._tokenstart = 0;
DummyKey._dataStart = 0;