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: [PATCHv6 3/6] Add support for title-casing letters (bug#24603) Date: Tue, 21 Mar 2017 02:27:06 +0100 Message-ID: <20170321012709.19402-4-mina86@mina86.com> References: <20170309215150.9562-1-mina86@mina86.com> <20170321012709.19402-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 1490059700 8505 195.159.176.226 (21 Mar 2017 01:28:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 21 Mar 2017 01:28:20 +0000 (UTC) To: Eli Zaretskii , Andreas Schwab , 24603@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 21 02:28:14 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 1cq8ar-0001fR-Vr for geb-bug-gnu-emacs@m.gmane.org; Tue, 21 Mar 2017 02:28:14 +0100 Original-Received: from localhost ([::1]:36104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cq8ax-0006YG-8K for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Mar 2017 21:28:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cq8ak-0006WP-Q9 for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2017 21:28:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cq8ai-0006q7-Im for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2017 21:28:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cq8ai-0006pz-G4 for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2017 21:28:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cq8ai-0008Oz-A9 for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2017 21:28:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 Mar 2017 01:28:04 +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.149005965632216 (code B ref 24603); Tue, 21 Mar 2017 01:28:04 +0000 Original-Received: (at 24603) by debbugs.gnu.org; 21 Mar 2017 01:27:36 +0000 Original-Received: from localhost ([127.0.0.1]:37007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq8aF-0008NR-SB for submit@debbugs.gnu.org; Mon, 20 Mar 2017 21:27:36 -0400 Original-Received: from mail-wr0-f181.google.com ([209.85.128.181]:34504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq8a7-0008MB-Lb for 24603@debbugs.gnu.org; Mon, 20 Mar 2017 21:27:28 -0400 Original-Received: by mail-wr0-f181.google.com with SMTP id l37so103163660wrc.1 for <24603@debbugs.gnu.org>; Mon, 20 Mar 2017 18:27:27 -0700 (PDT) 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=MDPXWL3TO6IrseGDi5k/Qz6SScLqAAv7qr2CPqRh7+0=; b=QCf+GeI405kE2Rc8IyhpiUbolZ7IkISB2owdEvM2xlBszXo6Amwu501zsikQFInogm gIezeCigf/yS5gbMDEiifKIjmkIiHNA4UBUlZweCssZxrMgO3elWJI9UtTV957ntkOX5 9NMtLSIkNha/PdjTMlmGDTLV+K6uVLVzo1RQm4+mOB3KqLmNYuz6zQidGNc0BwKESCok uANx+uHyDbkwVlQeaA6RwpRw2MlRGuZZbKakL3V39ujsHcwyY0sdw0MXVEsCXQX57OLQ lhZbhjDUz9dYYQ4IEIBhzGh+GUYV4e++ppOtU4tUxEOJrkJZZneIaq1pjY81TmXrwqBo QoQg== 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=MDPXWL3TO6IrseGDi5k/Qz6SScLqAAv7qr2CPqRh7+0=; b=NzN4Wc2RJKGcgk+/v249i52Vig93ssvFt2OiKf3fgDNSp6D0S3mbHz2Ge7rWL1S71E 7pkvyaSfKv0x5KLXluCfEvrk8OnnWLNA4muqlDsFEC1qfBOISQAOYGkt4/cprxUD1uCo jvVj4JmqZIBskza8iiaAdfXw1yepq0C37hBHcUUmScJLOfBMOHS39PZ6DSUnzdWnXwS1 muj9sD2/+cEsfVQtb2CpV2XFo5BInxksB6VOJKleXDu0AnDNXjSbVhqv13l8PVf/6n7l Y2e6l78hhT9z+wxtOniaCE7aymhUGaE24kFIqDPxYUAB3R4M0zIzxlj+/WT8WuuGU/0q dLXg== X-Gm-Message-State: AFeK/H261hAjrtlwPN1zNknZrisXzQjnyAPlShw1pWSHgc6bDxXk00CKnuO2TMUjljXJsTTv X-Received: by 10.223.163.81 with SMTP id d17mr27753612wrb.94.1490059641578; Mon, 20 Mar 2017 18:27:21 -0700 (PDT) Original-Received: from mpn.zrh.corp.google.com ([172.16.115.43]) by smtp.gmail.com with ESMTPSA id h3sm22832435wrb.6.2017.03.20.18.27.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 18:27:18 -0700 (PDT) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id 414B61E0277; Tue, 21 Mar 2017 02:27:14 +0100 (CET) X-Mailer: git-send-email 2.12.1.500.gab5fba24ee-goog In-Reply-To: <20170321012709.19402-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:130765 Archived-At: * src/casefiddle.c (struct casing_context, prepare_casing_context): Add titlecase_char_table member. It’s set to the ‘titlecase’ Unicode property table if capitalisation has been requested. (case_character): Make use of the titlecase_char_table to title-case initial characters when capitalising. * test/src/casefiddle-tests.el (casefiddle-tests--characters, casefiddle-tests-casing): Update test cases which are now passing. --- etc/NEWS | 2 +- src/casefiddle.c | 25 +++++++++++++++++++------ test/src/casefiddle-tests.el | 39 ++++++++++++++++++++++++++------------- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index cd98f533998..ff9e5c058be 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -355,7 +355,7 @@ same as in modes where the character is not whitespace. Instead of only checking the modification time, Emacs now also checks the file's actual content before prompting the user. -** Title case characters are properly converted to upper case. +** Title case characters are properly cased (from and into). 'upcase', 'upcase-region' et al. convert title case characters (such as the single character "Dz") into their upper case form (such as "DZ"). As a downside, 'capitalize' and 'upcase-initials' produce awkward diff --git a/src/casefiddle.c b/src/casefiddle.c index dfbb5c3e172..a83469cbdc7 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -33,6 +33,9 @@ enum case_action {CASE_UP, CASE_DOWN, CASE_CAPITALIZE, CASE_CAPITALIZE_UP}; /* State for casing individual characters. */ struct casing_context { + /* A char-table with title-case character mappings or nil. Non-nil implies + flag is CASE_CAPITALIZE or CASE_CAPITALIZE_UP. */ + Lisp_Object titlecase_char_table; /* User-requested action. */ enum case_action flag; /* If true, function operates on a buffer as opposed to a string or character. @@ -53,6 +56,8 @@ prepare_casing_context (struct casing_context *ctx, ctx->flag = flag; ctx->inbuffer = inbuffer; ctx->inword = flag == CASE_DOWN; + ctx->titlecase_char_table = (int)flag < (int)CASE_CAPITALIZE ? Qnil : + uniprop_table (intern_c_string ("titlecase")); /* If the case table is flagged as modified, rescan it. */ if (NILP (XCHAR_TABLE (BVAR (current_buffer, downcase_table))->extras[1])) @@ -67,10 +72,16 @@ prepare_casing_context (struct casing_context *ctx, static int case_character (struct casing_context *ctx, int ch) { + Lisp_Object prop; + if (ctx->inword) ch = ctx->flag == CASE_CAPITALIZE_UP ? ch : downcase (ch); + else if (!NILP (ctx->titlecase_char_table) && + CHARACTERP (prop = CHAR_TABLE_REF (ctx->titlecase_char_table, ch))) + ch = XFASTINT (prop); else ch = upcase(ch); + if ((int) ctx->flag >= (int) CASE_CAPITALIZE) ctx->inword = SYNTAX (ch) == Sword && (!ctx->inbuffer || ctx->inword || !syntax_prefix_flag_p (ch)); @@ -198,8 +209,8 @@ The argument object is not altered--the value is a copy. */) DEFUN ("capitalize", Fcapitalize, Scapitalize, 1, 1, 0, doc: /* Convert argument to capitalized form and return that. -This means that each word's first character is upper case -and the rest is lower case. +This means that each word's first character is converted to either +title case or upper case, and the rest to lower case. The argument may be a character or string. The result has the same type. The argument object is not altered--the value is a copy. */) (Lisp_Object obj) @@ -211,7 +222,8 @@ The argument object is not altered--the value is a copy. */) DEFUN ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0, doc: /* Convert the initial of each word in the argument to upper case. -Do not change the other letters of each word. +This means that each word's first character is converted to either +title case or upper case, and the rest are left unchanged. The argument may be a character or string. The result has the same type. The argument object is not altered--the value is a copy. */) (Lisp_Object obj) @@ -375,8 +387,8 @@ point and the mark is operated on. */) DEFUN ("capitalize-region", Fcapitalize_region, Scapitalize_region, 2, 2, "r", doc: /* Convert the region to capitalized form. -Capitalized form means each word's first character is upper case -and the rest of it is lower case. +This means that each word's first character is converted to either +title case or upper case, and the rest to lower case. In programs, give two arguments, the starting and ending character positions to operate on. */) (Lisp_Object beg, Lisp_Object end) @@ -390,7 +402,8 @@ character positions to operate on. */) DEFUN ("upcase-initials-region", Fupcase_initials_region, Supcase_initials_region, 2, 2, "r", doc: /* Upcase the initial of each word in the region. -Subsequent letters of each word are not changed. +This means that each word's first character is converted to either +title case or upper case, and the rest are left unchanged. In programs, give two arguments, the starting and ending character positions to operate on. */) (Lisp_Object beg, Lisp_Object end) diff --git a/test/src/casefiddle-tests.el b/test/src/casefiddle-tests.el index 152d85de006..e83cb00059b 100644 --- a/test/src/casefiddle-tests.el +++ b/test/src/casefiddle-tests.el @@ -63,13 +63,9 @@ casefiddle-tests--characters (?Ł ?Ł ?ł ?Ł) (?ł ?Ł ?ł ?Ł) - ;; FIXME(bug#24603): Commented ones are what we want. - ;;(?DŽ ?DŽ ?dž ?Dž) - (?DŽ ?DŽ ?dž ?DŽ) - ;;(?Dž ?DŽ ?dž ?Dž) - (?Dž ?DŽ ?dž ?DŽ) - ;;(?dž ?DŽ ?dž ?Dž) - (?dž ?DŽ ?dž ?DŽ) + (?DŽ ?DŽ ?dž ?Dž) + (?Dž ?DŽ ?dž ?Dž) + (?dž ?DŽ ?dž ?Dž) (?Σ ?Σ ?σ ?Σ) (?σ ?Σ ?σ ?Σ) @@ -186,19 +182,19 @@ casefiddle-tests--test-casing ;; input upper lower capitalize up-initials '(("Foo baR" "FOO BAR" "foo bar" "Foo Bar" "Foo BaR") ("Ⅷ ⅷ" "Ⅷ Ⅷ" "ⅷ ⅷ" "Ⅷ Ⅷ" "Ⅷ Ⅷ") + ;; "DžUNGLA" is an unfortunate result but it’s really best we can + ;; do while still being consistent. Hopefully, users only ever + ;; use upcase-initials on camelCase identifiers not real words. + ("DŽUNGLA" "DŽUNGLA" "džungla" "Džungla" "DžUNGLA") + ("Džungla" "DŽUNGLA" "džungla" "Džungla" "Džungla") + ("džungla" "DŽUNGLA" "džungla" "Džungla" "Džungla") ;; FIXME(bug#24603): Everything below is broken at the moment. ;; Here’s what should happen: - ;;("DŽUNGLA" "DŽUNGLA" "džungla" "Džungla" "DžUNGLA") - ;;("Džungla" "DŽUNGLA" "džungla" "Džungla" "Džungla") - ;;("džungla" "DŽUNGLA" "džungla" "Džungla" "Džungla") ;;("define" "DEFINE" "define" "Define" "Define") ;;("fish" "FIsh" "fish" "Fish" "Fish") ;;("Straße" "STRASSE" "straße" "Straße" "Straße") ;;("ΌΣΟΣ" "ΌΣΟΣ" "όσος" "Όσος" "Όσος") ;; And here’s what is actually happening: - ("DŽUNGLA" "DŽUNGLA" "džungla" "DŽungla" "DŽUNGLA") - ("Džungla" "DŽUNGLA" "džungla" "DŽungla" "DŽungla") - ("džungla" "DŽUNGLA" "džungla" "DŽungla" "DŽungla") ("define" "DEfiNE" "define" "Define" "Define") ("fish" "fiSH" "fish" "fish" "fish") ("Straße" "STRAßE" "straße" "Straße" "Straße") @@ -243,4 +239,21 @@ casefiddle-tests--test-casing "\xef\xff\xef Zażółć GĘŚlą \xcf\xcf"))))))) +(ert-deftest casefiddle-tests-char-casing () + ;; input upcase downcase [titlecase] + (dolist (test '((?a ?A ?a) (?A ?A ?a) + (?ł ?Ł ?ł) (?Ł ?Ł ?ł) + (?ß ?ß ?ß) (?ẞ ?ẞ ?ß) + (?ⅷ ?Ⅷ ?ⅷ) (?Ⅷ ?Ⅷ ?ⅷ) + (?DŽ ?DŽ ?dž ?Dž) (?Dž ?DŽ ?dž ?Dž) (?dž ?DŽ ?dž ?Dž))) + (let ((ch (car test)) + (up (nth 1 test)) + (lo (nth 2 test)) + (tc (or (nth 3 test) (nth 1 test)))) + (should (eq up (upcase ch))) + (should (eq lo (downcase ch))) + (should (eq tc (capitalize ch))) + (should (eq tc (upcase-initials ch)))))) + + ;;; casefiddle-tests.el ends here -- 2.12.0.367.g23dc2f6d3c-goog