#include <boost/tuple/tuple.hpp>
-using lyx::docstring;
-using lyx::pos_type;
-using lyx::pit_type;
-using lyx::textclass_type;
-using lyx::support::bformat;
+namespace lyx {
-using lyx::frontend::Clipboard;
+using support::bformat;
+using frontend::Clipboard;
using std::endl;
using std::for_each;
namespace {
-typedef std::pair<lyx::pit_type, int> PitPosPair;
+typedef std::pair<pit_type, int> PitPosPair;
typedef limited_stack<pair<ParagraphList, textclass_type> > CutStack;
for (pos_type j = 0; j < insertion[i].size(); ++j) {
if (insertion[i].isNewline(j)) {
// do not track deletion of newline
- insertion[i].erase(j, false);
+ insertion[i].eraseChar(j, false);
breakParagraphConservative(
buffer.params(),
insertion, i, j);
// 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);
+ 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();
- Paragraph::depth_type max_depth = pars[pit].getMaxDepthAfter();
+ depth_type max_depth = pars[pit].getMaxDepthAfter();
for (; tmpbuf != insertion.end(); ++tmpbuf) {
// If we have a negative jump so that the depth would
if (tmpbuf->getChar(i) == Paragraph::META_INSET &&
!pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
// do not track deletion of invalid insets
- tmpbuf->erase(i--, false);
+ tmpbuf->eraseChar(i--, false);
}
// FIXME: Change tracking (MG)
// Start and end is inside same paragraph
if (endpit == pit_type(pars.size()) ||
startpit == endpit) {
- endpos -= pars[startpit].erase(startpos, endpos);
+ endpos -= pars[startpit].eraseChars(startpos, endpos, false);
return PitPosPair(endpit, endpos);
}
pos_type const right = ( pit == endpit ? endpos :
pars[pit].size() + 1 );
// Logical erase only:
- pars[pit].erase(left, right);
+ pars[pit].eraseChars(left, right, false);
// Separate handling of para break:
if (merge && pit != endpit &&
(pit + 1 != endpit || pars[pit].hasSameLayout(pars[pit + 1]))) {
// Cut out the end of the last paragraph.
Paragraph & back = paragraphs.back();
- back.erase(end, back.size());
+ // do not track deletion here; it is an internal action not visible to the user
+ back.eraseChars(end, back.size(), false);
// Cut out the begin of the first paragraph
Paragraph & front = paragraphs.front();
- front.erase(0, start);
+ // again, do not track deletion
+ front.eraseChars(0, start, false);
theCuts.push(make_pair(paragraphs, tc));
}
-namespace lyx {
namespace cap {
-string grabAndEraseSelection(LCursor & cur)
+docstring grabAndEraseSelection(LCursor & cur)
{
if (!cur.selection())
- return string();
- string res = grabSelection(cur);
+ return docstring();
+ docstring res = grabSelection(cur);
eraseSelection(cur);
return res;
}
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"),
- lyx::from_utf8(name), lyx::from_utf8(it->layout()->name()),
- lyx::from_utf8(tclass1.name()), lyx::from_utf8(tclass2.name()));
+ from_utf8(name), from_utf8(it->layout()->name()),
+ from_utf8(tclass1.name()), from_utf8(tclass2.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(_("Changed Layout"), s,
it->id(), 0,
"Character style %1$s is "
"undefined because of class "
"conversion from\n%2$s to %3$s"),
- lyx::from_utf8(name), lyx::from_utf8(tclass1.name()),
- lyx::from_utf8(tclass2.name()));
+ 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"),
asciiSel += pit->asString(buffer, false);
if (asciiSel.size() > 25) {
asciiSel.replace(22, docstring::npos,
- lyx::from_ascii("..."));
+ from_ascii("..."));
break;
}
}
}
-lyx::size_type numberOfSelections()
+size_type numberOfSelections()
{
return theCuts.size();
}
BufferParams const & bp = cur.buffer().params();
pars.back().layout(bp.getLyXTextClass().defaultLayout());
for_each(pars.begin(), pars.end(), resetParagraph(cur.buffer()));
- pars.back().insert(0, grabSelection(cur), LyXFont());
+ // FIXME: change tracking (MG)
+ pars.back().insert(0, grabSelection(cur), LyXFont(), Change(Change::UNCHANGED));
theCuts.push(make_pair(pars, bp.textclass));
}
// tell tabular that a recent copy happened
string::const_iterator cit = str.begin();
string::const_iterator end = str.end();
for (; cit != end; ++cit, ++pos)
- // FIXME: change tracking (MG)
- par.insertChar(pos, (*cit), font, Change(Change::INSERTED));
+ par.insertChar(pos, (*cit), font, cur.buffer().params().trackChanges);
// Cut the selection
cutSelection(cur, true, false);
// select the replacement
if (backwards) {
selbeg.pos() += str.length();
- cur.setSelection(selbeg, -str.length());
+ cur.setSelection(selbeg, -int(str.length()));
} else
cur.setSelection(selbeg, str.length());
}
}
-string grabSelection(LCursor const & cur)
+docstring grabSelection(LCursor const & cur)
{
if (!cur.selection())
- return string();
+ return docstring();
// FIXME: What is wrong with the following?
#if 0
MathArray::const_iterator it = i1.cell().begin();
return asString(MathArray(it + i1.pos(), it + i2.pos()));
} else {
- return "unknown selection 1";
+ return from_ascii("unknown selection 1");
}
}
InsetBase::col_type c1, c2;
region(i1, i2, r1, r2, c1, c2);
- string data;
+ docstring data;
if (i1.inset().asInsetMath()) {
for (InsetBase::row_type row = r1; row <= r2; ++row) {
if (row > r1)
}
}
} else {
- data = "unknown selection 2";
+ data = from_ascii("unknown selection 2");
}
return data;
}
} // namespace cap
+
} // namespace lyx
projects / lyx.git / blobdiff