commit 2348e0b61519a8a1298fcf5b4e66cfe0c293bbe1
Author: Kornel Benko <kor...@lyx.org>
Date: Tue Oct 2 11:53:01 2018 +0200
Advaced search: Added handling to search for colored text
if used with format enabled
---
src/lyxfind.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 08faf0a..936ea24 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -841,8 +841,9 @@ static size_t identifyLeading(string const & s)
{
string t = s;
// @TODO Support \item[text]
- // Kornel: Added textsf, textit and noun
- while (regex_replace(t, t, REGEX_BOS
"\\\\(emph|noun|text(bf|sl|sf|it|tt)|(u|uu)line|(s|x)out|uwave|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{",
"")
+ // Kornel: Added textsl, textsf, textit, texttt and noun
+ // + allow to seach for colored text too
+ while (regex_replace(t, t, REGEX_BOS
"\\\\(emph|noun|text(bf|sl|sf|it|tt|color\\{[a-z]+\\})|(u|uu)line|(s|x)out|uwave|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{",
"")
|| regex_replace(t, t, REGEX_BOS "\\$", "")
|| regex_replace(t, t, REGEX_BOS "\\\\\\[ ", "")
|| regex_replace(t, t, REGEX_BOS "\\\\item ", "")
@@ -1104,9 +1105,10 @@ string MatchStringAdv::normalize(docstring const & s,
bool hack_braces) const
while ((pos = t.find("\n")) != string::npos)
t.replace(pos, 1, " ");
// Remove stale empty \emph{}, \textbf{} and similar blocks from
latexify
- // Kornel: Added textsf, textit and noun
+ // Kornel: Added textsl, textsf, textit, texttt and noun
+ // + allow to seach for colored text too
LYXERR(Debug::FIND, "Removing stale empty \\emph{}, \\textbf{},
\\*section{} macros from: " << t);
- while (regex_replace(t, t,
"\\\\(emph|noun|text(bf|sl|sf|it|tt)|(u|uu)line|(s|x)out|uwave|subsubsection|subsection|section|subparagraph|paragraph|part)(\\{\\})+",
""))
+ while (regex_replace(t, t,
"\\\\(emph|noun|text(bf|sl|sf|it|tt|color\\{[a-z]+\\})|(u|uu)line|(s|x)out|uwave|subsubsection|subsection|section|subparagraph|paragraph|part)(\\{\\})+",
""))
LYXERR(Debug::FIND, " further removing stale empty \\emph{},
\\textbf{} macros from: " << t);
// FIXME - check what preceeds the brace
