From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenichi Handa Newsgroups: gmane.emacs.devel Subject: font-backend branch merged into the trunk Date: Wed, 14 May 2008 11:04:05 +0900 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1210730724 728 80.91.229.12 (14 May 2008 02:05:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 14 May 2008 02:05:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 14 04:06:00 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jw6Mq-0000n0-6U for ged-emacs-devel@m.gmane.org; Wed, 14 May 2008 04:05:49 +0200 Original-Received: from localhost ([127.0.0.1]:41647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jw6M6-0007GA-KI for ged-emacs-devel@m.gmane.org; Tue, 13 May 2008 22:04:34 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jw6M2-0007Fw-6L for emacs-devel@gnu.org; Tue, 13 May 2008 22:04:30 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jw6M0-0007FJ-CC for emacs-devel@gnu.org; Tue, 13 May 2008 22:04:29 -0400 Original-Received: from [199.232.76.173] (port=56949 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jw6Lz-0007FF-Tf for emacs-devel@gnu.org; Tue, 13 May 2008 22:04:27 -0400 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:59439) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jw6Lz-0000oi-3y for emacs-devel@gnu.org; Tue, 13 May 2008 22:04:27 -0400 Original-Received: from rqsmtp1.aist.go.jp (rqsmtp1.aist.go.jp [150.29.254.115]) by mx1.aist.go.jp with ESMTP id m4E24GqT015393 for ; Wed, 14 May 2008 11:04:18 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp3.aist.go.jp by rqsmtp1.aist.go.jp with ESMTP id m4E24Gsk016621 for ; Wed, 14 May 2008 11:04:16 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp3.aist.go.jp with ESMTP id m4E245wV026459 for ; Wed, 14 May 2008 11:04:05 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken.m17n.org with local (Exim 4.69) (envelope-from ) id 1Jw6Ld-0006R5-H1 for emacs-devel@gnu.org; Wed, 14 May 2008 11:04:05 +0900 User-Agent: SEMI/1.14.3 (Ushinoya) FLIM/1.14.2 (Yagi-Nishiguchi) APEL/10.2 Emacs/23.0.60 (i686-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) X-detected-kernel: by monty-python.gnu.org: Solaris 8 (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:97106 Archived-At: I've just merged the font-backend branch into the trunk. But, I forgot to add Jason's these changes in the CVS log. So, I tried "cvs admin -m...." but it seems that I don't have the right to do that. Could someone please add these to the CVS log of each file? 2008-05-14 Jason Rumney * font.h (struct font) [WINDOWSNT]: Remove codepage member. * w32font.h (w32font_open_internal): Update declaration. * w32font.c (w32font_open_internal): Change last argument from w32font_info struct to font object. Fill in font object from font_entity. Get Outline metrics if possible. Use them to calculate underline position and thickness. Use xlfd name as name property. Don't set codepage. (w32font_open): Pass font_object to w32font_open_internal. Don't update dpyinfo->smallest_font_height and dpyinfo->smallest_char_width. (w32font_draw): Use s->font. (clear_cached_metrics): Don't clear non-existent blocks. * w32term.c (w32_compute_glyph_string_overhangs): Don't compute if font was not found. (x_draw_glyph_string): Use underline position and thickness from font. * w32uniscribe.c (uniscribe_open): Pass font_object to w32font_open_internal. --- Kenichi Handa handa@ni.aist.go.jp