anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not record undo when typing two spaces has been blocked

Browse Source 
Move the code that forbids character insertion in its own helper function.

Call this function before doing a recordUndo. This avoids to mark the
document dirty in cases where nothing happens.

Part of bug #10721.
This commit is contained in:
Jean-Marc Lasgouttes 2017-07-11 12:15:29 +02:00
parent 7945ba0cb0
commit cfd27dd219
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/Text.cpp
View File

@ -908,12 +908,58 @@ void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str,
}
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;
}
}
// 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);
@ -922,9 +968,6 @@ void Text::insertChar(Cursor & cur, char_type c)
// 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("+-");
@ -1007,45 +1050,6 @@ void Text::insertChar(Cursor & cur, char_type c)
}
}
// 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 &&