Merge lp:~sil2100/ubuntu-keyboard/enhance_word_completion into lp:ubuntu-keyboard

[Łukasz Zemczak]

Changes related to fixing the preedit word completion, enhancing the usage with regards to adding whitespaces, separators. Enhanced autocaps. Added possibility to commit (word-completion) when using separators (., etc). Double-space with auto-correction enabled now results in a full-stop sign. Also, in auto-correct unnecessary whitespaces before separators are removed. Include unit-testing of some of the features.

* Are there any related MPs required for this MP to build/function as expected? Please list.
-> No

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
-> Yes

* Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
-> Yes, on my mako device

* Did you successfully run all tests found in your component's Test Plan on device or emulator?
-> Yes, on my mako device

* If you changed the UI, was the change specified/approved by design?
-> N/A

* If you changed the packaging (debian), did you subscribe a core-dev to this MP?
-> N/A

Description:

Changes related to fixing the preedit word completion, enhancing the usage with regards to adding whitespaces, separators. Enhanced autocaps.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/349/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/177

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/349/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

One slight issue is the spacing behaviour when using Pinyin. At the moment you have to do a double space to get a space character for Pinyin (and then of course you get two spaces). It behaves correctly when entering characters, in that it's not appending a space after completing a character, but when entering a space on its own (after finishing a character) you currently don't get any output.

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

153. By Łukasz Zemczak on 2014-04-22

Enable the double-space as a full stop sequence generator during auto-complete

154. By Łukasz Zemczak on 2014-04-22

Remove any trailing whitespaces during auto-correct when a separator is inputted and make the double-space action only work in case of space-started auto-correct

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/361/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/189/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/361/rebuild

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

I will look now into the issue with Pinyin - currently it seems to be not working at all even (maliit-server stops due to assertion issues). In the meantime, just a quick comment related to the removal of whitespaces that I made here. The best, cleanest way would be to use preedit for those, but sadly that approach was very very troublesome. Preedit has a specific way of formatting its input. And it also interferes with the word-prediction... Since it was really really troublesome, I decided to use a more 'hacky way' for this - doing backspace actions to remove the whitespaces. It's not perfect, but it seems to be the only sane way without having to modify maliit too much.

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

155. By Łukasz Zemczak on 2014-04-24

Fix the new behavior for pinyin

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/362/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/190/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/362/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

156. By Łukasz Zemczak on 2014-04-24

Add some additional comments

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/363/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/191/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/363/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

157. By Łukasz Zemczak on 2014-04-25

Add the possibility to commit strings using separators (like dots and commas). Fix pinyin input to consider separators

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/365/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/194/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/194/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/193/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/365/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

158. By Łukasz Zemczak on 2014-04-28

Merge trunk

159. By Łukasz Zemczak on 2014-04-30

Fix the tests, still working on fixing all edge-cases

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/203
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/202

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/374/rebuild

review: Approve (continuous-integration)

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

160. By Łukasz Zemczak on 2014-05-07

Fix all outstanding issues... Refactor the code heavily as it was a 'patch on a patch of a patch'. Now it should be good

161. By Łukasz Zemczak on 2014-05-07

Merge trunk

162. By Łukasz Zemczak on 2014-05-07

Add a new unit test for the double-space full-stop

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/377/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/377/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/379/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

I'm finding that when first entering an empty field caps don't get disabled until the second letter has been completed, so "Hello" becomes "HEllo". This seems to be related to the panel.autoCapsTriggered condition on line 114 of the diff, which prevents the keypad state from being set back to NORMAL. With that removed everything appears to work correctly, however I'm not clear on what the intention is there so I might be missing some side effect that I'm unaware of?

[Łukasz Zemczak (sil2100)]

Sadly, this conditional is required to enable activation of autocaps by normal character key-presses. Without this, each character key automatically disables autocaps, making it impossible to triggering it properly. I just need to handle this case better, let me fix this ;)

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

163. By Łukasz Zemczak on 2014-05-08

Workaround fix for the broken initial autocaps

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/380/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/380/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

[Bill Filler (bfiller)]

Getting close. There are still a few issues that need to be addressed:

For all of these tests, I just open Notes and type a new note

== turn on all the settings (spellcheck, autocomplete, word suggestions)
1) No space is entered after pressing spacebar to commit the word. For example type:
"Hey my"[spacebar]
This should produce
"Hey my " but instead produces "Hey my"
The space does not get added until you type the next word. Whenever spacebar is pressed it should commit the word and add a space.

2) Double tap on spacebar not always adding punctation:
This works correctly if there is a suggested word in the list to complete. i.e
"Hello my fri" [double tap spacebar] produces "Hello my friend. "
But if there is no suggested word, or if word suggestion/auto complete is disabled it does not work.
For example:
"Hello my uubgugugugug"[double tap spacebar] produces "Hello my uubgugugugug " while it should produce "Hello my uubgugugugug.

The rule should be double-tapping spacebar when the preceding character is not a space should always a) commit the word b) add the period + trailing space, regardless if word suggesting existed or not and regardless if word suggestion/auto-complete is enabled. This is how Android and iphone both work

review: Needs Fixing

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

164. By Łukasz Zemczak on 2014-05-20

Change the approach: for now let's not use the preedit for appending the whitespaces for auto-correct. Let's actually print it out but remove it when needed. We could do this otherwise, i.e. use preedit and custom formatting strings, but that actually requires more work and is more error prone. Let's do that later. The unit tests need some love still though...

165. By Łukasz Zemczak on 2014-05-20

Merge trunk

[Łukasz Zemczak (sil2100)]

As per our earlier discussion, Android doesn't enable double-space = full-stop when auto-complete is disabled. I guess most of the things mentioned should be resolved.

As already mentioned in the trunk commits, now we're doing things differently. No more usage of preedit. It's less clean, but much less error prone. I would consider using preedit again with custom formatting strings, but let's leave that for some later refactoring :)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/393/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/393/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Spotted one new issue, if you enter a full stop when in a URL/email context (e.g. in the browser address bar or the messaging app email field) a space is now inserted, this behaviour should probably be disabled under these circumstances.

[Michael Sheldon (michael-sheldon)]

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

I think we need to be more picky over the punctuation behaviour as well, it currently causes issues when inserting smilies in text. For example, if you try typing "This is getting better :)" you end up with "This is getting better: )"

review: Needs Fixing

[Łukasz Zemczak (sil2100)]

Ah! Smileys ;) Forgot about those! Let me make a quick fix soon.

[Łukasz Zemczak (sil2100)]

Just a quick heads up - I'm working on this, just have a lot of landing team work nowadays. The fix for those issues is almost done, just need to find 10 free minutes.

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

166. By Łukasz Zemczak on 2014-05-28

Do not consider : and ; as separators right now

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/400/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/400/rebuild

review: Approve (continuous-integration)

[lp:~sil2100/ubuntu-keyboard/enhance_word_completion]

167. By Łukasz Zemczak on 2014-06-11

Yeah, this should be much easier to do the detection of content type - as all non free text content types explicitly disable preedit.

168. By Łukasz Zemczak on 2014-06-11

Merge trunk

[Łukasz Zemczak (sil2100)]

Should be ok now ;p! Curse you landing team work!

btw. I tried connecting to the contentType changed signals, but those didn't really work. But this way should cover all the currently known cases as well.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/402/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/402/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

I've tested out of silo 3, it's all working nicely. Good job Sil!

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2014-04-15 12:18:47 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2014-06-11 13:16:05 +0000
@@ -47,6 +47,24 @@
 
 QString ChineseLanguageFeatures::appendixForReplacedPreedit(const QString &preedit) const
 {
-    Q_UNUSED(preedit)
+    if (isSeparator(preedit.right(1))) {
+        return QString(" ");
+    }
+
     return QString("");
 }
+
+bool ChineseLanguageFeatures::isSeparator(const QString &text) const
+{
+    static const QString separators = QString::fromUtf8("。、,!?:;\r\n");
+
+    if (text.isEmpty()) {
+        return false;
+    }
+
+    if (separators.contains(text.right(1))) {
+        return true;
+    }
+
+    return false;
+}
\ No newline at end of file

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.h'
--- plugins/pinyin/src/chineselanguagefeatures.h	2014-04-15 12:18:47 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.h	2014-06-11 13:16:05 +0000
@@ -31,6 +31,7 @@
     virtual bool autoCapsAvailable() const;
     virtual bool activateAutoCaps(const QString &preedit) const;
     virtual QString appendixForReplacedPreedit(const QString &preedit) const;
+    virtual bool isSeparator(const QString &text) const;
 };
 
 #endif // CHINESELANGUAGEFEATURES_H

=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
--- plugins/westernsupport/westernlanguagefeatures.cpp	2014-04-15 12:18:47 +0000
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2014-06-11 13:16:05 +0000
@@ -74,3 +74,18 @@
 
     return QString(" ");
 }
+
+bool WesternLanguageFeatures::isSeparator(const QString &text) const
+{
+    static const QString separators = QString::fromUtf8(",.!?\r\n");
+
+    if (text.isEmpty()) {
+        return false;
+    }
+
+    if (separators.contains(text.right(1))) {
+        return true;
+    }
+
+    return false;
+}

=== modified file 'plugins/westernsupport/westernlanguagefeatures.h'
--- plugins/westernsupport/westernlanguagefeatures.h	2014-04-15 12:18:47 +0000
+++ plugins/westernsupport/westernlanguagefeatures.h	2014-06-11 13:16:05 +0000
@@ -46,6 +46,8 @@
     virtual bool autoCapsAvailable() const;
     virtual bool activateAutoCaps(const QString &preedit) const;
     virtual QString appendixForReplacedPreedit(const QString &preedit) const;
+    virtual bool isSeparator(const QString &text) const;
+    virtual QString fullStopSequence() const { return QString("."); }
 };
 
 #endif // MALIITKEYBOARD_LANGUAGEFEATURES_H

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2014-02-28 18:25:13 +0000
+++ qml/Keyboard.qml	2014-06-11 13:16:05 +0000
@@ -244,6 +244,7 @@
                 onActivateAutocaps: {
                     keypad.state = "CHARACTERS";
                     keypad.activeKeypadState = "SHIFTED";
+                    keypad.autoCapsTriggered = true;
                 }
             }
 

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2014-05-12 20:24:36 +0000
+++ qml/KeyboardContainer.qml	2014-06-11 13:16:05 +0000
@@ -28,6 +28,8 @@
     property int keyWidth: 0
     property int keyHeight: 0
 
+    property bool autoCapsTriggered: false
+
     property string activeKeypadState: "NORMAL"
     property alias popoverEnabled: extendedKeysSelector.enabled
 

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2014-05-01 16:39:00 +0000
+++ qml/keys/CharKey.qml	2014-06-11 13:16:05 +0000
@@ -142,9 +142,14 @@
         onReleased: {
             if (!extendedKeysShown) {
                 event_handler.onKeyReleased(valueToSubmit, action);
-                if (!skipAutoCaps)
+
+                if (panel.autoCapsTriggered) {
+                    panel.autoCapsTriggered = false;
+                }
+                else if (!skipAutoCaps) {
                     if (panel.activeKeypadState === "SHIFTED" && panel.state === "CHARACTERS")
                         panel.activeKeypadState = "NORMAL"
+                }
             }
         }
         onPressed: {
@@ -154,6 +159,8 @@
             if (maliit_input_method.useHapticFeedback)
                  pressEffect.start();
 
+            // Quick workaround to fix initial autocaps - not beautiful, but works
+            panel.autoCapsTriggered = false;
             event_handler.onKeyPressed(valueToSubmit, action);
         }
     }

=== modified file 'src/lib/logic/abstractlanguagefeatures.h'
--- src/lib/logic/abstractlanguagefeatures.h	2014-04-15 12:19:05 +0000
+++ src/lib/logic/abstractlanguagefeatures.h	2014-06-11 13:16:05 +0000
@@ -45,6 +45,8 @@
     virtual bool autoCapsAvailable() const = 0;
     virtual bool activateAutoCaps(const QString &preedit) const = 0;
     virtual QString appendixForReplacedPreedit(const QString &preedit) const = 0;
+    virtual bool isSeparator(const QString &text) const { Q_UNUSED(text); return false; }
+    virtual QString fullStopSequence() const { return QString(); }
 };
 
 #endif // MALIIT_KEYBOARD_ABSTRACTLANGUAGEFEATURES_H

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-05-27 15:37:37 +0000
+++ src/view/abstracttexteditor.cpp	2014-06-11 13:16:05 +0000
@@ -285,6 +285,8 @@
     bool auto_caps_enabled;
     int ignore_next_cursor_position;
     QString ignore_next_surrounding_text;
+    bool look_for_a_double_space;
+    QString appendix_for_previous_preedit;
     int backspace_word_acceleration;
 
     explicit AbstractTextEditorPrivate(const EditorOptions &new_options,
@@ -307,6 +309,8 @@
     , auto_caps_enabled(false)
     , ignore_next_cursor_position(-1)
     , ignore_next_surrounding_text()
+    , look_for_a_double_space(false)
+    , appendix_for_previous_preedit()
     , backspace_word_acceleration(0)
 {
     auto_repeat_backspace_timer.setSingleShot(true);
@@ -415,23 +419,66 @@
     const QString text = key.label();
     QString keyText = QString("");
     Qt::Key event_key = Qt::Key_unknown;
+    bool look_for_a_double_space = d->look_for_a_double_space;
+
+    if (look_for_a_double_space) {
+        // we reset the flag here so that we won't have to add boilerplate code later
+        d->look_for_a_double_space = false;
+    }
 
     switch(key.action()) {
     case Key::ActionInsert: {
-        d->text->appendToPreedit(text);
+        bool alreadyAppended = false;
+        bool auto_caps_activated = false;
+        const bool isSeparator = d->word_engine->languageFeature()->isSeparator(text);
+        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && 
+                    not d->text->preedit().isEmpty() && isSeparator;
 
-        // computeCandidates can change preedit face, so needs to happen
-        // before sending preedit:
         if (d->preedit_enabled) {
-            d->word_engine->computeCandidates(d->text.data());
-        }
-
-        sendPreeditString(d->text->preedit(), d->text->preeditFace(),
-                          Replacement(d->text->cursorPosition()));
+            if (replace_preedit) {
+                // this means we should commit the candidate, add the separator and whitespace
+                d->text->setPreedit(d->text->primaryCandidate());
+                d->text->appendToPreedit(text);
+                d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
+                d->text->appendToPreedit(d->appendix_for_previous_preedit);
+                commitPreedit();
+                auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit() + text);
+                alreadyAppended = true;
+            }
+            else if (d->auto_correct_enabled && isSeparator) {
+                // remove all whitespaces before the separator, then add a whitespace after it
+                removeTrailingWhitespaces();
+
+                d->text->appendToPreedit(text);
+                auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit());
+                d->text->appendToPreedit(d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit()));
+                commitPreedit();
+                alreadyAppended = true;
+            }
+        }
+
+        // if we had modified the preedit already because of a separator entry, there is no need to perform all the
+        // steps like appending the input or computing candidates - as all we needed was already done in the previous part
+        if (not alreadyAppended) {
+            d->text->appendToPreedit(text);     
+
+            // computeCandidates can change preedit face, so needs to happen
+            // before sending preedit:
+            if (d->preedit_enabled) {
+                d->word_engine->computeCandidates(d->text.data());
+            }
+
+            sendPreeditString(d->text->preedit(), d->text->preeditFace(),
+                              Replacement(d->text->cursorPosition()));
+        }
 
         if (not d->preedit_enabled) {
             commitPreedit();
         }
+        else if (auto_caps_activated && d->auto_caps_enabled) {
+            // standard input (like certain separators, e.g. '.' in western languages) can also trigger autoCaps
+            Q_EMIT autoCapsActivated();
+        }
     } break;
 
     case Key::ActionBackspace: {
@@ -445,17 +492,31 @@
     } break;
 
     case Key::ActionSpace: {
+        QString space = " ";
         QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
-        const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
+        bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
         const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && not d->text->preedit().isEmpty();
+        const QString stopSequence = d->word_engine->languageFeature()->fullStopSequence();
+
+        // every double-space character inputs one-after-another force a full-stop, so trigger it if needed
+        if (d->preedit_enabled && d->auto_correct_enabled && not look_for_a_double_space) {
+            d->look_for_a_double_space = true;
+        }
 
         if (replace_preedit) {
-            const QString &appendix = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
+            space = d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
             d->text->setPreedit(d->text->primaryCandidate());
-            d->text->appendToPreedit(appendix);
-        } else {
-            d->text->appendToPreedit(" ");
-        }
+        }
+        else if (look_for_a_double_space && not stopSequence.isEmpty()) {
+            removeTrailingWhitespaces();
+            d->text->appendToPreedit(d->word_engine->languageFeature()->fullStopSequence());
+
+            // we need to re-evaluate autocaps after our changes to the preedit
+            textOnLeft = d->text->surroundingLeft() + d->text->preedit();
+            auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
+        }
+
+        d->text->appendToPreedit(space);
         commitPreedit();
 
         if (auto_caps_activated && d->auto_caps_enabled) {
@@ -578,8 +639,10 @@
 
     d->text->setPreedit(replacement);
     const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->preedit());
-    const QString appendix = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
-    d->text->appendToPreedit(appendix);
+    d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
+    if (d->auto_correct_enabled) {
+        d->text->appendToPreedit(d->appendix_for_previous_preedit);
+    }
     commitPreedit();
 
     if (auto_caps_activated && d->auto_caps_enabled) {
@@ -674,6 +737,21 @@
     d->word_engine->clearCandidates();
 }
 
+void AbstractTextEditor::removeTrailingWhitespaces()
+{
+    Q_D(AbstractTextEditor);
+
+    const QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
+
+    QString::const_iterator begin = textOnLeft.cbegin();
+    QString::const_iterator i = textOnLeft.cend();
+    while (i != begin) {
+        --i;
+        if (*i != ' ') break;
+        singleBackspace();
+    }
+}
+
 // TODO: this implementation does not take into account following features:
 // 1) preedit string
 //      if there is preedit then first call to autoRepeatBackspace should clean it completely

=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2014-05-14 13:14:34 +0000
+++ src/view/abstracttexteditor.h	2014-06-11 13:16:05 +0000
@@ -158,6 +158,7 @@
     virtual void singleBackspace();
 
     void commitPreedit();
+    void removeTrailingWhitespaces();
     Q_SLOT void autoRepeatBackspace();
     void autoRepeatWordBackspace();
     QString wordLeftOfCursor() const;

=== modified file 'tests/unittests/ut_editor/ut_editor.cpp'
--- tests/unittests/ut_editor/ut_editor.cpp	2013-12-19 15:55:17 +0000
+++ tests/unittests/ut_editor/ut_editor.cpp	2014-06-11 13:16:05 +0000
@@ -69,6 +69,8 @@
             Key key;
             if (c.isSpace()) {
                 key.setAction(Key::ActionSpace);
+            } else if (c == '\r') {
+                key.setAction(Key::ActionReturn);
             } else {
                 key.setAction(Key::ActionInsert);
                 key.rLabel() = QString(c);
@@ -101,12 +103,24 @@
                 << false << "Helol Wordl! " << "Helol Wordl! ";
         QTest::newRow("auto-correct disabled, multiple punctation")
                 << false << "Helol Wordl!! " << "Helol Wordl!! ";
-        QTest::newRow("auto-correct enabled, digits")
+        QTest::newRow("auto-correct disabled, digits")
                 << false << "Helol Wordl12 " << "Helol Wordl12 ";
 //        QTest::newRow("auto-correct enabled")
 //                << true << "Helol Wordl! " << "Hello World! ";
 //        QTest::newRow("auto-correct enabled, multiple punctation")
 //                << true << "Helol Wordl!! " << "Hello World!! ";
+
+        // Tests for the auto-correct and separator-at-end behavior
+        // FIXME: In the current testing infra, we cannot really test this properly, as we are using the 'backspace' character
+        //  a lot during auto-correction, which is currently not handled too well here.
+        QTest::newRow("auto-correct enabled, commit with space, check separators")
+                << true << "Hel ,Wor ." << "Hello , World . ";
+        QTest::newRow("auto-correct enabled, commit with separators, check separators")
+                << true << "Hel.Wor." << "Hello. World. ";
+        QTest::newRow("auto-correct enabled, check if two spaces are full-stop")
+                << true << "Hel  " << "Hello . ";      
+        //QTest::newRow("auto-correct enabled, check removal of unnecessary whitespaces")
+        //        << true << "Hello.       . " << "Hello.. ";
     }
 
     Q_SLOT void testAutoCorrect()
@@ -169,14 +183,24 @@
                 << false << "This is a \"first sentence\". And a second, one! "
                 << "This is a \"first sentence\". And a second, one! " << 2;
         QTest::newRow("auto-correct enabled, multiple sentences with mixed punctation")
-                << true << "This is a \"first sentence\". And a second, one! "
+                << true << "This is a \"first sentence\".And a second,one!"
                 << "This is a \"first sentence\". And a second, one! " << 2;
         QTest::newRow("auto-correct disabled, multiple sentences with dots")
                 << false << "First sentence. Second one. And Third. "
                 << "First sentence. Second one. And Third. " << 3;
         QTest::newRow("auto-correct enabled, multiple sentences with dots")
-                << true << "First sentence. Second one. And Third. "
+                << true << "First sentence.Second one.And Third."
                 << "First sentence. Second one. And Third. " << 3;
+
+        // Tests for the auto-correct and autocaps separator functionality
+        // FIXME: In the current testing infra, we cannot really test this properly, as we are using the 'backspace' character
+        //  a lot during auto-correction, which is currently not handled too well here.
+        QTest::newRow("auto-correct enabled, autocaps after separator auto-correction")
+                << true << "Hello Wor .This should be autocapsed "
+                << "Hello World . This should be autocapsed " << 1;
+        QTest::newRow("auto-correct enabled, autocaps after separator auto-correction #2")
+                << true << "Hello Wor .This should be autocapsed "
+                << "Hello World . This should be autocapsed " << 1;
     }
 
     Q_SLOT void testAutoCaps()
@@ -196,6 +220,7 @@
         initializeWordEngine(word_engine);
 
         editor.wordEngine()->setWordPredictionEnabled(true);
+        editor.wordEngine()->setEnabled(true);
         editor.setAutoCorrectEnabled(enable_auto_correct);
         editor.setPreeditEnabled(true);
         editor.setAutoCapsEnabled(true);
@@ -204,7 +229,7 @@
 
         QCOMPARE(host.commitStringHistory(), expected_commit_history);
         Q_UNUSED(expected_auto_caps_activated_count)
-//        QCOMPARE(auto_caps_activated_spy.count(), expected_auto_caps_activated_count);
+        QCOMPARE(auto_caps_activated_spy.count(), expected_auto_caps_activated_count);
     }
 };
 

=== modified file 'tests/unittests/ut_editor/wordengineprobe.cpp'
--- tests/unittests/ut_editor/wordengineprobe.cpp	2014-04-24 13:18:54 +0000
+++ tests/unittests/ut_editor/wordengineprobe.cpp	2014-06-11 13:16:05 +0000
@@ -31,6 +31,38 @@
 
 #include "wordengineprobe.h"
 
+// To properly mock language features, we need to realistically determine separators and autoCaps
+// Since unittests use latin letters, we simply use the same methods as in WesternLanguageFeatures
+bool MockLanguageFeatures::activateAutoCaps(const QString &preedit) const
+{
+    static const QString sentenceBreak = QString::fromUtf8("!.?:\r\n");
+
+    if (preedit.isEmpty()) {
+        return false;
+    }
+
+    if (sentenceBreak.contains(preedit.right(1))) {
+        return true;
+    }
+
+    return false;
+}
+
+bool MockLanguageFeatures::isSeparator(const QString &text) const
+{
+    static const QString separators = QString::fromUtf8(",.!?:;\r\n");
+
+    if (text.isEmpty()) {
+        return false;
+    }
+
+    if (separators.contains(text.right(1))) {
+        return true;
+    }
+
+    return false;
+}
+
 namespace MaliitKeyboard {
 namespace Logic {
 

=== modified file 'tests/unittests/ut_editor/wordengineprobe.h'
--- tests/unittests/ut_editor/wordengineprobe.h	2014-04-24 13:18:54 +0000
+++ tests/unittests/ut_editor/wordengineprobe.h	2014-06-11 13:16:05 +0000
@@ -43,10 +43,12 @@
     explicit MockLanguageFeatures() {}
     virtual ~MockLanguageFeatures() {}
 
+    virtual bool isSeparator(const QString &text) const;
     virtual bool alwaysShowSuggestions() const { return false; }
-    virtual bool autoCapsAvailable() const { return false; }
-    virtual bool activateAutoCaps(const QString &preedit) const { Q_UNUSED(preedit); return false; }
-    virtual QString appendixForReplacedPreedit(const QString &preedit) const { Q_UNUSED(preedit); return ""; }
+    virtual bool autoCapsAvailable() const { return true; }
+    virtual bool activateAutoCaps(const QString &preedit) const;
+    virtual QString appendixForReplacedPreedit(const QString &preedit) const { Q_UNUSED(preedit); return " "; }
+    virtual QString fullStopSequence() const { return QString("."); }
 };
 
 namespace MaliitKeyboard {