Fix conversion errors leading to malformed keymap files.
MFC after: 3 days
This commit is contained in:
Stefan Eßer
parent
83886c28c9
commit
0ee7262a72
@ -262,7 +262,7 @@
|
||||
( 'i' 0xed ) ( 'n' 0x0144 ) ( 'o' 0xf3 ) ( 'u' 0xfa )
|
||||
( 'y' 0xfd )
|
||||
|
||||
dcir '^' ( <?'^?> ' ' <?^'?> ) ( 'A' 0xc2 ) ( 'I' 0xce ) ( 'O' 0xd4 )
|
||||
dcir '^' ( '^' '^' ) ( 'A' 0xc2 ) ( 'I' 0xce ) ( 'O' 0xd4 )
|
||||
( 'a' 0xe2 ) ( 'i' 0xee ) ( 'o' 0xf4 )
|
||||
|
||||
dbre 0x02d8 ( 0x02d8 0x02d8 ) ( 'A' 0x0102 ) ( 'a' 0x0103 )
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# A Dvorak keyboard for French
|
||||
#
|
||||
# This is a Dvorak-like layout for French
|
||||
# according to Francis Leboutte on
|
||||
# according to Francis Leboutte on
|
||||
# http://www.algo.be/ergo/dvorak-fr.html
|
||||
#
|
||||
# -Frédéric Praca <frederic.praca@freebsd-fr.org>
|
||||
@ -14,58 +14,58 @@
|
||||
# ------------------------------------------------------------------
|
||||
000 nop nop nop nop nop nop nop nop O
|
||||
001 esc esc esc esc esc esc debug esc O
|
||||
002 '=' '1' nop nop nop nop nop nop C
|
||||
003 '/' '2' nop nop nop nop nop nop C
|
||||
004 '-' '3' nop nop nop nop nop nop C
|
||||
005 'è' '4' nop nop nop nop nop nop C
|
||||
006 '\' '5' nop nop nop nop nop nop C
|
||||
007 dcir '6' nop nop nop nop nop nop C
|
||||
008 '(' '7' nop nop nop nop nop nop C
|
||||
009 dgra '8' nop nop nop nop nop nop C
|
||||
010 ')' '9' nop nop nop nop nop nop C
|
||||
011 '"' '0' nop nop nop nop nop nop C
|
||||
012 '[' '+' nop nop nop nop nop nop C
|
||||
013 ']' '%' nop nop nop nop nop nop C
|
||||
002 '=' '1' nop nop nop nop nop nop C
|
||||
003 '/' '2' nop nop nop nop nop nop C
|
||||
004 '-' '3' nop nop nop nop nop nop C
|
||||
005 0xe8 '4' nop nop nop nop nop nop C
|
||||
006 '\' '5' nop nop nop nop nop nop C
|
||||
007 dcir '6' nop nop nop nop nop nop C
|
||||
008 '(' '7' nop nop nop nop nop nop C
|
||||
009 dgra '8' nop nop nop nop nop nop C
|
||||
010 ')' '9' nop nop nop nop nop nop C
|
||||
011 '"' '0' nop nop nop nop nop nop C
|
||||
012 '[' '+' nop nop nop nop nop nop C
|
||||
013 ']' '%' nop nop nop nop nop nop C
|
||||
014 bs bs del del bs bs del del O
|
||||
015 ht btab nop nop ht btab nop nop O
|
||||
016 ':' '?' nop nop nop nop nop nop O
|
||||
017 ''' '<' nop nop nop nop nop nop C
|
||||
018 'é' '>' nop nop nop nop nop nop C
|
||||
019 'g' 'G' nop nop nop nop nop nop C
|
||||
020 '.' '!' nop nop nop nop nop nop O
|
||||
021 'h' 'H' nop nop nop nop nop nop C
|
||||
022 'v' 'V' nop nop nop nop nop nop C
|
||||
023 'c' 'C' nop nop nop nop nop nop C
|
||||
024 'm' 'M' nop nop nop nop nop nop C
|
||||
025 'k' 'K' nop nop nop nop nop nop C
|
||||
026 'z' 'Z' nop nop nop nop nop nop C
|
||||
027 ddia '&' nop nop nop nop nop nop O
|
||||
016 ':' '?' nop nop nop nop nop nop O
|
||||
017 ''' '<' nop nop nop nop nop nop C
|
||||
018 0xe9 '>' nop nop nop nop nop nop C
|
||||
019 'g' 'G' nop nop nop nop nop nop C
|
||||
020 '.' '!' nop nop nop nop nop nop O
|
||||
021 'h' 'H' nop nop nop nop nop nop C
|
||||
022 'v' 'V' nop nop nop nop nop nop C
|
||||
023 'c' 'C' nop nop nop nop nop nop C
|
||||
024 'm' 'M' nop nop nop nop nop nop C
|
||||
025 'k' 'K' nop nop nop nop nop nop C
|
||||
026 'z' 'Z' nop nop nop nop nop nop C
|
||||
027 ddia '&' nop nop nop nop nop nop O
|
||||
028 cr cr nl nl cr cr nl nl O
|
||||
029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O
|
||||
030 'o' 'O' nop nop nop nop nop nop C
|
||||
031 'a' 'A' nop nop nop nop nop nop C
|
||||
032 'u' 'U' nop nop nop nop nop nop C
|
||||
033 'e' 'E' nop nop nop nop nop nop C
|
||||
034 'b' 'B' nop nop nop nop nop nop C
|
||||
035 'f' 'F' nop nop nop nop nop nop C
|
||||
036 's' 'S' nop nop nop nop nop nop C
|
||||
037 't' 'T' nop nop nop nop nop nop C
|
||||
038 'n' 'N' nop nop nop nop nop nop C
|
||||
039 'd' 'D' nop nop nop nop nop nop C
|
||||
040 'w' 'W' nop nop nop nop nop nop C
|
||||
030 'o' 'O' nop nop nop nop nop nop C
|
||||
031 'a' 'A' nop nop nop nop nop nop C
|
||||
032 'u' 'U' nop nop nop nop nop nop C
|
||||
033 'e' 'E' nop nop nop nop nop nop C
|
||||
034 'b' 'B' nop nop nop nop nop nop C
|
||||
035 'f' 'F' nop nop nop nop nop nop C
|
||||
036 's' 'S' nop nop nop nop nop nop C
|
||||
037 't' 'T' nop nop nop nop nop nop C
|
||||
038 'n' 'N' nop nop nop nop nop nop C
|
||||
039 'd' 'D' nop nop nop nop nop nop C
|
||||
040 'w' 'W' nop nop nop nop nop nop C
|
||||
041 '_' '*' nop nop nop nop nop nop C
|
||||
042 lshift lshift lshift lshift lshift lshift lshift lshift O
|
||||
043 dtil '#' nop nop nop nop nop nop O
|
||||
044 ';' '|' nop nop nop nop nop nop O
|
||||
045 'q' 'Q' nop nop nop nop nop nop C
|
||||
046 ',' '@' nop nop nop nop nop nop O
|
||||
047 'i' 'I' nop nop nop nop nop nop C
|
||||
048 'y' 'Y' nop nop nop nop nop nop C
|
||||
049 'x' 'X' nop nop nop nop nop nop C
|
||||
050 'r' 'R' nop nop nop nop nop nop C
|
||||
051 'l' 'L' nop nop nop nop nop nop C
|
||||
052 'p' 'P' nop nop nop nop nop nop C
|
||||
053 'j' 'J' nop nop nop nop nop nop C
|
||||
043 dtil '#' nop nop nop nop nop nop O
|
||||
044 ';' '|' nop nop nop nop nop nop O
|
||||
045 'q' 'Q' nop nop nop nop nop nop C
|
||||
046 ',' '@' nop nop nop nop nop nop O
|
||||
047 'i' 'I' nop nop nop nop nop nop C
|
||||
048 'y' 'Y' nop nop nop nop nop nop C
|
||||
049 'x' 'X' nop nop nop nop nop nop C
|
||||
050 'r' 'R' nop nop nop nop nop nop C
|
||||
051 'l' 'L' nop nop nop nop nop nop C
|
||||
052 'p' 'P' nop nop nop nop nop nop C
|
||||
053 'j' 'J' nop nop nop nop nop nop C
|
||||
054 rshift rshift rshift rshift rshift rshift rshift rshift O
|
||||
055 '*' '*' '*' '*' '*' '*' '*' '*' O
|
||||
056 lalt lalt lalt lalt lalt lalt lalt lalt O
|
||||
@ -98,7 +98,7 @@
|
||||
083 del '.' '.' '.' '.' '.' boot boot N
|
||||
084 nop nop nop nop nop nop nop nop O
|
||||
085 nop nop nop nop nop nop nop nop O
|
||||
086 'à' 'ç' nop nop nop nop nop nop O
|
||||
086 0xe0 0xe7 nop nop nop nop nop nop O
|
||||
087 fkey11 fkey23 fkey35 fkey47 scr11 scr11 scr11 scr11 O
|
||||
088 fkey12 fkey24 fkey36 fkey48 scr12 scr12 scr12 scr12 O
|
||||
089 cr cr nl nl cr cr nl nl O
|
||||
@ -115,31 +115,35 @@
|
||||
100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O
|
||||
101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O
|
||||
102 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O
|
||||
103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O
|
||||
103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O
|
||||
104 slock saver slock saver susp nop susp nop O
|
||||
105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O
|
||||
106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
|
||||
107 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 O
|
||||
108 nop nop nop nop nop nop nop nop O
|
||||
|
||||
dgra '`' ( '/' '±' ) ( '-' 'Œ' ) ( 'è' 'œ' ) ( '\' 'Ÿ' )
|
||||
( '?' 'Æ' ) ( 'C' 'Ç' )
|
||||
( ':' 'æ' ) ( '`' '$' ) ( 'é' 'É' ) ( 'g' 164 )
|
||||
( '.' '°' ) ( 'c' 'ç' ) ( 'm' 'µ' )
|
||||
( 'O' 'Ò' ) ( 'A' 192 ) ( 'U' 'Ù' ) ( 'E' 'È' )
|
||||
( 'o' 'ò' ) ( 'a' 'à' ) ( 'u' 'ù' ) ( 'e' 'è' )
|
||||
( 's' '«' ) ( 'n' '»' )
|
||||
( 'ç' 'Ç' ) ( '|' 188 ) ( 'I' 'Ì' )
|
||||
( 'à' 192 ) ( ';' 189 ) ( 'q' '{' ) ( ',' '}' )
|
||||
( 'i' 'ì' ) ( 'r' 'º' ) ( 'p' '§' )
|
||||
( '!' '¡' )
|
||||
dcir '^' ( 'a' 'â' ) ( 'e' 'ê' ) ( 'i' 'î' ) ( 'o' 'ô' ) ( 'u' 'û' )
|
||||
( 'A' 'Â' ) ( 'E' 'Ê' ) ( 'I' 'Î' ) ( 'O' 'Ô' ) ( 'U' 'Û' )
|
||||
dtil '~' ( 'n' 'ñ' ) ( 'N' 'Ñ' )
|
||||
( 'a' 'ã' ) ( 'A' 'Ã' ) ( 'o' 'õ' ) ( 'O' 'Õ' )
|
||||
ddia '"' ( 'a' 'ä' ) ( 'e' 'ë' ) ( 'i' 'ï' ) ( 'o' 'ö' ) ( 'u' 'ü' )
|
||||
( 'A' 'Ä' ) ( 'E' 'Ë' ) ( 'I' 'Ï' ) ( 'O' 'Ö' ) ( 'U' 'Ü' )
|
||||
( 'y' 255 ) ( 'Y' 190 )
|
||||
dacu 0xb4 ( 'a' 'á' ) ( 'e' 'é' ) ( 'i' 237 ) ( 'o' 'ó') ( 'u' 'ú' )
|
||||
( 'A' 'Á' ) ( 'E' 'É' ) ( 'I' 'Í' ) ( 'O' 'Ó' ) ( 'U' 'Ú' )
|
||||
( 'Y' 221 ) ( 'y' 253 )
|
||||
dgra '`' ( '/' 0xb1 ) ( '-' 0x0152 ) ( 0xe8 0x0153 ) ( '\' 0x0178 )
|
||||
( '?' 0xc6 ) ( 'C' 0xc7 )
|
||||
( ':' 0xe6 ) ( '`' '$' ) ( 0xe9 0xc9 ) ( 'g' 0x20ac )
|
||||
( '.' 0xb0 ) ( 'c' 0xe7 ) ( 'm' 0xb5 )
|
||||
( 'O' 0xd2 ) ( 'A' 0xc0 ) ( 'U' 0xd9 ) ( 'E' 0xc8 )
|
||||
( 'o' 0xf2 ) ( 'a' 0xe0 ) ( 'u' 0xf9 ) ( 'e' 0xe8 )
|
||||
( 's' 0xab ) ( 'n' 0xbb )
|
||||
( 0xe7 0xc7 ) ( '|' 0x0152 ) ( 'I' 0xcc )
|
||||
( 0xe0 0xc0 ) ( ';' 0x0153 ) ( 'q' '{' ) ( ',' '}' )
|
||||
( 'i' 0xec ) ( 'r' 0xba ) ( 'p' 0xa7 )
|
||||
( '!' 0xa1 )
|
||||
|
||||
dcir '^' ( 'a' 0xe2 ) ( 'e' 0xea ) ( 'i' 0xee ) ( 'o' 0xf4 ) ( 'u' 0xfb )
|
||||
( 'A' 0xc2 ) ( 'E' 0xca ) ( 'I' 0xce ) ( 'O' 0xd4 ) ( 'U' 0xdb )
|
||||
|
||||
dtil '~' ( 'n' 0xf1 ) ( 'N' 0xd1 )
|
||||
( 'a' 0xe3 ) ( 'A' 0xc3 ) ( 'o' 0xf5 ) ( 'O' 0xd5 )
|
||||
|
||||
ddia '"' ( 'a' 0xe4 ) ( 'e' 0xeb ) ( 'i' 0xef ) ( 'o' 0xf6 ) ( 'u' 0xfc )
|
||||
( 'A' 0xc4 ) ( 'E' 0xcb ) ( 'I' 0xcf ) ( 'O' 0xd6 ) ( 'U' 0xdc )
|
||||
( 'y' 0xff ) ( 'Y' 0x0178 )
|
||||
|
||||
dacu 0x017d ( 'a' 0xe1 ) ( 'e' 0xe9 ) ( 'i' 0xed ) ( 'o' 0xf3 ) ( 'u' 0xfa )
|
||||
( 'A' 0xc1 ) ( 'E' 0xc9 ) ( 'I' 0xcd ) ( 'O' 0xd3 ) ( 'U' 0xda )
|
||||
( 'Y' 0xdd ) ( 'y' 0xfd )
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
006 '5' '%' nop nop nop nop nop nop O
|
||||
007 '6' '&' nop nop nop nop nop nop O
|
||||
# Alt + Shift + 7 = ÷
|
||||
008 '7' '/' nop nop '{' <?'÷'?> nop nop O
|
||||
008 '7' '/' nop nop '{' 0xf7 nop nop O
|
||||
009 '8' '(' nop nop '[' nop nop nop O
|
||||
010 '9' ')' nop nop ']' nop gs nop O
|
||||
011 '0' '=' nop nop '}' nop nop nop O
|
||||
@ -24,24 +24,24 @@
|
||||
016 'q' 'Q' dc1 dc1 'q' 'Q' dc1 dc1 C
|
||||
017 'w' 'W' etb etb 'w' 'W' etb etb C
|
||||
# Alt + Ctrl + E = French e (as in café)
|
||||
018 'e' 'E' enq enq 0x20ac 'E' <?'é'?> enq C
|
||||
018 'e' 'E' enq enq 0x20ac 'E' 0xe9 enq C
|
||||
# Alt + R = Copyright sign
|
||||
019 'r' 'R' dc2 dc2 <?'®'?> 'R' dc2 dc2 C
|
||||
019 'r' 'R' dc2 dc2 0xae 'R' dc2 dc2 C
|
||||
020 't' 'T' dc4 dc4 't' 'T' dc4 dc4 C
|
||||
021 'y' 'Y' em em 'y' 'Y' em em C
|
||||
# Alt + U = Mikro, Alt + Shift + U = German u
|
||||
022 'u' 'U' nak nak <?'µ'?> 'U' <?'ü'?> <?'Ü'?> C
|
||||
022 'u' 'U' nak nak 0xb5 'U' 0xfc 0xdc C
|
||||
023 'i' 'I' ht ht 'i' 'I' ht ht C
|
||||
# Alt + O = Norwegian/Danish Ã
|
||||
024 'o' 'O' si si <?'ø'?> <?'Ø'?> si si C
|
||||
024 'o' 'O' si si 0xf8 0xd8 si si C
|
||||
# Alt + P = Pi
|
||||
025 'p' 'P' dle dle <?'¶'?> 'P' dle dle C
|
||||
025 'p' 'P' dle dle 0xb6 'P' dle dle C
|
||||
026 0xe5 0xc5 nop nop '}' ']' nop nop C
|
||||
027 0x0161 '^' nop nop '~' nop nop nop O
|
||||
028 cr cr nl nl cr cr nl nl O
|
||||
029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O
|
||||
# Alt + A = At sign, Ctrl+Alt = ae, Ctrl+Alt+Shift = AE
|
||||
030 'a' 'A' soh soh '@' 'A' <?'æ'?> <?'Æ'?> C
|
||||
030 'a' 'A' soh soh '@' 'A' 0xe6 0xc6 C
|
||||
031 's' 'S' dc3 dc3 's' 'S' dc3 dc3 C
|
||||
032 'd' 'D' eot eot 'd' 'D' eot eot C
|
||||
033 'f' 'F' ack ack 'f' 'F' ack ack C
|
||||
@ -61,7 +61,7 @@
|
||||
046 'c' 'C' etx etx 'c' 'C' etx etx C
|
||||
047 'v' 'V' syn syn 'v' 'V' syn syn C
|
||||
# Ctrl + Shift + B = German B
|
||||
048 'b' 'B' stx <?'ß'?> 'b' 'B' stx stx C
|
||||
048 'b' 'B' stx 0xdf 'b' 'B' stx stx C
|
||||
049 'n' 'N' so so 'n' 'N' so so C
|
||||
# Alt + M = Mikro
|
||||
050 'm' 'M' cr cr 0xb5 'M' cr cr C
|
||||
|
||||
@ -115,4 +115,3 @@
|
||||
106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
|
||||
107 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 O
|
||||
108 nop nop nop nop nop nop nop nop O
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user