Created attachment 110233 [details] patch to fix Mari variant of Russian layout I have found some mistakes in Mari variant of Russian keyboard layout. Here is a patch to fix it. Being a native speaker It should be noticed, that Mari language has only 5 additional letters to standart Russian alphabet (but current layout has 7, some of which are wrong). The right symbols are: * cyrillic a with diaresis, * cyrillic u with diaresis, * cyrillic yeru (curillic ui) with diaresis, * cyrillic o with diaresis * cyrillic legature en ghe The patch fixes this problem.
The file that should be patched in tree is root/symbols/ru. This file on installed linux machine in filesystem located at /usr/share/X11/xkb/symbols/ru
Hmm. The patch is not very clean: in some lines it merely makes whitespace changes. Please don't do that -- it obscures the real changes that you make. Also please don't change the position of the include line, and don't add back the pointless "based on" comment line. As for the actual changes, could you discuss with the poster of the current layout (in bug 32532) about why he included the things that you are wrong? As for getting the patch applied, please be patient -- it can take several days or even weeks for the maintainer of xkeyboard-config to respond or apply stuff.
Viatcheslav is from the same localization group that I was working with when I submitted the original version, so I defer to their judgment on correctness of layout, although I have asked him privately to provide some explanation here for the change, at least for posterity's sake. I am also working with him to help him make a clean patch, so that should be resolved shortly.
Created attachment 110419 [details] [review] More cleaner patch
I have attached new patch. Now it should be clean. What does this patch changes: First of all it changes include file. - include "ru(common)" + include "ru(winkeys)" Now Mari variant is based on winkeys variant, therefore dot, comma and other such symbols would work proper. Second change deletes some keymaps that are not from Mari language: - key <AC11> { [ Cyrillic_e, Cyrillic_E, U04E9, U04E8 ] }; - key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, U04EB, U04EA ] }; - key <AC01> { [ Cyrillic_ef, Cyrillic_EF, UF537, UF536 ] }; Letters U04E9 and U04E8 are from Udmurt language, Mari language does not have such letters. And what about UF537 and UF536 - I don't even know what language these letters are from. Being a native speaker I am absolutely certain that Mari language does not have such letters. And the third change adds one keymap: + key <AC07> { [ Cyrillic_o, Cyrillic_O, U04E7, U04E6 ] }; This two letters (U04E7, U04E6) were missed in original layout, though they are used in Mari language and Mari alphabet have them.
Thanks, Viatcheslav. As the contributor of the previous layout, I have no concerns with the patch and am glad to see the Mari community contributing directly now.
(In reply to Viatcheslav Kileev from comment #5) Thanks for the detailed explanations, Viatcheslav. The patch looks nice now. Except... for the subject line. It now says just "[PATCH] b", but it should instead very succinctly describe the change that is made. I would propose something like: "[PATCH] symbols/ru: remove non-Mari letters from Mari layout and add the missing one". After a blank line you then add the URL of this bug (https://bugs.freedesktop.org/show_bug.cgi?id=86858) so interested people can later easily find the full rationale for the change.
> Except... for the subject line. It now says just "[PATCH] b", but it should > instead very succinctly describe the change that is made. I would propose > something like: "[PATCH] symbols/ru: remove non-Mari letters from Mari > layout and add the missing one". After a blank line you then add the URL of > this bug > (https://bugs.freedesktop.org/show_bug.cgi?id=86858) so interested people > can later easily find the full rationale for the change. Yes please, I would second that request. Let's make that patch absolutely beautiful before I commit it.
Created attachment 110684 [details] [review] updated patch I'm new in creating patches, so thanks a lot for your attempts in teaching me how to create them. I have added the description to header as Benno suggested. I suppose that patch file should be perfect now.
The patch was nearly perfect:) I had to remove xkeyboard-config from the file paths. Anyway, it is in git now. Thank you!
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.