diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-12 16:23:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-12 16:23:41 (GMT) |
| commit | 43b775d29369a1dc3315abb9521b3d697069433b (patch) | |
| tree | 303540a032daaf82e6b5565f0ff39bb108594ab8 | |
| parent | d72326e2c7dfda17f989a465004d7b94266747b0 (diff) | |
| parent | 6861f52317f285a87e4fded9020dc541cb54d6fb (diff) | |
| download | tk-43b775d29369a1dc3315abb9521b3d697069433b.zip tk-43b775d29369a1dc3315abb9521b3d697069433b.tar.gz tk-43b775d29369a1dc3315abb9521b3d697069433b.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | doc/keysyms.n | 10 | ||||
| -rw-r--r-- | generic/ks_names.h | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/doc/keysyms.n b/doc/keysyms.n index 808561f..b9ccd84 100644 --- a/doc/keysyms.n +++ b/doc/keysyms.n @@ -129,7 +129,7 @@ nobreakspace 160 0xA0 \(ad (diaeresis) 168 0xA8 \(co (copyright) 169 0xA9 \(Of (ordfeminine) 170 0xAA -\(Fo (guillemotleft) 171 0xAB +\(Fo (guillemetleft) 171 0xAB \(no (notsign) 172 0xAC hyphen 173 0xAD \(rg (registered) 174 0xAE @@ -144,8 +144,8 @@ hyphen 173 0xAD \(pc (periodcentered) 183 0xB7 \(ac (cedilla) 184 0xB8 \(S1 (onesuperior) 185 0xB9 -\(Om (masculine) 186 0xBA -\(Fc (guillemotright) 187 0xBB +\(Om (ordmasculine) 186 0xBA +\(Fc (guillemetright) 187 0xBB \(14 (onequarter) 188 0xBC \(12 (onehalf) 189 0xBD \(34 (threequarters) 190 0xBE @@ -1093,8 +1093,8 @@ dead_o 65158 0xFE86 dead_O 65159 0xFE87 dead_u 65160 0xFE88 dead_U 65161 0xFE89 -dead_small_schwa 65162 0xFE8A -dead_capital_schwa 65163 0xFE8B +dead_schwa 65162 0xFE8A +dead_SCHWA 65163 0xFE8B dead_greek 65164 0xFE8C dead_lowline 65168 0xFE90 dead_aboveverticalline 65169 0xFE91 diff --git a/generic/ks_names.h b/generic/ks_names.h index 8aa1715..9fe91f6 100644 --- a/generic/ks_names.h +++ b/generic/ks_names.h @@ -310,7 +310,9 @@ { "dead_O", 0xFE87 }, { "dead_u", 0xFE88 }, { "dead_U", 0xFE89 }, +{ "dead_schwa", 0xFE8A }, { "dead_small_schwa", 0xFE8A }, +{ "dead_SCHWA", 0xFE8B }, { "dead_capital_schwa", 0xFE8B }, { "dead_greek", 0xFE8C }, { "dead_lowline", 0xFE90 }, @@ -483,6 +485,7 @@ { "diaeresis", 0xA8 }, { "copyright", 0xA9 }, { "ordfeminine", 0xAA }, +{ "guillemetleft", 0xAB }, { "guillemotleft", 0xAB }, { "notsign", 0xAC }, { "hyphen", 0xAD }, @@ -498,7 +501,9 @@ { "periodcentered", 0xB7 }, { "cedilla", 0xB8 }, { "onesuperior", 0xB9 }, +{ "ordmasculine", 0xBA }, { "masculine", 0xBA }, +{ "guillemetright", 0xBB }, { "guillemotright", 0xBB }, { "onequarter", 0xBC }, { "onehalf", 0xBD }, @@ -530,9 +535,7 @@ { "Odiaeresis", 0xD6 }, { "multiply", 0xD7 }, { "Oslash", 0xD8 }, -#ifndef TK_NO_DEPRECATED { "Ooblique", 0xD8 }, -#endif { "Ugrave", 0xD9 }, { "Uacute", 0xDA }, { "Ucircumflex", 0xDB }, @@ -566,6 +569,7 @@ { "odiaeresis", 0xF6 }, { "division", 0xF7 }, { "oslash", 0xF8 }, +{ "ooblique", 0xF8 }, { "ugrave", 0xF9 }, { "uacute", 0xFA }, { "ucircumflex", 0xFB }, |