} 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()));
}
+namespace {
+
+bool canInsertChar(Cursor const & cur, char_type c)
+{
+ Paragraph const & par = cur.paragraph();
+ // If not in free spacing mode, check if there will be two blanks together or a blank at
+ // the beginning of a paragraph.
+ if (!par.isFreeSpacing() && isLineSeparatorChar(c)) {
+ if (cur.pos() == 0) {
+ cur.message(_(
+ "You cannot insert a space at the "
+ "beginning of a paragraph. Please read the Tutorial."));
+ return false;
+ }
+ // LASSERT: Is it safe to continue here?
+ LASSERT(cur.pos() > 0, /**/);
+ if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
+ && !par.isDeleted(cur.pos() - 1)) {
+ cur.message(_(
+ "You cannot type two spaces this way. "
+ "Please read the Tutorial."));
+ return false;
+ }
+ }
+
+ // Prevent to insert uncodable characters in verbatim and ERT
+ // (workaround for bug 9012)
+ // Don't do it for listings inset, since InsetListings::latex() tries
+ // to switch to a usable encoding which works in many cases (bug 9102).
+ if (par.isPassThru() && cur.inset().lyxCode() != LISTINGS_CODE &&
+ cur.current_font.language()) {
+ Encoding const * e = cur.current_font.language()->encoding();
+ if (!e->encodable(c)) {
+ cur.message(_("Character is uncodable in verbatim paragraphs."));
+ return false;
+ }
+ }
+ return true;
+}
+
+} // namespace
+
+
// insert a character, moves all the following breaks in the
// same Paragraph one to the right and make a rebreak
void Text::insertChar(Cursor & cur, char_type c)
{
LBUFERR(this == cur.text());
+ if (!canInsertChar(cur,c))
+ return;
+
cur.recordUndo(INSERT_UNDO);
TextMetrics const & tm = cur.bv().textMetrics(this);
// try to remove this
pit_type const pit = cur.pit();
- bool const freeSpacing = par.layout().free_spacing ||
- par.isFreeSpacing();
-
if (lyxrc.auto_number) {
static docstring const number_operators = from_ascii("+-/*");
static docstring const number_unary_operators = from_ascii("+-");
}
}
- // Next check, if there will be two blanks together or a blank at
- // the beginning of a paragraph.
- // I decided to handle blanks like normal characters, the main
- // difference are the special checks when calculating the row.fill
- // (blank does not count at the end of a row) and the check here
-
- // When the free-spacing option is set for the current layout,
- // disable the double-space checking
- if (!freeSpacing && isLineSeparatorChar(c)) {
- if (cur.pos() == 0) {
- cur.message(_(
- "You cannot insert a space at the "
- "beginning of a paragraph. Please read the Tutorial."));
- return;
- }
- // LASSERT: Is it safe to continue here?
- LASSERT(cur.pos() > 0, /**/);
- if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
- && !par.isDeleted(cur.pos() - 1)) {
- cur.message(_(
- "You cannot type two spaces this way. "
- "Please read the Tutorial."));
- return;
- }
- }
-
- // Prevent to insert uncodable characters in verbatim and ERT
- // (workaround for bug 9012)
- // Don't do it for listings inset, since InsetListings::latex() tries
- // to switch to a usable encoding which works in many cases (bug 9102).
- if (cur.paragraph().isPassThru() && owner_->lyxCode() != LISTINGS_CODE &&
- cur.current_font.language()) {
- Encoding const * e = cur.current_font.language()->encoding();
- if (!e->encodable(c)) {
- cur.message(_("Character is uncodable in verbatim paragraphs."));
- return;
- }
- }
-
pos_type pos = cur.pos();
if (!cur.paragraph().isPassThru() && owner_->lyxCode() != IPA_CODE &&
cur.real_current_font.fontInfo().family() != TYPEWRITER_FAMILY &&
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();
+ }
}
}
cur.recordUndoInset();
cur.setMark(false);
cur.selHandle(false);
- // save position
+ // save position inside inset
pos_type spos = cur.pos();
pit_type spit = cur.pit();
ParagraphList plist;
if (cur.lastpit() != 0 || cur.lastpos() != 0)
plist = paragraphs();
cur.popBackward();
- // store cursor offset
+ // update cursor offset
if (spit == 0)
spos += cur.pos();
spit += cur.pit();
- Buffer & b = *cur.buffer();
- cur.paragraph().eraseChar(cur.pos(), b.params().track_changes);
+ // remember position outside inset to delete inset later
+ // we do not do it now to avoid memory reuse issues (see #10667).
+ DocIterator inset_it = cur;
+ // jump over inset
+ ++cur.pos();
+ Buffer & b = *cur.buffer();
if (!plist.empty()) {
// see bug 7319
// we clear the cache so that we won't get conflicts with labels
pasteParagraphList(cur, plist, b.params().documentClassPtr(),
b.errorList("Paste"));
- // restore position
- cur.pit() = min(cur.lastpit(), spit);
- cur.pos() = min(cur.lastpos(), spos);
}
- cur.forceBufferUpdate();
+ // delete the inset now
+ inset_it.paragraph().eraseChar(inset_it.pos(), b.params().track_changes);
+ // restore position
+ cur.pit() = min(cur.lastpit(), spit);
+ cur.pos() = min(cur.lastpos(), spos);
// Ensure the current language is set correctly (bug 6292)
cur.text()->setCursor(cur, cur.pit(), cur.pos());
cur.clearSelection();
cur.resetAnchor();
+ cur.forceBufferUpdate();
+
return true;
}
// Returns the current font and depth as a message.
-docstring Text::currentState(Cursor const & cur) const
+docstring Text::currentState(Cursor const & cur, bool devel_mode) const
{
LBUFERR(this == cur.text());
Buffer & buf = *cur.buffer();
}
}
-#ifdef DEVEL_VERSION
- os << _(", Inset: ") << &cur.inset();
- os << _(", Paragraph: ") << cur.pit();
- os << _(", Id: ") << par.id();
- os << _(", Position: ") << cur.pos();
- // FIXME: Why is the check for par.size() needed?
- // We are called with cur.pos() == par.size() quite often.
- if (!par.empty() && cur.pos() < par.size()) {
- // Force output of code point, not character
- size_t const c = par.getChar(cur.pos());
- os << _(", Char: 0x") << hex << c;
- }
- os << _(", Boundary: ") << cur.boundary();
-// Row & row = cur.textRow();
-// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
-#endif
+ if (devel_mode) {
+ os << _(", Inset: ") << &cur.inset();
+ os << _(", Paragraph: ") << cur.pit();
+ os << _(", Id: ") << par.id();
+ os << _(", Position: ") << cur.pos();
+ // FIXME: Why is the check for par.size() needed?
+ // We are called with cur.pos() == par.size() quite often.
+ if (!par.empty() && cur.pos() < par.size()) {
+ // Force output of code point, not character
+ size_t const c = par.getChar(cur.pos());
+ os << _(", Char: 0x") << hex << c;
+ }
+ os << _(", Boundary: ") << cur.boundary();
+// Row & row = cur.textRow();
+// os << bformat(_(", Row b:%1$d e:%2$d"), row.pos(), row.endpos());
+ }
return os.str();
}
projects / lyx.git / blobdiff