anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Find LyX with replace, in common use cases.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31141 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2009-08-19 15:14:28 +00:00
parent dbdf88f2f4
commit 5b1e7027ba
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt4/FindAndReplace.cpp
View File

@ -126,8 +126,10 @@ void FindAndReplaceWidget::findAndReplace(
bool const regexp = to_utf8(searchString).find("\\regexp") != std::string::npos; bool const regexp = to_utf8(searchString).find("\\regexp") != std::string::npos;
docstring replaceString; docstring replaceString;
if (replace) { if (replace) {
Buffer & replace_buffer = replace_work_area_->bufferView().buffer(); Buffer & repl_buffer = replace_work_area_->bufferView().buffer();
replaceString = buffer_to_latex(replace_buffer); ostringstream oss;
repl_buffer.write(oss);
replaceString = from_utf8(oss.str()); //buffer_to_latex(replace_buffer);
} else { } else {
replaceString = from_utf8(LYX_FR_NULL_STRING); replaceString = from_utf8(LYX_FR_NULL_STRING);
} }

44
src/lyxfind.cpp
View File

@ -802,11 +802,11 @@ docstring stringifyFromCursor(DocIterator const & cur, int len)
return docstring(); return docstring();
} }
/** Computes the LaTeX export of buf starting from cur and ending len positions /** Computes the LaTeX export of buf starting from cur and ending len positions
* after cur, if len is positive, or at the paragraph or innermost inset end * after cur, if len is positive, or at the paragraph or innermost inset end
* if len is -1. * if len is -1.
*/ */
docstring latexifyFromCursor(DocIterator const & cur, int len) docstring latexifyFromCursor(DocIterator const & cur, int len)
{ {
LYXERR(Debug::FIND, "Latexifying with len=" << len << " from cursor at pos: " << cur); LYXERR(Debug::FIND, "Latexifying with len=" << len << " from cursor at pos: " << cur);
@ -1092,9 +1092,45 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
LYXERR(Debug::FIND, "Putting selection at " << cur << " with len: " << match_len); LYXERR(Debug::FIND, "Putting selection at " << cur << " with len: " << match_len);
bv->putSelectionAt(cur, match_len, ! opt.forward); bv->putSelectionAt(cur, match_len, ! opt.forward);
bv->message(_("Match found!")); if (opt.replace == docstring(from_utf8(LYX_FR_NULL_STRING))) {
if (opt.replace != docstring(from_utf8(LYX_FR_NULL_STRING))) { bv->message(_("Match found !"));
dispatch(FuncRequest(LFUN_SELF_INSERT, opt.replace)); } else {
string lyx = to_utf8(opt.replace);
// FIXME: Seems so stupid to me to rebuild a buffer here,
// when we already have one (replace_work_area_.buffer())
Buffer repl_buffer("", false);
repl_buffer.setUnnamed(true);
if (repl_buffer.readString(lyx)) {
cap::cutSelection(bv->cursor(), true, false);
if (! cur.inMathed()) {
LYXERR(Debug::FIND, "Replacing by pasteParagraphList()ing repl_buffer");
cap::pasteParagraphList(bv->cursor(), repl_buffer.paragraphs(),
repl_buffer.params().documentClassPtr(),
bv->buffer().errorList("Paste"));
} else {
odocstringstream ods;
OutputParams runparams(&repl_buffer.params().encoding());
runparams.nice = false;
runparams.flavor = OutputParams::LATEX;
runparams.linelen = 8000; //lyxrc.plaintext_linelen;
runparams.dryrun = true;
TexRow texrow;
TeXOnePar(repl_buffer, repl_buffer.text(), repl_buffer.paragraphs().begin(), ods, texrow, runparams);
//repl_buffer.getSourceCode(ods, 0, repl_buffer.paragraphs().size(), false);
docstring repl_latex = ods.str();
LYXERR(Debug::FIND, "Latexified replace_buffer: '" << repl_latex << "'");
string s;
regex_replace(to_utf8(repl_latex), s, "\\$(.*)\\$", "$1");
regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1");
repl_latex = from_utf8(s);
LYXERR(Debug::FIND, "Replacing by niceInsert()ing latex: '" << repl_latex << "'");
bv->cursor().niceInsert(repl_latex);
}
bv->putSelectionAt(cur, repl_buffer.paragraphs().begin()->size(), ! opt.forward);
bv->message(_("Match found and replaced !"));
} else
LASSERT(false, /**/);
// dispatch(FuncRequest(LFUN_SELF_INSERT, opt.replace));
} }
return true; return true;