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 03/11] Add support for title-casing letters (bug#24603) Date: Thu, 9 Mar 2017 22:51:42 +0100 Message-ID: <20170309215150.9562-4-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 1489096408 731 195.159.176.226 (9 Mar 2017 21:53:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Mar 2017 21:53:28 +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:22 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 1cm5zk-00071S-Jz for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Mar 2017 22:53:12 +0100 Original-Received: from localhost ([::1]:36397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cm5zo-0002iY-N7 for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Mar 2017 16:53:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cm5zf-0002gB-37 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-0004JG-Ux for bug-gnu-emacs@gnu.org; Thu, 09 Mar 2017 16:53:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49930) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cm5zb-0004J9-RH 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-0000PJ-Km 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.14890963321382 (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:12 +0000 Original-Received: from localhost ([127.0.0.1]:48104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm5yl-0000M7-IT for submit@debbugs.gnu.org; Thu, 09 Mar 2017 16:52:12 -0500 Original-Received: from mail-wm0-f45.google.com ([74.125.82.45]:34078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cm5yi-0000LB-KP for 24603@debbugs.gnu.org; Thu, 09 Mar 2017 16:52:09 -0500 Original-Received: by mail-wm0-f45.google.com with SMTP id 196so343037wmm.1 for <24603@debbugs.gnu.org>; Thu, 09 Mar 2017 13:52:08 -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=2gV3L/xqe0TgwVUoA6fhdVJjwp2eNIUWXChmygs4QDA=; b=HziQ3OTj+pvWEeSJ2tFdOHYbin7ip3jZeXJ/xz3wVU1vmbm5MsNmwB8c1ZBrwuA9of UbmtsnFzalUTHDTlrvNp/+dKyc4HQEuE9Ez8GMHFrVP9SuKGM0A0QBWQnXlCr3P/OCgq b1ItDvxlcRZ6kwbuoDEcB6xmrtdb9XbuLPUN8fPup8sqLwSW2v8e39OwVMUzklJ3FFxM yT6ivp8w2SoEYiufvkflLrB0q1ZB+K5eGMLcG4+BnYvObvQrWOa4gaY9Iiw2LAK4xO4P TMLlEI1mAUky7WviR9c+B75mI4BtIhO10O7edIoKu0B39cWTB+5P6c07PIZjCykO2Mu3 Zqfw== 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=2gV3L/xqe0TgwVUoA6fhdVJjwp2eNIUWXChmygs4QDA=; b=OJOFAWdWqvrR+/PmYi/j/P5MBXIMD32IqiwQbUQWYSmF9oL1zLTn5cZETTakTwUTbX O1LUdxc9xb35VDpFu2isggLgyN81pN33Suf/kSwhx3y6bJLs2M22XfN2sslzHiPUfKc6 ERAf6DpXQfW/gmH6pWUWyfvdAT9pfIaFZW4qZ8y9ZR23AYA9KsyvcWHNVWNZ0tgFhQYS uxFIP2QSsmcjYSAW8fg5sVWIgpBFm3gZY925vAjtVbIn67AGn3vveBsZvSc4XjQ9f57G G+JcWIIucNebKmPR10lpMkFeK6W0b3+8eY4K9Zc7ZWZjx3aJctjP4bMy/p6g9N/lNVhB SUSg== X-Gm-Message-State: AMke39mCc+KkrSI0GVRBjfJ3N97UmG6g0dc8EoZmZAMLlqi1LXxxGkng62Q71/0aIImhD6bc X-Received: by 10.28.199.132 with SMTP id x126mr11728879wmf.37.1489096322336; Thu, 09 Mar 2017 13:52:02 -0800 (PST) Original-Received: from mpn.zrh.corp.google.com ([172.16.115.43]) by smtp.gmail.com with ESMTPSA id e6sm9800423wrc.30.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 8B6921E029E; 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:130396 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 | 27 +++++++++++++++++++++------ test/src/casefiddle-tests.el | 39 ++++++++++++++++++++++++++------------- 3 files changed, 48 insertions(+), 20 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 32137a79da6..715764accf1 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -351,7 +351,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 8129d376a5a..01e35194e0e 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -33,6 +33,10 @@ 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. It being non-nil + implies flag being CASE_CAPITALIZE or CASE_CAPITALIZE_UP (but the reverse + is not true). */ + 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. @@ -54,6 +58,9 @@ 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 + ? uniprop_table (intern_c_string ("titlecase")) + : Qnil; /* If the case table is flagged as modified, rescan it. */ if (NILP (XCHAR_TABLE (BVAR (current_buffer, downcase_table))->extras[1])) @@ -68,10 +75,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)); @@ -199,8 +212,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 upper case (more +precisely, if available, title case) and the rest is 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) @@ -212,7 +225,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. +(More precisely, if available, initial of each word is converted to +title-case). Do not change the other letters of each word. 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) @@ -376,8 +390,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. +Capitalized form means each word's first character is upper case (more +precisely, if available, title case) and the rest of it is lower case. In programs, give two arguments, the starting and ending character positions to operate on. */) (Lisp_Object beg, Lisp_Object end) @@ -391,7 +405,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. +(More precisely, if available, initial of each word is converted to +title-case). Subsequent letters of each word are not changed. 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.246.ga2ecc84866-goog