#include "funcrequest.h"
#include "gettext.h"
#include "insetiterator.h"
+#include "language.h"
#include "lfuns.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "support/lstrings.h"
+#include "frontends/Gui.h"
+#include "frontends/LyXView.h"
+#include "frontends/Clipboard.h"
+
#include <boost/tuple/tuple.hpp>
using lyx::pos_type;
using lyx::support::bformat;
+using lyx::frontend::Gui;
+using lyx::frontend::Clipboard;
+
using std::endl;
using std::for_each;
using std::make_pair;
CutStack theCuts(10);
// store whether the tabular stack is newer than the normal copy stack
-// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
+// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
// when we (hopefully) have a one-for-all paste mechanism.
bool dirty_tabular_stack_;
-class resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+class resetParagraph : public std::unary_function<Paragraph, Buffer const &> {
public:
+ resetParagraph(Buffer const & b) : buffer_(b) {}
void operator()(Paragraph & p) const {
p.cleanChanges();
+ // ERT paragraphs have the Language latex_language.
+ // This is invalid outside of ERT, so we need to change it
+ // to the buffer language.
+ if (p.ownerCode() == InsetBase::ERT_CODE) {
+ p.changeLanguage(buffer_.params(), latex_language,
+ buffer_.getLanguage());
+ }
p.setInsetOwner(0);
}
+private:
+ Buffer const & buffer_;
};
pair<PitPosPair, pit_type>
-pasteSelectionHelper(Buffer const & buffer, ParagraphList & pars,
- pit_type pit, int pos,
- textclass_type tc, size_t cut_index, ErrorList & errorlist)
+pasteSelectionHelper(Buffer const & buffer,
+ ParagraphList & pars, pit_type pit, int pos,
+ ParagraphList const & parlist, textclass_type textclass,
+ ErrorList & errorlist)
{
- if (!checkPastePossible(cut_index))
+ if (parlist.empty())
return make_pair(PitPosPair(pit, pos), pit);
BOOST_ASSERT (pos <= pars[pit].size());
// Make a copy of the CaP paragraphs.
- ParagraphList insertion = theCuts[cut_index].first;
- textclass_type const textclass = theCuts[cut_index].second;
+ ParagraphList insertion = parlist;
+ textclass_type const tc = buffer.params().textclass;
// Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required.
}
// Make sure there is no class difference.
- lyx::cap::SwitchBetweenClasses(textclass, tc, insertion, errorlist);
+ InsetText in;
+ // This works without copying any paragraph data because we have
+ // a specialized swap method for ParagraphList. This is important
+ // since we store pointers to insets at some places and we don't
+ // want to invalidate them.
+ insertion.swap(in.paragraphs());
+ lyx::cap::switchBetweenClasses(textclass, tc, in, errorlist);
+ insertion.swap(in.paragraphs());
ParagraphList::iterator tmpbuf = insertion.begin();
int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth();
!pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
tmpbuf->erase(i--);
}
+
+ // reset change tracking status
+ if (buffer.params().tracking_changes)
+ tmpbuf->cleanChanges(Paragraph::trackingOn);
+ else
+ tmpbuf->cleanChanges(Paragraph::trackingOff);
}
bool const empty = pars[pit].empty();
// Prepare the paragraphs and insets for insertion.
// A couple of insets store buffer references so need updating.
- InsetText in;
- std::swap(in.paragraphs(), insertion);
+ insertion.swap(in.paragraphs());
ParIterator fpit = par_iterator_begin(in);
ParIterator fend = par_iterator_end(in);
}
}
}
- std::swap(in.paragraphs(), insertion);
+ insertion.swap(in.paragraphs());
// Split the paragraph for inserting the buf if necessary.
if (!empty)
// Paste it!
if (empty) {
- pars.insert(pars.begin() + pit, insertion.begin(),
- insertion.end());
+ pars.insert(boost::next(pars.begin(), pit),
+ insertion.begin(),
+ insertion.end());
// merge the empty par with the last par of the insertion
mergeParagraph(buffer.params(), pars,
- pit + insertion.size() - 1);
+ pit + insertion.size() - 1);
} else {
- pars.insert(pars.begin() + pit + 1, insertion.begin(),
- insertion.end());
+ pars.insert(boost::next(pars.begin(), pit + 1),
+ insertion.begin(),
+ insertion.end());
// merge the first par of the insertion with the current par
mergeParagraph(buffer.params(), pars, pit);
pit = last_paste;
pos = pars[last_paste].size();
- // Maybe some pasting.
+ // Join (conditionally) last pasted paragraph with next one, i.e.,
+ // the tail of the spliced document paragraph
if (!empty && last_paste + 1 != pit_type(pars.size())) {
if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) {
mergeParagraph(buffer.params(), pars, last_paste);
pit_type startpit, pit_type endpit,
int startpos, int endpos, bool doclear)
{
- // Start of selection is really invalid.
+ // Start of selection is really invalid.
if (startpit == pit_type(pars.size()) ||
(startpos > pars[startpit].size()))
return PitPosPair(endpit, endpos);
- // Start and end is inside same paragraph
+ // Start and end is inside same paragraph
if (endpit == pit_type(pars.size()) ||
startpit == endpit) {
endpos -= pars[startpit].erase(startpos, endpos);
return PitPosPair(endpit, endpos);
}
- bool all_erased = true;
-
- // Clear fragments of the first par in selection
- pars[startpit].erase(startpos, pars[startpit].size());
- if (pars[startpit].size() != startpos)
- all_erased = false;
-
- // Clear fragments of the last par in selection
- endpos -= pars[endpit].erase(0, endpos);
- if (endpos != 0)
- all_erased = false;
-
- // Erase all the "middle" paragraphs.
- if (params.tracking_changes) {
- // Look through the deleted pars if any, erasing as needed
- for (pit_type pit = startpit + 1; pit != endpit;) {
- // "erase" the contents of the par
- pars[pit].erase(0, pars[pit].size());
- if (pars[pit].empty()) {
- // remove the par if it's now empty
- pars.erase(pars.begin() + pit);
- --endpit;
- } else {
- ++pit;
- all_erased = false;
- }
- }
- } else {
- pars.erase(pars.begin() + startpit + 1, pars.begin() + endpit);
- endpit = startpit + 1;
- }
-
-#if 0 // FIXME: why for cut but not copy ?
- // the cut selection should begin with standard layout
- if (realcut) {
- buf->params().clear();
- buf->bibkey = 0;
- buf->layout(textclasslist[buffer->params.textclass].defaultLayoutName());
- }
-#endif
-
- if (startpit + 1 == pit_type(pars.size()))
- return PitPosPair(endpit, endpos);
-
- if (doclear) {
- pars[startpit + 1].stripLeadingSpaces();
- }
-
- // Merge first and last paragraph, if possible
- if (all_erased &&
- (pars[startpit].hasSameLayout(pars[startpit + 1]) ||
- pars[startpit + 1].empty())) {
- mergeParagraph(params, pars, startpit);
- // This because endpar gets deleted here!
- endpit = startpit;
- endpos = startpos;
+ // A paragraph break has to be physically removed by merging, but
+ // only if either (1) change tracking is off, or (2) the para break
+ // is "blue"
+ for (pit_type pit = startpit; pit != endpit + 1;) {
+ bool const merge = !params.tracking_changes ||
+ pars[pit].lookupChange(pars[pit].size()) ==
+ Change::INSERTED;
+ pos_type const left = ( pit == startpit ? startpos : 0 );
+ pos_type const right = ( pit == endpit ? endpos :
+ pars[pit].size() + 1 );
+ // Logical erase only:
+ pars[pit].erase(left, right);
+ // Separate handling of para break:
+ if (merge && pit != endpit &&
+ (pit + 1 != endpit || pars[pit].hasSameLayout(pars[pit + 1]))) {
+ pos_type const thissize = pars[pit].size();
+ if (doclear)
+ pars[pit + 1].stripLeadingSpaces();
+ mergeParagraph(params, pars, pit);
+ --endpit;
+ if (pit == endpit)
+ endpos += thissize;
+ } else
+ ++pit;
}
+ // Ensure legal cursor pos:
+ endpit = startpit;
+ endpos = startpos;
return PitPosPair(endpit, endpos);
}
-void copySelectionHelper(ParagraphList & pars,
+void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
pit_type startpit, pit_type endpit,
int start, int end, textclass_type tc)
{
BOOST_ASSERT(startpit != endpit || start <= end);
// Clone the paragraphs within the selection.
- ParagraphList paragraphs(pars.begin() + startpit, pars.begin() + endpit + 1);
+ ParagraphList paragraphs(boost::next(pars.begin(), startpit),
+ boost::next(pars.begin(), endpit + 1));
- for_each(paragraphs.begin(), paragraphs.end(), resetOwnerAndChanges());
+ for_each(paragraphs.begin(), paragraphs.end(), resetParagraph(buf));
// Cut out the end of the last paragraph.
Paragraph & back = paragraphs.back();
}
-void SwitchBetweenClasses(textclass_type c1, textclass_type c2,
- ParagraphList & pars, ErrorList & errorlist)
+void switchBetweenClasses(textclass_type c1, textclass_type c2,
+ InsetText & in, ErrorList & errorlist)
{
- BOOST_ASSERT(!pars.empty());
+ BOOST_ASSERT(!in.paragraphs().empty());
if (c1 == c2)
return;
LyXTextClass const & tclass1 = textclasslist[c1];
LyXTextClass const & tclass2 = textclasslist[c2];
- InsetText in;
- std::swap(in.paragraphs(), pars);
-
// layouts
ParIterator end = par_iterator_end(in);
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
}
}
}
-
- std::swap(in.paragraphs(), pars);
}
}
+lyx::size_type numberOfSelections()
+{
+ return theCuts.size();
+}
+
+
void cutSelection(LCursor & cur, bool doclear, bool realcut)
{
// This doesn't make sense, if there is no selection
// solved by running the line below only when the selection has
// finished. The solution used currently just works, to make it
// faster we need to be more clever and probably also have more
- // calls to stuffClipboard. (Lgb)
-// cur.bv().stuffClipboard(cur.selectionAsString(true));
+ // calls to cur.bv().owner()->gui().selection().put. (Lgb)
+// cur.bv().owner()->gui().selection().put(cur.selectionAsString(true));
+
// make sure that the depth behind the selection are restored, too
recordUndoSelection(cur);
BufferParams const & bp = cur.buffer().params();
if (realcut) {
- copySelectionHelper(text->paragraphs(),
+ copySelectionHelper(cur.buffer(),
+ text->paragraphs(),
begpit, endpit,
cur.selBegin().pos(), endpos,
bp.textclass);
// need a valid cursor. (Lgb)
cur.clearSelection();
- updateCounters(cur.buffer());
+ updateLabels(cur.buffer());
// tell tabular that a recent copy happened
dirtyTabularStack(false);
void copySelection(LCursor & cur)
{
// stuff the selection onto the X clipboard, from an explicit copy request
- cur.bv().stuffClipboard(cur.selectionAsString(true));
+ cur.bv().owner()->gui().clipboard().put(cur.selectionAsString(true));
// this doesn't make sense, if there is no selection
if (!cur.selection())
&& (par != cur.selEnd().pit() || pos < cur.selEnd().pos()))
++pos;
- copySelectionHelper(pars, par, cur.selEnd().pit(),
+ copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
pos, cur.selEnd().pos(), cur.buffer().params().textclass);
}
if (cur.inMathed()) {
- lyxerr << "copySelection in mathed" << endl;
+ //lyxerr << "copySelection in mathed" << endl;
ParagraphList pars;
pars.push_back(Paragraph());
BufferParams const & bp = cur.buffer().params();
pars.back().layout(bp.getLyXTextClass().defaultLayout());
- for_each(pars.begin(), pars.end(), resetOwnerAndChanges());
+ for_each(pars.begin(), pars.end(), resetParagraph(cur.buffer()));
pars.back().insert(0, grabSelection(cur), LyXFont());
theCuts.push(make_pair(pars, bp.textclass));
}
}
-void pasteSelection(LCursor & cur, size_t sel_index)
+void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
+ textclass_type textclass, ErrorList & errorList)
{
- // this does not make sense, if there is nothing to paste
- lyxerr << "#### pasteSelection " << sel_index << endl;
- if (!checkPastePossible(sel_index))
- return;
-
if (cur.inTexted()) {
LyXText * text = cur.text();
BOOST_ASSERT(text);
pit_type endpit;
PitPosPair ppp;
- ErrorList el;
-
boost::tie(ppp, endpit) =
pasteSelectionHelper(cur.buffer(),
- text->paragraphs(),
- cur.pit(), cur.pos(),
- cur.buffer().params().textclass,
- sel_index, el);
- bufferErrors(cur.buffer(), el);
- cur.bv().showErrorList(_("Paste"));
-
+ text->paragraphs(),
+ cur.pit(), cur.pos(),
+ parlist, textclass,
+ errorList);
+ updateLabels(cur.buffer());
cur.clearSelection();
text->setCursor(cur, ppp.first, ppp.second);
- cur.setSelection();
- updateCounters(cur.buffer());
}
// mathed is handled in MathNestInset/MathGridInset
}
-void setSelectionRange(LCursor & cur, pos_type length)
+void pasteSelection(LCursor & cur, ErrorList & errorList, size_t sel_index)
{
- LyXText * text = cur.text();
- BOOST_ASSERT(text);
- if (!length)
+ // this does not make sense, if there is nothing to paste
+ if (!checkPastePossible(sel_index))
return;
- cur.resetAnchor();
- while (length--)
- text->cursorRight(cur);
+
+ pasteParagraphList(cur, theCuts[sel_index].first,
+ theCuts[sel_index].second, errorList);
cur.setSelection();
}
// simple replacing. The font of the first selected character is used
-void replaceSelectionWithString(LCursor & cur, string const & str)
+void replaceSelectionWithString(LCursor & cur, string const & str, bool backwards)
{
- LyXText * text = cur.text();
- BOOST_ASSERT(text);
recordUndo(cur);
+ DocIterator selbeg = cur.selectionBegin();
// Get font setting before we cut
- pos_type pos = cur.selEnd().pos();
- Paragraph & par = text->getPar(cur.selEnd().pit());
LyXFont const font =
- par.getFontSettings(cur.buffer().params(), cur.selBegin().pos());
+ selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos());
// Insert the new string
+ pos_type pos = cur.selEnd().pos();
+ Paragraph & par = cur.selEnd().paragraph();
string::const_iterator cit = str.begin();
string::const_iterator end = str.end();
for (; cit != end; ++cit, ++pos)
// Cut the selection
cutSelection(cur, true, false);
+
+ // select the replacement
+ if (backwards) {
+ selbeg.pos() += str.length();
+ cur.setSelection(selbeg, -str.length());
+ } else
+ cur.setSelection(selbeg, str.length());
}
}
-// only used by the spellchecker
-void replaceWord(LCursor & cur, string const & replacestring)
-{
- LyXText * text = cur.text();
- BOOST_ASSERT(text);
-
- replaceSelectionWithString(cur, replacestring);
- setSelectionRange(cur, replacestring.length());
-
- // Go back so that replacement string is also spellchecked
- for (string::size_type i = 0; i < replacestring.length() + 1; ++i)
- text->cursorLeft(cur);
-}
-
-
void eraseSelection(LCursor & cur)
{
//lyxerr << "LCursor::eraseSelection begin: " << cur << endl;
projects / lyx.git / blobdiff