From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.bugs Subject: bug#8863: 23.3; Strikethrough won't display on MacOS Date: Sat, 18 Jun 2011 17:48:41 -0400 Message-ID: <87aade24li.fsf@stupidchicken.com> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1308434187 13859 80.91.229.12 (18 Jun 2011 21:56:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 18 Jun 2011 21:56:27 +0000 (UTC) Cc: 8863@debbugs.gnu.org To: Dave Abrahams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 18 23:56:23 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QY3V7-0005hI-I5 for geb-bug-gnu-emacs@m.gmane.org; Sat, 18 Jun 2011 23:56:21 +0200 Original-Received: from localhost ([::1]:58398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QY3V6-0000Cw-TS for geb-bug-gnu-emacs@m.gmane.org; Sat, 18 Jun 2011 17:56:20 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:49786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QY3O6-0007RM-6J for bug-gnu-emacs@gnu.org; Sat, 18 Jun 2011 17:49:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QY3O3-0006Nl-Gj for bug-gnu-emacs@gnu.org; Sat, 18 Jun 2011 17:49:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QY3O3-0006Nc-AF for bug-gnu-emacs@gnu.org; Sat, 18 Jun 2011 17:49:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QY3O2-00052g-9g; Sat, 18 Jun 2011 17:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Chong Yidong Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 18 Jun 2011 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8863 X-GNU-PR-Package: emacs,ns X-GNU-PR-Keywords: Original-Received: via spool by 8863-submit@debbugs.gnu.org id=B8863.130843373019364 (code B ref 8863); Sat, 18 Jun 2011 21:49:02 +0000 Original-Received: (at 8863) by debbugs.gnu.org; 18 Jun 2011 21:48:50 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QY3Np-00052G-Hl for submit@debbugs.gnu.org; Sat, 18 Jun 2011 17:48:49 -0400 Original-Received: from vm-emlprdomr-02.its.yale.edu ([130.132.50.143]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QY3Nn-000524-Mw for 8863@debbugs.gnu.org; Sat, 18 Jun 2011 17:48:48 -0400 Original-Received: from furball (dhcp128036226133.central.yale.edu [128.36.226.133]) (authenticated bits=0) by vm-emlprdomr-02.its.yale.edu (8.14.4/8.14.4) with ESMTP id p5ILmfRl031489 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 18 Jun 2011 17:48:42 -0400 Original-Received: by furball (Postfix, from userid 1000) id B00A916041A; Sat, 18 Jun 2011 17:48:41 -0400 (EDT) In-Reply-To: (Dave Abrahams's message of "Tue, 14 Jun 2011 12:05:26 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-Scanned-By: MIMEDefang 2.71 on 130.132.50.143 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sat, 18 Jun 2011 17:49:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:47296 Archived-At: Dave Abrahams writes: > Title says it all. Faces with the "strikethrough" property set show up > as un-struck-through. Does this (100% untested) patch do the right thing? *** src/nsfont.m 2011-01-02 23:50:46 +0000 --- src/nsfont.m 2011-06-18 21:48:28 +0000 *************** *** 1188,1193 **** --- 1188,1207 ---- /*[context GSSetTextDrawingMode: GSTextFill]; /// not implemented yet */ } + /* do strike-through */ + if (face->strike_through_p) + { + float line_y = r.origin.y - 0.5 * font->height; + if (face->strike_through_color != 0) + [ns_lookup_indexed_color (face->strike_through_color, s->f) set]; + else + [col set]; + DPSmoveto (context, r.origin.x, line_y); + DPSlineto (context, r.origin.x + r.size.width, line_y); + if (face->strike_through_color != 0) + [col set]; + } + /* do underline */ if (face->underline_p) {