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") {
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
// 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;