*** empty log message ***

6 files changed, 64 insertions, 3 deletions

diff --git a/ChangeLog.unicode b/ChangeLog.unicode
index d389d797967..370ae6123f6 100644
--- a/ChangeLog.unicode
+++ b/ChangeLog.unicode
@@ -1,3 +1,13 @@
+2006-06-06  Kenichi Handa  <handa@m17n.org>
+
+        * 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  <handa@m17n.org>
 
         * make-dist: Include etc/charsets in tarball.
diff --git a/README.unicode b/README.unicode
index 79613c9c6e4..bcaff98627f 100644
--- a/README.unicode
+++ b/README.unicode
@@ -129,3 +129,41 @@ existing support and the extra stuff at
 
  * 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 --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index bfeb6dd763e..5a716491086 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -1,3 +1,14 @@
+2006-06-06  Kenichi Handa  <handa@m17n.org>
+
+        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  <mituharu@math.s.chiba-u.ac.jp>
 
         * term/mac-win.el (mac-utxt-to-string, mac-string-to-utxt)
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 86831f14d5b..13c8fdc0918 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -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 --git a/src/character.c b/src/character.c
index ca3b136a463..3d3e28bc7d2 100644
--- a/src/character.c
+++ b/src/character.c
@@ -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 --git a/src/character.h b/src/character.h
index a939dc727f0..d02fdfb8b79 100644
--- a/src/character.h
+++ b/src/character.h
@@ -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