From patchwork Thu Nov 30 15:21:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 843053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-87675-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="g9b8hoUZ"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ynh230p6Qz9t2x for ; Fri, 1 Dec 2017 02:21:14 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=GU6omJr1nPzrIFu95RdgZGsqO9USC AhRDOjbiCeoa1uyKxLPcvbognMGw493Bz93yyNLoblpiq//lndFs3PqqAeNRZWU8 qhDH3IRjGJpg0CtTEqlPC13fj+lE7JtVKdjPS6B0nNIQoKD/iBl/X/ORxON6DsoP o6InvIgaYsIVMk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type; s=default; bh=0fq2RtiYZutH8mqvrUtulm3FP7s=; b=g9b 8hoUZOk9OOVJqN0S/xqU09rwboQ6XXYRMyFErX8dzS93uHo0/mwysksuTGdFfF67 jeM0y9OdmPJNIMkj97l/Ln6e5laYkT33epIUJgwTMXF8ldk/7GuqoHoKl6l55cRG URUNIbRpOwQfHaJk5aby6NKxXG+CVbxsxQi3ni50= Received: (qmail 64278 invoked by alias); 30 Nov 2017 15:21:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 64268 invoked by uid 89); 30 Nov 2017 15:21:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com From: Mike FABIAN To: GNU C Library Subject: [COMMITTED] hr_HR locale: fix collation and expand collation test file Date: Thu, 30 Nov 2017 16:21:03 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Subject: [COMMITTED] hr_HR locale: fix collation and expand collation test file To: GNU C Library hr_HR locale: fix collation and expand collation test file * localedata/locales/hr_HR (LC_COLLATE): Fix collation to make test case pass. * localedata/hr_HR.UTF-8.in: Add more test strings. From 5e56e937c9144e70a16793d2c5aa22d1bd0b2c18 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Thu, 30 Nov 2017 12:13:02 +0100 Subject: [PATCH 4/5] hr_HR locale: fix collation and expand collation test file * localedata/locales/hr_HR (LC_COLLATE): Fix collation to make test case pass. * localedata/hr_HR.UTF-8.in: Add more test strings. --- ChangeLog | 6 +++ localedata/hr_HR.UTF-8.in | 27 ++++++++++++ localedata/locales/hr_HR | 106 ++++++++++++++++++++-------------------------- 3 files changed, 80 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3c2c750bb..44f46d2dc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-11-30 Mike FABIAN + + * localedata/locales/hr_HR (LC_COLLATE): Fix collation + to make test case pass. + * localedata/hr_HR.UTF-8.in: Add more test strings. + 2017-11-30 Mike FABIAN * stdlib/tst-strfmon_l.c: Fix testcase. Needed because of [BZ #10580] diff --git a/localedata/hr_HR.UTF-8.in b/localedata/hr_HR.UTF-8.in index c33ee6a614..72f04bd7f0 100644 --- a/localedata/hr_HR.UTF-8.in +++ b/localedata/hr_HR.UTF-8.in @@ -6,7 +6,23 @@ cvrčić ćutjeti Dalekovidan disharmoničan +dza +ĎŽ +dž +dž +dŽ +Dž +Dž +DŽ +DŽ +dža +džepni +džepni +dŽepni +Džepni Džepni +DŽepni +DŽepni Džersej DŽezistički džip @@ -18,14 +34,25 @@ Edicija Lakovjeran limunčić lJekovito +ljenivac +ljenivac +Ljenivac Ljenivac +LJenivac +LJenivac Ljepljiv ljeskov ljetni LJutiti Mačić natočiti +njedra +njedra nJedra +Njedra +Njedra +NJedra +NJedra NJegovateljica Njemački njihalo diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR index 184364288c..a3b3a75387 100644 --- a/localedata/locales/hr_HR +++ b/localedata/locales/hr_HR @@ -67,8 +67,16 @@ END LC_CTYPE LC_COLLATE copy "iso14651_t1" -% define collating elements which should be considered -% as if they are digraphs while collating +% CLDR collation rules for Croatian +% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/hr.xml): +% &C<č<<<Č<ć<<<Ć +% &D from "" collating-element from "" collating-element from "" - -% {}, {} and {} -% make č, ć, dž, đ, lj, nj, š and ž distinct letters collating-symbol collating-symbol collating-symbol @@ -103,13 +108,10 @@ collating-symbol collating-symbol collating-symbol -% order them as: -% a b c č ć d dž đ e f g h i j k l lj m n nj o p r s š t u v z ž - reorder-after - +reorder-after reorder-after @@ -121,58 +123,44 @@ reorder-after reorder-after -% c č ć -reorder-after - ;;;IGNORE - ;;;IGNORE -reorder-after - ;;;IGNORE - ;;;IGNORE - -% d, dž and đ -% give collating elements collating value of dž -reorder-after - "";"";"";IGNORE - "";"";"";IGNORE - ;;;IGNORE -reorder-after - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE - ;;;IGNORE - -% give collating elements collating value of lj -reorder-after - "";"";"";IGNORE - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE - -% give collating elements collating value of nj -reorder-after - "";"";"";IGNORE - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE - -% s š -reorder-after - ;;;IGNORE -reorder-after - ;;;IGNORE - -% z ž -reorder-after - ;;;IGNORE -reorder-after - ;;;IGNORE + ;;;IGNORE % č + ;;;IGNORE % Č + ;;;IGNORE % ć + ;;;IGNORE % Ć + + "";"";"";IGNORE % dž + "";"";"";IGNORE % dž + "";"";"";IGNORE % dŽ + "";"";"";IGNORE % Dž + "";"";"";IGNORE % Dž + "";"";"";IGNORE % DŽ + "";"";"";IGNORE % DŽ + ;;;IGNORE % đ + ;;;IGNORE % Đ + + "";"";"";IGNORE % lj + "";"";"";IGNORE % lj + "";"";"";IGNORE % lJ + "";"";"";IGNORE % Lj + "";"";"";IGNORE % Lj + "";"";"";IGNORE % LJ + "";"";"";IGNORE % LJ + + "";"";"";IGNORE % nj + "";"";"";IGNORE % nj + "";"";"";IGNORE % nJ + "";"";"";IGNORE % Nj + "";"";"";IGNORE % Nj + "";"";"";IGNORE % NJ + "";"";"";IGNORE % NJ + + ;;;IGNORE % š + ;;;IGNORE % Š + + ;;;IGNORE % ž + ;;;IGNORE % Ž reorder-end - END LC_COLLATE LC_MESSAGES -- 2.14.3