commit 3519be2292f44cfbc450f83fa84616b72f8871f2
Author: Isaac <[email protected]>
Date: Sat May 25 11:07:26 2019 +1200
Removed shortcuts to toggle autocorrect.
They are not really needed now that autocorrection can be undone. This
increases autocorrect usability.
---
src/Cursor.cpp | 6 +++---
src/Cursor.h | 7 -------
src/mathed/InsetMathNest.cpp | 26 +-------------------------
3 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 7623c5b..48a74f3 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -121,19 +121,19 @@ DocIterator bruteFind(Cursor const & c, int x, int y)
CursorData::CursorData()
: DocIterator(), anchor_(), selection_(false), mark_(false),
- word_selection_(false), autocorrect_(false),
current_font(inherit_font)
+ word_selection_(false), current_font(inherit_font)
{}
CursorData::CursorData(Buffer * buffer)
: DocIterator(buffer), anchor_(), selection_(false), mark_(false),
- word_selection_(false), autocorrect_(false),
current_font(inherit_font)
+ word_selection_(false), current_font(inherit_font)
{}
CursorData::CursorData(DocIterator const & dit)
: DocIterator(dit), anchor_(), selection_(false), mark_(false),
- word_selection_(false), autocorrect_(false),
current_font(inherit_font)
+ word_selection_(false), current_font(inherit_font)
{}
diff --git a/src/Cursor.h b/src/Cursor.h
index 3d3db5d..35d2fc9 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -160,11 +160,6 @@ public:
///
docstring currentState(bool devel_mode) const;
- /// auto-correct mode
- bool autocorrect() const { return autocorrect_; }
- /// auto-correct mode
- bool & autocorrect() { return autocorrect_; }
-
/// fix cursor in circumstances that should never happen.
/// \retval true if a fix occurred.
bool fixIfBroken();
@@ -238,8 +233,6 @@ private:
//
// math specific stuff that could be promoted to "global" later
//
- /// do we allow autocorrection
- bool autocorrect_;
// FIXME: make them private
public:
diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 85e4dd7..3078ef9 100644
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -706,12 +706,6 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest &
cmd)
|| act == LFUN_PARAGRAPH_UP_SELECT;
cur.selHandle(select);
- // handle autocorrect:
- if (lyxrc.autocorrection_math && cur.autocorrect()) {
- cur.autocorrect() = false;
- cur.message(_("Autocorrect Off ('!' to enter)"));
- }
-
// go up/down
bool up = act == LFUN_UP || act == LFUN_UP_SELECT
|| act == LFUN_PARAGRAPH_UP || act ==
LFUN_PARAGRAPH_UP_SELECT;
@@ -1729,18 +1723,6 @@ bool InsetMathNest::interpretChar(Cursor & cur,
char_type const c)
}
- // leave autocorrect mode if necessary
- if (lyxrc.autocorrection_math && c == ' ' && cur.autocorrect()) {
- cur.autocorrect() = false;
- cur.message(_("Autocorrect Off ('!' to enter)"));
- return true;
- }
- if (lyxrc.autocorrection_math && c == '!' && !cur.autocorrect()) {
- cur.autocorrect() = true;
- cur.message(_("Autocorrect On (<space> to exit)"));
- return true;
- }
-
// just clear selection on pressing the space bar
if (cur.selection() && c == ' ') {
cur.selection(false);
@@ -1867,18 +1849,12 @@ bool InsetMathNest::interpretChar(Cursor & cur,
char_type const c)
// try auto-correction
- if (lyxrc.autocorrection_math && cur.autocorrect() && cur.pos() != 0
+ if (lyxrc.autocorrection_math && cur.pos() != 0
&& math_autocorrect(cur, c))
return true;
// no special circumstances, so insert the character without any fuss
cur.insert(c);
- if (lyxrc.autocorrection_math) {
- if (!cur.autocorrect())
- cur.message(_("Autocorrect Off ('!' to enter)"));
- else
- cur.message(_("Autocorrect On (<space> to exit)"));
- }
return true;
}
