#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 "LyXRC.h"
#include "Text.h"
-#include "TextClass_ptr.h"
#include "TextClassList.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParIterator.h"
#include "Undo.h"
-#include "insets/InsetCharStyle.h"
+#include "insets/InsetFlex.h"
#include "insets/InsetTabular.h"
#include "mathed/MathData.h"
#include "mathed/InsetMath.h"
#include "mathed/MathSupport.h"
+#include "support/limited_stack.h"
#include "support/lstrings.h"
#include "frontends/Clipboard.h"
#include <boost/current_function.hpp>
#include <boost/tuple/tuple.hpp>
+#include <boost/next_prior.hpp>
#include <string>
typedef std::pair<pit_type, int> PitPosPair;
-typedef limited_stack<pair<ParagraphList, TextClass_ptr> > CutStack;
+typedef limited_stack<pair<ParagraphList, TextClassPtr> > CutStack;
CutStack theCuts(10);
// persistent selection, cleared until the next selection
pair<PitPosPair, pit_type>
pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
- TextClass_ptr textclass, ErrorList & errorlist)
+ TextClassPtr textclass, ErrorList & errorlist)
{
Buffer const & buffer = cur.buffer();
pit_type pit = cur.pit();
// Make a copy of the CaP paragraphs.
ParagraphList insertion = parlist;
- TextClass_ptr const tc = buffer.params().getTextClass_ptr();
+ TextClassPtr const tc = buffer.params().getTextClassPtr();
// Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required.
// 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;
}
-void putClipboard(ParagraphList const & paragraphs, TextClass_ptr textclass,
+void putClipboard(ParagraphList const & paragraphs, TextClassPtr textclass,
docstring const & plaintext)
{
// For some strange reason gcc 3.2 and 3.3 do not accept
void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
pit_type startpit, pit_type endpit,
- int start, int end, TextClass_ptr tc, CutStack & cutstack)
+ int start, int end, TextClassPtr tc, CutStack & cutstack)
{
BOOST_ASSERT(0 <= start && start <= pars[startpit].size());
BOOST_ASSERT(0 <= end && end <= pars[endpit].size());
// 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);
}
}
-void switchBetweenClasses(TextClass_ptr const & c1,
- TextClass_ptr const & c2, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(TextClassPtr const & c1,
+ TextClassPtr const & c2, InsetText & in, ErrorList & errorlist)
{
errorlist.clear();
// 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::CHARSTYLE_CODE) {
- InsetCharStyle & inset =
- static_cast<InsetCharStyle &>(*it);
+ if (it->lyxCode() == 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 character style is undefined in tclass2
+ // The flex inset is undefined in tclass2
docstring const s = bformat(_(
- "Character style %1$s is "
+ "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 character style"),
+ _("Undefined flex inset"),
s, it.paragraph().id(), it.pos(), it.pos() + 1));
}
}
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();
text->paragraphs(),
begpit, endpit,
cur.selBegin().pos(), endpos,
- bp.getTextClass_ptr(), theCuts);
+ bp.getTextClassPtr(), theCuts);
// Stuff what we got on the clipboard.
// Even if there is no selection.
putClipboard(theCuts[0].first, theCuts[0].second,
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);
copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
pos, cur.selEnd().pos(),
- cur.buffer().params().getTextClass_ptr(), cutstack);
+ cur.buffer().params().getTextClassPtr(), cutstack);
dirtyTabularStack(false);
}
par.layout(bp.getTextClass().defaultLayout());
par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
pars.push_back(par);
- cutstack.push(make_pair(pars, bp.getTextClass_ptr()));
+ cutstack.push(make_pair(pars, bp.getTextClassPtr()));
}
}
par.layout(bp.getTextClass().defaultLayout());
par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
pars.push_back(par);
- theCuts.push(make_pair(pars, bp.getTextClass_ptr()));
+ theCuts.push(make_pair(pars, bp.getTextClassPtr()));
} else
copySelectionToStack(cur, theCuts);
}
+void clearCutStack()
+{
+ theCuts.clear();
+}
+
+
docstring getSelection(Buffer const & buf, size_t sel_index)
{
return sel_index < theCuts.size()
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
- TextClass_ptr textclass, ErrorList & errorList)
+ TextClassPtr textclass, ErrorList & errorList)
{
if (cur.inTexted()) {
Text * text = cur.text();
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().getTextClass_ptr(), errorList);
+ buffer.params().getTextClassPtr(), errorList);
cur.setSelection();
return;
}
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
projects / lyx.git / blobdiff