~ruther/qmk_firmware

afb93b7f481a46e3980905e635d5a1d45a0ad678 — Silvio Gulizia 6 years ago 99f5d6c
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
M quantum/keymap_extras/keymap_italian.h => quantum/keymap_extras/keymap_italian.h +28 -27
@@ 78,35 78,36 @@
#define IT_MINS KC_SLSH  // - and _

// shifted characters
#define IT_PIPE LSFT(IT_BKSL)  // °
#define IT_EXLM LSFT(KC_1)     // !
#define IT_DQOT LSFT(KC_2)     // "
#define IT_STRL LSFT(KC_3)     // £
#define IT_DLR LSFT(KC_4)      // $
#define IT_PERC LSFT(KC_5)     // %
#define IT_AMPR LSFT(KC_6)     // &
#define IT_SLSH LSFT(KC_7)     // /
#define IT_LPRN LSFT(KC_8)     // (
#define IT_RPRN LSFT(KC_9)     // )
#define IT_EQL LSFT(KC_0)      // =
#define IT_QST LSFT(IT_APOS)   // ?
#define IT_CRC LSFT(IT_IACC)   // ^
#define IT_ASTR LSFT(IT_PLUS)  // *
#define IT_MORE LSFT(IT_LESS)  // >
#define IT_COLN LSFT(IT_DOT)   // :
#define IT_SCLN LSFT(IT_COMM)  // ;
#define IT_UNDS LSFT(IT_MINS)  // _
#define IT_DEGR LSFT(IT_AACC) // °
#define IT_EXLM LSFT(KC_1) // !
#define IT_DQOT LSFT(KC_2) // "
#define IT_STRL LSFT(KC_3) // £
#define IT_DLR  LSFT(KC_4) // $
#define IT_PERC LSFT(KC_5) // %
#define IT_AMPR LSFT(KC_6) // &
#define IT_SLSH LSFT(KC_7) // /
#define IT_LPRN LSFT(KC_8) // (
#define IT_RPRN LSFT(KC_9) // )
#define IT_EQL  LSFT(KC_0) // =
#define IT_QST  LSFT(IT_APOS) // ?
#define IT_CRC  LSFT(IT_IACC) // ^
#define IT_ASTR LSFT(IT_PLUS) // *
#define IT_MORE LSFT(IT_LESS) // >
#define IT_COLN LSFT(IT_DOT) // :
#define IT_SCLN LSFT(IT_COMM) // ;
#define IT_UNDS LSFT(IT_MINS) // _

// Alt Gr-ed characters
#define IT_LCBR ALGR(KC_7)     // {
#define IT_LBRC ALGR(IT_EACC)  // [
#define IT_RBRC ALGR(IT_PLUS)  // ]
#define IT_RCBR ALGR(KC_0)     // }
#define IT_AT ALGR(IT_OACC)    // @
#define IT_EURO ALGR(KC_E)     // €
#define IT_PIPE LSFT(IT_BKSL)  // |
#define IT_SHRP ALGR(IT_AACC)  // #
#define IT_LCBR ALGR(KC_7) // {
#define IT_LBRC ALGR(IT_EACC) // [
#define IT_RBRC ALGR(IT_PLUS) // ]
#define IT_RCBR ALGR(KC_0) // }
#define IT_AT   ALGR(IT_OACC) 	// @
#define IT_EURO ALGR(KC_E) 		// €
#define IT_PIPE LSFT(IT_BSLS) 	// |
#define	IT_SHRP	ALGR(IT_AACC) 	// #

#define IT_X_PLUS X_RBRACKET  // #
// Deprecated
#define	IT_X_PLUS	X_RBRACKET 	// #

#endif

A quantum/keymap_extras/keymap_italian_osx_ansi.h => quantum/keymap_extras/keymap_italian_osx_ansi.h +113 -0
@@ 0,0 1,113 @@
/* Copyright 2015-2016 Matthias Schmidtt
 *
 * 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, either version 2 of the License, or
 * (at your option) any later version.
 *
 * 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/>.
 */

// This is a clone of quantum/keymap_extra/keymap_italian.h intended to be used with Apple devices

#ifndef KEYMAP_ITALIAN
#define KEYMAP_ITALIAN

#include "keymap.h"

// normal characters
#define IT_A KC_A
#define IT_B KC_B
#define IT_C KC_C
#define IT_D KC_D
#define IT_E KC_E
#define IT_F KC_F
#define IT_G KC_G
#define IT_H KC_H
#define IT_I KC_I
#define IT_J KC_J
#define IT_K KC_K
#define IT_L KC_L
#define IT_M KC_M
#define IT_N KC_N
#define IT_O KC_O
#define IT_P KC_P
#define IT_Q KC_Q
#define IT_R KC_R
#define IT_S KC_S
#define IT_T KC_T
#define IT_U KC_U
#define IT_V KC_V
#define IT_W KC_W
#define IT_X KC_X
#define IT_Y KC_Y
#define IT_Z KC_Z

#define IT_0 KC_0
#define IT_1 KC_1
#define IT_2 KC_2
#define IT_3 KC_3
#define IT_4 KC_4
#define IT_5 KC_5
#define IT_6 KC_6
#define IT_7 KC_7
#define IT_8 KC_8
#define IT_9 KC_9

// punctuation
#define IT_DOT KC_DOT    // . and  :
#define IT_COMM KC_COMM  // , and  ;
#define IT_APOS KC_MINS  // ' and  ?
#define IT_BSLS KC_NUBS  // \ and  |
#define IT_LESS KC_GRV // < and  >
#define IT_MINS KC_SLSH  // - and  _

// accented vowels (regular, with shift, with option, with option and shift)
#define IT_EACC KC_LBRC  // è, é, [, {
#define IT_PLUS KC_RBRC  // +, *, ], }
#define IT_OACC KC_SCLN  // ò, ç, @, Ç
#define IT_AACC KC_QUOT  // à, °, #, ∞
#define IT_UACC KC_BSLS  // ù, §, ¶, ◊
#define IT_IACC KC_EQL   // ì, ^, ˆ, ±

// shifted characters
#define IT_EXLM LSFT(KC_1)  // !
#define IT_DQOT LSFT(KC_2)  // "
#define IT_STRL LSFT(KC_3)  // £
#define IT_DLR LSFT(KC_4)   // $
#define IT_PERC LSFT(KC_5)  // %
#define IT_AMPR LSFT(KC_6)  // &
#define IT_SLSH LSFT(KC_7)  // /
#define IT_LPRN LSFT(KC_8)  // (
#define IT_RPRN LSFT(KC_9)  // )
#define IT_EQL LSFT(KC_0)   // =
#define IT_DEGR LSFT(IT_AACC) // °
#define IT_QST LSFT(IT_APOS)  // ?
#define IT_CRC LSFT(IT_IACC)  // ^
#define IT_ASTR LSFT(IT_PLUS) // *
#define IT_MORE LSFT(IT_LESS) // >
#define IT_COLN LSFT(IT_DOT)  // :
#define IT_SCLN LSFT(IT_COMM) // ;
#define IT_UNDS LSFT(IT_MINS) // _
#define IT_LCBR LSFT(IT_LBRC) // {
#define IT_RCBR LSFT(IT_RBRC) // }
#define IT_PIPE LSFT(IT_BSLS) // |

// Alt -ed characters
#define IT_LBRC LALT(IT_EACC)  // [
#define IT_RBRC LALT(IT_PLUS)  // ]
#define IT_AT LALT(IT_OACC)    // @
#define IT_EURO LALT(KC_E)     // €
#define IT_SHRP LALT(IT_AACC ) // #
#define IT_ACUT LALT(KC_8)     // ´
#define IT_GRAVE LALT(KC_9)    // `
#define IT_TILDE LALT(KC_5)    // ~
#define IT_PLMN LALT(LSFT(IT_IACC))  // ±

#endif

A quantum/keymap_extras/keymap_italian_osx_iso.h => quantum/keymap_extras/keymap_italian_osx_iso.h +113 -0
@@ 0,0 1,113 @@
/* Copyright 2015-2016 Matthias Schmidtt
 *
 * 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, either version 2 of the License, or
 * (at your option) any later version.
 *
 * 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/>.
 */

// This is a clone of quantum/keymap_extra/keymap_italian.h intended to be used with Apple devices

#ifndef KEYMAP_ITALIAN
#define KEYMAP_ITALIAN

#include "keymap.h"

// normal characters
#define IT_A KC_A
#define IT_B KC_B
#define IT_C KC_C
#define IT_D KC_D
#define IT_E KC_E
#define IT_F KC_F
#define IT_G KC_G
#define IT_H KC_H
#define IT_I KC_I
#define IT_J KC_J
#define IT_K KC_K
#define IT_L KC_L
#define IT_M KC_M
#define IT_N KC_N
#define IT_O KC_O
#define IT_P KC_P
#define IT_Q KC_Q
#define IT_R KC_R
#define IT_S KC_S
#define IT_T KC_T
#define IT_U KC_U
#define IT_V KC_V
#define IT_W KC_W
#define IT_X KC_X
#define IT_Y KC_Y
#define IT_Z KC_Z

#define IT_0 KC_0
#define IT_1 KC_1
#define IT_2 KC_2
#define IT_3 KC_3
#define IT_4 KC_4
#define IT_5 KC_5
#define IT_6 KC_6
#define IT_7 KC_7
#define IT_8 KC_8
#define IT_9 KC_9

// punctuation
#define IT_DOT KC_DOT    // . and  :
#define IT_COMM KC_COMM  // , and  ;
#define IT_APOS KC_MINS  // ' and  ?
#define IT_BSLS KC_GRV   // \ and  |
#define IT_LESS KC_NUBS// < and  >
#define IT_MINS KC_SLSH  // - and  _

// accented vowels (regular, with shift, with option, with option and shift)
#define IT_EACC KC_LBRC  // è, é, [, {
#define IT_PLUS KC_RBRC  // +, *, ], }
#define IT_OACC KC_SCLN  // ò, ç, @, Ç
#define IT_AACC KC_QUOT  // à, °, #, ∞
#define IT_UACC KC_BSLS  // ù, §, ¶, ◊
#define IT_IACC KC_EQL   // ì, ^, ˆ, ±

// shifted characters
#define IT_EXLM LSFT(KC_1)  // !
#define IT_DQOT LSFT(KC_2)  // "
#define IT_STRL LSFT(KC_3)  // £
#define IT_DLR LSFT(KC_4)   // $
#define IT_PERC LSFT(KC_5)  // %
#define IT_AMPR LSFT(KC_6)  // &
#define IT_SLSH LSFT(KC_7)  // /
#define IT_LPRN LSFT(KC_8)  // (
#define IT_RPRN LSFT(KC_9)  // )
#define IT_EQL LSFT(KC_0)   // =
#define IT_DEGR LSFT(IT_AACC) // °
#define IT_QST LSFT(IT_APOS)  // ?
#define IT_CRC LSFT(IT_IACC)  // ^
#define IT_ASTR LSFT(IT_PLUS) // *
#define IT_MORE LSFT(IT_LESS) // >
#define IT_COLN LSFT(IT_DOT)  // :
#define IT_SCLN LSFT(IT_COMM) // ;
#define IT_UNDS LSFT(IT_MINS) // _
#define IT_LCBR LSFT(IT_LBRC) // {
#define IT_RCBR LSFT(IT_RBRC) // }
#define IT_PIPE LSFT(IT_BSLS) // |

// Alt -ed characters
#define IT_LBRC LALT(IT_EACC)  // [
#define IT_RBRC LALT(IT_PLUS)  // ]
#define IT_AT LALT(IT_OACC)    // @
#define IT_EURO LALT(KC_E)     // €
#define IT_SHRP LALT(IT_AACC ) // #
#define IT_ACUT LALT(KC_8)     // ´
#define IT_GRAVE LALT(KC_9)    // `
#define IT_TILDE LALT(KC_5)    // ~
#define IT_PLMN LALT(LSFT(IT_IACC))  // ±

#endif