# HG changeset patch # User Kenichi Handa # Date 1149566242 0 # Node ID 4c7d4b278599868f4aa44ac0170783cc9c75708f # Parent 654ff3b48a8146998d3afa9d82926083724a3426 *** empty log message *** diff -r 654ff3b48a81 -r 4c7d4b278599 ChangeLog.unicode --- a/ChangeLog.unicode Tue Jun 06 03:56:46 2006 +0000 +++ b/ChangeLog.unicode Tue Jun 06 03:57:22 2006 +0000 @@ -1,3 +1,13 @@ +2006-06-06 Kenichi Handa + + * configure.in: New args --enable-font-backend, --with-xft, + --with-freetyp. New AC_DEFINEs USE_FONT_BACKEND, HAVE_XFT, + HAVE_FREETYPE, HAVE_LIBOTF. New AC_SUBSTs XFT_LIBS, + FREETYPE_CFLAGS, FREETYPE_LIBS, FONTCONFIG_CFLAGS, + FONTCONFIG_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS. + + * configure: Re-generated. + 2006-01-18 Kenichi Handa * make-dist: Include etc/charsets in tarball. diff -r 654ff3b48a81 -r 4c7d4b278599 README.unicode --- a/README.unicode Tue Jun 06 03:56:46 2006 +0000 +++ b/README.unicode Tue Jun 06 03:57:22 2006 +0000 @@ -129,3 +129,41 @@ * Old auto-save files, and similar files, such as Gnus drafts, containing non-ASCII characters probably won't be re-read correctly. + + + +New font handling mechanism with font backend method +---------------------------------------------------- + +This branch now contains new codes for handling fonts by multiple font +backends. The old font handling codes still exist completely parallel +to the new codes, and the new codes are used only when you configure +Emacs with the argument "--enable-font-backend" and run Emacs with the +same argument. + +The configure script, if invoked with "--enable-font-backend", checks +existing of libraries freetype and fontconfig. If they are both +available, macro "USE_FONT_BACKEND" is defined in src/config.h. +In that case, the exiting of Xft library is checked too. + +The new files are: + font.c -- main font handling code. + xfont.c -- font-driver on X for X core fonts. + ftfont.c -- generic font-driver for FreeType fonts. + xftfont.c -- font-driver on X using Xft for FreeType fonts. + ftxfont.c -- font-driver on X not using Xft for FreeType fonts. + +So we already have codes for X. For the other systems (win32 and mac), +it seems that we need these files: + bdffont.c -- generic font-driver for BDF fonts. + w32font.c -- font driver on win32 using Windows native fonts. + w32bdffont.c -- font-driver on win32 using BDF fonts. + atmfont.c -- font-driver on mac using ATM fonts. + +It may be interesting if Emacs supports frame buffer directly and have +these font driver. + ftfbfont.c -- font-driver on FB for FreeType fonts. + bdffbfont.c -- font-driver on FB for BDF fonts. + +Several other files have "#ifdef USE_FONT_BACKEND ... #endif" at the +place where changed for this new font codes. diff -r 654ff3b48a81 -r 4c7d4b278599 lisp/ChangeLog.unicode --- a/lisp/ChangeLog.unicode Tue Jun 06 03:56:46 2006 +0000 +++ b/lisp/ChangeLog.unicode Tue Jun 06 03:57:22 2006 +0000 @@ -1,3 +1,14 @@ +2006-06-06 Kenichi Handa + + These changes are for the new font handling codes. + + * faces.el (font-weight-table, font-slant-table) + (font-swidth-table): New customizable variables. + + * international/fontset.el (font-encoding-alist): Add koi8-4. + (script-representative-chars): Set the default value. + (create-fontset-from-x-resource): Delete `message'. + 2006-05-15 YAMAMOTO Mitsuharu * term/mac-win.el (mac-utxt-to-string, mac-string-to-utxt) diff -r 654ff3b48a81 -r 4c7d4b278599 src/ChangeLog.unicode --- a/src/ChangeLog.unicode Tue Jun 06 03:56:46 2006 +0000 +++ b/src/ChangeLog.unicode Tue Jun 06 03:57:22 2006 +0000 @@ -61,6 +61,8 @@ (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend mechanism. + * lisp.h (assoc_no_quit): Extern it. + * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h". Through out the file, use FONT_INFO_FROM_FACE instead of FONT_INFO_FROM_ID, use get_per_char_metric instead of diff -r 654ff3b48a81 -r 4c7d4b278599 src/character.c --- a/src/character.c Tue Jun 06 03:56:46 2006 +0000 +++ b/src/character.c Tue Jun 06 03:57:22 2006 +0000 @@ -1,8 +1,8 @@ /* Basic character support. Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001, 2005 Free Software Foundation, Inc. - Copyright (C) 2003 + Copyright (C) 2001, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff -r 654ff3b48a81 -r 4c7d4b278599 src/character.h --- a/src/character.h Tue Jun 06 03:56:46 2006 +0000 +++ b/src/character.h Tue Jun 06 03:57:22 2006 +0000 @@ -1,7 +1,7 @@ /* Header for multibyte character handler. Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2003 + Copyright (C) 2003, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009