Merge remote-tracking branch 'origin/master' into develop

1 files changed, 101 insertions, 0 deletions

diff --git a/users/ericgebhart/defs/accented_keys.def b/users/ericgebhart/defs/accented_keys.def
new file mode 100644
index 0000000000..a0b203be93
--- /dev/null
+++ b/users/ericgebhart/defs/accented_keys.def
@@ -0,0 +1,101 @@
+// Accented keys.
+// add them to the custom keys enum.
+// List them here, with their keycode and the accent keycode
+// that are needed to create them.
+
+
+// Last, most frequent letters in french.
+// é is further up.
+// 24	x	3 588 990	0.38%
+// 25	j	3 276 064	0.34%
+// 26	è	2 969 466	0.31%
+// 27	à	2 966 029	0.31%
+// 28	k	2 747 547	0.29%
+// 29	w	1 653 435	0.17%
+// 30	z	1 433 913	0.15%
+// 31	ê	802 211	0.08%
+// 32	ç	544 509	0.06%
+// 33	ô	357 197	0.04%
+// 34	â	320 837	0.03%
+// 35	î	280 201	0.03%
+// 36	û	164 516	0.02%
+// 37	ù	151 236	0.02%
+// 38	ï	138 221	0.01%
+// 39	á	73 751	0.01%	 - absent.
+// 79	ü	55 172	0.01%
+// 82	ë	53 862	0.01%
+//absent.
+// 83	ö	51 020	0.01%
+// 84	í	48 391	0.01%
+
+ // ACCENT
+// Custom key code,  Keycode, altgr accent keycode.
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+ACCENTED(BP_OCIR, BP_O, BP_DCIR)
+ACCENTED(BP_ACIR, BP_A, BP_DCIR)
+ACCENTED(BP_ICIR, BP_I, BP_DCIR)
+ACCENTED(BP_UCIR, BP_U, BP_DCIR)
+//ACCENTED(BP_CCIR, BP_C, BP_DCIR)
+//ACCENTED(BP_GCIR, BP_G, BP_DCIR)
+//ACCENTED(BP_HCIR, BP_H, BP_DCIR)
+#endif
+
+ACCENTED(US_OCIR, US_O, US_DCIR)
+ACCENTED(US_ACIR, US_A, US_DCIR)
+ACCENTED(US_ICIR, US_I, US_DCIR)
+ACCENTED(US_UCIR, US_U, US_DCIR)
+ACCENTED(US_ECIR, US_E, US_DCIR)
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+ACCENTED(BP_AACU, BP_A, BP_ACUT)
+ACCENTED(BP_OACU, BP_O, BP_ACUT)
+ACCENTED(BP_IACU, BP_I, BP_ACUT)
+ACCENTED(BP_UACU, BP_U, BP_ACUT)
+
+//ACCENTED(BP_OGRV, BP_O, BP_DGRV)
+ACCENTED(BP_IGRV, BP_I, BP_DGRV)
+#endif
+
+ACCENTED(US_IGRV, US_I, US_DGRV)
+ACCENTED(US_UGRV, US_U, US_DGRV)
+ACCENTED(US_EGRV, US_E, US_DGRV)
+ACCENTED(US_AGRV, US_A, US_DGRV)
+
+// ACCENTED(BP_NTIL, BP_N, BP_DTIL)
+// ACCENTED(BP_ATIL, BP_A, BP_DTIL)
+// ACCENTED(BP_OTIL, BP_O, BP_DTIL)
+// ACCENTED(BP_UTIL, BP_U, BP_DTIL)
+
+ACCENTED(US_IIAE, US_I, US_DIAE)
+ACCENTED(US_UIAE, US_U, US_DIAE)
+ACCENTED(US_EIAE, US_E, US_DIAE)
+ACCENTED(US_OIAE, US_O, US_DIAE)
+
+#if defined(SECOND_LOCALE) && (SECOND_LOCALE == BEPO)
+ACCENTED(BP_IIAE, BP_I, BP_DIAE)
+ACCENTED(BP_UIAE, BP_U, BP_DIAE)
+ACCENTED(BP_EIAE, BP_E, BP_DIAE)
+ACCENTED(BP_OIAE, BP_O, BP_DIAE)
+// ACCENTED(BP_AIAE, BP_A, BP_DIAE)
+#endif
+
+  // ACCENTED(E_ACUTE, SK_E, SK_ACUT)
+  // ACCENTED(R_ACUTE, SK_R, SK_ACUT)
+  // ACCENTED(U_ACUTE, SK_U, SK_ACUT)
+  // ACCENTED(I_ACUTE, SK_I, SK_ACUT)
+  // ACCENTED(O_ACUTE, SK_O, SK_ACUT)
+  // ACCENTED(A_ACUTE, SK_A, SK_ACUT)
+  // ACCENTED(L_ACUTE, SK_L, SK_ACUT)
+  // ACCENTED(Y_ACUTE, SK_Z, SK_ACUT)
+  // ACCENTED(T_CARON, SK_T, SK_CARN)
+  // ACCENTED(Z_CARON, SK_Y, SK_CARN)
+  // ACCENTED(O_CARON, SK_O, SK_CARN)
+  // ACCENTED(S_CARON, SK_S, SK_CARN)
+  // ACCENTED(D_CARON, SK_D, SK_CARN)
+  // ACCENTED(L_CARON, SK_L, SK_CARN)
+  // ACCENTED(C_CARON, SK_C, SK_CARN)
+  // ACCENTED(N_CARON, SK_N, SK_CARN)
+  // ACCENTED(U_UMLAU, SK_U, SK_DIAE
+  // ACCENTED(O_UMLAU,SK_O, SK_DIAE)
+  // // napis o s vokanom cez vokan rather than normalne aby sa dalo velke uo
+  // ACCENTED(O_CCIRC, SK_O, SK_CIRC)