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

Amend(2) 73188e3.

Browse Source 
Added noun, textsf and texit to the list of possible
leading strings if searche with format enabled.
Searching seems to work as intended now.
This commit is contained in:
Kornel Benko 2018-09-30 16:08:47 +02:00
parent cfb2a89ef3
commit 2fdc52df19
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/lyxfind.cpp
View File

@ -841,7 +841,8 @@ static size_t identifyLeading(string const & s)
{ {
string t = s; string t = s;
// @TODO Support \item[text] // @TODO Support \item[text]
while (regex_replace(t, t, REGEX_BOS "\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{", "") // Kornel: Added textsf, textit and noun
while (regex_replace(t, t, REGEX_BOS "\\\\(emph|noun|text(bf|sf|it)|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{", "")
|| regex_replace(t, t, REGEX_BOS "\\$", "") || regex_replace(t, t, REGEX_BOS "\\$", "")
|| regex_replace(t, t, REGEX_BOS "\\\\\\[ ", "") || regex_replace(t, t, REGEX_BOS "\\\\\\[ ", "")
|| regex_replace(t, t, REGEX_BOS "\\\\item ", "") || regex_replace(t, t, REGEX_BOS "\\\\item ", "")
@ -930,8 +931,8 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const &
++close_wildcards; ++close_wildcards;
} }
if (!opt.ignoreformat) { if (!opt.ignoreformat) {
// Remove extra '}' at end // Remove extra '\}' at end
regex_replace(par_as_string, par_as_string, "(.*)\\\\}$", "$1"); while ( regex_replace(par_as_string, par_as_string, "(.*)\\\\}$", "$1"));
// save '\.' // save '\.'
regex_replace(par_as_string, par_as_string, "\\\\\\.", "_xxbdotxx_"); regex_replace(par_as_string, par_as_string, "\\\\\\.", "_xxbdotxx_");
// handle '.' -> '[^]', replace later as '[^\}\{\\]' // handle '.' -> '[^]', replace later as '[^\}\{\\]'
@ -949,12 +950,14 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const &
LYXERR(Debug::FIND, "Replaced text (to be used as regex): " << par_as_string); LYXERR(Debug::FIND, "Replaced text (to be used as regex): " << par_as_string);
// If entered regexp must match at begin of searched string buffer // If entered regexp must match at begin of searched string buffer
string regexp_str = lead_as_regexp + par_as_string; // Kornel: Added parentheses to use $1 for size of the leading string
string regexp_str = "(" + lead_as_regexp + ")" + par_as_string;
LYXERR(Debug::FIND, "Setting regexp to : '" << regexp_str << "'"); LYXERR(Debug::FIND, "Setting regexp to : '" << regexp_str << "'");
regexp = lyx::regex(regexp_str); regexp = lyx::regex(regexp_str);
// If entered regexp may match wherever in searched string buffer // If entered regexp may match wherever in searched string buffer
string regexp2_str = lead_as_regexp + ".*" + par_as_string; // Kornel: Added parentheses to use $1 for size of the leading string
string regexp2_str = "(" + lead_as_regexp + ").*" + par_as_string;
LYXERR(Debug::FIND, "Setting regexp2 to: '" << regexp2_str << "'"); LYXERR(Debug::FIND, "Setting regexp2 to: '" << regexp2_str << "'");
regexp2 = lyx::regex(regexp2_str); regexp2 = lyx::regex(regexp2_str);
} }
@ -999,14 +1002,29 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con
// except the last "padding" one inserted by lyx. // except the last "padding" one inserted by lyx.
for (size_t i = 1; i < m.size() - 1; ++i) for (size_t i = 1; i < m.size() - 1; ++i)
if (!braces_match(m[i].first, m[i].second)) if (!braces_match(m[i].first, m[i].second))
return false; return 0;
// Exclude from the returned match length any length // Exclude from the returned match length any length
// due to close wildcards added at end of regexp // due to close wildcards added at end of regexp
// and also the length of the leading (e.g. '\emph{')
//
// Whole found string, including the leading: m[0].second - m[0].first
// Size of the leading string: m[1].second - m[1].first
int leadingsize = 0;
if (m.size() > 1)
leadingsize = m[1].second - m[1].first;
int result;
if (close_wildcards == 0) if (close_wildcards == 0)
return m[0].second - m[0].first; result = m[0].second - m[0].first;
return m[m.size() - close_wildcards].first - m[0].first; else
result = m[m.size() - close_wildcards].first - m[0].first;
if (result > leadingsize)
result -= leadingsize;
else
result = 0;
return(result);
} }
// else !use_regexp: but all code paths above return // else !use_regexp: but all code paths above return
@ -1074,8 +1092,9 @@ string MatchStringAdv::normalize(docstring const & s, bool hack_braces) const
while ((pos = t.find("\n")) != string::npos) while ((pos = t.find("\n")) != string::npos)
t.replace(pos, 1, " "); t.replace(pos, 1, " ");
// Remove stale empty \emph{}, \textbf{} and similar blocks from latexify // Remove stale empty \emph{}, \textbf{} and similar blocks from latexify
// Kornel: Added textsf, textit and noun
LYXERR(Debug::FIND, "Removing stale empty \\emph{}, \\textbf{}, \\*section{} macros from: " << t); LYXERR(Debug::FIND, "Removing stale empty \\emph{}, \\textbf{}, \\*section{} macros from: " << t);
while (regex_replace(t, t, "\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)(\\{\\})+", "")) while (regex_replace(t, t, "\\\\(emph|noun|text(bf|sf|it)|subsubsection|subsection|section|subparagraph|paragraph|part)(\\{\\})+", ""))
LYXERR(Debug::FIND, " further removing stale empty \\emph{}, \\textbf{} macros from: " << t); LYXERR(Debug::FIND, " further removing stale empty \\emph{}, \\textbf{} macros from: " << t);
// FIXME - check what preceeds the brace // FIXME - check what preceeds the brace