nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix Armenian punctuation order"

main
Tadashi G. Takaoka 2014-03-20 06:43:50 +00:00 committed by Android (Google) Code Review
parent e4e6e739e8 d51aebd328
commit e884fde8d2
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
View File

@ -1949,15 +1949,17 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null,
/* ~ more_keys_for_cyrillic_soft_sign */
// U+058A: "֊" ARMENIAN HYPHEN
// U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+055D: "՝" ARMENIAN COMMA
// U+055E: "՞" ARMENIAN QUESTION MARK
// U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
// U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+055A: "՚" ARMENIAN APOSTROPHE
// U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
// U+055D: "՝" ARMENIAN COMMA
// U+055B: "՛" ARMENIAN EMPHASIS MARK
// U+058A: "֊" ARMENIAN HYPHEN
// U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+055F: "՟" ARMENIAN ABBREVIATION MARK
/* more_keys_for_punctuation */ "!fixedColumnOrder!8,!,?,\u0559,\u055A,.,\u055C,\\,,\u055E,:,;,\u055F,\u00AB,\u00BB,\u058A,\u055D,\u055B",
/* more_keys_for_punctuation */ "!autoColumnOrder!8,\\,,\u055E,\u055C,.,\u055A,\u0559,?,!,\u055D,\u055B,\u058A,\u00BB,\u00AB,\u055F,;,:",
/* more_keys_for_nordic_row2_11 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

18
tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java
View File

@ -74,19 +74,19 @@ public final class ArmenianPhonetic extends LayoutBase {
private static final ExpectedKey ARMENIAN_ALPHABET_KEY = key(
"\u0531\u0532\u0533", Constants.CODE_SWITCH_ALPHA_SYMBOL);
// U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
// U+055A: "՚" ARMENIAN APOSTROPHE
// U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+055E: "՞" ARMENIAN QUESTION MARK
// U+055F: "՟" ARMENIAN ABBREVIATION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+058A: "֊" ARMENIAN HYPHEN
// U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+055A: "՚" ARMENIAN APOSTROPHE
// U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
// U+055D: "՝" ARMENIAN COMMA
// U+055B: "՛" ARMENIAN EMPHASIS MARK
// U+058A: "֊" ARMENIAN HYPHEN
// U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+055F: "՟" ARMENIAN ABBREVIATION MARK
private static final ExpectedKey[] ARMENIAN_PUNCTUATION_MORE_KEYS = joinMoreKeys(
"!", "?", "\u0559", "\u055A", ".", "\u055C", ",", "\u055E",
":", ";", "\u055F", "\u00AB", "\u00BB", "\u058A", "\u055D", "\u055B");
",", "\u055E", "\u055C", ".", "\u055A", "\u0559", "?", "!",
"\u055D", "\u055B", "\u058A", "\u00BB", "\u00AB", "\u055F", ";", ":");
}
@Override

28
tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
View File

@ -23,20 +23,22 @@
U+0532: "Բ" ARMENIAN CAPITAL LETTER BEN
U+0533: "Գ" ARMENIAN CAPITAL LETTER GIM -->
<string name="label_to_alpha_key">&#x0531;&#x0532;&#x0533;</string>
<!-- U+058A: "֊" ARMENIAN HYPHEN -->
<!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK -->
<!-- U+055D: "՝" ARMENIAN COMMA -->
<!-- U+055E: "՞" ARMENIAN QUESTION MARK -->
<!-- U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING -->
<!-- U+055A: "՚" ARMENIAN APOSTROPHE -->
<!-- U+055B: "՛" ARMENIAN EMPHASIS MARK -->
<!-- U+055F: "՟" ARMENIAN ABBREVIATION MARK -->
<string name="more_keys_for_punctuation">"!fixedColumnOrder!8,!,?,&#x0559;,&#x055A;,.,&#x055C;,\\,,&#x055E;,:,;,&#x055F;,&#x00AB;,&#x00BB;,&#x058A;,&#x055D;,&#x055B;"</string>
<!-- U+055E: "՞" ARMENIAN QUESTION MARK -->
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<!-- U+055E: "՞" ARMENIAN QUESTION MARK
U+055C: "՜" ARMENIAN EXCLAMATION MARK
U+055A: "՚" ARMENIAN APOSTROPHE
U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
U+055D: "՝" ARMENIAN COMMA
U+055B: "՛" ARMENIAN EMPHASIS MARK
U+058A: "֊" ARMENIAN HYPHEN
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+055F: "՟" ARMENIAN ABBREVIATION MARK -->
<string name="more_keys_for_punctuation">"!autoColumnOrder!8,\\,,&#x055E;,&#x055C;,.,&#x055A;,&#x0559;,?,!,&#x055D;,&#x055B;,&#x058A;,&#x00BB;,&#x00AB;,&#x055F;,;,:"</string>
<!-- U+055E: "՞" ARMENIAN QUESTION MARK
U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_question">&#x055E;,&#x00BF;</string>
<!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK -->
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK
U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<string name="more_keys_for_exclamation">&#x055C;,&#x00A1;</string>
<!-- U+058F: "֏" ARMENIAN DRAM SIGN -->
<!-- TODO: Enable this when we have glyph for the following letter