Created attachment 36210 [details] [review] SFS 5966 Annex 4 implementation I'm attaching a patch that adds Annex 4 of SFS 5966 for Finland (nls/fi_FI.UTF-8/Compose.pre) and fixes two typos in Annex 3 (which were actually copied verbatim from the standard text). The implementation of the standard is complete after applying this patch. Thanks.
This patch breaks make check: make[2]: Entering directory `/home/julien/src/debian.org/git/pkg-xorg/lib/libx11/build/nls/fi_FI.UTF-8' Clash with existing sequence in Compose on line 309: <dead_breve> <a> line #309: <dead_breve> <a> : "ă" # LATIN SMALL LETTER A WITH BREVE line #60: <dead_breve> <a> : "ă" # LATIN SMALL LETTER A WITH BREVE Clash with existing sequence in Compose on line 315: <dead_breve> <A> line #315: <dead_breve> <A> : "Ă" # LATIN CAPITAL LETTER A WITH BREVE line #61: <dead_breve> <A> : "Ă" # LATIN CAPITAL LETTER A WITH BREVE Clash with existing sequence in Compose on line 323: <dead_circumflex> <a> line #323: <dead_circumflex> <a> : "â" # LATIN SMALL LETTER A WITH CIRCUMFLEX line #131: <dead_circumflex> <a> : "â" # LATIN SMALL LETTER A WITH CIRCUMFLEX Clash with existing sequence in Compose on line 329: <dead_circumflex> <A> line #329: <dead_circumflex> <A> : "Â" # LATIN CAPITAL LETTER A WITH CIRCUMFLEX line #132: <dead_circumflex> <A> : "Â" # LATIN CAPITAL LETTER A WITH CIRCUMFLEX Clash with existing sequence in Compose on line 335: <dead_circumflex> <e> line #335: <dead_circumflex> <e> : "ê" # LATIN SMALL LETTER E WITH CIRCUMFLEX line #135: <dead_circumflex> <e> : "ê" # LATIN SMALL LETTER E WITH CIRCUMFLEX Clash with existing sequence in Compose on line 341: <dead_circumflex> <E> line #341: <dead_circumflex> <E> : "Ê" # LATIN CAPITAL LETTER E WITH CIRCUMFLEX line #136: <dead_circumflex> <E> : "Ê" # LATIN CAPITAL LETTER E WITH CIRCUMFLEX Clash with existing sequence in Compose on line 347: <dead_circumflex> <o> line #347: <dead_circumflex> <o> : "ô" # LATIN SMALL LETTER O WITH CIRCUMFLEX line #145: <dead_circumflex> <o> : "ô" # LATIN SMALL LETTER O WITH CIRCUMFLEX Clash with existing sequence in Compose on line 353: <dead_circumflex> <O> line #353: <dead_circumflex> <O> : "Ô" # LATIN CAPITAL LETTER O WITH CIRCUMFLEX line #146: <dead_circumflex> <O> : "Ô" # LATIN CAPITAL LETTER O WITH CIRCUMFLEX Clash with existing sequence in Compose on line 361: <dead_diaeresis> <a> line #361: <dead_diaeresis> <a> : "ä" # LATIN SMALL LETTER A WITH DIAERESIS line #158: <dead_diaeresis> <a> : "ä" # LATIN SMALL LETTER A WITH DIAERESIS Clash with existing sequence in Compose on line 363: <dead_diaeresis> <A> line #363: <dead_diaeresis> <A> : "Ä" # LATIN CAPITAL LETTER A WITH DIAERESIS line #159: <dead_diaeresis> <A> : "Ä" # LATIN CAPITAL LETTER A WITH DIAERESIS Clash with existing sequence in Compose on line 413: <dead_ogonek> <o> line #413: <dead_ogonek> <o> : "ǫ" # LATIN SMALL LETTER O WITH OGONEK line #263: <dead_ogonek> <o> : "ǫ" # LATIN SMALL LETTER O WITH OGONEK Clash with existing sequence in Compose on line 415: <dead_ogonek> <O> line #415: <dead_ogonek> <O> : "Ǫ" # LATIN CAPITAL LETTER O WITH OGONEK line #264: <dead_ogonek> <O> : "Ǫ" # LATIN CAPITAL LETTER O WITH OGONEK Clash with existing sequence in Compose on line 419: <dead_abovering> <a> line #419: <dead_abovering> <a> : "å" # LATIN SMALL LETTER A WITH RING ABOVE line #270: <dead_abovering> <a> : "å" # LATIN SMALL LETTER A WITH RING ABOVE Clash with existing sequence in Compose on line 421: <dead_abovering> <A> line #421: <dead_abovering> <A> : "Å" # LATIN CAPITAL LETTER A WITH RING ABOVE line #271: <dead_abovering> <A> : "Å" # LATIN CAPITAL LETTER A WITH RING ABOVE FAIL: ../../../nls/compose-check.pl ======================================================================== 1 of 1 test failed Please report to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ======================================================================== make[2]: *** [check-TESTS] Error 1 Can you update it to not do that? Thanks.
Created attachment 36251 [details] [review] SFS 5966 Annex 4 implementation Updated patch attached - duplicate definitions removed, now passes make check and still fully implements the standard. Thanks.
Applied, thanks! commit a25ae169862ab9b76daf259613b37c6b07bc2ef2 Author: Marko Myllynen <myllynen@redhat.com> Date: Sun Jun 13 19:23:05 2010 +0300 Implement SFS 5966 Annex 4 for Finland This patch adds Annex 4 of SFS 5966 for Finland and fixes two typos in Annex 3 (which were actually copied verbatim from the standard text). The implementation of the standard is now complete. X.Org bug#28498 <https://bugs.freedesktop.org/show_bug.cgi?id=28498> Signed-off-by: Julien Cristau <jcristau@debian.org>
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.