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

FindAdv: Polishing

Browse Source 
1.) Handle some unclosed parentheses
	Sometimes \shortcut is not correctly closed
2.) Added \ldots as known char
3.) Discard some shapes (circlepar, droppar, ...)
4.) Omit resulting empty string and use some value
	which cannot be matched instead
This commit is contained in:
Kornel Benko 2018-11-08 09:59:51 +01:00
parent 2daf493cbc
commit 0c05432284
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lyxfind.cpp
View File

@ -1475,12 +1475,12 @@ void LatexInfo::buildEntries(bool isPatternString)
else { else {
// begin|end of unknown env, discard // begin|end of unknown env, discard
found = keys[key]; found = keys[key];
// discard spaces and '%' before pos(0) // discard spaces before pos(0)
int pos = sub.position(size_t(0)); int pos = sub.position(size_t(0));
int count; int count;
for (count = 0; pos - count > 0; count++) { for (count = 0; pos - count > 0; count++) {
char c = interval.par[pos-count-1]; char c = interval.par[pos-count-1];
if ((c != ' ') && (c != '%')) if (c != ' ')
break; break;
} }
found.keytype = KeyInfo::doRemove; found.keytype = KeyInfo::doRemove;
@ -1533,7 +1533,16 @@ void LatexInfo::buildEntries(bool isPatternString)
} }
found._tokensize = found.head.length(); found._tokensize = found.head.length();
found._dataStart = found._tokenstart + found.head.length(); found._dataStart = found._tokenstart + found.head.length();
found._dataEnd = interval.findclosing(found._dataStart, interval.par.length()); size_t endpos = interval.findclosing(found._dataStart, interval.par.length());
if ((endpos == interval.par.length()) &&
(found.keytype == KeyInfo::doRemove)) {
// Missing closing => error in latex-input?
// therefore do not delete remaining data
found._dataStart -= 1;
found._dataEnd = found._dataStart;
}
else
found._dataEnd = endpos;
if (isPatternString) { if (isPatternString) {
keys[key].used = true; keys[key].used = true;
} }
@ -1591,7 +1600,7 @@ void LatexInfo::buildKeys(bool isPatternString)
// Know charaters // Know charaters
// No split // No split
makeKey("backslash|textbackslash|textasciicircum|textasciitilde", KeyInfo(KeyInfo::isChar, 1, false), isPatternString); makeKey("backslash|textbackslash|textasciicircum|textasciitilde|ldots", KeyInfo(KeyInfo::isChar, 1, false), isPatternString);
// Found in fr/UserGuide.lyx // Found in fr/UserGuide.lyx
makeKey("og|fg", KeyInfo(KeyInfo::isChar, 0, false), isPatternString); makeKey("og|fg", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
@ -1606,7 +1615,13 @@ void LatexInfo::buildKeys(bool isPatternString)
// Same effect as previous, parameter will survive (because there is no one anyway) // Same effect as previous, parameter will survive (because there is no one anyway)
// No split // No split
makeKey("noindent", KeyInfo(KeyInfo::isStandard, 0, true), isPatternString); makeKey("noindent", KeyInfo(KeyInfo::isStandard, 0, true), isPatternString);
// Remove table decorations
makeKey("hline|tabularnewline|toprule|bottomrule|midrule", KeyInfo(KeyInfo::doRemove, 0, true), isPatternString); makeKey("hline|tabularnewline|toprule|bottomrule|midrule", KeyInfo(KeyInfo::doRemove, 0, true), isPatternString);
// Discard shape-header
makeKey("circlepar|diamondpar|heartpar|nutpar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
makeKey("trianglerightpar|hexagonpar|starpar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
makeKey("triangleuppar|triangledownpar|droppar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
makeKey("triangleleftpar|shapepar|dropuppar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
// like ('tiny{}' or '\tiny ' ... } // like ('tiny{}' or '\tiny ' ... }
makeKey("footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge", KeyInfo(KeyInfo::isSize, 0, true), isPatternString); makeKey("footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge", KeyInfo(KeyInfo::isSize, 0, true), isPatternString);
@ -1846,7 +1861,7 @@ int LatexInfo::dispatch(ostringstream &os, int previousStart, KeyInfo &actual)
break; break;
} }
case KeyInfo::isSectioning: { case KeyInfo::isSectioning: {
// Discard space before _tokenstart // Discard spaces before _tokenstart
int count; int count;
for (count = 0; count < actual._tokenstart; count++) { for (count = 0; count < actual._tokenstart; count++) {
if (interval.par[actual._tokenstart-count-1] != ' ') if (interval.par[actual._tokenstart-count-1] != ' ')
@ -2019,6 +2034,10 @@ string splitOnKnownMacros(string par, bool isPatternString) {
(void) li.process(os, firstKey); (void) li.process(os, firstKey);
} }
s = os.str(); s = os.str();
if (s.empty()) {
// return string definitelly impossible to match
s = "\\foreignlanguage{ignore}{ }";
}
} }
else else
s = par; /* no known macros found */ s = par; /* no known macros found */