diff options
author | Silvio Gulizia <desk@silviogulizia.com> | 2019-10-03 02:27:01 +0200 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2019-10-03 10:27:01 +1000 |
commit | afb93b7f481a46e3980905e635d5a1d45a0ad678 (patch) | |
tree | 0944d12c1283937114a69a606741a270798f9552 | |
parent | 99f5d6c56d0e3b28ed208acdeae16cea5d563725 (diff) | |
download | qmk_firmware-afb93b7f481a46e3980905e635d5a1d45a0ad678.tar.gz qmk_firmware-afb93b7f481a46e3980905e635d5a1d45a0ad678.zip |
Fix quantum keymapextra italian (#6779)
* remove IT_PIPE duplicate and add IT_GRAD
IT_PIPE was declared 2 times, ones as ° and once as |. I changed the first declaration and called it IT_GRAD. I even fixed the definition because the ° in Italian is obtained with LSFT(IT_AACC)
* rename IT_GRAD to IT_DEGR
* add missing plus_and_minus
* fix missing IT_ACUT definition
* change KC_LALT(KC_LSFT to LALT(LSFT
* Fix alignment
* remove leftover
* fix issue generated with chars while pushing
* fix typo
* fix LCBR and RCBR
* fix euro symbol
* fix RBRC
* change IT_LESS form KC_NUBS to KC_GRAVE
* add IT_TILDE and change IT_GRAV to IT_GRAVE
* add missing legends for accented vowels
* format for readability
* revert to commit befor I edit it
* initial commit
* edited to be easier to compare to _ansi.h
* remove keymap_italian_osx_iso.h and rename with edits keymap_italian_osx_ansi.h to keymap_italian_osx.h
I found out there were no difference at all
* fix missing #endif
* rename quantum/keymap_extras/keymap_italian_osx.h to quantum/keymap_extras/keymap_italian_ansi.h
Now this file is a clone of the keymap_italian.h that appears to be working only for ISO keyboards. It also contains a few improvements for IT_PIPE (defined two times) and IT_ACUT (missing definition). Additionally it redefines LCBR and RCBR to LSFT(IT_LBRC) and LSFT(IT_RBRC)
* rename file
* redefines IT_BKSL and IT_PIPE based on KC_BKSL
* add new osx_iso and osx_ansi version for italian.h and align BKSL to BSLS, fix double definition of PIPE
-rw-r--r-- | quantum/keymap_extras/keymap_italian.h | 55 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_italian_osx_ansi.h | 113 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_italian_osx_iso.h | 113 |
3 files changed, 254 insertions, 27 deletions
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h index 544ae9408..a8c03b884 100644 --- a/quantum/keymap_extras/keymap_italian.h +++ b/quantum/keymap_extras/keymap_italian.h | |||
@@ -78,35 +78,36 @@ | |||
78 | #define IT_MINS KC_SLSH // - and _ | 78 | #define IT_MINS KC_SLSH // - and _ |
79 | 79 | ||
80 | // shifted characters | 80 | // shifted characters |
81 | #define IT_PIPE LSFT(IT_BKSL) // ° | 81 | #define IT_DEGR LSFT(IT_AACC) // ° |
82 | #define IT_EXLM LSFT(KC_1) // ! | 82 | #define IT_EXLM LSFT(KC_1) // ! |
83 | #define IT_DQOT LSFT(KC_2) // " | 83 | #define IT_DQOT LSFT(KC_2) // " |
84 | #define IT_STRL LSFT(KC_3) // £ | 84 | #define IT_STRL LSFT(KC_3) // £ |
85 | #define IT_DLR LSFT(KC_4) // $ | 85 | #define IT_DLR LSFT(KC_4) // $ |
86 | #define IT_PERC LSFT(KC_5) // % | 86 | #define IT_PERC LSFT(KC_5) // % |
87 | #define IT_AMPR LSFT(KC_6) // & | 87 | #define IT_AMPR LSFT(KC_6) // & |
88 | #define IT_SLSH LSFT(KC_7) // / | 88 | #define IT_SLSH LSFT(KC_7) // / |
89 | #define IT_LPRN LSFT(KC_8) // ( | 89 | #define IT_LPRN LSFT(KC_8) // ( |
90 | #define IT_RPRN LSFT(KC_9) // ) | 90 | #define IT_RPRN LSFT(KC_9) // ) |
91 | #define IT_EQL LSFT(KC_0) // = | 91 | #define IT_EQL LSFT(KC_0) // = |
92 | #define IT_QST LSFT(IT_APOS) // ? | 92 | #define IT_QST LSFT(IT_APOS) // ? |
93 | #define IT_CRC LSFT(IT_IACC) // ^ | 93 | #define IT_CRC LSFT(IT_IACC) // ^ |
94 | #define IT_ASTR LSFT(IT_PLUS) // * | 94 | #define IT_ASTR LSFT(IT_PLUS) // * |
95 | #define IT_MORE LSFT(IT_LESS) // > | 95 | #define IT_MORE LSFT(IT_LESS) // > |
96 | #define IT_COLN LSFT(IT_DOT) // : | 96 | #define IT_COLN LSFT(IT_DOT) // : |
97 | #define IT_SCLN LSFT(IT_COMM) // ; | 97 | #define IT_SCLN LSFT(IT_COMM) // ; |
98 | #define IT_UNDS LSFT(IT_MINS) // _ | 98 | #define IT_UNDS LSFT(IT_MINS) // _ |
99 | 99 | ||
100 | // Alt Gr-ed characters | 100 | // Alt Gr-ed characters |
101 | #define IT_LCBR ALGR(KC_7) // { | 101 | #define IT_LCBR ALGR(KC_7) // { |
102 | #define IT_LBRC ALGR(IT_EACC) // [ | 102 | #define IT_LBRC ALGR(IT_EACC) // [ |
103 | #define IT_RBRC ALGR(IT_PLUS) // ] | 103 | #define IT_RBRC ALGR(IT_PLUS) // ] |
104 | #define IT_RCBR ALGR(KC_0) // } | 104 | #define IT_RCBR ALGR(KC_0) // } |
105 | #define IT_AT ALGR(IT_OACC) // @ | 105 | #define IT_AT ALGR(IT_OACC) // @ |
106 | #define IT_EURO ALGR(KC_E) // € | 106 | #define IT_EURO ALGR(KC_E) // € |
107 | #define IT_PIPE LSFT(IT_BKSL) // | | 107 | #define IT_PIPE LSFT(IT_BSLS) // | |
108 | #define IT_SHRP ALGR(IT_AACC) // # | 108 | #define IT_SHRP ALGR(IT_AACC) // # |
109 | 109 | ||
110 | #define IT_X_PLUS X_RBRACKET // # | 110 | // Deprecated |
111 | #define IT_X_PLUS X_RBRACKET // # | ||
111 | 112 | ||
112 | #endif | 113 | #endif |
diff --git a/quantum/keymap_extras/keymap_italian_osx_ansi.h b/quantum/keymap_extras/keymap_italian_osx_ansi.h new file mode 100644 index 000000000..2b7160ff3 --- /dev/null +++ b/quantum/keymap_extras/keymap_italian_osx_ansi.h | |||
@@ -0,0 +1,113 @@ | |||
1 | /* Copyright 2015-2016 Matthias Schmidtt | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | // This is a clone of quantum/keymap_extra/keymap_italian.h intended to be used with Apple devices | ||
18 | |||
19 | #ifndef KEYMAP_ITALIAN | ||
20 | #define KEYMAP_ITALIAN | ||
21 | |||
22 | #include "keymap.h" | ||
23 | |||
24 | // normal characters | ||
25 | #define IT_A KC_A | ||
26 | #define IT_B KC_B | ||
27 | #define IT_C KC_C | ||
28 | #define IT_D KC_D | ||
29 | #define IT_E KC_E | ||
30 | #define IT_F KC_F | ||
31 | #define IT_G KC_G | ||
32 | #define IT_H KC_H | ||
33 | #define IT_I KC_I | ||
34 | #define IT_J KC_J | ||
35 | #define IT_K KC_K | ||
36 | #define IT_L KC_L | ||
37 | #define IT_M KC_M | ||
38 | #define IT_N KC_N | ||
39 | #define IT_O KC_O | ||
40 | #define IT_P KC_P | ||
41 | #define IT_Q KC_Q | ||
42 | #define IT_R KC_R | ||
43 | #define IT_S KC_S | ||
44 | #define IT_T KC_T | ||
45 | #define IT_U KC_U | ||
46 | #define IT_V KC_V | ||
47 | #define IT_W KC_W | ||
48 | #define IT_X KC_X | ||
49 | #define IT_Y KC_Y | ||
50 | #define IT_Z KC_Z | ||
51 | |||
52 | #define IT_0 KC_0 | ||
53 | #define IT_1 KC_1 | ||
54 | #define IT_2 KC_2 | ||
55 | #define IT_3 KC_3 | ||
56 | #define IT_4 KC_4 | ||
57 | #define IT_5 KC_5 | ||
58 | #define IT_6 KC_6 | ||
59 | #define IT_7 KC_7 | ||
60 | #define IT_8 KC_8 | ||
61 | #define IT_9 KC_9 | ||
62 | |||
63 | // punctuation | ||
64 | #define IT_DOT KC_DOT // . and : | ||
65 | #define IT_COMM KC_COMM // , and ; | ||
66 | #define IT_APOS KC_MINS // ' and ? | ||
67 | #define IT_BSLS KC_NUBS // \ and | | ||
68 | #define IT_LESS KC_GRV // < and > | ||
69 | #define IT_MINS KC_SLSH // - and _ | ||
70 | |||
71 | // accented vowels (regular, with shift, with option, with option and shift) | ||
72 | #define IT_EACC KC_LBRC // è, é, [, { | ||
73 | #define IT_PLUS KC_RBRC // +, *, ], } | ||
74 | #define IT_OACC KC_SCLN // ò, ç, @, Ç | ||
75 | #define IT_AACC KC_QUOT // à, °, #, ∞ | ||
76 | #define IT_UACC KC_BSLS // ù, §, ¶, ◊ | ||
77 | #define IT_IACC KC_EQL // ì, ^, ˆ, ± | ||
78 | |||
79 | // shifted characters | ||
80 | #define IT_EXLM LSFT(KC_1) // ! | ||
81 | #define IT_DQOT LSFT(KC_2) // " | ||
82 | #define IT_STRL LSFT(KC_3) // £ | ||
83 | #define IT_DLR LSFT(KC_4) // $ | ||
84 | #define IT_PERC LSFT(KC_5) // % | ||
85 | #define IT_AMPR LSFT(KC_6) // & | ||
86 | #define IT_SLSH LSFT(KC_7) // / | ||
87 | #define IT_LPRN LSFT(KC_8) // ( | ||
88 | #define IT_RPRN LSFT(KC_9) // ) | ||
89 | #define IT_EQL LSFT(KC_0) // = | ||
90 | #define IT_DEGR LSFT(IT_AACC) // ° | ||
91 | #define IT_QST LSFT(IT_APOS) // ? | ||
92 | #define IT_CRC LSFT(IT_IACC) // ^ | ||
93 | #define IT_ASTR LSFT(IT_PLUS) // * | ||
94 | #define IT_MORE LSFT(IT_LESS) // > | ||
95 | #define IT_COLN LSFT(IT_DOT) // : | ||
96 | #define IT_SCLN LSFT(IT_COMM) // ; | ||
97 | #define IT_UNDS LSFT(IT_MINS) // _ | ||
98 | #define IT_LCBR LSFT(IT_LBRC) // { | ||
99 | #define IT_RCBR LSFT(IT_RBRC) // } | ||
100 | #define IT_PIPE LSFT(IT_BSLS) // | | ||
101 | |||
102 | // Alt -ed characters | ||
103 | #define IT_LBRC LALT(IT_EACC) // [ | ||
104 | #define IT_RBRC LALT(IT_PLUS) // ] | ||
105 | #define IT_AT LALT(IT_OACC) // @ | ||
106 | #define IT_EURO LALT(KC_E) // € | ||
107 | #define IT_SHRP LALT(IT_AACC ) // # | ||
108 | #define IT_ACUT LALT(KC_8) // ´ | ||
109 | #define IT_GRAVE LALT(KC_9) // ` | ||
110 | #define IT_TILDE LALT(KC_5) // ~ | ||
111 | #define IT_PLMN LALT(LSFT(IT_IACC)) // ± | ||
112 | |||
113 | #endif | ||
diff --git a/quantum/keymap_extras/keymap_italian_osx_iso.h b/quantum/keymap_extras/keymap_italian_osx_iso.h new file mode 100644 index 000000000..5c920014a --- /dev/null +++ b/quantum/keymap_extras/keymap_italian_osx_iso.h | |||
@@ -0,0 +1,113 @@ | |||
1 | /* Copyright 2015-2016 Matthias Schmidtt | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | // This is a clone of quantum/keymap_extra/keymap_italian.h intended to be used with Apple devices | ||
18 | |||
19 | #ifndef KEYMAP_ITALIAN | ||
20 | #define KEYMAP_ITALIAN | ||
21 | |||
22 | #include "keymap.h" | ||
23 | |||
24 | // normal characters | ||
25 | #define IT_A KC_A | ||
26 | #define IT_B KC_B | ||
27 | #define IT_C KC_C | ||
28 | #define IT_D KC_D | ||
29 | #define IT_E KC_E | ||
30 | #define IT_F KC_F | ||
31 | #define IT_G KC_G | ||
32 | #define IT_H KC_H | ||
33 | #define IT_I KC_I | ||
34 | #define IT_J KC_J | ||
35 | #define IT_K KC_K | ||
36 | #define IT_L KC_L | ||
37 | #define IT_M KC_M | ||
38 | #define IT_N KC_N | ||
39 | #define IT_O KC_O | ||
40 | #define IT_P KC_P | ||
41 | #define IT_Q KC_Q | ||
42 | #define IT_R KC_R | ||
43 | #define IT_S KC_S | ||
44 | #define IT_T KC_T | ||
45 | #define IT_U KC_U | ||
46 | #define IT_V KC_V | ||
47 | #define IT_W KC_W | ||
48 | #define IT_X KC_X | ||
49 | #define IT_Y KC_Y | ||
50 | #define IT_Z KC_Z | ||
51 | |||
52 | #define IT_0 KC_0 | ||
53 | #define IT_1 KC_1 | ||
54 | #define IT_2 KC_2 | ||
55 | #define IT_3 KC_3 | ||
56 | #define IT_4 KC_4 | ||
57 | #define IT_5 KC_5 | ||
58 | #define IT_6 KC_6 | ||
59 | #define IT_7 KC_7 | ||
60 | #define IT_8 KC_8 | ||
61 | #define IT_9 KC_9 | ||
62 | |||
63 | // punctuation | ||
64 | #define IT_DOT KC_DOT // . and : | ||
65 | #define IT_COMM KC_COMM // , and ; | ||
66 | #define IT_APOS KC_MINS // ' and ? | ||
67 | #define IT_BSLS KC_GRV // \ and | | ||
68 | #define IT_LESS KC_NUBS// < and > | ||
69 | #define IT_MINS KC_SLSH // - and _ | ||
70 | |||
71 | // accented vowels (regular, with shift, with option, with option and shift) | ||
72 | #define IT_EACC KC_LBRC // è, é, [, { | ||
73 | #define IT_PLUS KC_RBRC // +, *, ], } | ||
74 | #define IT_OACC KC_SCLN // ò, ç, @, Ç | ||
75 | #define IT_AACC KC_QUOT // à, °, #, ∞ | ||
76 | #define IT_UACC KC_BSLS // ù, §, ¶, ◊ | ||
77 | #define IT_IACC KC_EQL // ì, ^, ˆ, ± | ||
78 | |||
79 | // shifted characters | ||
80 | #define IT_EXLM LSFT(KC_1) // ! | ||
81 | #define IT_DQOT LSFT(KC_2) // " | ||
82 | #define IT_STRL LSFT(KC_3) // £ | ||
83 | #define IT_DLR LSFT(KC_4) // $ | ||
84 | #define IT_PERC LSFT(KC_5) // % | ||
85 | #define IT_AMPR LSFT(KC_6) // & | ||
86 | #define IT_SLSH LSFT(KC_7) // / | ||
87 | #define IT_LPRN LSFT(KC_8) // ( | ||
88 | #define IT_RPRN LSFT(KC_9) // ) | ||
89 | #define IT_EQL LSFT(KC_0) // = | ||
90 | #define IT_DEGR LSFT(IT_AACC) // ° | ||
91 | #define IT_QST LSFT(IT_APOS) // ? | ||
92 | #define IT_CRC LSFT(IT_IACC) // ^ | ||
93 | #define IT_ASTR LSFT(IT_PLUS) // * | ||
94 | #define IT_MORE LSFT(IT_LESS) // > | ||
95 | #define IT_COLN LSFT(IT_DOT) // : | ||
96 | #define IT_SCLN LSFT(IT_COMM) // ; | ||
97 | #define IT_UNDS LSFT(IT_MINS) // _ | ||
98 | #define IT_LCBR LSFT(IT_LBRC) // { | ||
99 | #define IT_RCBR LSFT(IT_RBRC) // } | ||
100 | #define IT_PIPE LSFT(IT_BSLS) // | | ||
101 | |||
102 | // Alt -ed characters | ||
103 | #define IT_LBRC LALT(IT_EACC) // [ | ||
104 | #define IT_RBRC LALT(IT_PLUS) // ] | ||
105 | #define IT_AT LALT(IT_OACC) // @ | ||
106 | #define IT_EURO LALT(KC_E) // € | ||
107 | #define IT_SHRP LALT(IT_AACC ) // # | ||
108 | #define IT_ACUT LALT(KC_8) // ´ | ||
109 | #define IT_GRAVE LALT(KC_9) // ` | ||
110 | #define IT_TILDE LALT(KC_5) // ~ | ||
111 | #define IT_PLMN LALT(LSFT(IT_IACC)) // ± | ||
112 | |||
113 | #endif | ||