#include "support/lyxalgo.h"
#include "support/lyxtime.h"
#include "support/textutils.h"
+#include "support/unique_ptr.h"
#include <sstream>
}
+pit_type Text::lastInSequence(pit_type pit) const
+{
+ depth_type const depth = pars_[pit].getDepth();
+ pit_type newpit = pit;
+
+ while (size_t(newpit + 1) < pars_.size() &&
+ (pars_[newpit + 1].getDepth() > depth ||
+ (pars_[newpit + 1].getDepth() == depth &&
+ pars_[newpit + 1].layout() == pars_[pit].layout())))
+ ++newpit;
+
+ return newpit;
+}
+
+
int Text::getTocLevel(pit_type par_offset) const
{
Paragraph const & par = pars_[par_offset];
if (added_one) {
// Warn the user.
docstring const s = bformat(_("Layout `%1$s' was not found."), layoutname);
- errorList.push_back(
- ErrorItem(_("Layout Not Found"), s, par.id(), 0, par.size()));
+ errorList.push_back(ErrorItem(_("Layout Not Found"), s,
+ {par.id(), 0}, {par.id(), -1}));
}
par.setLayout(bp.documentClass()[layoutname]);
lex.eatLine();
docstring line = lex.getDocString();
errorList.push_back(ErrorItem(_("Unknown Inset"), line,
- par.id(), 0, par.size()));
+ {par.id(), 0}, {par.id(), -1}));
}
} else if (token == "\\family") {
lex.next();
} else if (token == "\\strikeout") {
lex.next();
font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
+ } else if (token == "\\xout") {
+ lex.next();
+ font.fontInfo().setXout(setLyXMisc(lex.getString()));
} else if (token == "\\uuline") {
lex.next();
font.fontInfo().setUuline(setLyXMisc(lex.getString()));
} else if (token == "\\SpecialChar" ||
(token == "\\SpecialCharNoPassThru" &&
!par.layout().pass_thru && !inset().isPassThru())) {
- auto_ptr<Inset> inset;
- inset.reset(new InsetSpecialChar);
+ auto inset = make_unique<InsetSpecialChar>();
inset->read(lex);
inset->setBuffer(*buf);
par.insertInset(par.size(), inset.release(), font, change);
docstring const s = ltrim(lex.getDocString(), "\\");
par.insert(par.size(), s, font, change);
} else if (token == "\\IPAChar") {
- auto_ptr<Inset> inset;
- inset.reset(new InsetIPAChar);
+ auto inset = make_unique<InsetIPAChar>();
inset->read(lex);
inset->setBuffer(*buf);
par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\backslash") {
par.appendChar('\\', font, change);
} else if (token == "\\LyXTable") {
- auto_ptr<Inset> inset(new InsetTabular(buf));
+ auto inset = make_unique<InsetTabular>(buf);
inset->read(lex);
par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\change_unchanged") {
"missing until the corresponding tracked changes "
"are merged or this user edits the file again.\n"),
aid),
- par.id(), par.size(), par.size() + 1
- ));
+ {par.id(), par.size()}, {par.id(), par.size() + 1}));
bp.addAuthor(Author(aid));
}
if (token == "\\change_inserted")
} else {
lex.eatLine();
errorList.push_back(ErrorItem(_("Unknown token"),
- bformat(_("Unknown token: %1$s %2$s\n"), from_utf8(token),
- lex.getDocString()),
- par.id(), 0, par.size()));
+ bformat(_("Unknown token: %1$s %2$s\n"),
+ from_utf8(token),
+ lex.getDocString()),
+ {par.id(), 0}, {par.id(), -1}));
}
}
{
public:
///
- TextCompletionList(Cursor const & cur, WordList const * list)
+ TextCompletionList(Cursor const & cur, WordList const & list)
: buffer_(cur.buffer()), list_(list)
{}
///
///
virtual size_t size() const
{
- return list_->size();
+ return list_.size();
}
///
virtual docstring const & data(size_t idx) const
{
- return list_->word(idx);
+ return list_.word(idx);
}
private:
///
Buffer const * buffer_;
///
- WordList const * list_;
+ WordList const & list_;
};
Layout const & layout = cpar.layout();
if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
- if (changeDepthAllowed(cur, DEC_DEPTH))
+ if (changeDepthAllowed(cur, DEC_DEPTH)) {
changeDepth(cur, DEC_DEPTH);
- else {
+ pit_type const prev = depthHook(cpit, cpar.getDepth());
+ docstring const & lay = pars_[prev].layout().name();
+ if (lay != layout.name())
+ setLayout(cur, lay);
+ } else {
docstring const & lay = cur.paragraph().usePlainLayout()
? tclass.plainLayoutName() : tclass.defaultLayoutName();
- setLayout(cur, lay);
+ if (lay != layout.name())
+ setLayout(cur, lay);
}
return;
}
par.eraseChar(pos - 1, cur.buffer()->params().track_changes);
c = 0x2014;
pos--;
- } else if (par.getChar(pos - 1) == 0x2014) {
- // convert "----" to "-"
- par.eraseChar(pos - 1, cur.buffer()->params().track_changes);
- c = '-';
- pos--;
}
}
}
-void Text::deleteWordForward(Cursor & cur)
+void Text::deleteWordForward(Cursor & cur, bool const force)
{
LBUFERR(this == cur.text());
if (cur.lastpos() == 0)
cur.selection(true);
cursorForwardOneWord(cur);
cur.setSelection();
- cutSelection(cur, true, false);
- cur.checkBufferStructure();
+ if (force || !cur.confirmDeletion()) {
+ cutSelection(cur, true, false);
+ cur.checkBufferStructure();
+ }
}
}
-void Text::deleteWordBackward(Cursor & cur)
+void Text::deleteWordBackward(Cursor & cur, bool const force)
{
LBUFERR(this == cur.text());
if (cur.lastpos() == 0)
cur.selection(true);
cursorBackwardOneWord(cur);
cur.setSelection();
- cutSelection(cur, true, false);
- cur.checkBufferStructure();
+ if (force || !cur.confirmDeletion()) {
+ cutSelection(cur, true, false);
+ cur.checkBufferStructure();
+ }
}
}
return dissolveInset(cur);
if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
+ cur.recordUndo(DELETE_UNDO);
par.setChange(cur.pos(), Change(Change::DELETED));
cur.forwardPos();
needsUpdate = true;
void Text::shortenForOutliner(docstring & str, size_t const maxlen)
{
support::truncateWithEllipsis(str, maxlen);
- docstring::iterator it = str.begin();
- docstring::iterator end = str.end();
- for (; it != end; ++it)
- if ((*it) == L'\n' || (*it) == L'\t')
- (*it) = L' ';
+ for (char_type & c : str)
+ if (c == L'\n' || c == L'\t')
+ c = L' ';
}
void Text::forOutliner(docstring & os, size_t const maxlen,
- bool const shorten) const
+ bool const shorten) const
+{
+ pit_type end = pars_.size() - 1;
+ if (0 <= end && !pars_[0].labelString().empty())
+ os += pars_[0].labelString() + ' ';
+ forOutliner(os, maxlen, 0, end, shorten);
+}
+
+
+void Text::forOutliner(docstring & os, size_t const maxlen,
+ pit_type pit_start, pit_type pit_end,
+ bool const shorten) const
{
size_t tmplen = shorten ? maxlen + 1 : maxlen;
- for (size_t i = 0; i != pars_.size() && os.length() < tmplen; ++i)
- pars_[i].forOutliner(os, tmplen, false);
+ pit_type end = min(size_t(pit_end), pars_.size() - 1);
+ bool first = true;
+ for (pit_type i = pit_start; i <= end && os.length() < tmplen; ++i) {
+ if (!first)
+ os += ' ';
+ // This function lets the first label be treated separately
+ pars_[i].forOutliner(os, tmplen, false, !first);
+ first = false;
+ }
if (shorten)
shortenForOutliner(os, maxlen);
}
CompletionList const * Text::createCompletionList(Cursor const & cur) const
{
- WordList const * list = theWordList(cur.getFont().language()->lang());
+ WordList const & list = theWordList(cur.getFont().language()->lang());
return new TextCompletionList(cur, list);
}