#include "buffer_funcs.h"
#include "BufferParams.h"
#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 "lfuns.h"
#include "LyXFunc.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;
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);
}
// Convert newline to paragraph break in ERT inset.
// This should not be here!
if (pars[pit].inInset() &&
- (pars[pit].inInset()->lyxCode() == Inset::ERT_CODE ||
- pars[pit].inInset()->lyxCode() == Inset::LISTINGS_CODE)) {
+ (pars[pit].inInset()->lyxCode() == ERT_CODE ||
+ pars[pit].inInset()->lyxCode() == LISTINGS_CODE)) {
for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
for (pos_type j = 0; j < insertion[i].size(); ++j) {
if (insertion[i].isNewline(j)) {
// Set the inset owner of this paragraph.
tmpbuf->setInsetOwner(pars[pit].inInset());
for (pos_type i = 0; i < tmpbuf->size(); ++i) {
- if (tmpbuf->getChar(i) == Paragraph::META_INSET &&
+ if (tmpbuf->isInset(i) &&
!pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
// do not track deletion of invalid insets
tmpbuf->eraseChar(i--, false);
ParIterator fend = par_iterator_end(in);
for (; fpit != fend; ++fpit) {
- InsetList::const_iterator lit = fpit->insetlist.begin();
- InsetList::const_iterator eit = fpit->insetlist.end();
+ InsetList::const_iterator lit = fpit->insetList().begin();
+ InsetList::const_iterator eit = fpit->insetList().end();
for (; lit != eit; ++lit) {
switch (lit->inset->lyxCode()) {
- case Inset::TABULAR_CODE: {
+ case TABULAR_CODE: {
InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
it->buffer(&buffer);
break;
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
// ERT paragraphs have the Language latex_language.
// This is invalid outside of ERT, so we need to change it
// to the buffer language.
- if (it->ownerCode() == Inset::ERT_CODE || it->ownerCode() == Inset::LISTINGS_CODE) {
- it->changeLanguage(buf.params(), latex_language,
- buf.getLanguage());
+ if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) {
+ it->changeLanguage(buf.params(), latex_language, buf.language());
}
it->setInsetOwner(0);
}
// character styles
InsetIterator const i_end = inset_iterator_end(in);
for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
- if (it->lyxCode() == Inset::FLEX_CODE) {
- InsetFlex & inset =
- static_cast<InsetFlex &>(*it);
- string const name = inset.params().name;
- InsetLayout const il =
- tclass2.insetlayout(from_utf8(name));
- inset.setLayout(il);
- if (il.labelstring == from_utf8("UNDEFINED")) {
- // The flex inset is undefined in tclass2
- docstring const s = bformat(_(
- "Flex inset %1$s is "
- "undefined because of class "
- "conversion from\n%2$s to %3$s"),
- from_utf8(name), from_utf8(tclass1.name()),
- from_utf8(tclass2.name()));
- // To warn the user that something had to be done.
- errorlist.push_back(ErrorItem(
- _("Undefined flex inset"),
- s, it.paragraph().id(), it.pos(), it.pos() + 1));
- }
- }
+ InsetCollapsable * inset = it->asInsetCollapsable();
+ if (!inset)
+ continue;
+ 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"))
+ continue;
+ // The flex inset is undefined in tclass2
+ 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()));
+ // To warn the user that something had to be done.
+ errorlist.push_back(ErrorItem(
+ _("Undefined flex inset"),
+ s, it.paragraph().id(), it.pos(), it.pos() + 1));
}
}
-std::vector<docstring> const availableSelections(Buffer const & buffer)
+vector<docstring> const availableSelections(Buffer const & buffer)
{
vector<docstring> selList;
saveSelection(cur);
// make sure that the depth behind the selection are restored, too
- recordUndoSelection(cur);
+ cur.recordUndoSelection();
pit_type begpit = cur.selBegin().pit();
pit_type endpit = cur.selEnd().pit();
if (cur.selBegin().idx() != cur.selEnd().idx()) {
// The current selection spans more than one cell.
// Record all cells
- recordUndoInset(cur);
+ cur.recordUndoInset();
} else {
// Record only the current cell to avoid a jumping
// cursor after undo
- recordUndo(cur);
+ cur.recordUndo();
}
if (realcut)
copySelection(cur);
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);
}
}
if (!checkPastePossible(sel_index))
return;
- recordUndo(cur);
+ cur.recordUndo();
pasteParagraphList(cur, theCuts[sel_index].first,
theCuts[sel_index].second, errorList);
cur.setSelection();
Buffer buffer("", false);
buffer.setUnnamed(true);
if (buffer.readString(lyx)) {
- recordUndo(cur);
+ cur.recordUndo();
pasteParagraphList(cur, buffer.paragraphs(),
buffer.params().getTextClassPtr(), errorList);
cur.setSelection();
docstring const text = theClipboard().getAsText();
if (text.empty())
return;
- recordUndo(cur);
+ cur.recordUndo();
if (asParagraphs)
cur.text()->insertStringAsParagraphs(cur, text);
else
{
if (selectionBuffer.empty())
return;
- recordUndo(cur);
+ cur.recordUndo();
pasteParagraphList(cur, selectionBuffer[0].first,
selectionBuffer[0].second, errorList);
}
void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwards)
{
- recordUndo(cur);
+ cur.recordUndo();
DocIterator selbeg = cur.selectionBegin();
// Get font setting before we cut
// 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());