Merge lp:~mterry/ubuntu-keyboard/emdash into lp:ubuntu-keyboard

[Michael Terry]

Add em dash, en dash, and the bullet as extended hyphen options.

Add em dash, en dash, and the bullet as extended hyphen options.

I chose to make the em dash the primary character, since I think that's the most commonly desired of the three (I have no data for that, but the en dash is a bit close to hyphen to make it the go-to extended character).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:292
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/540/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/41

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good, however these characters should also be added to the isSymbol() function in plugins/westernsupport/westernlanguagefeatures.cpp and plugins/pinyin/src/chineselanguagefeatures.cpp so that they get treated correctly by the auto-complete/auto-correct word engine. Once that's done this should be good to go :).

review: Needs Fixing

[lp:~mterry/ubuntu-keyboard/emdash]

293. By Michael Terry on 2015-01-28

Add the new symbols to isSymbol()

[Michael Terry (mterry)]

Done! Thanks, didn't know about that.

[Michael Terry (mterry)]

(Mightn't you just check the QChar's category() to see if it's a letter?)

[Michael Terry (mterry)]

Or heck, even call isLetter()

[Michael Sheldon (michael-sheldon)]

This implementation actually pre-dates me working on the keyboard, so I'm not certain of the original rationale; my guess would be that this was done to avoid potential issues with Chinese (and other non-latin based) input, but I'm not certain so I'll have a play and see if this can be cleaned up a bit when I've got some time.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:293
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/541/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/42

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

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Well, we can land this in the meantime, I assume.

/me is itching to make whales with bullet and underline characters

[Michael Sheldon (michael-sheldon)]

Yep, all looking good now.

review: Approve

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2014-12-08 14:26:19 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2015-01-28 13:56:34 +0000
@@ -71,7 +71,7 @@
 
 bool ChineseLanguageFeatures::isSymbol(const QString &text) const
 {
-    static const QString symbols = QString::fromUtf8("*#+=()@~/\\€£$¥₹%<>[]`^|_§{}¡¿«»\"“”„&0123456789");
+    static const QString symbols = QString::fromUtf8("*#+=()@~/\\€£$¥₹%<>[]`^|_—–•§{}¡¿«»\"“”„&0123456789");
 
     if (text.isEmpty()) {
         return false;

=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
--- plugins/westernsupport/westernlanguagefeatures.cpp	2014-12-09 20:42:49 +0000
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2015-01-28 13:56:34 +0000
@@ -92,7 +92,7 @@
 
 bool WesternLanguageFeatures::isSymbol(const QString &text) const
 {
-    static const QString symbols = QString::fromUtf8("*#+=()@~/\\€£$¥₹%<>[]`^|_§{}¡¿«»\"“”„&0123456789");
+    static const QString symbols = QString::fromUtf8("*#+=()@~/\\€£$¥₹%<>[]`^|_—–•§{}¡¿«»\"“”„&0123456789");
 
     if (text.isEmpty()) {
         return false;

=== modified file 'qml/languages/Keyboard_symbols.qml'
--- qml/languages/Keyboard_symbols.qml	2014-09-26 15:51:34 +0000
+++ qml/languages/Keyboard_symbols.qml	2015-01-28 13:56:34 +0000
@@ -55,7 +55,7 @@
             CharKey { label: "*"; shifted: "`"; leftSide: true; }
             CharKey { label: "#"; shifted: "^"; }
             CharKey { label: "+"; shifted: "|"; }
-            CharKey { label: "-"; shifted: "_"; }
+            CharKey { label: "-"; shifted: "_"; extended: ["—", "–", "•"]; }
             CharKey { label: "="; shifted: "§"; }
             CharKey { label: "("; shifted: "{"; }
             CharKey { label: ")"; shifted: "}"; }