From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.bugs Subject: bug#24603: [PATCHv5 06/11] Implement special sigma casing rule (bug#24603) Date: Thu, 9 Mar 2017 22:51:45 +0100 Message-ID: <20170309215150.9562-7-mina86@mina86.com> References: <20170309215150.9562-1-mina86@mina86.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1489096405 32254 195.159.176.226 (9 Mar 2017 21:53:25 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Mar 2017 21:53:25 +0000 (UTC) To: 24603@debbugs.gnu.org, eliz@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 09 22:53:21 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm5zm-0007Mc-4P for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Mar 2017 22:53:14 +0100 Original-Received: from localhost ([::1]:36399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cm5zs-0002jI-1Z for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Mar 2017 16:53:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cm5ze-0002g9-Hc for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cm5zb-0004J3-FU for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cm5zb-0004Iz-Bj for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cm5zb-0000PC-4q for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 09 Mar 2017 21:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24603 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 24603-submit@debbugs.gnu.org id=B24603.14890963311375 (code B ref 24603); Thu, 09 Mar 2017 21:53:03 +0000 Original-Received: (at 24603) by debbugs.gnu.org; 9 Mar 2017 21:52:11 +0000 Original-Received: from localhost ([127.0.0.1]:48101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm5yl-0000M4-06 for submit@debbugs.gnu.org; Thu, 09 Mar 2017 16:52:11 -0500 Original-Received: from mail-wm0-f43.google.com ([74.125.82.43]:36473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm5yh-0000L1-IH for 24603@debbugs.gnu.org; Thu, 09 Mar 2017 16:52:08 -0500 Original-Received: by mail-wm0-f43.google.com with SMTP id n11so149499358wma.1 for <24603@debbugs.gnu.org>; Thu, 09 Mar 2017 13:52:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UBNjKjVl0y5D8JBeXUbYLhMPLaCKvbC7PtPbRUqq/i8=; b=aynBl2Mav3ucC+BEtlBX+XQJtnsP+V5j0GDyfx0nqy1zJdv1MrYOASeKy0p8OSoYDJ 4/fDYGxh3udqNc0OgjBX5EDQH44ulb8lpXz6rwAS7XPX92FeSyAigwAkdw6u/6XX7YCI G42eWtp+HOj+QWaB/picQuWNw9axppzkOq+2Wi7oRs5I0kj4JDomKvT1Va1IN5rfqQMp tiR2GF6CNNl0vFTsa+yhYJLQmXDxzrs5o/4r4WhGkbsLFR5fWcXMoZZb1C1NaODq6Ei1 1btCk1zGarW59buFyWnobRoBtfT1zqmoCStJ4WYfK5tIKaqgM21DJviEoi8IjvJ7wVyH ZUqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UBNjKjVl0y5D8JBeXUbYLhMPLaCKvbC7PtPbRUqq/i8=; b=fkhBmUlOlSkM7lHdStPYOhy+Z503HnWfGomKgydyAn/erE+X70GagIIrUqwdGwBawR u0EcfIRm6tV9+b0NMbYqhlxhUY8ax6FZVxvl2n6BX/veRakj6PsuJBnyUp5lMd17fUZX BtKVrUvLH9h973Jv99bFlPmXJ6EwdmF05sWoyHfaqfflT281aqndkKChk5S9WGmAOKaP jtF94J/VvKrYywQaxjy+WFKXyJOtQpxuti3e8vdWzBrPF3KC//eiUiTqXkoOY99+bWwE AgO/iOJA+Cu2vk5EvCtzBnksz4sPcN6h+hjh/w5zrQP2O4Ekb1KrRXV/WKV4X9VJD29k R8IQ== X-Gm-Message-State: AMke39m/OnrPj0/PhBa54QS8rH4WE115jdzvD/oFCqYFbpq7tl45jzfwDRfSGO8NGOMuUSSg X-Received: by 10.28.93.68 with SMTP id r65mr13156714wmb.133.1489096321484; Thu, 09 Mar 2017 13:52:01 -0800 (PST) Original-Received: from mpn.zrh.corp.google.com ([172.16.115.43]) by smtp.gmail.com with ESMTPSA id q75sm261288wmd.27.2017.03.09.13.51.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2017 13:52:00 -0800 (PST) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id 74E5B1E0295; Thu, 9 Mar 2017 22:51:58 +0100 (CET) X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog In-Reply-To: <20170309215150.9562-1-mina86@mina86.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:130395 Archived-At: In Greek, a sigma character has two lower case forms which depend on their position in the word. Implement logic determining it. * src/casefiddle.c (struct casing_context, case_character_impl): Don’t assume inword is true when flag is CASE_UP and false when flag is CASE_DOWN. For final sigma detection we need this information tracked reliably;. (CAPITAL_SIGMA, SMALL_SIGMA, SMALL_FINAL_SIGMA): New macros defining Unicode code point of different forms of sigma letter. (case_character): Implement support for final sigma casing. (do_casify_multibyte_string, do_casify_multibyte_region): Update after changes to case_character. * test/src/casefiddle-tests.el (casefiddle-tests-casing): Add test cases for final sigma. --- etc/NEWS | 5 +++ src/casefiddle.c | 73 +++++++++++++++++++++++++++++++++----------- test/src/casefiddle-tests.el | 15 +++++---- 3 files changed, 69 insertions(+), 24 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 902b91a2f1a..a080a95e276 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -363,6 +363,11 @@ of incorrect DŽungla). *** Characters which turn into multiple ones when cased are correctly handled. For example, fi ligature is converted to FI when upper cased. +*** Greek small sigma is correctly handled when at the end of the word. +Strings such as ΌΣΟΣ are now correctly converted to Όσος when +capitalized instead of incorrect Όσοσ (compare lowercase sigma at the +end of the word). + * Changes in Specialized Modes and Packages in Emacs 26.1 diff --git a/src/casefiddle.c b/src/casefiddle.c index 36b9de3ba90..2f573782115 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -47,9 +47,7 @@ struct casing_context { When run on a buffer, syntax_prefix_flag_p is taken into account when determined inword flag. */ bool inbuffer; - /* Conceptually, this denotes whether we are inside of a word except - that if flag is CASE_UP it’s always false and if flag is CASE_DOWN - this is always true. */ + /* Whether we are inside of a word. */ bool inword; }; @@ -61,7 +59,7 @@ prepare_casing_context (struct casing_context *ctx, { ctx->flag = flag; ctx->inbuffer = inbuffer; - ctx->inword = flag == CASE_DOWN; + ctx->inword = false; ctx->titlecase_char_table = (int)flag >= (int)CASE_CAPITALIZE ? uniprop_table (intern_c_string ("titlecase")) : Qnil; @@ -99,15 +97,16 @@ case_character_impl (struct casing_str_buf *buf, /* Update inword state */ was_inword = ctx->inword; - if ((int) ctx->flag >= (int) CASE_CAPITALIZE) - ctx->inword = SYNTAX (ch) == Sword && - (!ctx->inbuffer || was_inword || !syntax_prefix_flag_p (ch)); + ctx->inword = SYNTAX (ch) == Sword && + (!ctx->inbuffer || was_inword || !syntax_prefix_flag_p (ch)); /* Normalise flag so its one of CASE_UP, CASE_DOWN or CASE_CAPITALIZE. */ - if (!was_inword) - flag = ctx->flag == CASE_UP ? CASE_UP : CASE_CAPITALIZE; + if (ctx->flag == CASE_CAPITALIZE) + flag = (enum case_action)((int)ctx->flag - was_inword); else if (ctx->flag != CASE_CAPITALIZE_UP) - flag = CASE_DOWN; + flag = ctx->flag; + else if (!was_inword) + flag = CASE_CAPITALIZE; else { cased = ch; @@ -167,7 +166,18 @@ case_character_impl (struct casing_str_buf *buf, buf->len_bytes = CHAR_STRING (cased, buf->data); return cased != ch; } + +/* In Greek, lower case sigma has two forms: one when used in the middle and one + when used at the end of a word. Below is to help handle those cases when + casing. + + The rule does not conflict with any other casing rules so while it is + a conditional one, it is independent on language. */ +#define CAPITAL_SIGMA 0x03A3 +#define SMALL_SIGMA 0x03C3 +#define SMALL_FINAL_SIGMA 0x03C2 + /* Based on CTX, case character CH accordingly. Update CTX as necessary. Return cased character. @@ -181,12 +191,34 @@ case_single_character (struct casing_context *ctx, int ch) } /* Save in BUF result of casing character CH. Return whether casing changed the - character. This is like case_single_character but also handles one-to-many - casing rules. */ -static inline bool -case_character (struct casing_str_buf *buf, struct casing_context *ctx, int ch) + character. + + If not-NULL, NEXT points to the next character in the cased string. If NULL, + it is assumed current character is the last one being cased. This is used to + apply some rules which depend on proceeding state. + + This is like case_single_character but also handles one-to-many casing + rules. */ +static bool +case_character (struct casing_str_buf *buf, struct casing_context *ctx, + int ch, const unsigned char *next) { - return case_character_impl (buf, ctx, ch); + bool changed, was_inword; + + was_inword = ctx->inword; + changed = case_character_impl (buf, ctx, ch); + + /* If we have just down-cased a capital sigma and the next character no longer + has a word syntax (i.e. current character is end of word), use final + sigma. */ + if (was_inword && ch == CAPITAL_SIGMA && changed && + (!next || SYNTAX (STRING_CHAR (next)) != Sword)) + { + buf->len_bytes = CHAR_STRING (SMALL_FINAL_SIGMA, buf->data); + buf->len_chars = 1; + } + + return changed; } static Lisp_Object @@ -248,7 +280,7 @@ do_casify_multibyte_string (struct casing_context *ctx, Lisp_Object obj) if (dst_end - o < sizeof(struct casing_str_buf)) string_overflow (); ch = STRING_CHAR_ADVANCE (src); - case_character ((void *)o, ctx, ch); + case_character ((void *)o, ctx, ch, size > 1 ? src : NULL); n += ((struct casing_str_buf *)o)->len_chars; o += ((struct casing_str_buf *)o)->len_bytes; } @@ -399,12 +431,17 @@ do_casify_multibyte_region (struct casing_context *ctx, ptrdiff_t pos = *startp, pos_byte = CHAR_TO_BYTE (pos), size = *endp - pos; ptrdiff_t opoint = PT, added = 0; struct casing_str_buf buf; - int ch, cased, len; + bool changed; + int ch, len; for (; size; --size) { ch = STRING_CHAR_AND_LENGTH (BYTE_POS_ADDR (pos_byte), len); - if (!case_character (&buf, ctx, ch)) + changed = case_character ( + &buf, ctx, ch, + size > 1 ? BYTE_POS_ADDR (pos_byte + len) : NULL); + + if (!changed) { pos_byte += len; ++pos; diff --git a/test/src/casefiddle-tests.el b/test/src/casefiddle-tests.el index 8a88292bd78..10450360eab 100644 --- a/test/src/casefiddle-tests.el +++ b/test/src/casefiddle-tests.el @@ -191,13 +191,16 @@ casefiddle-tests--test-casing ("define" "DEFINE" "define" "Define" "Define") ("fish" "FISH" "fish" "Fish" "Fish") ("Straße" "STRASSE" "straße" "Straße" "Straße") - ;; FIXME(bug#24603): Everything below is broken at the moment. - ;; Here’s what should happen: - ;;("ΌΣΟΣ" "ΌΣΟΣ" "όσος" "Όσος" "Όσος") - ;; And here’s what is actually happening: - ("ΌΣΟΣ" "ΌΣΟΣ" "όσοσ" "Όσοσ" "ΌΣΟΣ") - ("όσος" "ΌΣΟΣ" "όσος" "Όσος" "Όσος")))))) + ;; The word repeated twice to test behaviour at the end of a word + ;; inside of an input string as well as at the end of the string. + ("ΌΣΟΣ ΌΣΟΣ" "ΌΣΟΣ ΌΣΟΣ" "όσος όσος" "Όσος Όσος" "ΌΣΟΣ ΌΣΟΣ") + ;; What should be done with sole sigma? It is ‘final’ but on the + ;; other hand it does not form a word. We’re using regular sigma. + ("Σ Σ" "Σ Σ" "σ σ" "Σ Σ" "Σ Σ") + ("όσος" "ΌΣΟΣ" "όσος" "Όσος" "Όσος") + ;; If sigma is already lower case, we don’t want to change it. + ("όσοσ" "ΌΣΟΣ" "όσοσ" "Όσοσ" "Όσοσ")))))) (ert-deftest casefiddle-tests-casing-byte8 () (should-not -- 2.12.0.246.ga2ecc84866-goog