#include "BufferView.h"
#include "Changes.h"
#include "Cursor.h"
-#include "debug.h"
#include "ErrorList.h"
#include "FuncRequest.h"
-#include "gettext.h"
#include "InsetIterator.h"
#include "InsetList.h"
#include "Language.h"
#include "Undo.h"
#include "insets/InsetFlex.h"
+#include "insets/InsetGraphics.h"
+#include "insets/InsetGraphicsParams.h"
#include "insets/InsetTabular.h"
#include "mathed/MathData.h"
#include "mathed/InsetMath.h"
#include "mathed/MathSupport.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
#include "support/limited_stack.h"
#include "support/lstrings.h"
#include "frontends/Clipboard.h"
#include "frontends/Selection.h"
-#include <boost/current_function.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/next_prior.hpp>
#include <string>
-using std::endl;
-using std::for_each;
-using std::make_pair;
-using std::pair;
-using std::vector;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
+using lyx::frontend::Clipboard;
namespace lyx {
-using support::bformat;
-using frontend::Clipboard;
-
namespace {
-typedef std::pair<pit_type, int> PitPosPair;
+typedef pair<pit_type, int> PitPosPair;
typedef limited_stack<pair<ParagraphList, TextClassPtr> > CutStack;
c1 = p.col(i1.idx());
c2 = p.col(i2.idx());
if (c1 > c2)
- std::swap(c1, c2);
+ swap(c1, c2);
r1 = p.row(i1.idx());
r2 = p.row(i2.idx());
if (r1 > r2)
- std::swap(r1, r2);
+ swap(r1, r2);
}
}
}
- // If we are in an inset which returns forceDefaultParagraphs,
- // set the paragraphs to default
- if (cur.inset().forceDefaultParagraphs(cur.idx())) {
+ // set the paragraphs to empty layout if necessary
+ // note that we are doing this if the empty layout is
+ // supposed to be the default, not just if it is forced
+ if (cur.inset().useEmptyLayout()) {
LayoutPtr const layout =
- buffer.params().getTextClass().defaultLayout();
+ buffer.params().getTextClass().emptyLayout();
ParagraphList::iterator const end = insertion.end();
for (ParagraphList::iterator par = insertion.begin();
par != end; ++par)
// Set the inset owner of this paragraph.
tmpbuf->setInsetOwner(pars[pit].inInset());
for (pos_type i = 0; i < tmpbuf->size(); ++i) {
- if (tmpbuf->isInset(i) &&
- !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
- // do not track deletion of invalid insets
- tmpbuf->eraseChar(i--, false);
+ // do not track deletion of invalid insets
+ if (Inset * inset = tmpbuf->getInset(i))
+ if (!pars[pit].insetAllowed(inset->lyxCode()))
+ tmpbuf->eraseChar(i--, false);
}
tmpbuf->setChange(Change(buffer.params().trackChanges ?
// Separate handling of paragraph break:
if (merge && pit != endpit &&
- (pit + 1 != endpit || pars[pit].hasSameLayout(pars[endpit]))) {
+ (pit + 1 != endpit
+ || pars[pit].hasSameLayout(pars[endpit])
+ || pars[endpit].size() == endpos)) {
if (pit + 1 == endpit)
endpos += pars[pit].size();
mergeParagraph(params, pars, pit);
buffer.setUnnamed(true);
buffer.paragraphs() = paragraphs;
buffer.params().setTextClass(textclass);
- std::ostringstream lyx;
+ ostringstream lyx;
if (buffer.write(lyx))
theClipboard().put(lyx.str(), plaintext);
else
}
-void switchBetweenClasses(TextClassPtr const & c1,
- TextClassPtr const & c2, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(TextClassPtr const & oldone,
+ TextClassPtr const & newone, InsetText & in, ErrorList & errorlist)
{
errorlist.clear();
BOOST_ASSERT(!in.paragraphs().empty());
- if (c1 == c2)
+ if (oldone == newone)
return;
- TextClass const & tclass1 = *c1;
- TextClass const & tclass2 = *c2;
+ TextClass const & oldtc = *oldone;
+ TextClass const & newtc = *newone;
// layouts
ParIterator end = par_iterator_end(in);
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
docstring const name = it->layout()->name();
- bool hasLayout = tclass2.hasLayout(name);
+ bool hasLayout = newtc.hasLayout(name);
if (hasLayout)
- it->layout(tclass2[name]);
+ it->layout(newtc[name]);
else
- it->layout(tclass2.defaultLayout());
+ it->layout(newtc.defaultLayout());
- if (!hasLayout && name != tclass1.defaultLayoutName()) {
+ if (!hasLayout && name != oldtc.defaultLayoutName()) {
docstring const s = bformat(
_("Layout had to be changed from\n%1$s to %2$s\n"
"because of class conversion from\n%3$s to %4$s"),
name, it->layout()->name(),
- from_utf8(tclass1.name()), from_utf8(tclass2.name()));
+ from_utf8(oldtc.name()), from_utf8(newtc.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(_("Changed Layout"), s,
it->id(), 0,
if (inset->lyxCode() != FLEX_CODE)
// FIXME: Should we verify all InsetCollapsable?
continue;
- docstring const name = inset->name();
- InsetLayout const & il = tclass2.insetlayout(name);
- inset->setLayout(il);
- if (il.labelstring != from_utf8("UNDEFINED"))
+ inset->setLayout(newone);
+ if (!inset->undefined())
continue;
- // The flex inset is undefined in tclass2
+ // The flex inset is undefined in newtc
docstring const s = bformat(_(
"Flex inset %1$s is "
"undefined because of class "
"conversion from\n%2$s to %3$s"),
- name, from_utf8(tclass1.name()),
- from_utf8(tclass2.name()));
+ inset->name(), from_utf8(oldtc.name()),
+ from_utf8(newtc.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(
_("Undefined flex inset"),
}
-std::vector<docstring> const availableSelections(Buffer const & buffer)
+vector<docstring> const availableSelections(Buffer const & buffer)
{
vector<docstring> selList;
void copySelection(Cursor & cur, docstring const & plaintext)
{
// In tablemode, because copy and paste actually use special table stack
- // we do not attemp to get selected paragraphs under cursor. Instead, a
+ // we do not attempt to get selected paragraphs under cursor. Instead, a
// paragraph with the plain text version is generated so that table cells
// can be pasted as pure text somewhere else.
if (cur.selBegin().idx() != cur.selEnd().idx()) {
par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
pars.push_back(par);
theCuts.push(make_pair(pars, bp.getTextClassPtr()));
- } else
+ } else {
copySelectionToStack(cur, theCuts);
+ }
// stuff the selection onto the X clipboard, from an explicit copy request
putClipboard(theCuts[0].first, theCuts[0].second, plaintext);
if (cur.selection()
&& cur.selBegin() == cur.bv().cursor().selBegin()
&& cur.selEnd() == cur.bv().cursor().selEnd()) {
- LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
- << to_utf8(cur.selectionAsString(true)) << "'."
- << endl;
+ LYXERR(Debug::ACTION, "'" << cur.selectionAsString(true) << "'");
copySelectionToStack(cur, selectionBuffer);
}
}
}
-void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
+void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs)
{
// Use internal clipboard if it is the most recent one
if (theClipboard().isInternal()) {
}
+void pasteClipboardGraphics(Cursor & cur, ErrorList & errorList,
+ Clipboard::GraphicsType preferedType)
+{
+ BOOST_ASSERT(theClipboard().hasGraphicsContents(preferedType));
+
+ // get picture from clipboard
+ FileName filename = theClipboard().getAsGraphics(cur, preferedType);
+ if (filename.empty())
+ return;
+
+ // create inset for graphic
+ InsetGraphics * inset = new InsetGraphics;
+ InsetGraphicsParams params;
+ params.filename = EmbeddedFile(filename.absFilename(), cur.buffer().filePath());
+ inset->setParams(params);
+ cur.recordUndo();
+ cur.insert(inset);
+}
+
+
void pasteSelection(Cursor & cur, ErrorList & errorList)
{
if (selectionBuffer.empty())
// FIXME: What is wrong with the following?
#if 0
- std::ostringstream os;
+ ostringstream os;
for (DocIterator dit = cur.selectionBegin();
dit != cur.selectionEnd(); dit.forwardPos())
os << asString(dit.cell());