#include "BufferView.h"
#include "Changes.h"
#include "Cursor.h"
+#include "Encoding.h"
#include "ErrorList.h"
#include "FuncCode.h"
#include "FuncRequest.h"
typedef pair<pit_type, int> PitPosPair;
-typedef limited_stack<pair<ParagraphList, DocumentClass const *> > CutStack;
+typedef limited_stack<pair<ParagraphList, DocumentClassConstPtr> > CutStack;
CutStack theCuts(10);
// persistent selection, cleared until the next selection
}
-pair<PitPosPair, pit_type>
-pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
- DocumentClass const * const oldDocClass, ErrorList & errorlist)
+struct PasteReturnValue {
+ PasteReturnValue(pit_type r_par, pos_type r_pos, bool r_nu) :
+ par(r_par), pos(r_pos), needupdate(r_nu)
+ {}
+
+ pit_type par;
+ pos_type pos;
+ bool needupdate;
+};
+
+PasteReturnValue
+pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
+ DocumentClassConstPtr oldDocClass, Buffer * tmpbuffer,
+ ErrorList & errorlist)
{
Buffer const & buffer = *cur.buffer();
pit_type pit = cur.pit();
pos_type pos = cur.pos();
+ bool need_update = false;
InsetText * target_inset = cur.inset().asInsetText();
if (!target_inset) {
InsetTabular * it = cur.inset().asInsetTabular();
target_inset = it? it->cell(cur.idx())->asInsetText() : 0;
}
- LASSERT(target_inset, return make_pair(PitPosPair(pit, pos), pit));
+ LASSERT(target_inset, return PasteReturnValue(pit, pos, need_update));
ParagraphList & pars = target_inset->paragraphs();
if (parlist.empty())
- return make_pair(PitPosPair(pit, pos), pit);
+ return PasteReturnValue(pit, pos, need_update);
BOOST_ASSERT (pos <= pars[pit].size());
// Make a copy of the CaP paragraphs.
ParagraphList insertion = parlist;
- DocumentClass const * const newDocClass =
- buffer.params().documentClassPtr();
+ DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr();
// Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required.
docstring const oldname = lab->getParam("name");
lab->updateLabel(oldname);
// We need to update the buffer reference cache.
- cur.forceBufferUpdate();
+ need_update = true;
docstring const newname = lab->getParam("name");
if (oldname == newname)
continue;
docstring const oldname = lab.getParam("name");
lab.updateLabel(oldname);
// We need to update the buffer reference cache.
- cur.forceBufferUpdate();
+ need_update = true;
docstring const newname = lab.getParam("name");
if (oldname == newname)
break;
InsetInclude & inc = static_cast<InsetInclude &>(*it);
inc.updateCommand();
// We need to update the list of included files.
- cur.forceBufferUpdate();
+ need_update = true;
break;
}
docstring const oldkey = bib.getParam("key");
bib.updateCommand(oldkey, false);
// We need to update the buffer reference cache.
- cur.forceBufferUpdate();
+ need_update = true;
docstring const newkey = bib.getParam("key");
if (oldkey == newkey)
break;
|| (is_child && (branchlist.find(name)
|| buffer.masterBuffer()->params().branchlist().find(name))))
break;
- // FIXME: add an option to add the branch to the master's BranchList.
- docstring text = bformat(
+ if (tmpbuffer) {
+ // This is for a temporary buffer, so simply create the branch.
+ // Must not use lyx::dispatch(), since tmpbuffer has no view.
+ DispatchResult dr;
+ tmpbuffer->dispatch(FuncRequest(LFUN_BRANCH_ADD, name), dr);
+ } else {
+ docstring text = bformat(
_("The pasted branch \"%1$s\" is undefined.\n"
"Do you want to add it to the document's branch list?"),
name);
- if (frontend::Alert::prompt(_("Unknown branch"),
+ if (frontend::Alert::prompt(_("Unknown branch"),
text, 0, 1, _("&Add"), _("&Don't Add")) != 0)
- break;
- lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name));
+ break;
+ lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name));
+ }
// We need to update the list of branches.
- cur.forceBufferUpdate();
+ need_update = true;
break;
}
}
}
- return make_pair(PitPosPair(pit, pos), last_paste + 1);
+ return PasteReturnValue(pit, pos, need_update);
}
void putClipboard(ParagraphList const & paragraphs,
- DocumentClass const * const docclass, docstring const & plaintext)
+ DocumentClassConstPtr docclass, docstring const & plaintext)
{
- // For some strange reason gcc 3.2 and 3.3 do not accept
- // Buffer buffer(string(), false);
- // This needs to be static to avoid a memory leak. When a Buffer is
- // constructed, it constructs a BufferParams, which in turn constructs
- // a DocumentClass, via new, that is never deleted. If we were to go to
- // some kind of garbage collection there, or a shared_ptr, then this
- // would not be needed.
- static Buffer * buffer = theBufferList().newBuffer(
- FileName::tempName().absFileName() + "_clipboard.internal");
- buffer->setUnnamed(true);
- buffer->paragraphs() = paragraphs;
- buffer->inset().setBuffer(*buffer);
+ // This used to need to be static to avoid a memory leak. It no longer needs
+ // to be so, but the alternative is to construct a new one of these (with a
+ // new temporary directory, etc) every time, and then to destroy it. So maybe
+ // it's worth just keeping this one around.
+ static Buffer * staticbuffer = theBufferList().newInternalBuffer(
+ FileName::tempName("clipboard.internal").absFileName());
+
+ // These two things only really need doing the first time.
+ staticbuffer->setUnnamed(true);
+ staticbuffer->inset().setBuffer(*staticbuffer);
+
+ // Use a clone for the complicated stuff so that we do not need to clean
+ // up in order to avoid a crash.
+ Buffer * buffer = staticbuffer->cloneBufferOnly();
+ LASSERT(buffer, return);
+
+ // This needs doing every time.
buffer->params().setDocumentClass(docclass);
- ostringstream lyx;
- if (buffer->write(lyx))
- theClipboard().put(lyx.str(), plaintext);
- else
- theClipboard().put(string(), plaintext);
+
+ // we will use pasteSelectionHelper to copy the paragraphs into the
+ // temporary Buffer, since it does a lot of things to fix them up.
+ DocIterator dit = doc_iterator_begin(buffer, &buffer->inset());
+ ErrorList el;
+ pasteSelectionHelper(dit, paragraphs, docclass, buffer, el);
+
+ // We don't want to produce images that are not used. Therefore,
+ // output formulas as MathML. Even if this is not understood by all
+ // applications, the number that can parse it should go up in the future.
+ buffer->params().html_math_output = BufferParams::MathML;
+
+ // Make sure MarkAsExporting is deleted before buffer is
+ {
+ // The Buffer is being used to export. This is necessary so that the
+ // updateMacros call will record the needed information.
+ MarkAsExporting mex(buffer);
+
+ buffer->updateBuffer(Buffer::UpdateMaster, OutputUpdate);
+ buffer->updateMacros();
+ buffer->updateMacroInstances(OutputUpdate);
+
+ // LyX's own format
+ string lyx;
+ ostringstream oslyx;
+ if (buffer->write(oslyx))
+ lyx = oslyx.str();
+
+ // XHTML format
+ odocstringstream oshtml;
+ OutputParams runparams(encodings.fromLyXName("utf8"));
+ // We do not need to produce images, etc.
+ runparams.dryrun = true;
+ buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource);
+
+ theClipboard().put(lyx, oshtml.str(), plaintext);
+ }
+
// Save that memory
- buffer->paragraphs().clear();
+ delete buffer;
}
void copySelectionHelper(Buffer const & buf, Text const & text,
pit_type startpit, pit_type endpit,
- int start, int end, DocumentClass const * const dc, CutStack & cutstack)
+ int start, int end, DocumentClassConstPtr dc, CutStack & cutstack)
{
ParagraphList const & pars = text.paragraphs();
- LASSERT(0 <= start && start <= pars[startpit].size(), /**/);
- LASSERT(0 <= end && end <= pars[endpit].size(), /**/);
- LASSERT(startpit != endpit || start <= end, /**/);
+ // In most of these cases, we can try to recover.
+ LASSERT(0 <= start, start = 0);
+ LASSERT(start <= pars[startpit].size(), start = pars[startpit].size());
+ LASSERT(0 <= end, end = 0);
+ LASSERT(end <= pars[endpit].size(), end = pars[endpit].size());
+ LASSERT(startpit != endpit || start <= end, return);
// Clone the paragraphs within the selection.
ParagraphList copy_pars(boost::next(pars.begin(), startpit),
ParagraphList::iterator it = copy_pars.begin();
ParagraphList::iterator it_end = copy_pars.end();
- for (; it != it_end; it++) {
+ for (; it != it_end; ++it) {
// Since we have a copy of the paragraphs, the insets
// do not have a proper buffer reference. It makes
// sense to add them temporarily, because the
// do some final cleanup now, to make sure that the paragraphs
// are not linked to something else.
it = copy_pars.begin();
- for (; it != it_end; it++) {
+ for (; it != it_end; ++it) {
it->setBuffer(*static_cast<Buffer *>(0));
it->setInsetOwner(0);
}
- DocumentClass * d = const_cast<DocumentClass *>(dc);
- cutstack.push(make_pair(copy_pars, d));
+ cutstack.push(make_pair(copy_pars, dc));
}
} // namespace anon
}
-void switchBetweenClasses(DocumentClass const * const oldone,
- DocumentClass const * const newone, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(DocumentClassConstPtr oldone,
+ DocumentClassConstPtr newone, InsetText & in, ErrorList & errorlist)
{
errorlist.clear();
- LASSERT(!in.paragraphs().empty(), /**/);
+ LBUFERR(!in.paragraphs().empty());
if (oldone == newone)
return;
if (cur.inTexted()) {
Text * text = cur.text();
- LASSERT(text, /**/);
+ LBUFERR(text);
saveSelection(cur);
putClipboard(theCuts[0].first, theCuts[0].second, plaintext);
}
+
namespace {
void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
if (cur.inTexted()) {
Text * text = cur.text();
- LASSERT(text, /**/);
+ LBUFERR(text);
// ok we have a selection. This is always between cur.selBegin()
// and sel_end cursor
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
- DocumentClass const * const docclass, ErrorList & errorList)
+ DocumentClassConstPtr docclass, ErrorList & errorList)
{
if (cur.inTexted()) {
Text * text = cur.text();
- LASSERT(text, /**/);
+ LBUFERR(text);
- pit_type endpit;
- PitPosPair ppp;
-
- boost::tie(ppp, endpit) =
- pasteSelectionHelper(cur, parlist, docclass, errorList);
+ PasteReturnValue prv =
+ pasteSelectionHelper(cur, parlist, docclass, 0, errorList);
cur.forceBufferUpdate();
cur.clearSelection();
- text->setCursor(cur, ppp.first, ppp.second);
+ text->setCursor(cur, prv.par, prv.pos);
}
// mathed is handled in InsetMathNest/InsetMathGrid
- LASSERT(!cur.inMathed(), /**/);
+ LATTEST(!cur.inMathed());
}
cur.recordUndo();
pasteParagraphList(cur, theCuts[sel_index].first,
theCuts[sel_index].second, errorList);
- cur.setSelection();
}
-void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs)
+void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
+ Clipboard::TextType type)
{
// Use internal clipboard if it is the most recent one
+ // This overrides asParagraphs and type on purpose!
if (theClipboard().isInternal()) {
pasteFromStack(cur, errorList, 0);
return;
}
// First try LyX format
- if (theClipboard().hasLyXContents()) {
+ if ((type == Clipboard::LyXTextType ||
+ type == Clipboard::LyXOrPlainTextType ||
+ type == Clipboard::AnyTextType) &&
+ theClipboard().hasTextContents(Clipboard::LyXTextType)) {
string lyx = theClipboard().getAsLyX();
if (!lyx.empty()) {
// For some strange reason gcc 3.2 and 3.3 do not accept
cur.recordUndo();
pasteParagraphList(cur, buffer.paragraphs(),
buffer.params().documentClassPtr(), errorList);
- cur.setSelection();
return;
}
}
}
+ // Then try TeX and HTML
+ Clipboard::TextType types[2] = {Clipboard::HtmlTextType, Clipboard::LaTeXTextType};
+ string names[2] = {"html", "latex"};
+ for (int i = 0; i < 2; ++i) {
+ if (type != types[i] && type != Clipboard::AnyTextType)
+ continue;
+ bool available = theClipboard().hasTextContents(types[i]);
+
+ // If a specific type was explicitly requested, try to
+ // interpret plain text: The user told us that the clipboard
+ // contents is in the desired format
+ if (!available && type == types[i]) {
+ types[i] = Clipboard::PlainTextType;
+ available = theClipboard().hasTextContents(types[i]);
+ }
+
+ if (available) {
+ docstring text = theClipboard().getAsText(types[i]);
+ available = !text.empty();
+ if (available) {
+ // For some strange reason gcc 3.2 and 3.3 do not accept
+ // Buffer buffer(string(), false);
+ Buffer buffer("", false);
+ buffer.setUnnamed(true);
+ if (buffer.importString(names[i], text, errorList)) {
+ cur.recordUndo();
+ pasteParagraphList(cur, buffer.paragraphs(),
+ buffer.params().documentClassPtr(), errorList);
+ return;
+ }
+ }
+ }
+ }
+
// Then try plain text
- docstring const text = theClipboard().getAsText();
+ docstring const text = theClipboard().getAsText(Clipboard::PlainTextType);
if (text.empty())
return;
cur.recordUndo();
cur.text()->insertStringAsParagraphs(cur, text, cur.current_font);
else
cur.text()->insertStringAsLines(cur, text, cur.current_font);
- cur.setSelection();
}
asParagraphs = false;
} else {
// Then try plain text
- text = theClipboard().getAsText();
+ text = theClipboard().getAsText(Clipboard::PlainTextType);
}
if (text.empty())
void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
Clipboard::GraphicsType preferedType)
{
- LASSERT(theClipboard().hasGraphicsContents(preferedType), /**/);
+ LASSERT(theClipboard().hasGraphicsContents(preferedType), return);
// get picture from clipboard
FileName filename = theClipboard().getAsGraphics(cur, preferedType);
projects / lyx.git / blobdiff