Merge lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted into lp:ubuntu-keyboard

[Mitsuya Shibata]

Implement Japanese keyboard layout

This is rewrite code to input Japanese from ubuntu-keyboard.

How to try it:

1. install ubuntu-keyboard this branch

2. setup japanese environment and enable japanese input method
    1. launch System Settings and select Language & Text
    2. set "Display language" to "日本語(日本)" (most bottom in list)
    3. set "Keyboard layouts" to "[Ja] 日本語"

3. return to home scope and tap search icon

4. enjoy japanese input!
    - Japanese input method use "Flick input" which is commonly used japanese
      smartphones.
    - please refer following video about how to input.
      http://www.youtube.com/watch?v=pbGdEeHzFnk

Note about this branch:

1. support single kana-kanji conversion only
    - does not support resize segment.

2. publish preedit and cursor_position property to QML
    - Japanese input method use preedit hardly.
    - So needs to edit preedit from QML before commit it.
    - This branch add properties preedit and cursor_position to maliit_input_method.
    - And emit signal by changed this property from abstracttexteditor.
      src/plugin/inputmethod.{h,cpp}
      src/plugin/inputmethod_p.h
      src/view/abstracttexteditor.cpp
      src/view/abstracttexteditor.{h,cpp}
      src/lib/logic/eventhandler.cpp

Thanks!

[Michael Sheldon (michael-sheldon)]

Hi Mitsuya,

 Thanks for updating this, I've only just started reviewing it so there'll be some more comments to come later, but the most immediate issue with this branch is that it doesn't install the japanese plugin's "keys" directory (plugins/ja/qml/keys).

 I've also made a couple of inline comments at locations where it's still using the old relative path imports for the global keys directory, this should now be done as "import keys 1.0" as this we allow the plugin to be installed separately from the rest of maliit in the future (e.g. as part of a custom tarball, or possibly as a click package at some point)

Thanks!

review: Needs Fixing

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

404. By Mitsuya Shibata on 2015-08-19

Install customized qml files for Japanese layout.

[Mitsuya Shibata (cosmos-door)]

Hi Michael,

> Thanks for updating this, I've only just started reviewing it so there'll be
> some more comments to come later, but the most immediate issue with this
> branch is that it doesn't install the japanese plugin's "keys" directory
> (plugins/ja/qml/keys).

oh, sorry... I fixed qml.pro, it will install plugins/ja/qml/keys too.

> I've also made a couple of inline comments at locations where it's still
> using the old relative path imports for the global keys directory, this should
> now be done as "import keys 1.0" as this we allow the plugin to be installed
> separately from the rest of maliit in the future (e.g. as part of a custom
> tarball, or possibly as a click package at some point)

Changed to "import keys 1.0".

Thank you for your review!

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

Looking really good, just a few small things needing fixing:

1) The cursor keys move two characters at a time (it looks like they're moving the cursor on both the press and release events)

2) In the character selection pop-over the characters that aren't currently selected should use the same colour as the selection pop-over on the other keyboard layouts (this is done by setting the opacity to 0.6 when not selected)

3) If touch feedback is enabled in settings then sliding between characters on the selection pop-over should trigger haptic feedback via pressEffect.start() (same as on other keyboard layouts)

4) The copyright year on a lot of the added files is listed as 2012/2013/2014, this should be 2015 since these are new files

5) Is it correct that the URL and email layouts should be a non-Japanese qwerty layout? (If so it might be worth populating the URL key with useful Japanese TLDs like .jp, .co.jp, etc.)

6) Could you add a comment to the modifier.js explaining the purpose of the map and normalize arrays?

review: Needs Fixing

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

405. By Mitsuya Shibata on 2015-09-27

fixes copyright year and add some comments

406. By Mitsuya Shibata on 2015-09-27

fixes double key released for cursor keys

407. By Mitsuya Shibata on 2015-09-27

set the text opacity to 0.6 when not selected in the selection pop-over

408. By Mitsuya Shibata on 2015-09-27

trigger haptic feedback on the selection pop-over too.

409. By Mitsuya Shibata on 2015-09-27

add email/url layout for japanese.

[Mitsuya Shibata (cosmos-door)]

Thank you for more reviewing!

I fixed all of your pointed out. Please check it.

> 1) The cursor keys move two characters at a time (it looks like they're moving
> the cursor on both the press and release events)

Fixed typo (s/Released/Pressed/)

> 2) In the character selection pop-over the characters that aren't currently
> selected should use the same colour as the selection pop-over on the other
> keyboard layouts (this is done by setting the opacity to 0.6 when not
> selected)

Set opacity for unselected Text element.

> 3) If touch feedback is enabled in settings then sliding between characters on
> the selection pop-over should trigger haptic feedback via pressEffect.start()
> (same as on other keyboard layouts)

Add haptic feedback and not audio feedback (same as original extended key).

> 4) The copyright year on a lot of the added files is listed as 2012/2013/2014,
> this should be 2015 since these are new files

Set all 2015.

> 5) Is it correct that the URL and email layouts should be a non-Japanese
> qwerty layout? (If so it might be worth populating the URL key with useful
> Japanese TLDs like .jp, .co.jp, etc.)

Change email/url layout to same as normal Japanese layout.
Commonly used Japanese TLD is ".com" and ".jp".
Indeed ".co.jp" is used too, but doesn't manual typewith frequently as url/email .

Additionally to this, set email/url default layout alphabet instead of kana.

> 6) Could you add a comment to the modifier.js explaining the purpose of the
> map and normalize arrays?

Add comment.

Thanks!

review: Needs Resubmitting

[Mitsuya Shibata (cosmos-door)]

Hi Michael,

Is there any chance to be merged for OTA-8 or OTA-9?

[Michael Sheldon (michael-sheldon)]

Hi Mitsuya,

 Sorry for the delay in replying, I hadn't spotted your updates; I'll try to get it re-reviewed and included for OTA-9

Cheers,
 Mike

[Michael Sheldon (michael-sheldon)]

Hi Mitsuya,

 I've just been re-reviewing this, and it looks great; but I've found one last issue, whereby the cursor keys don't work correctly whilst still in pre-edit. I'm wondering if it might be best to simply call Qt.inputMethod.commit() when pressing the cursor keys?

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

It looks like the cursor does get moved internally within maliit (so deletions and insertions occur in the correct place) but the visual cursor doesn't move. I think just committing the text prior to moving the cursor would be the simplest solution for this.

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

410. By Mitsuya Shibata on 2016-01-31

Merge upstream's changes

411. By Mitsuya Shibata on 2016-01-31

Switch to Ubuntu.Components 1.3 and QtQuick 2.4

[Mitsuya Shibata (cosmos-door)]

Hi Michael,

I rebased newer ubuntu-keyboard code.

About cursor key:
I think "commit" is just commit current preedit, then clear preedit and predictions.
In this means, a preedit in Japanese should not be cleared by cursor key,
should be moved just cursor position.

Can I move visible cursor position without commit?

[Mitsuya Shibata (cosmos-door)]

Perhaps I can use cursor_pos_override argument of setPreedit() in src/lib/models/text.h.

However AbstractTextEditor::replacePreedit() uses text->setPreedit() without 2nd argument.
I will try to customize replacePreedit().

[Mitsuya Shibata (cosmos-door)]

Umm... cursor_pos_override just updates m_cursor_position...
Anyway, when exists preedit, press twice left and insert any character, then update cursor position.
I hope there are any hint in this behaviour.

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

412. By Mitsuya Shibata on 2016-02-02

fix moving cursor position in preedit by cursor key

[Mitsuya Shibata (cosmos-door)]

Hi Michael,

Finally fixed cursor key problem in rev412. Could you review it?

IMPORTANT NOTE:
Revision 412 modify code in singleBackspace() in src/view/abstracttexteditor.cpp.
It will affect other language not only Japanese.
I believe this modification does not change behaviours of backspace.

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

Hi Mitsuya,

 The changes appear to have fixed the cursor issue nicely, and I haven't seen any negative effects on other layouts, so that's looking good, great work :).

 Unfortunately I've found one more issue: if an ideographic space character (second function from the normal space) is inserted and then committed without any other characters, all predictions are broken until the user switches to another layout and back (effectively unloading and then reloading the Japanese word engine).

 One other quick question, is it normal in Japanese input methods for the return key to be used for committing pre-edit strings? For all other layouts this is done by the space key. I'm happy to leave it with the return key if that's what most Japanese users would already expect, but otherwise it would be good to keep consistent with other layouts if possible.

Thanks!
 Mike.

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

Actually after a bit of further testing it doesn't appear to be directly related to the ideographic space, it seems it can happen with any string if you type it quickly and the commit (presumably whilst anthy is still processing predictions?)

[Mitsuya Shibata (cosmos-door)]

Thank you your review!

> quickly typing problem

I can't reproduce yet. Could you tell me any typing sample word (and any apps)?

> enter key

Yes, Japanese users expect return key as "commit preedit".
Additionally, in desktop, space key means "change next candidate of the preedit".
I think return key label should not be changed.

More generally, Japanese input method change label of return key
to "確定" ("commit" in Japanease) if in preedit.
I would like to implement this feature in the future.

[Mitsuya Shibata (cosmos-door)]

Hmm... it seems that plugins/ja/src/anthyadapter.cpp isn't reentrant.
I'll check more deeply. Thanks!

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

413. By Mitsuya Shibata on 2016-02-04

fix problem with parsePredictionText signal on parse()

If parsePredictionText signal is issued when AnthyAdapter::parse() in
procedure, new preedit is saved to JapanesePlugin::m_nextWord then return back.

When AnthyAdapter::parse() is finished, JapanesePlugin::finishedProcessing() is
called. And if parsed text is differ from m_nextWord, retry to parse().

This commit fix to pass wrong old word to new parse() call.

[Mitsuya Shibata (cosmos-door)]

Hi Micahel,

I found a problem in plugins/ja/src/japaneseplugin.cpp and fixed it.
Perhaps it will be related you found quickly typing problem.
Could you retry it?

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

Hi Mitsuya,

 That seems to have fixed it, great work! I'm just waiting on some fixes to unity8 that are causing some issues with the autopilot tests and then we can see about getting your branch landed :)

[Michael Sheldon (michael-sheldon)]

Hi Mitsuya,

 I'm afraid during my final run through the test plan for this I spotted another issue, the bottom row of keys isn't positioned correctly in the landscape view, here's a screenshot showing the issue: http://mikeasoft.com/~mike/jp-landscape.png

 Once that's fixed we should be able to land this :)

Cheers,
 Mike.

review: Needs Fixing

[Mitsuya Shibata (cosmos-door)]

OK, I can reproduce it. However layout is changed English layout then back to Japanese layout, bottom row is positioned correctly. Umm...

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

414. By Mitsuya Shibata on 2016-02-11

fix layout in landscape mode.

The height of Language key should be keyHeight.

[Mitsuya Shibata (cosmos-door)]

Ah, OK. Language key is wrong height. Fixed.

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

Great, thanks, one last little thing I spotted, the backspace icon is offset slightly, this actually looks like a bug in the leftSide/rightSide handling for action keys, so for now I'd suggest you just set the width of that key to "panel.keyWidth". Then as a separate task I'll fix the action key icon positioning at a later date and also update all the existing layouts to use leftSide/rightSide for shift and backspace (which they don't currently do).

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

One other thing, would it not make more sense for the "." to be the primary key on the URL layout's url key instead of the ","?

[Ken VanDine (ken-vandine)]

packaging looks good

review: Approve (packaging)

[Mitsuya Shibata (cosmos-door)]

Hi Michael,

> I'd suggest you just set the width of that key to "panel.keyWidth".

If set width or remove "rightSide", then first row will be right offset.
This is caused by no rightMargin in CharKey.
Should I push the code to remain the layout corruption?

https://goo.gl/photos/bG5ZxHxfyMhExc926

> would it not make more sense for the "." to be the primary key on the URL layout's url key instead of the ","?

Indeed. To operation coherency, I will swap "," and "." at all keyboard.

[Michael Sheldon (michael-sheldon)]

Hi Mitsuya,

 Just did a quick test, you can work around that by setting the width on the UndoKey as well as the width on the BackspaceKey, then everything will align correctly.

Cheers,
 Mike.

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

415. By Mitsuya Shibata on 2016-02-12

add workaround for backspace icon misalignment

416. By Mitsuya Shibata on 2016-02-12

swap "," and "." which is mainly used to input url and email.

[Mitsuya Shibata (cosmos-door)]

Hi Michael,

Thanks you for nice advice!
I pushed codes to fix problems which you pointed out.

Thanks,

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

Great, thanks; I'll run that through the test plan one last time on Monday and then hopefully we can get it landed :)

[Michael Sheldon (michael-sheldon)]

Hey Mitsuya,

 Sorry! Spotted another issue, you must be getting really tired of me saying "one last thing..." ;)

 The commit key isn't inserting the primary candidate (the bold candidate) when in auto-complete mode, instead it inserts the user's input unmodified. Is this deliberate (i.e. does the Japanese keyboard not really support auto-complete at all)? If so then we shouldn't be highlighting a primary candidate for Japanese, otherwise pressing the commit key should input the primary candidate instead of the user input.

review: Needs Fixing

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

417. By Mitsuya Shibata on 2016-02-15

set primary candidate to user input string

[Mitsuya Shibata (cosmos-door)]

Hi Michael,

Indeed. Generally in Japanese, the commit key should insert the preedit string (primary purpose to input Hiragana).
To clarify which candidate will be committed, I set the primary candidate to the preedit string.

Is it okay?

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

Okay, that sounds good; I'll kick off a rebuild now and retest when it's done

[Michael Sheldon (michael-sheldon)]

Unfortunately I found an extra issue, one of the changes made to the core breaks both the email detection and mid-word insertion based disabling of pre-edit for all the other plugins.

const bool enablePreeditAtInsertion = d->word_engine->languageFeature()->wordEngineAvailable();

^ wordEngineAvailable isn't really an appropriate feature to check for this, as that's going to be true for pretty much all plugins. I think you really need to explicitly add a new language feature for this (which could be called enablePreeditAtInsertion), that's true for Japanese but false for all other plugins.

review: Needs Fixing

[lp:~cosmos-door/ubuntu-keyboard/japanese-keyboard-rebooted]

418. By Mitsuya Shibata on 2016-02-19

fix calling wrong method

[Mitsuya Shibata (cosmos-door)]

Sorry for my numerous failure...

I fixed wordEngineAvailable() bug. Could you check it?

review: Needs Resubmitting

[Michael Sheldon (michael-sheldon)]

That's great thanks, and no are apologies necessary :) This is by far the most advanced keyboard we've had contributed, so it's natural that there be a few issues in the review.

I've completed a full test now and everything looks good, so I'll propose it for landing now :)

Thanks for all your hard work on this!

review: Approve

[Mitsuya Shibata (cosmos-door)]

Thank you for your review and merge!

=== modified file 'debian/control'
--- debian/control	2016-01-12 11:35:18 +0000
+++ debian/control	2016-02-19 18:07:05 +0000
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Michael Hasselmann <[e-mail]>
 Build-Depends: debhelper (>= 9),
                doxygen,
+               libanthy-dev,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
                libglib2.0-dev,
@@ -98,6 +99,7 @@
          ubuntu-keyboard-hungarian (>= ${source:Version}),
          ubuntu-keyboard-icelandic (>= ${source:Version}),
          ubuntu-keyboard-italian (>= ${source:Version}),
+         ubuntu-keyboard-japanese (>= ${source:Version}),
          ubuntu-keyboard-norwegian-bokmal (>= ${source:Version}),
          ubuntu-keyboard-polish (>= ${source:Version}),
          ubuntu-keyboard-portuguese (>= ${source:Version}),
@@ -280,6 +282,15 @@
 Description: Ubuntu on-screen keyboard data files - Italian
  Data files for the Ubuntu virtual keyboard - Italian
 
+Package: ubuntu-keyboard-japanese
+Architecture: any
+Depends: ubuntu-keyboard (= ${binary:Version}),
+         anthy,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu on-screen keyboard data files - Japanese
+ Data files for the Ubuntu virtual keyboard - Japanese
+
 Package: ubuntu-keyboard-norwegian-bokmal
 Architecture: any
 Depends: ubuntu-keyboard (= ${binary:Version}),
 
=== modified file 'debian/server.conf'
--- debian/server.conf	2015-05-11 10:53:43 +0000
+++ debian/server.conf	2016-02-19 18:07:05 +0000
@@ -10,6 +10,7 @@
 libubuntu-keyboard-plugin.so:el, \
 libubuntu-keyboard-plugin.so:es, \
 libubuntu-keyboard-plugin.so:ca, \
+libubuntu-keyboard-plugin.so:ja, \
 libubuntu-keyboard-plugin.so:zh_cn_cangjie, \
 libubuntu-keyboard-plugin.so:zh_cn_pinyin, \
 libubuntu-keyboard-plugin.so:zh_cn_zhuyin,
 
=== added file 'debian/ubuntu-keyboard-japanese.install'
--- debian/ubuntu-keyboard-japanese.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-keyboard-japanese.install	2016-02-19 18:07:05 +0000
@@ -0,0 +1,1 @@
+usr/share/maliit/plugins/com/ubuntu/lib/ja/
 
=== added directory 'plugins/ja'
=== added file 'plugins/ja/ja.pro'
--- plugins/ja/ja.pro	1970-01-01 00:00:00 +0000
+++ plugins/ja/ja.pro	2016-02-19 18:07:05 +0000
@@ -0,0 +1,9 @@
+CONFIG += ordered
+TEMPLATE = subdirs
+SUBDIRS = \
+    src \
+    qml
+
+QMAKE_EXTRA_TARGETS += check
+check.target = check
+check.CONFIG = recursive
 
=== added directory 'plugins/ja/qml'
=== added file 'plugins/ja/qml/Keyboard_ja.qml'
--- plugins/ja/qml/Keyboard_ja.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/Keyboard_ja.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "keys/"
+import keys 1.0
+
+KeyPad {
+    anchors.fill: parent
+
+    content: c1
+
+    Column {
+        id: c1
+        anchors.fill: parent
+        spacing: 0
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            UndoKey { leftSide: true; width: panel.keyWidth; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "あ" : "@ / : _";
+                leaves: layout.state == "kana" ? ["あ", "い", "う", "え", "お"] : ["@", "/", ":", "_", "1"];
+                annotation: layout.state == "kana" ? "" : "1";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "か" : "ABC";
+                leaves: layout.state == "kana" ? ["か", "き", "く", "け", "こ"] : ["a", "b", "c", "#", "2"];
+                annotation: layout.state == "kana" ? "" : "2#";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "さ" : "DEF";
+                leaves: layout.state == "kana" ? ["さ", "し", "す", "せ", "そ"] : ["d", "e", "f", "$", "3"];
+                annotation: layout.state == "kana" ? "" : "3$";
+            }
+            BackspaceKey { rightSide: true; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            CursorKey { action: "left"; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "た" : "GHI";
+                leaves: layout.state == "kana" ? ["た", "ち", "つ", "て", "と"] : ["g", "h", "i", "(", "4"];
+                annotation: layout.state == "kana" ? "" : "4(";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "な" : "JKL";
+                leaves: layout.state == "kana" ? ["な", "に", "ぬ", "ね", "の"] : ["j", "k", "l", "\"", "5"];
+                annotation: layout.state == "kana" ? "" : "5\"";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "は" : "MNO";
+                leaves: layout.state == "kana" ? ["は", "ひ", "ふ", "へ", "ほ"] : ["m", "n", "o", ")", "6"];
+                annotation: layout.state == "kana" ? "" : "6)";
+            }
+            CursorKey { action: "right"; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            LanguageKey    { id: languageMenuButton; height: panel.keyHeight; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ま" : "PQRS"
+                leaves: layout.state == "kana" ? ["ま", "み", "む", "め", "も"] : ["p", "q", "r", "s", "7"]
+                annotation: layout.state == "kana" ? "" : "7"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "や" : "TUV"
+                leaves: layout.state == "kana" ? ["や", "（", "ゆ", "）", "よ"] : ["t", "u", "v", "'", "8"]
+                annotation: layout.state == "kana" ? "" : "8'"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ら" : "WXYZ"
+                leaves: layout.state == "kana" ? ["ら", "り", "る", "れ", "ろ"] : ["w", "x", "y", "z", "9"]
+                annotation: layout.state == "kana" ? "" : "9"
+            }
+            ActionKey { label: "記号"; action: "symbol"; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            KanaSwitchKey { id: layout; }
+            ModifierKey { layoutState: layout.state; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "わ" : "- + *"
+                leaves: layout.state == "kana" ? ["わ", "を", "ん", "ー"] : ["-", "+", "0", "*"];
+                annotation: layout.state == "kana" ? "" : "0";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "、。" : ". , ! ?";
+                leaves: layout.state == "kana" ? ["、", "。", "！", "？"] : [".", ",", "!", "?"];
+            }
+            CommitKey    { id: enterKey; width: panel.keyWidth; }
+        }
+    } // column
+}
 
=== added file 'plugins/ja/qml/Keyboard_ja_email.qml'
--- plugins/ja/qml/Keyboard_ja_email.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/Keyboard_ja_email.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "keys/"
+import keys 1.0
+
+KeyPad {
+    anchors.fill: parent
+
+    content: c1
+
+    Column {
+        id: c1
+        anchors.fill: parent
+        spacing: 0
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            UndoKey { leftSide: true; width: panel.keyWidth; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "あ" : "@ / : _";
+                leaves: layout.state == "kana" ? ["あ", "い", "う", "え", "お"] : ["@", "/", ":", "_", "1"];
+                annotation: layout.state == "kana" ? "" : "1";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "か" : "ABC";
+                leaves: layout.state == "kana" ? ["か", "き", "く", "け", "こ"] : ["a", "b", "c", "#", "2"];
+                annotation: layout.state == "kana" ? "" : "2#";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "さ" : "DEF";
+                leaves: layout.state == "kana" ? ["さ", "し", "す", "せ", "そ"] : ["d", "e", "f", "$", "3"];
+                annotation: layout.state == "kana" ? "" : "3$";
+            }
+            BackspaceKey { rightSide: true; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            CursorKey { action: "left"; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "た" : "GHI";
+                leaves: layout.state == "kana" ? ["た", "ち", "つ", "て", "と"] : ["g", "h", "i", "(", "4"];
+                annotation: layout.state == "kana" ? "" : "4(";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "な" : "JKL";
+                leaves: layout.state == "kana" ? ["な", "に", "ぬ", "ね", "の"] : ["j", "k", "l", "\"", "5"];
+                annotation: layout.state == "kana" ? "" : "5\"";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "は" : "MNO";
+                leaves: layout.state == "kana" ? ["は", "ひ", "ふ", "へ", "ほ"] : ["m", "n", "o", ")", "6"];
+                annotation: layout.state == "kana" ? "" : "6)";
+            }
+            CursorKey { action: "right"; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            LanguageKey    { id: languageMenuButton; height: panel.keyHeight; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ま" : "PQRS"
+                leaves: layout.state == "kana" ? ["ま", "み", "む", "め", "も"] : ["p", "q", "r", "s", "7"]
+                annotation: layout.state == "kana" ? "" : "7"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "や" : "TUV"
+                leaves: layout.state == "kana" ? ["や", "（", "ゆ", "）", "よ"] : ["t", "u", "v", "'", "8"]
+                annotation: layout.state == "kana" ? "" : "8'"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ら" : "WXYZ"
+                leaves: layout.state == "kana" ? ["ら", "り", "る", "れ", "ろ"] : ["w", "x", "y", "z", "9"]
+                annotation: layout.state == "kana" ? "" : "9"
+            }
+            ActionKey { label: "記号"; action: "symbol"; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            KanaSwitchKey { id: layout; default_state: "alnum" }
+            ModifierKey { layoutState: layout.state; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "わ" : "- + *"
+                leaves: layout.state == "kana" ? ["わ", "を", "ん", "ー"] : ["-", "+", "0", "*"];
+                annotation: layout.state == "kana" ? "" : "0";
+            }
+            DomainKey {
+                label: layout.state == "kana" ? "、。" : ". ,";
+                leaves: layout.state == "kana" ? ["、", "。", "！", "？"] :
+                    [".", ",", "<font size=\"1\">.com</font>", "<font size=\"1\">.jp</font>"];
+                unstyledLeaves: layout.state == "kana" ? ["、", "。", "！", "？"] : [".", ",", ".com", ".jp"];
+                annotation: layout.state == "kana" ? "" : ".com .jp"
+            }
+            CommitKey    { id: enterKey; width: panel.keyWidth; }
+        }
+    } // column
+}
 
=== added file 'plugins/ja/qml/Keyboard_ja_url.qml'
--- plugins/ja/qml/Keyboard_ja_url.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/Keyboard_ja_url.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "keys/"
+import keys 1.0
+
+KeyPad {
+    anchors.fill: parent
+
+    content: c1
+
+    Column {
+        id: c1
+        anchors.fill: parent
+        spacing: 0
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            UndoKey { leftSide: true; width: panel.keyWidth; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "あ" : "@ / : _";
+                leaves: layout.state == "kana" ? ["あ", "い", "う", "え", "お"] : ["@", "/", ":", "_", "1"];
+                annotation: layout.state == "kana" ? "" : "1";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "か" : "ABC";
+                leaves: layout.state == "kana" ? ["か", "き", "く", "け", "こ"] : ["a", "b", "c", "#", "2"];
+                annotation: layout.state == "kana" ? "" : "2#";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "さ" : "DEF";
+                leaves: layout.state == "kana" ? ["さ", "し", "す", "せ", "そ"] : ["d", "e", "f", "$", "3"];
+                annotation: layout.state == "kana" ? "" : "3$";
+            }
+            BackspaceKey { rightSide: true; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            CursorKey { action: "left"; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "た" : "GHI";
+                leaves: layout.state == "kana" ? ["た", "ち", "つ", "て", "と"] : ["g", "h", "i", "(", "4"];
+                annotation: layout.state == "kana" ? "" : "4(";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "な" : "JKL";
+                leaves: layout.state == "kana" ? ["な", "に", "ぬ", "ね", "の"] : ["j", "k", "l", "\"", "5"];
+                annotation: layout.state == "kana" ? "" : "5\"";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "は" : "MNO";
+                leaves: layout.state == "kana" ? ["は", "ひ", "ふ", "へ", "ほ"] : ["m", "n", "o", ")", "6"];
+                annotation: layout.state == "kana" ? "" : "6)";
+            }
+            CursorKey { action: "right"; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            LanguageKey    { id: languageMenuButton; height: panel.keyHeight; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ま" : "PQRS"
+                leaves: layout.state == "kana" ? ["ま", "み", "む", "め", "も"] : ["p", "q", "r", "s", "7"]
+                annotation: layout.state == "kana" ? "" : "7"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "や" : "TUV"
+                leaves: layout.state == "kana" ? ["や", "（", "ゆ", "）", "よ"] : ["t", "u", "v", "'", "8"]
+                annotation: layout.state == "kana" ? "" : "8'"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ら" : "WXYZ"
+                leaves: layout.state == "kana" ? ["ら", "り", "る", "れ", "ろ"] : ["w", "x", "y", "z", "9"]
+                annotation: layout.state == "kana" ? "" : "9"
+            }
+            ActionKey { label: "記号"; action: "symbol"; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            KanaSwitchKey { id: layout; default_state: "alnum" }
+            ModifierKey { layoutState: layout.state; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "わ" : "- + *"
+                leaves: layout.state == "kana" ? ["わ", "を", "ん", "ー"] : ["-", "+", "0", "*"];
+                annotation: layout.state == "kana" ? "" : "0";
+            }
+            DomainKey {
+                label: layout.state == "kana" ? "、。" : ". ,";
+                leaves: layout.state == "kana" ? ["、", "。", "！", "？"] :
+                    [".", ",", "<font size=\"1\">.com</font>", "<font size=\"1\">.jp</font>"];
+                unstyledLeaves: layout.state == "kana" ? ["、", "。", "！", "？"] : [".", ",", ".com", ".jp"];
+                annotation: layout.state == "kana" ? "" : ".com .jp"
+            }
+            CommitKey    { id: enterKey; width: panel.keyWidth; }
+        }
+    } // column
+}
 
=== added file 'plugins/ja/qml/Keyboard_ja_url_search.qml'
--- plugins/ja/qml/Keyboard_ja_url_search.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/Keyboard_ja_url_search.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "keys/"
+import keys 1.0
+
+KeyPad {
+    anchors.fill: parent
+
+    content: c1
+
+    Column {
+        id: c1
+        anchors.fill: parent
+        spacing: 0
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            UndoKey { leftSide: true; width: panel.keyWidth; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "あ" : "@ / : _";
+                leaves: layout.state == "kana" ? ["あ", "い", "う", "え", "お"] : ["@", "/", ":", "_", "1"];
+                annotation: layout.state == "kana" ? "" : "1";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "か" : "ABC";
+                leaves: layout.state == "kana" ? ["か", "き", "く", "け", "こ"] : ["a", "b", "c", "#", "2"];
+                annotation: layout.state == "kana" ? "" : "2#";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "さ" : "DEF";
+                leaves: layout.state == "kana" ? ["さ", "し", "す", "せ", "そ"] : ["d", "e", "f", "$", "3"];
+                annotation: layout.state == "kana" ? "" : "3$";
+            }
+            BackspaceKey { rightSide: true; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            CursorKey { action: "left"; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "た" : "GHI";
+                leaves: layout.state == "kana" ? ["た", "ち", "つ", "て", "と"] : ["g", "h", "i", "(", "4"];
+                annotation: layout.state == "kana" ? "" : "4(";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "な" : "JKL";
+                leaves: layout.state == "kana" ? ["な", "に", "ぬ", "ね", "の"] : ["j", "k", "l", "\"", "5"];
+                annotation: layout.state == "kana" ? "" : "5\"";
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "は" : "MNO";
+                leaves: layout.state == "kana" ? ["は", "ひ", "ふ", "へ", "ほ"] : ["m", "n", "o", ")", "6"];
+                annotation: layout.state == "kana" ? "" : "6)";
+            }
+            CursorKey { action: "right"; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            LanguageKey    { id: languageMenuButton; height: panel.keyHeight; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ま" : "PQRS"
+                leaves: layout.state == "kana" ? ["ま", "み", "む", "め", "も"] : ["p", "q", "r", "s", "7"]
+                annotation: layout.state == "kana" ? "" : "7"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "や" : "TUV"
+                leaves: layout.state == "kana" ? ["や", "（", "ゆ", "）", "よ"] : ["t", "u", "v", "'", "8"]
+                annotation: layout.state == "kana" ? "" : "8'"
+            }
+            FlickCharKey {
+                label: layout.state == "kana" ? "ら" : "WXYZ"
+                leaves: layout.state == "kana" ? ["ら", "り", "る", "れ", "ろ"] : ["w", "x", "y", "z", "9"]
+                annotation: layout.state == "kana" ? "" : "9"
+            }
+            ActionKey { label: "記号"; action: "symbol"; width: panel.keyWidth; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            spacing: 0
+
+            KanaSwitchKey { id: layout; default_state: "alnum" }
+            ModifierKey { layoutState: layout.state; }
+            FlickCharKey {
+                label: layout.state == "kana" ? "わ" : "- + *"
+                leaves: layout.state == "kana" ? ["わ", "を", "ん", "ー"] : ["-", "+", "0", "*"];
+                annotation: layout.state == "kana" ? "" : "0";
+            }
+            DomainKey {
+                label: layout.state == "kana" ? "、。" : ". ,";
+                leaves: layout.state == "kana" ? ["、", "。", "！", "？"] :
+                    [".", ",", "<font size=\"1\">.com</font>", "<font size=\"1\">.jp</font>"];
+                unstyledLeaves: layout.state == "kana" ? ["、", "。", "！", "？"] : [".", ",", ".com", ".jp"];
+                annotation: layout.state == "kana" ? "" : ".com .jp"
+            }
+            CommitKey    { id: enterKey; width: panel.keyWidth; }
+        }
+    } // column
+}
 
=== added directory 'plugins/ja/qml/keys'
=== added file 'plugins/ja/qml/keys/CommitKey.qml'
--- plugins/ja/qml/keys/CommitKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/CommitKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "key_constants.js" as UI
+import keys 1.0
+
+ActionKey {
+    property var actionKeyOverride: maliit_input_method.actionKeyOverride
+    property string overrideIconName: actionKeyOverride && actionKeyOverride.icon ? actionKeyOverride.icon : ""
+    property string overrideLabel: actionKeyOverride && actionKeyOverride.label ? actionKeyOverride.label : ""
+
+    enabled: actionKeyOverride ? actionKeyOverride.enabled : true
+    // overrideIcon has high priority over label
+    label: overrideIconName == "" ? overrideLabel : ""
+    // Scale the font so the label fits if a long word is set
+    fontSize: units.gu(UI.symbolShiftKeyFontSize) * (4 / (label.length >= 4 ? (label.length <= 6 ? label.length : 6) : 4));
+    shifted: label
+
+    iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-return" : overrideIconName
+    iconShifted: iconNormal
+    iconCapsLock: iconNormal
+
+    action: maliit_input_method.preedit != "" ? "commit" : "return"
+    switchBackFromSymbols: true
+    // TODO: input_method.actionKeyOverride.highlighted
+}
 
=== added file 'plugins/ja/qml/keys/CursorKey.qml'
--- plugins/ja/qml/keys/CursorKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/CursorKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "key_constants.js" as UI
+import keys 1.0
+
+ActionKey {
+    label: action == "left" ? "⬅" : "➡";
+    leftSide: action == "left";
+    rightSide: action == "right";
+
+    property string preedit: maliit_input_method.preedit
+    property int cursorPosition: maliit_input_method.cursorPosition
+    property bool isPreedit: preedit != ""
+
+    overridePressArea: true;
+
+    onReleased: {
+        if (isPreedit) {
+            if (action == "left" && cursorPosition > 0) {
+                maliit_input_method.cursorPosition--
+            } else if (action == "right" && cursorPosition < preedit.length) {
+                maliit_input_method.cursorPosition++
+            }
+        } else {
+            event_handler.onKeyReleased("", action);
+        }
+    }
+
+    onPressed: {
+        if (maliit_input_method.useAudioFeedback)
+            audioFeedback.play();
+
+        if (maliit_input_method.useHapticFeedback)
+            pressEffect.start();
+
+        if (!isPreedit)
+            event_handler.onKeyPressed("", action);
+    }
+
+    onPressAndHold: {
+        return;
+    }
+}
 
=== added file 'plugins/ja/qml/keys/DomainKey.qml'
--- plugins/ja/qml/keys/DomainKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/DomainKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtMultimedia 5.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+import "key_constants.js" as UI
+
+FlickCharKey {
+    property var unstyledLeaves: ["", "", "", "", ""];
+
+    overridePressArea: true
+
+    onReleased: {
+        event_handler.onKeyReleased(unstyledLeaves[index], action);
+    }
+
+    onPressed: {
+        if (maliit_input_method.useAudioFeedback)
+            audioFeedback.play();
+
+        if (maliit_input_method.useHapticFeedback)
+            pressEffect.start();
+
+        event_handler.onKeyPressed(unstyledLeaves[index], action);
+    }
+}
 
=== added file 'plugins/ja/qml/keys/FlickArea.qml'
--- plugins/ja/qml/keys/FlickArea.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/FlickArea.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+
+MultiPointTouchArea {
+    id: root
+
+    /// Is true while the area is touched, and the finger did not yet lift
+    property bool pressed: false
+
+    /// Cancels the current pressed state of the mouse are
+    function cancelPress() {
+        pressed = false;
+    }
+
+    onPressed: {
+        index = 0;
+        pressed = true;
+        rad = 0
+    }
+
+    onReleased: {
+        pressed = false;
+    }
+
+    property int index: 0   // 0:center, 1:left, 2:top, 3:right, 4:bottom
+    property int old_index: 0
+    property real posX: point.x - parent.width / 2
+    property real posY: point.y - parent.height / 2
+    property real rad: 0
+
+    touchPoints: [
+        TouchPoint { id: point }
+    ]
+
+    onUpdated: {
+        rad = Math.atan2(posY, posX)
+        if ((posX * posX + posY * posY) < (0.5 * parent.height * 0.5 * parent.height)) {
+            index = 0
+        } else {
+            if (rad < -Math.PI / 4.0) {
+                if (rad < -Math.PI * 3.0 / 4.0) {
+                    index = 1
+                } else {
+                    index = 2
+                }
+            } else if (rad > Math.PI / 4.0) {
+                if (rad > Math.PI * 3.0 / 4.0) {
+                    index = 1
+                } else {
+                    index = 4
+                }
+            } else {
+                index = 3
+            }
+        }
+
+        if (old_index != index) {
+            old_index = index
+
+            if (maliit_input_method.useHapticFeedback)
+                pressEffect.start();
+        }
+    }
+}
 
=== added file 'plugins/ja/qml/keys/FlickCharKey.qml'
--- plugins/ja/qml/keys/FlickCharKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/FlickCharKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtMultimedia 5.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+import "key_constants.js" as UI
+
+Item {
+    id: key
+
+    property int padding: 0
+
+    width: leftSide || rightSide ? panel.keyWidth * 2 : panel.keyWidth
+    height: panel.keyHeight
+
+    /* to be set in keyboard layouts */
+    property string label: "";
+    property var leaves: ["", "", "", "", ""];
+    property int index: keyFlickArea.index;
+    property bool highlight: false;
+
+    property string action
+    property bool noMagnifier: false
+    property bool skipAutoCaps: false
+    property bool switchBackFromSymbols: false
+
+    property bool leftSide: false
+    property bool rightSide: false
+
+    property double rowMargin: fullScreenItem.tablet ? units.gu(UI.tabletRowMargin)
+                                                     : (fullScreenItem.landscape ? units.dp(UI.phoneRowMarginLandscape)
+                                                                                 : units.dp(UI.phoneRowMarginPortrait))
+    property double keyMargin: fullScreenItem.tablet ? units.gu(UI.tabletKeyMargins)
+                                                     : units.gu(UI.phoneKeyMargins)
+
+    // These properties are used by autopilot to determine the visible
+    // portion of the key to press
+    readonly property double leftOffset: buttonRect.anchors.leftMargin
+    readonly property double rightOffset: buttonRect.anchors.rightMargin
+
+    /* design */
+    property string normalColor: UI.charKeyColor
+    property string pressedColor: UI.charKeyPressedColor
+    property int fontSize: (fullScreenItem.landscape ? (height / 2) : (height / 2.8));
+
+    /// annotation shows a small label in the upper right corner
+    // if the annotiation property is set, it will be used. If not, the first position in extended[] list or extendedShifted[] list will
+    // be used, depending on the state. If no extended/extendedShifted arrays exist, no annotation is shown
+    property string annotation: ""
+
+    /*! indicates if te key is currently pressed/down*/
+    property alias currentlyPressed: keyFlickArea.pressed
+
+    property string oskState: panel.activeKeypadState
+
+    // Allow action keys to override the standard key behaviour
+    property bool overridePressArea: false
+
+    signal pressed()
+    signal released()
+
+    // Make it possible for the visible area of the key to differ from the
+    // actual key size. This allows us to extend the touch area of the bottom
+    // row of keys all the way to the bottom of the keyboard, whilst
+    // maintaining the same visual appearance.
+    Item {
+        anchors.top: parent.top
+        height: panel.keyHeight
+        width: parent.width
+
+        Rectangle {
+            id: buttonRect
+            color: key.currentlyPressed || key.highlight ? pressedColor : normalColor
+            anchors.fill: parent
+            anchors.leftMargin: key.leftSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin
+            anchors.rightMargin: key.rightSide ? (parent.width - panel.keyWidth) + key.keyMargin : key.keyMargin
+            anchors.bottomMargin: key.rowMargin
+            radius: units.dp(4)
+
+            /// label of the key
+            //  the label is also the value subitted to the app
+
+            Column {
+                spacing: units.gu( UI.annotationMargins )
+                anchors.centerIn: parent
+
+                Text {
+                    id: keyLabel
+                    text: label
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    font.family: UI.fontFamily
+                    font.pixelSize: fontSize
+                    font.weight: Font.Light
+                    color: UI.fontColor
+                    textFormat: Text.StyledText
+                }
+
+                Text {
+                    id: annotationLabel
+                    text: annotation
+
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.bottomMargin: units.gu( UI.annotationMargins )
+
+                    font.family: UI.annotationFont
+                    font.pixelSize: fullScreenItem.tablet ? units.dp(UI.tabletAnnotationFontSize) : units.dp(UI.phoneAnnotationFontSize)
+                    font.weight: Font.Light
+                    color: UI.annotationFontColor
+                    visible: annotation != ""
+                }
+            }
+        }
+
+        FlickPop {
+            anchors.horizontalCenter: buttonRect.horizontalCenter
+            anchors.bottom: buttonRect.top
+            anchors.bottomMargin: key.height * 0.5
+            width: units.gu((UI.fontSize + UI.flickMargin) * 3)
+            height: units.gu((UI.fontSize + UI.flickMargin) * 3)
+            chars: leaves
+            index: keyFlickArea.index
+            visible: key.currentlyPressed && chars.length > 1
+        }
+    }
+
+    FlickArea {
+        id: keyFlickArea
+        anchors.fill: key
+
+        onReleased: {
+            if (overridePressArea) {
+                key.released();
+                return;
+            }
+
+            event_handler.onKeyReleased(leaves[index], action);
+        }
+
+        onPressed: {
+            if (overridePressArea) {
+                key.pressed();
+                return;
+            }
+
+            if (maliit_input_method.useAudioFeedback)
+                audioFeedback.play();
+
+            if (maliit_input_method.useHapticFeedback)
+                pressEffect.start();
+
+            event_handler.onKeyPressed(leaves[index], action);
+        }
+    }
+
+    Connections {
+        target: swipeArea.drag
+        onActiveChanged: {
+            if (swipeArea.drag.active)
+                keyFlickArea.cancelPress();
+        }
+    }
+}
 
=== added file 'plugins/ja/qml/keys/FlickPop.qml'
--- plugins/ja/qml/keys/FlickPop.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/FlickPop.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+import "key_constants.js" as UI
+
+/*!
+  Item to show a "bubble" with a text in the center.
+  The bottom center is where the bubble points to, and it animates to that position
+  when hiding it.
+ */
+Item {
+    id: root
+
+    property var chars
+    property int index: 0
+
+    visible: false
+
+    FlickPopKey {
+        id: center
+        labelChar: chars[0]
+        anchors.centerIn: parent
+        labelOpacity: index == 0 ? 1.0 : 0.6
+        labelColor: index == 0 ? UbuntuColors.orange : UI.fontColor
+    }
+    FlickPopKey {
+        labelChar: chars[1] ? chars[1] : ""
+        anchors.verticalCenter: center.verticalCenter
+        anchors.right: center.left
+        labelOpacity: index == 1 ? 1.0 : 0.6
+        labelColor: index == 1 ? UbuntuColors.orange : UI.fontColor
+    }
+    FlickPopKey {
+        labelChar: chars[2] ? chars[2] : ""
+        anchors.horizontalCenter: center.horizontalCenter
+        anchors.bottom: center.top
+        labelOpacity: index == 2 ? 1.0 : 0.6
+        labelColor: index == 2 ? UbuntuColors.orange : UI.fontColor
+    }
+    FlickPopKey {
+        labelChar: chars[3] ? chars[3] : ""
+        anchors.verticalCenter: center.verticalCenter
+        anchors.left: center.right
+        labelOpacity: index == 3 ? 1.0 : 0.6
+        labelColor: index == 3 ? UbuntuColors.orange : UI.fontColor
+    }
+    FlickPopKey {
+        labelChar: chars[4] ? chars[4] : ""
+        anchors.horizontalCenter: center.horizontalCenter
+        anchors.top: center.bottom
+        labelOpacity: index == 4 ? 1.0 : 0.6
+        labelColor: index == 4 ? UbuntuColors.orange : UI.fontColor
+    }
+}
 
=== added file 'plugins/ja/qml/keys/FlickPopKey.qml'
--- plugins/ja/qml/keys/FlickPopKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/FlickPopKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "key_constants.js" as UI
+
+Rectangle {
+    width: units.gu(UI.fontSize + UI.flickMargin)
+    height: units.gu(UI.fontSize + UI.flickMargin)
+
+    property string labelChar
+    property color labelColor: UI.fontColor
+    property real labelOpacity: 1.0
+    visible: labelChar ? true : false
+
+    border.width: units.gu(UI.flickBorderWidth)
+    border.color: UI.flickBorderColor
+    radius: width / 10
+
+    Text {
+        anchors.centerIn: parent
+        text: parent.labelChar
+        font.family: UI.fontFamily
+        font.pixelSize: units.gu(UI.fontSize)
+        font.bold: UI.fontBold
+        color: parent.labelColor
+        opacity: parent.labelOpacity
+    }
+}
 
=== added file 'plugins/ja/qml/keys/KanaSwitchKey.qml'
--- plugins/ja/qml/keys/KanaSwitchKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/KanaSwitchKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtMultimedia 5.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+import "key_constants.js" as UI
+
+FlickCharKey {
+    padding: UI.actionKeyPadding
+    label: kana.label
+    leaves: ["↻", "", "あ", "A"]
+    normalColor: UI.actionKeyColor
+    pressedColor: UI.actionKeyPressedColor
+
+    overridePressArea: true
+
+    property bool isPreedit: maliit_input_method.preedit.length > 0
+    property string default_state: "kana"
+
+    state: kana.state
+
+    Item {
+        id: kana
+        property string label: "あ/A"
+
+        state: parent.default_state;
+        states: [
+            State {
+                name: "kana"
+                PropertyChanges {
+                    target: kana;
+                    label: "<font color=\"" + UbuntuColors.orange + "\">あ</font>/A";
+                    state: "kana";
+                }
+            },
+            State {
+                name: "alnum"
+                PropertyChanges {
+                    target: kana;
+                    label: "あ/<font color=\"" + UbuntuColors.orange + "\">A</font>";
+                    state: "alnum";
+                }
+            }
+        ]
+    }
+
+    onReleased: {
+        if (isPreedit) {
+            event_handler.onKeyReleased("", "commit");
+        }
+        if (index == 0) {
+            kana.state = kana.state == "kana" ? "alnum" : "kana"
+        } else {
+            if (index == 2) {
+                kana.state = "kana"
+            } else if (index == 3) {
+                kana.state = "alnum"
+            }
+        }
+    }
+
+    onPressed: {
+        if (maliit_input_method.useAudioFeedback)
+            audioFeedback.play();
+
+        if (maliit_input_method.useHapticFeedback)
+            pressEffect.start();
+    }
+}
 
=== added file 'plugins/ja/qml/keys/ModifierKey.qml'
--- plugins/ja/qml/keys/ModifierKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/ModifierKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtMultimedia 5.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+import "modifier.js" as Modifier
+import "key_constants.js" as UI
+
+FlickCharKey {
+    label: (isPreedit && layoutState == "kana") ? " ゛ ゜" : "␣"
+    leaves: isPreedit ? preeditLeaves : ["␣", "□"]
+    annotation: isPreedit ? "大⇔小" : ""
+    fontSize: isPreedit ? units.gu( UI.fontSize ) * 0.8 : units.gu( UI.fontSize )
+
+    overridePressArea: true
+
+    property string layoutState: "kana"
+    property string preedit: maliit_input_method.preedit
+    property int cursorPosition: maliit_input_method.cursorPosition
+    property bool isPreedit: preedit != ""
+    property string lastChar: ""
+    property var preeditLeaves: Modifier.map[lastChar] ? Modifier.map[lastChar] : [lastChar]
+
+    onReleased: {
+        if (isPreedit) {
+            if (layoutState == "alnum") {
+                if (index != 0) {
+                    event_handler.onKeyReleased("", "space");
+                } else {
+                    var pos = cursorPosition
+                    var newChar = lastChar.charCodeAt(0) < 91 ? lastChar.toLowerCase() : lastChar.toUpperCase()
+                    maliit_input_method.preedit = preedit.substr(0, cursorPosition-1) + newChar + preedit.substr(cursorPosition)
+                    maliit_input_method.cursorPosition = pos
+                }
+            } else if (preeditLeaves[index] && preeditLeaves[index] != "") {
+                var pos = cursorPosition
+                maliit_input_method.preedit = preedit.substr(0, cursorPosition-1) + preeditLeaves[index] + preedit.substr(cursorPosition)
+                maliit_input_method.cursorPosition = pos
+            }
+        } else {
+            if (index == 0) {
+                event_handler.onKeyReleased("", "space");
+            } else {
+                event_handler.onKeyReleased("　", "");
+            }
+        }
+    }
+
+    onPressed: {
+        if (maliit_input_method.useAudioFeedback)
+            audioFeedback.play();
+
+        if (maliit_input_method.useHapticFeedback)
+             pressEffect.start();
+
+        if (isPreedit) {
+            lastChar = preedit.charAt(cursorPosition-1)
+            if (!Modifier.map[lastChar] && Modifier.normalize[lastChar]) {
+                lastChar = Modifier.normalize[lastChar]
+            }
+        }
+    }
+}
 
=== added file 'plugins/ja/qml/keys/UndoKey.qml'
--- plugins/ja/qml/keys/UndoKey.qml	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/UndoKey.qml	2016-02-19 18:07:05 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "key_constants.js" as UI
+import keys 1.0
+
+ActionKey {
+    label: "戻す";
+    action: "undo";
+    fontSize: units.gu(UI.undoFontSize);
+}
 
=== added file 'plugins/ja/qml/keys/key_constants.js'
--- plugins/ja/qml/keys/key_constants.js	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/key_constants.js	2016-02-19 18:07:05 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.pragma library
+
+Qt.include("../../../keys/key_constants.js")
+
+/* ActionKey layout */
+var undoFontSize = 2;
+
+/* FlickCharKey layout */
+var annotationFontSize = 1.5; // gu
+var annotationMargins = 0.3; // gu
+
+/* FlickPop layout */
+var flickMargin = 1.5 // gu
+var flickBorderWidth = 0.1 // gu
+var flickBorderColor = "#999999"
 
=== added file 'plugins/ja/qml/keys/modifier.js'
--- plugins/ja/qml/keys/modifier.js	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/keys/modifier.js	2016-02-19 18:07:05 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.pragma library
+
+/*
+ * Modified character map for ModifierKey
+ *
+ * ModifierKey modify a charcter by left/right/up swipe. This is character map
+ * and swipe direction.
+ *   map[ORIGIN KEY] = [NO MODIFY, LEFT, UP, RIGHT]
+ */
+var map = {}
+map["あ"] = ["あ", "", "ぁ", ""]
+map["い"] = ["い", "", "ぃ", ""]
+map["う"] = ["う", "ヴ", "ぅ", ""]
+map["え"] = ["え", "", "ぇ", ""]
+map["お"] = ["お", "", "ぉ", ""]
+map["か"] = ["か", "が", "", ""]
+map["き"] = ["き", "ぎ", "", ""]
+map["く"] = ["く", "ぐ", "", ""]
+map["け"] = ["け", "げ", "", ""]
+map["こ"] = ["こ", "ご", "", ""]
+map["さ"] = ["さ", "ざ", "", ""]
+map["し"] = ["し", "じ", "", ""]
+map["す"] = ["す", "ず", "", ""]
+map["せ"] = ["せ", "ぜ", "", ""]
+map["そ"] = ["そ", "ぞ", "", ""]
+map["た"] = ["た", "だ", "", ""]
+map["ち"] = ["ち", "ぢ", "", ""]
+map["つ"] = ["つ", "づ", "っ", ""]
+map["て"] = ["て", "で", "", ""]
+map["と"] = ["と", "ど", "", ""]
+map["は"] = ["は", "ば", "", "ぱ"]
+map["ひ"] = ["ひ", "び", "", "ぴ"]
+map["ふ"] = ["ふ", "ぶ", "", "ぷ"]
+map["へ"] = ["へ", "べ", "", "ぺ"]
+map["ほ"] = ["ほ", "ぼ", "", "ぽ"]
+map["や"] = ["や", "", "ゃ", ""]
+map["（"] = ["（", "「", "『", "【"]
+map["ゆ"] = ["ゆ", "", "ゅ", ""]
+map["）"] = ["）", "」", "』", "】"]
+map["よ"] = ["よ", "", "ょ", ""]
+map["わ"] = ["わ", "ゐ", "ゎ", "ゑ"]
+map["ー"] = ["ー", "＝", "～", "＋"]
+map["、"] = ["、", "・", "…", "＠"]
+map["。"] = ["。", "：", "；", "♪"]
+
+/*
+ * Reverse map for ModifierKey map
+ *
+ * This map is reverse map for modified characters.
+ */
+var normalize = {}
+normalize["ぁ"] = "あ"
+normalize["ぃ"] = "い"
+normalize["ヴ"] = "う"; normalize["ぅ"] = "う"
+normalize["ぇ"] = "え"
+normalize["ぉ"] = "お"
+normalize["が"] = "か"
+normalize["ぎ"] = "き"
+normalize["ぐ"] = "く"
+normalize["げ"] = "け"
+normalize["ご"] = "こ"
+normalize["ざ"] = "さ"
+normalize["じ"] = "し"
+normalize["ず"] = "す"
+normalize["ぜ"] = "せ"
+normalize["ぞ"] = "そ"
+normalize["だ"] = "た"
+normalize["ぢ"] = "ち"
+normalize["づ"] = "つ"; normalize["っ"] = "つ"
+normalize["で"] = "て"
+normalize["ど"] = "と"
+normalize["ば"] = "は"; normalize["ぱ"] = "は"
+normalize["び"] = "ひ"; normalize["ぴ"] = "ひ"
+normalize["ぶ"] = "ふ"; normalize["ぷ"] = "ふ"
+normalize["べ"] = "へ"; normalize["ぺ"] = "へ"
+normalize["ぼ"] = "ほ"; normalize["ぽ"] = "ほ"
+normalize["ゃ"] = "や"
+normalize["「"] = "（"; normalize["『"] = "（"; normalize["【"] = "（"
+normalize["ゅ"] = "ゆ"
+normalize["」"] = "）"; normalize["』"] = "）"; normalize["】"] = "）"
+normalize["ょ"] = "よ"
+normalize["ゐ"] = "わ"; normalize["ゎ"] = "わ"; normalize["ゑ"] = "わ"
+normalize["＝"] = "ー"; normalize["～"] = "ー"; normalize["＋"] = "ー"
+normalize["・"] = "、"; normalize["…"] = "、"; normalize["＠"] = "、"
+normalize["："] = "。"; normalize["；"] = "。"; normalize["♪"] = "。"
+
 
=== added file 'plugins/ja/qml/qml.pro'
--- plugins/ja/qml/qml.pro	1970-01-01 00:00:00 +0000
+++ plugins/ja/qml/qml.pro	2016-02-19 18:07:05 +0000
@@ -0,0 +1,31 @@
+TOP_BUILDDIR = $$OUT_PWD/../../..
+TOP_SRCDIR = $$PWD/../../..
+
+include($${TOP_SRCDIR}/config.pri)
+
+TARGET = dummy
+TEMPLATE = lib
+
+lang_ja.path = "$$UBUNTU_KEYBOARD_LIB_DIR/ja/"
+lang_ja.files = *.qml *.js
+
+lang_ja_keys.path = "$$UBUNTU_KEYBOARD_LIB_DIR/ja/keys"
+lang_ja_keys.files = keys/*.qml keys/*.js
+
+INSTALLS += lang_ja lang_ja_keys
+
+# for QtCreator
+OTHER_FILES += \
+    Keyboard_ja.qml \
+    Keyboard_ja_email.qml \
+    Keyboard_ja_url.qml \
+    Keyboard_ja_url_search.qml \
+    keys/CommitKey.qml \
+    keys/CursorKey.qml \
+    keys/FlickArea.qml \
+    keys/FlickCharKey.qml \
+    keys/FlickPop.qml \
+    keys/FlickPopKey.qml \
+    keys/KanaSwitchKey.qml \
+    keys/ModifierKey.qml \
+    keys/UndoKey.qml
 
=== added directory 'plugins/ja/src'
=== added file 'plugins/ja/src/anthyadapter.cpp'
--- plugins/ja/src/anthyadapter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/anthyadapter.cpp	2016-02-19 18:07:05 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "anthyadapter.h"
+
+#include <QDebug>
+
+#ifdef JA_DEBUG
+static void anthy_log(int level, const char *log)
+{
+    Q_UNUSED(level)
+
+    qWarning() << "[anthy]: " << QString(log);
+}
+#endif
+
+AnthyAdapter::AnthyAdapter(QObject *parent) :
+    QObject(parent)
+{
+#ifdef JA_DEBUG
+    anthy_set_logger(anthy_log, 0);
+#endif
+    if (anthy_init() < 0)
+        qCritical() << "[anthy] failed to init.";
+
+    m_context = anthy_create_context();
+    if (m_context == 0)
+        qCritical() << "[anthy] failed to create anthy context.";
+
+    anthy_context_set_encoding(m_context, ANTHY_UTF8_ENCODING);
+}
+
+AnthyAdapter::~AnthyAdapter()
+{
+    anthy_release_context(m_context);
+    anthy_quit();
+}
+
+#define CANDIDATE_SIZE 1024
+void AnthyAdapter::parse(const QString& string)
+{
+    struct anthy_conv_stat cs;
+    struct anthy_segment_stat ss;
+    char buf[CANDIDATE_SIZE];
+    QString candidate, trail;
+
+    if (anthy_set_string(m_context, string.toUtf8().constData()) != 0) {
+        qCritical() << "[anthy] failed to set string: " << string;
+    }
+
+    if (anthy_get_stat(m_context, &cs) != 0) {
+        qCritical() << "[anthy] failed to get stat: " << string;
+    }
+
+    if (anthy_get_segment_stat(m_context, 0, &ss) != 0) {
+
+        qCritical() << "[anthy] failed to get segment stat: " << string;
+    }
+
+    /* Nth segment (N > 0) use only first candidate */
+    if (cs.nr_segment > 1) {
+        for (int i = 1; i < cs.nr_segment; ++i) {
+            if (anthy_get_segment(m_context, i, 0, NULL, 0) > CANDIDATE_SIZE - 1) {
+                qCritical() << "[anthy] buffer overflow: " << string;
+                continue;
+            }
+
+            if (anthy_get_segment(m_context, i, 0, buf, sizeof(buf)) < 0) {
+                qCritical() << "[anthy] failed to get segment: " << string;
+                continue;
+            }
+
+            trail.append(buf);
+        }
+    }
+
+    /* Create candidate list for 1st segment */
+    candidates.clear();
+    candidates.append(string);
+    for (int i = 0; i < ss.nr_candidate; ++i) {
+        if (anthy_get_segment(m_context, 0, i, NULL, 0) > CANDIDATE_SIZE - 1) {
+            qCritical() << "[anthy] buffer overflow: " << string;
+            continue;
+        }
+
+        if (anthy_get_segment(m_context, 0, i, buf, sizeof(buf)) < 0) {
+            qCritical() << "[anthy] failed to get segment: " << string;
+            continue;
+        }
+
+        candidate = QString(buf);
+        candidate.append(trail);
+        candidates.append(candidate);
+    }
+
+    Q_EMIT newPredictionSuggestions(string, candidates);
+}
+
+void AnthyAdapter::wordCandidateSelected(const QString& word)
+{
+    Q_UNUSED(word)
+
+    anthy_reset_context(m_context);
+}
 
=== added file 'plugins/ja/src/anthyadapter.h'
--- plugins/ja/src/anthyadapter.h	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/anthyadapter.h	2016-02-19 18:07:05 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ANTHYADAPTER_H
+#define ANTHYADAPTER_H
+
+#include <QObject>
+#include <QStringList>
+
+#include "anthy/anthy.h"
+
+class AnthyAdapter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AnthyAdapter(QObject *parent = 0);
+    ~AnthyAdapter();
+
+    QStringList candidates;
+
+signals:
+    void newPredictionSuggestions(QString, QStringList);
+
+public slots:
+    void parse(const QString& string);
+    void wordCandidateSelected(const QString& word);
+
+private:
+    anthy_context_t  m_context;
+};
+#endif // ANTHYADAPTER_H
 
=== added file 'plugins/ja/src/japaneselanguagefeatures.cpp'
--- plugins/ja/src/japaneselanguagefeatures.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/japaneselanguagefeatures.cpp	2016-02-19 18:07:05 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "japaneselanguagefeatures.h"
+
+JapaneseLanguageFeatures::JapaneseLanguageFeatures(QObject *parent) :
+    QObject(parent)
+{
+}
+
+JapaneseLanguageFeatures::~JapaneseLanguageFeatures()
+{
+}
+
+bool JapaneseLanguageFeatures::alwaysShowSuggestions() const
+{
+    // Japanese characters can only be entered via suggestions.
+    return true;
+}
+
+bool JapaneseLanguageFeatures::autoCapsAvailable() const
+{
+    return false;
+}
+
+bool JapaneseLanguageFeatures::activateAutoCaps(const QString &preedit) const
+{
+    Q_UNUSED(preedit)
+    return false;
+}
+
+QString JapaneseLanguageFeatures::appendixForReplacedPreedit(const QString &preedit) const
+{
+    Q_UNUSED(preedit)
+    // auto add a character in any event?
+    return QString("");
+}
+
+bool JapaneseLanguageFeatures::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;
+}
+
+bool JapaneseLanguageFeatures::isSymbol(const QString &text) const
+{
+    Q_UNUSED(text)
+
+    return false;
+}
+
+bool JapaneseLanguageFeatures::ignoreSimilarity() const
+{
+    return true;
+}
+
+bool JapaneseLanguageFeatures::wordEngineAvailable() const
+{
+    return true;
+}
+
+bool JapaneseLanguageFeatures::enablePreeditAtInsertion() const
+{
+    return true;
+}
+
+bool JapaneseLanguageFeatures::restorePreedit() const
+{
+    return false;
+}
 
=== added file 'plugins/ja/src/japaneselanguagefeatures.h'
--- plugins/ja/src/japaneselanguagefeatures.h	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/japaneselanguagefeatures.h	2016-02-19 18:07:05 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef JAPANESELANGUAGEFEATURES_H
+#define JAPANESELANGUAGEFEATURES_H
+
+#include "abstractlanguagefeatures.h"
+#include <QObject>
+
+class JapaneseLanguageFeatures : public QObject, public AbstractLanguageFeatures
+{
+    Q_OBJECT
+public:
+    explicit JapaneseLanguageFeatures(QObject *parent = 0);
+    virtual ~JapaneseLanguageFeatures();
+
+    virtual bool alwaysShowSuggestions() const;
+    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 bool isSymbol(const QString &text) const;
+    virtual bool ignoreSimilarity() const;
+    virtual bool wordEngineAvailable() const;
+    virtual bool enablePreeditAtInsertion() const;
+    virtual bool restorePreedit() const;
+};
+
+#endif // JAPANESELANGUAGEFEATURES_H
 
=== added file 'plugins/ja/src/japaneseplugin.cpp'
--- plugins/ja/src/japaneseplugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/japaneseplugin.cpp	2016-02-19 18:07:05 +0000
@@ -0,0 +1,59 @@
+#include "japaneseplugin.h"
+#include "japaneselanguagefeatures.h"
+
+#include <QDebug>
+
+JapanesePlugin::JapanesePlugin(QObject *parent) :
+    AbstractLanguagePlugin(parent)
+  , m_japaneseLanguageFeatures(new JapaneseLanguageFeatures)
+  , m_processingWord(false)
+{
+    m_anthyThread = new QThread();
+    m_anthyAdapter = new AnthyAdapter();
+    m_anthyAdapter->moveToThread(m_anthyThread);
+
+    connect(m_anthyAdapter, SIGNAL(newPredictionSuggestions(QString, QStringList)), this, SLOT(finishedProcessing(QString, QStringList)));
+    connect(this, SIGNAL(parsePredictionText(QString)), m_anthyAdapter, SLOT(parse(const QString&)));
+    connect(this, SIGNAL(candidateSelected(QString)), m_anthyAdapter, SLOT(wordCandidateSelected(const QString&)));
+
+    m_anthyThread->start();
+}
+
+JapanesePlugin::~JapanesePlugin()
+{
+    m_anthyAdapter->deleteLater();
+    m_anthyThread->quit();
+    m_anthyThread->wait();
+}
+
+AbstractLanguageFeatures* JapanesePlugin::languageFeature()
+{
+    return m_japaneseLanguageFeatures;
+}
+
+void JapanesePlugin::predict(const QString& surroundingLeft, const QString& preedit)
+{
+    Q_UNUSED(surroundingLeft)
+
+    m_nextWord = preedit;
+    if (!m_processingWord) {
+        m_processingWord = true;
+        Q_EMIT parsePredictionText(preedit);
+    }
+}
+
+void JapanesePlugin::wordCandidateSelected(QString word)
+{
+    Q_EMIT candidateSelected(word);
+}
+
+void JapanesePlugin::finishedProcessing(QString word, QStringList suggestions)
+{
+    Q_EMIT newPredictionSuggestions(word, suggestions);
+    if (word != m_nextWord) {
+        Q_EMIT parsePredictionText(m_nextWord);
+    } else {
+        m_processingWord = false;
+    }
+}
+
 
=== added file 'plugins/ja/src/japaneseplugin.h'
--- plugins/ja/src/japaneseplugin.h	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/japaneseplugin.h	2016-02-19 18:07:05 +0000
@@ -0,0 +1,43 @@
+#ifndef JAPANESEPLUGIN_H
+#define JAPANESEPLUGIN_H
+
+#include <QObject>
+#include <QThread>
+#include "languageplugininterface.h"
+#include "abstractlanguageplugin.h"
+
+#include "anthyadapter.h"
+
+class JapaneseLanguageFeatures;
+
+class JapanesePlugin : public AbstractLanguagePlugin
+{
+    Q_OBJECT
+    Q_INTERFACES(LanguagePluginInterface)
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.JapanesePlugin" FILE "japaneseplugin.json")
+
+public:
+    explicit JapanesePlugin(QObject* parent = 0);
+    virtual ~JapanesePlugin();
+    virtual AbstractLanguageFeatures* languageFeature();
+
+    virtual void predict(const QString& surroundingLeft, const QString& preedit);
+    virtual void wordCandidateSelected(QString word);
+
+signals:
+    void newPredictionSuggestions(QString word, QStringList suggestions);
+    void parsePredictionText(QString preedit);
+    void candidateSelected(QString word);
+
+public slots:
+    void finishedProcessing(QString word, QStringList suggestions);
+
+private:
+    JapaneseLanguageFeatures* m_japaneseLanguageFeatures;
+    QThread *m_anthyThread;
+    AnthyAdapter *m_anthyAdapter;
+    QString m_nextWord;
+    bool m_processingWord;
+};
+
+#endif // JAPANESEPLUGIN_H
 
=== added file 'plugins/ja/src/japaneseplugin.json'
--- plugins/ja/src/japaneseplugin.json	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/japaneseplugin.json	2016-02-19 18:07:05 +0000
@@ -0,0 +1,7 @@
+{
+    "IID": "org.qt-project.Qt.Examples.JapanesePlugin",
+    "MetaData": {
+    },
+    "className": "JapanesePlugin",
+    "debug": true
+}
 
=== added file 'plugins/ja/src/src.pro'
--- plugins/ja/src/src.pro	1970-01-01 00:00:00 +0000
+++ plugins/ja/src/src.pro	2016-02-19 18:07:05 +0000
@@ -0,0 +1,39 @@
+TOP_BUILDDIR = $$OUT_PWD/../../..
+TOP_SRCDIR = $$PWD/../../..
+
+include($${TOP_SRCDIR}/config.pri)
+
+TEMPLATE        = lib
+CONFIG         += plugin
+QT             += widgets
+INCLUDEPATH    += \
+    $${TOP_SRCDIR}/src/ \
+    $${TOP_SRCDIR}/src/lib/ \
+    $${TOP_SRCDIR}/src/lib/logic/
+
+HEADERS         = \
+    japaneseplugin.h \
+    japaneselanguagefeatures.h \
+    anthyadapter.h \
+    $${TOP_SRCDIR}/src/lib/logic/abstractlanguageplugin.h
+
+SOURCES         = \
+    japaneseplugin.cpp \
+    japaneselanguagefeatures.cpp \
+    anthyadapter.cpp \
+    $${TOP_SRCDIR}/src/lib/logic/abstractlanguageplugin.cpp
+
+TARGET          = $$qtLibraryTarget(japlugin)
+
+EXAMPLE_FILES = japaneseplugin.json
+
+# generate database for presage:
+PLUGIN_INSTALL_PATH = $${UBUNTU_KEYBOARD_LIB_DIR}/ja/
+
+target.path = $$PLUGIN_INSTALL_PATH
+INSTALLS += target
+
+OTHER_FILES += \
+    jaglishplugin.json
+
+LIBS += -lpresage -lanthy -lanthydic
 
=== added directory 'plugins/ja/tests'
=== modified file 'plugins/plugins.pro'
--- plugins/plugins.pro	2015-05-11 12:52:42 +0000
+++ plugins/plugins.pro	2016-02-19 18:07:05 +0000
@@ -21,6 +21,7 @@
     hu \
     is \
     it \
+    ja \
     nb \
     nl \
     pl \
 
=== modified file 'qml/keys/languages.js'
--- qml/keys/languages.js	2016-01-18 13:19:13 +0000
+++ qml/keys/languages.js	2016-02-19 18:07:05 +0000
@@ -35,6 +35,7 @@
     if (languageId == "hu")         return i18n.tr("Hungarian");
     if (languageId == "is")         return i18n.tr("Icelandic");
     if (languageId == "it")         return i18n.tr("Italian");
+    if (languageId == "ja")         return i18n.tr("Japanese");
     if (languageId == "nl")         return i18n.tr("Dutch");
     if (languageId == "nb")         return i18n.tr("Norwegian");
     if (languageId == "pl")         return i18n.tr("Polish");
 
=== modified file 'src/lib/logic/abstractlanguagefeatures.h'
--- src/lib/logic/abstractlanguagefeatures.h	2014-12-08 14:26:19 +0000
+++ src/lib/logic/abstractlanguagefeatures.h	2016-02-19 18:07:05 +0000
@@ -54,6 +54,8 @@
     // can be disabled by implementing this method to return true.
     virtual bool ignoreSimilarity() const { return false; }
     virtual bool wordEngineAvailable() const { return false; }
+    virtual bool enablePreeditAtInsertion() const { return false; }
+    virtual bool restorePreedit() const { return true; }
 
     Maliit::TextContentType contentType() const { return m_contentType; }
     void setContentType(Maliit::TextContentType contentType) { m_contentType = contentType; }
 
=== modified file 'src/lib/logic/eventhandler.cpp'
--- src/lib/logic/eventhandler.cpp	2015-07-16 13:55:08 +0000
+++ src/lib/logic/eventhandler.cpp	2016-02-19 18:07:05 +0000
@@ -84,6 +84,8 @@
 
     if (action == "return")
         key.setAction(Key::ActionReturn);
+    else if (action == "commit")
+        key.setAction(Key::ActionCommit);
     else if (action == "backspace")
         key.setAction(Key::ActionBackspace);
     else if (action == "space")
 
=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2015-06-02 10:22:09 +0000
+++ src/plugin/inputmethod.cpp	2016-02-19 18:07:05 +0000
@@ -110,6 +110,10 @@
     connect(this, SIGNAL(keyboardStateChanged(QString)), &d->editor, SLOT(onKeyboardStateChanged(QString)));
     connect(d->m_geometry, SIGNAL(visibleRectChanged()), this, SLOT(onVisibleRectChanged()));
     connect(&d->m_settings, SIGNAL(disableHeightChanged(bool)), this, SLOT(onVisibleRectChanged()));
+
+    connect(&d->editor, SIGNAL(preeditChanged(QString)), this, SIGNAL(preeditChanged(QString)));
+    connect(&d->editor, SIGNAL(cursorPositionChanged(int)), this, SIGNAL(cursorPositionChanged(int)));
+
     d->registerAudioFeedbackSoundSetting();
     d->registerAudioFeedbackSetting();
     d->registerHapticFeedbackSetting();
@@ -643,6 +647,31 @@
     return d->currentPluginPath;
 }
 
+const QString &InputMethod::preedit()
+{
+    Q_D(InputMethod);
+    d->preedit = d->editor.text()->preedit();
+    return d->preedit;
+}
+
+int InputMethod::cursorPosition() const
+{
+    Q_D(const InputMethod);
+    return d->editor.text()->cursorPosition();
+}
+
+void InputMethod::replacePreedit(const QString &preedit)
+{
+    Q_D(InputMethod);
+    d->editor.replacePreedit(preedit);
+}
+
+void InputMethod::setCursorPosition(const int pos)
+{
+    Q_D(InputMethod);
+    d->editor.setCursorPosition(pos);
+}
+
 bool InputMethod::languageIsSupported(const QString plugin) {
     Q_D(const InputMethod);
     foreach(QString pluginPath, d->pluginPaths) {
 
=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2015-04-15 14:03:42 +0000
+++ src/plugin/inputmethod.h	2016-02-19 18:07:05 +0000
@@ -59,6 +59,8 @@
     Q_PROPERTY(QString keyboardState READ keyboardState WRITE setKeyboardState NOTIFY keyboardStateChanged)
     Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY hasSelectionChanged)
     Q_PROPERTY(QString currentPluginPath READ currentPluginPath NOTIFY currentPluginPathChanged)
+    Q_PROPERTY(QString preedit READ preedit WRITE replacePreedit NOTIFY preeditChanged)
+    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
 
     Q_ENUMS(TextContentType)
 
@@ -126,6 +128,11 @@
 
     const QString currentPluginPath() const;
 
+    const QString &preedit();
+    void replacePreedit(const QString &preedit);
+    int cursorPosition() const;
+    void setCursorPosition(const int pos);
+
     QObject* actionKeyOverride() const;
 
     Q_SLOT void close();
@@ -154,6 +161,8 @@
     void hasSelectionChanged(bool hasSelection);
     void currentPluginPathChanged(QString currentPluginPath);
     void languagePluginChanged(QString pluginPath, QString languageId);
+    void preeditChanged(QString preedit);
+    void cursorPositionChanged(int cursor_position);
 
 private:
     Q_SLOT void onAutoCorrectSettingChanged();
 
=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2015-04-15 14:03:42 +0000
+++ src/plugin/inputmethod_p.h	2016-02-19 18:07:05 +0000
@@ -61,6 +61,8 @@
     QString keyboardState;
     bool hasSelection;
 
+    QString preedit;
+
     KeyboardGeometry *m_geometry;
     KeyboardSettings m_settings;
     GreeterStatus *m_greeterStatus;
@@ -89,6 +91,7 @@
         , appsCurrentOrientation(qGuiApp->primaryScreen()->orientation())
         , keyboardState("CHARACTERS")
         , hasSelection(false)
+        , preedit("")
         , m_geometry(new KeyboardGeometry(q))
         , m_settings()
         , m_greeterStatus(new GreeterStatus())
 
=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2015-07-16 13:55:08 +0000
+++ src/view/abstracttexteditor.cpp	2016-02-19 18:07:05 +0000
@@ -126,6 +126,14 @@
 //! \brief Emitted when preedit setting changes.
 //! \param enabled New setting.
 
+//! \fn void AbstractTextEditor::preeditChanged(const QString &preedit)
+//! \brief Emitted when preedit string changes.
+//! \param enabled New string.
+
+//! \fn void AbstractTextEditor::cursorPositionChanged(int pos)
+//! \brief Emitted when preedit cusor position changes.
+//! \param enabled New position.
+
 //! \fn void AbstractTextEditor::wordCandidatesChanged(const WordCandidateList &word_candidates)
 //! \brief Emitted when new word candidates are generated.
 //! \param word_candidates New word candidates.
@@ -373,11 +381,13 @@
         const bool isSymbol = d->word_engine->languageFeature()->isSymbol(text);
         const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && 
                     not d->text->preedit().isEmpty() && isSeparator;
+        const bool enablePreeditAtInsertion = d->word_engine->languageFeature()->enablePreeditAtInsertion();
 
         d->previous_preedit = "";
 
         if (d->preedit_enabled) {
-            if (d->text->surroundingRight().left(1).contains(QRegExp("[\\w]")) || email_detected) {
+            if (!enablePreeditAtInsertion &&
+                    (d->text->surroundingRight().left(1).contains(QRegExp("[\\w]")) || email_detected)) {
                 // We're editing in the middle of a word or entering an email address, so just insert characters directly
                 d->text->appendToPreedit(text);
                 commitPreedit();
@@ -429,6 +439,9 @@
             // standard input (like certain separators, e.g. '.' in western languages) can also trigger autoCaps
             Q_EMIT autoCapsActivated();
         }
+
+        Q_EMIT preeditChanged(d->text->preedit());
+        Q_EMIT cursorPositionChanged(d->text->cursorPosition());
     } break;
 
     case Key::ActionBackspace: {
@@ -505,6 +518,9 @@
         d->text->appendToPreedit(space);
         commitPreedit();
 
+        Q_EMIT preeditChanged(d->text->preedit());
+        Q_EMIT cursorPositionChanged(d->text->cursorPosition());
+
         if (auto_caps_activated && d->auto_caps_enabled) {
             Q_EMIT autoCapsActivated();
         }
@@ -515,6 +531,13 @@
         keyText = QString("\r");
     } break;
 
+    case Key::ActionCommit: {
+        commitPreedit();
+
+        Q_EMIT preeditChanged(d->text->preedit());
+        Q_EMIT cursorPositionChanged(d->text->cursorPosition());
+    } break;
+
     case Key::ActionClose:
         Q_EMIT keyboardClosed();
         break;
@@ -561,6 +584,9 @@
     if (event_key != Qt::Key_unknown) {
         commitPreedit();
         sendKeyPressAndReleaseEvents(event_key, Qt::NoModifier, keyText);
+
+        Q_EMIT preeditChanged(d->text->preedit());
+        Q_EMIT cursorPositionChanged(d->text->cursorPosition());
     }
 }
 
@@ -614,6 +640,9 @@
     // before sending preedit:
     d->word_engine->computeCandidates(d->text.data());
     sendPreeditString(d->text->preedit(), d->text->preeditFace());
+
+    Q_EMIT preeditChanged(d->text->preedit());
+    Q_EMIT cursorPositionChanged(d->text->cursorPosition());
 }
 
 void AbstractTextEditor::replaceTextWithPreedit(const QString &replacement, int start, int len, int pos)
@@ -629,6 +658,9 @@
     Replacement word_r(start, len, pos);
     sendPreeditString(d->text->preedit(), d->text->preeditFace(),
                       word_r);
+
+    Q_EMIT preeditChanged(d->text->preedit());
+    Q_EMIT cursorPositionChanged(d->text->cursorPosition());
 }
 
 //! \brief Replaces current preedit with given replacement and then
@@ -662,6 +694,9 @@
             Q_EMIT autoCapsDeactivated();
         }
     }
+
+    Q_EMIT preeditChanged(d->text->preedit());
+    Q_EMIT cursorPositionChanged(d->text->cursorPosition());
 }
 
 //! \brief Clears preedit.
@@ -702,6 +737,27 @@
     }
 }
 
+//! \brief Set cursor position of preedit.
+void AbstractTextEditor::setCursorPosition(int pos)
+{
+    Q_D(AbstractTextEditor);
+
+    if (not d->valid()) {
+        return;
+    }
+
+    if (pos == d->text->cursorPosition()) {
+        return;
+    }
+
+    d->text->setCursorPosition(pos);
+
+    sendPreeditString(d->text->preedit(), d->text->preeditFace(),
+                      Replacement(d->text->cursorPosition()));
+    Q_EMIT preeditChanged(d->text->preedit());
+    Q_EMIT cursorPositionChanged(d->text->cursorPosition());
+}
+
 //! \brief Returns whether auto-correct functionality is enabled.
 //! \sa autoCorrectEnabled
 bool AbstractTextEditor::isAutoCorrectEnabled() const
@@ -906,7 +962,10 @@
         // Clear previous word candidates
         Q_EMIT wordCandidatesChanged(WordCandidateList());
         sendPreeditString(d->text->preedit(), d->text->preeditFace(),
-                          Replacement());
+                          Replacement(d->text->cursorPosition()));
+
+        Q_EMIT preeditChanged(d->text->preedit());
+        Q_EMIT cursorPositionChanged(d->text->cursorPosition());
 
         if (d->text->preedit().isEmpty()) {
             d->word_engine->clearCandidates();
@@ -983,6 +1042,10 @@
         return;
     }
 
+    if(!d->word_engine->languageFeature()->restorePreedit()) {
+        return;
+    }
+
     int currentOffset = text()->surroundingOffset();
     if(currentOffset > 1 && currentOffset <= text()->surrounding().size()) {
         QString lastChar;
@@ -1023,10 +1086,8 @@
                 }
                 d->previous_preedit = "";
             }
-
             replaceTextWithPreedit(recreatedPreedit, 0, 0, recreatedPreedit.size());
         }
-
     }
 
     d->word_engine->computeCandidates(d->text.data());
 
=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2015-03-16 13:06:42 +0000
+++ src/view/abstracttexteditor.h	2016-02-19 18:07:05 +0000
@@ -129,6 +129,10 @@
     Q_SLOT void setPreeditEnabled(bool enabled);
     Q_SIGNAL void preeditEnabledChanged(bool enabled);
 
+    Q_SIGNAL void preeditChanged(const QString &preedit);
+    Q_SLOT void setCursorPosition(int pos);
+    Q_SIGNAL void cursorPositionChanged(int pos);
+
     bool isAutoCorrectEnabled() const;
     Q_SLOT void setAutoCorrectEnabled(bool enabled);
     Q_SIGNAL void autoCorrectEnabledChanged(bool enabled);