#include "ErrorList.h"
#include "FuncRequest.h"
#include "factory.h"
+#include "InsetList.h"
#include "Language.h"
+#include "Layout.h"
#include "Length.h"
#include "Lexer.h"
#include "lyxfind.h"
#include "LyXRC.h"
#include "Paragraph.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "TextClass.h"
using cap::cutSelection;
using cap::pasteParagraphList;
+static bool moveItem(Paragraph & fromPar, pos_type fromPos,
+ Paragraph & toPar, pos_type toPos, BufferParams const & params)
+{
+ // Note: moveItem() does not honour change tracking!
+ // Therefore, it should only be used for breaking and merging paragraphs
+
+ // We need a copy here because the character at fromPos is going to be erased.
+ Font const tmpFont = fromPar.getFontSettings(params, fromPos);
+ Change const tmpChange = fromPar.lookupChange(fromPos);
+
+ if (Inset * tmpInset = fromPar.getInset(fromPos)) {
+ fromPar.releaseInset(fromPos);
+ // The inset is not in fromPar any more.
+ if (!toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange)) {
+ delete tmpInset;
+ return false;
+ }
+ return true;
+ }
+
+ char_type const tmpChar = fromPar.getChar(fromPos);
+ fromPar.eraseChar(fromPos, false);
+ toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
+ return true;
+}
+
+
+void breakParagraphConservative(BufferParams const & bparams,
+ ParagraphList & pars, pit_type par_offset, pos_type pos)
+{
+ // create a new paragraph
+ Paragraph & tmp = *pars.insert(boost::next(pars.begin(), par_offset + 1),
+ Paragraph());
+ Paragraph & par = pars[par_offset];
+
+ tmp.setInsetOwner(&par.inInset());
+ tmp.makeSameLayout(par);
+
+ LASSERT(pos <= par.size(), /**/);
+
+ if (pos < par.size()) {
+ // move everything behind the break position to the new paragraph
+ pos_type pos_end = par.size() - 1;
+
+ for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+ if (moveItem(par, pos, tmp, j, bparams)) {
+ ++j;
+ }
+ }
+ // Move over the end-of-par change information
+ tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+ par.setChange(par.size(), Change(bparams.trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+ }
+}
+
+
+void mergeParagraph(BufferParams const & bparams,
+ ParagraphList & pars, pit_type par_offset)
+{
+ Paragraph & next = pars[par_offset + 1];
+ Paragraph & par = pars[par_offset];
+
+ pos_type pos_end = next.size() - 1;
+ pos_type pos_insert = par.size();
+
+ // the imaginary end-of-paragraph character (at par.size()) has to be
+ // marked as unmodified. Otherwise, its change is adopted by the first
+ // character of the next paragraph.
+ if (par.isChanged(par.size())) {
+ LYXERR(Debug::CHANGES,
+ "merging par with inserted/deleted end-of-par character");
+ par.setChange(par.size(), Change(Change::UNCHANGED));
+ }
+
+ Change change = next.lookupChange(next.size());
+
+ // move the content of the second paragraph to the end of the first one
+ for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
+ if (moveItem(next, 0, par, j, bparams)) {
+ ++j;
+ }
+ }
+
+ // move the change of the end-of-paragraph character
+ par.setChange(par.size(), change);
+
+ pars.erase(boost::next(pars.begin(), par_offset + 1));
+}
+
+
+pit_type Text::depthHook(pit_type pit, depth_type depth) const
+{
+ pit_type newpit = pit;
+
+ if (newpit != 0)
+ --newpit;
+
+ while (newpit != 0 && pars_[newpit].getDepth() > depth)
+ --newpit;
+
+ if (pars_[newpit].getDepth() > depth)
+ return pit;
+
+ return newpit;
+}
+
+
+pit_type Text::outerHook(pit_type par_offset) const
+{
+ Paragraph const & par = pars_[par_offset];
+
+ if (par.getDepth() == 0)
+ return pars_.size();
+ return depthHook(par_offset, depth_type(par.getDepth() - 1));
+}
+
+
+bool Text::isFirstInSequence(pit_type par_offset) const
+{
+ Paragraph const & par = pars_[par_offset];
+
+ pit_type dhook_offset = depthHook(par_offset, par.getDepth());
+
+ if (dhook_offset == par_offset)
+ return true;
+
+ Paragraph const & dhook = pars_[dhook_offset];
+
+ return dhook.layout() != par.layout()
+ || dhook.getDepth() != par.getDepth();
+}
+
+
+Font const Text::outerFont(pit_type par_offset) const
+{
+ depth_type par_depth = pars_[par_offset].getDepth();
+ FontInfo tmpfont = inherit_font;
+
+ // Resolve against environment font information
+ while (par_offset != pit_type(pars_.size())
+ && par_depth
+ && !tmpfont.resolved()) {
+ par_offset = outerHook(par_offset);
+ if (par_offset != pit_type(pars_.size())) {
+ tmpfont.realize(pars_[par_offset].layout().font);
+ par_depth = pars_[par_offset].getDepth();
+ }
+ }
+
+ return Font(tmpfont);
+}
+
+
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+ pit_type pars_size = static_cast<pit_type>(pars.size());
+
+ // first, accept changes within each individual paragraph
+ // (do not consider end-of-par)
+ for (pit_type pit = 0; pit < pars_size; ++pit) {
+ if (!pars[pit].empty()) // prevent assertion failure
+ pars[pit].acceptChanges(0, pars[pit].size());
+ }
+
+ // next, accept imaginary end-of-par characters
+ for (pit_type pit = 0; pit < pars_size; ++pit) {
+ pos_type pos = pars[pit].size();
+
+ if (pars[pit].isInserted(pos)) {
+ pars[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else if (pars[pit].isDeleted(pos)) {
+ if (pit == pars_size - 1) {
+ // we cannot remove a par break at the end of the last
+ // paragraph; instead, we mark it unchanged
+ pars[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else {
+ mergeParagraph(bparams, pars, pit);
+ --pit;
+ --pars_size;
+ }
+ }
+ }
+}
+
InsetText const & Text::inset() const
{
return *owner_;
void Text::readParToken(Paragraph & par, Lexer & lex,
string const & token, Font & font, Change & change, ErrorList & errorList)
{
- Buffer const & buf = owner_->buffer();
- BufferParams const & bp = buf.params();
+ Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
+ BufferParams const & bp = buf->params();
if (token[0] != '\\') {
docstring dstr = lex.getDocString();
}
} else if (token == "\\numeric") {
lex.next();
- font.fontInfo().setNumber(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNumber(setLyXMisc(lex.getString()));
} else if (token == "\\emph") {
lex.next();
- font.fontInfo().setEmph(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setEmph(setLyXMisc(lex.getString()));
} else if (token == "\\bar") {
lex.next();
string const tok = lex.getString();
"`$$Token'");
} else if (token == "\\strikeout") {
lex.next();
- font.fontInfo().setStrikeout(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
} else if (token == "\\uuline") {
lex.next();
- font.fontInfo().setUuline(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setUuline(setLyXMisc(lex.getString()));
} else if (token == "\\uwave") {
lex.next();
- font.fontInfo().setUwave(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setUwave(setLyXMisc(lex.getString()));
} else if (token == "\\noun") {
lex.next();
- font.fontInfo().setNoun(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNoun(setLyXMisc(lex.getString()));
} else if (token == "\\color") {
lex.next();
setLyXColor(lex.getString(), font.fontInfo());
} else if (token == "\\SpecialChar") {
- auto_ptr<Inset> inset;
- inset.reset(new InsetSpecialChar);
- inset->read(lex);
- par.insertInset(par.size(), inset.release(),
- font, change);
+ auto_ptr<Inset> inset;
+ inset.reset(new InsetSpecialChar);
+ 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(const_cast<Buffer &>(buf)));
+ auto_ptr<Inset> inset(new InsetTabular(buf));
inset->read(lex);
par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\lyxline") {
- par.insertInset(par.size(), new InsetLine, font, change);
+ auto_ptr<Inset> inset;
+ inset.reset(new InsetLine);
+ inset->setBuffer(*buf);
+ par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\change_unchanged") {
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted" || token == "\\change_deleted") {
{
public:
///
- TextCompletionList(Cursor const & cur)
- : buffer_(cur.buffer()), pos_(0)
+ TextCompletionList(Cursor const & cur, WordList const * list)
+ : buffer_(cur.buffer()), pos_(0), list_(list)
{}
///
virtual ~TextCompletionList() {}
///
virtual size_t size() const
{
- return theWordList().size();
+ return list_->size();
}
///
virtual docstring const & data(size_t idx) const
{
- return theWordList().word(idx);
+ return list_->word(idx);
}
private:
Buffer const * buffer_;
///
size_t pos_;
+ ///
+ WordList const * list_;
};
}
+/**
+ * This breaks a paragraph at the specified position.
+ * The new paragraph will:
+ * - Decrease depth by one (or change layout to default layout) when
+ * keep_layout == false
+ * - keep current depth and layout when keep_layout == true
+ */
+static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
+ bool keep_layout)
+{
+ BufferParams const & bparams = text.inset().buffer().params();
+ ParagraphList & pars = text.paragraphs();
+ // create a new paragraph, and insert into the list
+ ParagraphList::iterator tmp =
+ pars.insert(boost::next(pars.begin(), par_offset + 1),
+ Paragraph());
+
+ Paragraph & par = pars[par_offset];
+
+ // remember to set the inset_owner
+ tmp->setInsetOwner(&par.inInset());
+ // without doing that we get a crash when typing <Return> at the
+ // end of a paragraph
+ tmp->setPlainOrDefaultLayout(bparams.documentClass());
+
+ // layout stays the same with latex-environments
+ if (keep_layout) {
+ tmp->setLayout(par.layout());
+ tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(par.params().depth());
+ } else if (par.params().depth() > 0) {
+ Paragraph const & hook = pars[text.outerHook(par_offset)];
+ tmp->setLayout(hook.layout());
+ // not sure the line below is useful
+ tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(hook.params().depth());
+ }
+
+ bool const isempty = (par.allowEmpty() && par.empty());
+
+ if (!isempty && (par.size() > pos || par.empty())) {
+ tmp->setLayout(par.layout());
+ tmp->params().align(par.params().align());
+ tmp->setLabelWidthString(par.params().labelWidthString());
+
+ tmp->params().depth(par.params().depth());
+ tmp->params().noindent(par.params().noindent());
+
+ // move everything behind the break position
+ // to the new paragraph
+
+ /* Note: if !keepempty, empty() == true, then we reach
+ * here with size() == 0. So pos_end becomes - 1. This
+ * doesn't cause problems because both loops below
+ * enforce pos <= pos_end and 0 <= pos
+ */
+ pos_type pos_end = par.size() - 1;
+
+ for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+ if (moveItem(par, pos, *tmp, j, bparams)) {
+ ++j;
+ }
+ }
+ }
+
+ // Move over the end-of-par change information
+ tmp->setChange(tmp->size(), par.lookupChange(par.size()));
+ par.setChange(par.size(), Change(bparams.trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+
+ if (pos) {
+ // Make sure that we keep the language when
+ // breaking paragraph.
+ if (tmp->empty()) {
+ Font changed = tmp->getFirstFontSettings(bparams);
+ Font const & old = par.getFontSettings(bparams, par.size());
+ changed.setLanguage(old.language());
+ tmp->setFont(0, changed);
+ }
+
+ return;
+ }
+
+ if (!isempty) {
+ bool const soa = par.params().startOfAppendix();
+ par.params().clear();
+ // do not lose start of appendix marker (bug 4212)
+ par.params().startOfAppendix(soa);
+ par.setPlainOrDefaultLayout(bparams.documentClass());
+ }
+
+ // layout stays the same with latex-environments
+ if (keep_layout) {
+ par.setLayout(tmp->layout());
+ par.setLabelWidthString(tmp->params().labelWidthString());
+ par.params().depth(tmp->params().depth());
+ }
+}
+
+
void Text::breakParagraph(Cursor & cur, bool inverse_logic)
{
LASSERT(this == cur.text(), /**/);
// we need to set this before we insert the paragraph.
bool const isempty = cpar.allowEmpty() && cpar.empty();
- lyx::breakParagraph(cur.buffer()->params(), paragraphs(), cpit,
- cur.pos(), keep_layout);
+ lyx::breakParagraph(*this, cpit, cur.pos(), keep_layout);
// After this, neither paragraph contains any rows!
Paragraph & par = pars_[pit];
if (*cit == '\n') {
if (autoBreakRows_ && (!par.empty() || par.allowEmpty())) {
- lyx::breakParagraph(bparams, pars_, pit, pos,
- par.layout().isEnvironment());
+ lyx::breakParagraph(*this, pit, pos,
+ par.layout().isEnvironment());
++pit;
pos = 0;
space_inserted = true;
cur.checkBufferStructure();
// cur.updateFlags(Update::Force);
- bool boundary = tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
+ bool boundary = cur.boundary()
+ || tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary);
charInserted(cur);
}
// Here we call finishUndo for every 20 characters inserted.
// This is from my experience how emacs does it. (Lgb)
- static unsigned int counter;
- if (counter < 20) {
- ++counter;
+ if (undo_counter_ < 20) {
+ ++undo_counter_;
} else {
cur.finishUndo();
- counter = 0;
+ undo_counter_ = 0;
}
// register word if a non-letter was entered
setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
- cur.resetAnchor();
+ if (!cur.selection())
+ cur.resetAnchor();
setCursor(cur, to.pit(), to.pos());
cur.setSelection();
+ cur.setWordSelection(true);
}
// this is the least that needs to be done (bug 6003)
// in the above case, pasteParagraphList handles this
cur.buffer()->updateLabels();
+
+ // Ensure the current language is set correctly (bug 6292)
+ cur.text()->setCursor(cur, cur.pit(), cur.pos());
cur.clearSelection();
cur.resetAnchor();
return true;
readParagraph(pars_.back(), lex, errorList);
// register the words in the global word list
- CursorSlice sl = CursorSlice(*insetPtr);
- sl.pit() = pars_.size() - 1;
pars_.back().updateWords();
} else if (token == "\\begin_deeper") {
++depth;
CompletionList const * Text::createCompletionList(Cursor const & cur) const
{
- return new TextCompletionList(cur);
+ WordList const * list = theWordList(*cur.getFont().language());
+ return new TextCompletionList(cur, list);
}
projects / lyx.git / blobdiff