X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/51fb064bc72968e739e8dea580e58796c1a87f4c..114f9c96795aff3b51b9060d7c9c1b77debcc99a:/src/ftfont.c
diff --git a/src/ftfont.c b/src/ftfont.c
index 834c4a6f07..492d03bb8b 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1,15 +1,15 @@
/* ftfont.c -- FreeType font driver.
- Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
- Copyright (C) 2006, 2007, 2008
+ Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007, 2008, 2009, 2010
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,12 +17,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see . */
#include
#include
+#include
#include
#include
@@ -34,6 +33,7 @@ Boston, MA 02110-1301, USA. */
#include "character.h"
#include "charset.h"
#include "coding.h"
+#include "composite.h"
#include "fontset.h"
#include "font.h"
#include "ftfont.h"
@@ -44,7 +44,7 @@ Lisp_Object Qfreetype;
/* Fontconfig's generic families and their aliases. */
static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
-/* Flag to tell if FcInit is areadly called or not. */
+/* Flag to tell if FcInit is already called or not. */
static int fc_initialized;
/* Handle to a FreeType library instance. */
@@ -53,9 +53,8 @@ static FT_Library ft_library;
/* Cache for FreeType fonts. */
static Lisp_Object freetype_font_cache;
-/* Fontconfig's charset used for finding fonts of registry
- "iso8859-1". */
-static FcCharSet *cs_iso8859_1;
+/* Cache for FT_Face and FcCharSet. */
+static Lisp_Object ft_face_cache;
/* The actual structure for FreeType font that can be casted to struct
font. */
@@ -63,211 +62,435 @@ static FcCharSet *cs_iso8859_1;
struct ftfont_info
{
struct font font;
- FT_Size ft_size;
#ifdef HAVE_LIBOTF
+ /* The following four members must be here in this order to be
+ compatible with struct xftfont_info (in xftfont.c). */
int maybe_otf; /* Flag to tell if this may be OTF or not. */
OTF *otf;
#endif /* HAVE_LIBOTF */
+ FT_Size ft_size;
+ int index;
+ FT_Matrix matrix;
};
-static int ftfont_build_basic_charsets P_ ((void));
-static Lisp_Object ftfont_pattern_entity P_ ((FcPattern *,
- Lisp_Object, Lisp_Object));
-static Lisp_Object ftfont_list_generic_family P_ ((Lisp_Object, Lisp_Object,
- Lisp_Object));
-Lisp_Object ftfont_font_format P_ ((FcPattern *));
+enum ftfont_cache_for
+ {
+ FTFONT_CACHE_FOR_FACE,
+ FTFONT_CACHE_FOR_CHARSET,
+ FTFONT_CACHE_FOR_ENTITY
+ };
+
+static Lisp_Object ftfont_pattern_entity P_ ((FcPattern *, Lisp_Object));
+
+static Lisp_Object ftfont_resolve_generic_family P_ ((Lisp_Object,
+ FcPattern *));
+static Lisp_Object ftfont_lookup_cache P_ ((Lisp_Object,
+ enum ftfont_cache_for));
+
+static void ftfont_filter_properties P_ ((Lisp_Object font, Lisp_Object alist));
+
+Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object));
#define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM))
-static int
-ftfont_build_basic_charsets ()
+static struct
{
- FcChar32 c;
+ /* registry name */
+ char *name;
+ /* characters to distinguish the charset from the others */
+ int uniquifier[6];
+ /* additional constraint by language */
+ char *lang;
+ /* set on demand */
+ FcCharSet *fc_charset;
+} fc_charset_table[] =
+ { { "iso8859-1", { 0x00A0, 0x00A1, 0x00B4, 0x00BC, 0x00D0 } },
+ { "iso8859-2", { 0x00A0, 0x010E }},
+ { "iso8859-3", { 0x00A0, 0x0108 }},
+ { "iso8859-4", { 0x00A0, 0x00AF, 0x0128, 0x0156, 0x02C7 }},
+ { "iso8859-5", { 0x00A0, 0x0401 }},
+ { "iso8859-6", { 0x00A0, 0x060C }},
+ { "iso8859-7", { 0x00A0, 0x0384 }},
+ { "iso8859-8", { 0x00A0, 0x05D0 }},
+ { "iso8859-9", { 0x00A0, 0x00A1, 0x00BC, 0x011E }},
+ { "iso8859-10", { 0x00A0, 0x00D0, 0x0128, 0x2015 }},
+ { "iso8859-11", { 0x00A0, 0x0E01 }},
+ { "iso8859-13", { 0x00A0, 0x201C }},
+ { "iso8859-14", { 0x00A0, 0x0174 }},
+ { "iso8859-15", { 0x00A0, 0x00A1, 0x00D0, 0x0152 }},
+ { "iso8859-16", { 0x00A0, 0x0218}},
+ { "gb2312.1980-0", { 0x4E13 }, "zh-cn"},
+ { "big5-0", { 0xF6B1 }, "zh-tw" },
+ { "jisx0208.1983-0", { 0x4E55 }, "ja"},
+ { "ksc5601.1985-0", { 0xAC00 }, "ko"},
+ { "cns11643.1992-1", { 0xFE32 }, "zh-tw"},
+ { "cns11643.1992-2", { 0x4E33, 0x7934 }},
+ { "cns11643.1992-3", { 0x201A9 }},
+ { "cns11643.1992-4", { 0x20057 }},
+ { "cns11643.1992-5", { 0x20000 }},
+ { "cns11643.1992-6", { 0x20003 }},
+ { "cns11643.1992-7", { 0x20055 }},
+ { "gbk-0", { 0x4E06 }, "zh-cn"},
+ { "jisx0212.1990-0", { 0x4E44 }},
+ { "jisx0213.2000-1", { 0xFA10 }, "ja"},
+ { "jisx0213.2000-2", { 0xFA49 }},
+ { "jisx0213.2004-1", { 0x20B9F }},
+ { "viscii1.1-1", { 0x1EA0, 0x1EAE, 0x1ED2 }, "vi"},
+ { "tis620.2529-1", { 0x0E01 }, "th"},
+ { "windows-1251", { 0x0401, 0x0490 }, "ru"},
+ { "koi8-r", { 0x0401, 0x2219 }, "ru"},
+ { "mulelao-1", { 0x0E81 }, "lo"},
+ { "unicode-sip", { 0x20000 }},
+ { NULL }
+ };
- cs_iso8859_1 = FcCharSetCreate ();
- if (! cs_iso8859_1)
- return -1;
- for (c = ' '; c < 127; c++)
- if (! FcCharSetAddChar (cs_iso8859_1, c))
- return -1;
-#if 0
- /* This part is currently disabled. Should be fixed later. */
- for (c = 192; c < 256; c++)
- if (! FcCharSetAddChar (cs_iso8859_1, c))
- return -1;
-#endif
- return 0;
+extern Lisp_Object Qc, Qm, Qp, Qd;
+
+/* Dirty hack for handing ADSTYLE property.
+
+ Fontconfig (actually the underlying FreeType) gives such ADSTYLE
+ font property of PCF/BDF fonts in FC_STYLE. And, "Bold",
+ "Oblique", "Italic", or any non-normal SWIDTH property names
+ (e.g. SemiCondensed) are appended. In addition, if there's no
+ ADSTYLE property nor non-normal WEIGHT/SLANT/SWIDTH properties,
+ "Regular" is used for FC_STYLE (see the function
+ pcf_interpret_style in src/pcf/pcfread.c of FreeType).
+
+ Unfortunately this behavior is not documented, so the following
+ code may fail if FreeType changes the behavior in the future. */
+
+static Lisp_Object
+get_adstyle_property (FcPattern *p)
+{
+ char *str, *end;
+ Lisp_Object adstyle;
+
+ if (FcPatternGetString (p, FC_STYLE, 0, (FcChar8 **) &str) != FcResultMatch)
+ return Qnil;
+ for (end = str; *end && *end != ' '; end++);
+ if (*end)
+ {
+ char *p = alloca (end - str + 1);
+ memcpy (p, str, end - str);
+ p[end - str] = '\0';
+ end = p + (end - str);
+ str = p;
+ }
+ if (xstrcasecmp (str, "Regular") == 0
+ || xstrcasecmp (str, "Bold") == 0
+ || xstrcasecmp (str, "Oblique") == 0
+ || xstrcasecmp (str, "Italic") == 0)
+ return Qnil;
+ adstyle = font_intern_prop (str, end - str, 1);
+ if (font_style_to_value (FONT_WIDTH_INDEX, adstyle, 0) >= 0)
+ return Qnil;
+ return adstyle;
}
static Lisp_Object
-ftfont_pattern_entity (p, frame, registry)
+ftfont_pattern_entity (p, extra)
FcPattern *p;
- Lisp_Object frame, registry;
+ Lisp_Object extra;
{
- Lisp_Object entity;
- FcChar8 *file, *fontformat;
- FcCharSet *charset;
- char *str;
+ Lisp_Object key, cache, entity;
+ char *file, *str;
+ int index;
int numeric;
double dbl;
+ FcBool b;
- if (FcPatternGetString (p, FC_FILE, 0, &file) != FcResultMatch)
+ if (FcPatternGetString (p, FC_FILE, 0, (FcChar8 **) &file) != FcResultMatch)
+ return Qnil;
+ if (FcPatternGetInteger (p, FC_INDEX, 0, &index) != FcResultMatch)
return Qnil;
- if (FcPatternGetCharSet (p, FC_CHARSET, 0, &charset) != FcResultMatch)
- charset = NULL;
-#ifdef FC_FONTFORMAT
- if (FcPatternGetString (p, FC_FONTFORMAT, 0, &fontformat) != FcResultMatch)
-#endif /* FC_FONTFORMAT */
- fontformat = NULL;
- entity = Fmake_vector (make_number (FONT_ENTITY_MAX), null_string);
+ key = Fcons (make_unibyte_string ((char *) file, strlen ((char *) file)),
+ make_number (index));
+ cache = ftfont_lookup_cache (key, FTFONT_CACHE_FOR_ENTITY);
+ entity = XCAR (cache);
+ if (! NILP (entity))
+ {
+ Lisp_Object val = font_make_entity ();
+ int i;
+
+ for (i = 0; i < FONT_OBJLIST_INDEX; i++)
+ ASET (val, i, AREF (entity, i));
+ return val;
+ }
+ entity = font_make_entity ();
+ XSETCAR (cache, entity);
ASET (entity, FONT_TYPE_INDEX, Qfreetype);
- ASET (entity, FONT_REGISTRY_INDEX, registry);
- ASET (entity, FONT_FRAME_INDEX, frame);
- ASET (entity, FONT_OBJLIST_INDEX, Qnil);
+ ASET (entity, FONT_REGISTRY_INDEX, Qiso10646_1);
if (FcPatternGetString (p, FC_FOUNDRY, 0, (FcChar8 **) &str) == FcResultMatch)
- ASET (entity, FONT_FOUNDRY_INDEX, intern_downcase (str, strlen (str)));
+ ASET (entity, FONT_FOUNDRY_INDEX, font_intern_prop (str, strlen (str), 1));
if (FcPatternGetString (p, FC_FAMILY, 0, (FcChar8 **) &str) == FcResultMatch)
- ASET (entity, FONT_FAMILY_INDEX, intern_downcase (str, strlen (str)));
+ ASET (entity, FONT_FAMILY_INDEX, font_intern_prop (str, strlen (str), 1));
if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch)
{
- if (numeric == FC_WEIGHT_REGULAR)
- numeric = 100;
- ASET (entity, FONT_WEIGHT_INDEX, make_number (numeric));
+ if (numeric >= FC_WEIGHT_REGULAR && numeric < FC_WEIGHT_MEDIUM)
+ numeric = FC_WEIGHT_MEDIUM;
+ FONT_SET_STYLE (entity, FONT_WEIGHT_INDEX, make_number (numeric));
}
if (FcPatternGetInteger (p, FC_SLANT, 0, &numeric) == FcResultMatch)
- ASET (entity, FONT_SLANT_INDEX, make_number (numeric + 100));
+ {
+ numeric += 100;
+ FONT_SET_STYLE (entity, FONT_SLANT_INDEX, make_number (numeric));
+ }
if (FcPatternGetInteger (p, FC_WIDTH, 0, &numeric) == FcResultMatch)
- ASET (entity, FONT_WIDTH_INDEX, make_number (numeric));
+ {
+ FONT_SET_STYLE (entity, FONT_WIDTH_INDEX, make_number (numeric));
+ }
if (FcPatternGetDouble (p, FC_PIXEL_SIZE, 0, &dbl) == FcResultMatch)
- ASET (entity, FONT_SIZE_INDEX, make_number (dbl));
+ {
+ ASET (entity, FONT_SIZE_INDEX, make_number (dbl));
+ }
else
ASET (entity, FONT_SIZE_INDEX, make_number (0));
+ if (FcPatternGetInteger (p, FC_SPACING, 0, &numeric) == FcResultMatch)
+ ASET (entity, FONT_SPACING_INDEX, make_number (numeric));
+ if (FcPatternGetDouble (p, FC_DPI, 0, &dbl) == FcResultMatch)
+ {
+ int dpi = dbl;
+ ASET (entity, FONT_DPI_INDEX, make_number (dpi));
+ }
+ if (FcPatternGetBool (p, FC_SCALABLE, 0, &b) == FcResultMatch
+ && b == FcTrue)
+ {
+ ASET (entity, FONT_SIZE_INDEX, make_number (0));
+ ASET (entity, FONT_AVGWIDTH_INDEX, make_number (0));
+ }
+ else
+ {
+ /* As this font is not scalable, parhaps this is a BDF or PCF
+ font. */
+ FT_Face ft_face;
- if (FcPatternGetInteger (p, FC_SPACING, 0, &numeric) != FcResultMatch)
- numeric = -1;
- file = FcStrCopy (file);
- if (! file)
- return Qnil;
-
- p = FcPatternCreate ();
- if (! p)
- return Qnil;
+ ASET (entity, FONT_ADSTYLE_INDEX, get_adstyle_property (p));
+ if ((ft_library || FT_Init_FreeType (&ft_library) == 0)
+ && FT_New_Face (ft_library, file, index, &ft_face) == 0)
+ {
+ BDF_PropertyRec rec;
- if (FcPatternAddString (p, FC_FILE, file) == FcFalse
- || (charset
- && FcPatternAddCharSet (p, FC_CHARSET, charset) == FcFalse)
-#ifdef FC_FONTFORMAT
- || (fontformat
- && FcPatternAddString (p, FC_FONTFORMAT, fontformat) == FcFalse)
-#endif /* FC_FONTFORMAT */
- || (numeric >= 0
- && FcPatternAddInteger (p, FC_SPACING, numeric) == FcFalse))
- {
- FcPatternDestroy (p);
- return Qnil;
+ if (FT_Get_BDF_Property (ft_face, "AVERAGE_WIDTH", &rec) == 0
+ && rec.type == BDF_PROPERTY_TYPE_INTEGER)
+ ASET (entity, FONT_AVGWIDTH_INDEX, make_number (rec.u.integer));
+ FT_Done_Face (ft_face);
+ }
}
- ASET (entity, FONT_EXTRA_INDEX, make_save_value (p, 0));
+
+ ASET (entity, FONT_EXTRA_INDEX, Fcopy_sequence (extra));
+ font_put_extra (entity, QCfont_entity, key);
return entity;
}
+
static Lisp_Object ftfont_generic_family_list;
static Lisp_Object
-ftfont_list_generic_family (spec, frame, registry)
- Lisp_Object spec, frame, registry;
+ftfont_resolve_generic_family (family, pattern)
+ Lisp_Object family;
+ FcPattern *pattern;
{
- Lisp_Object family = AREF (spec, FONT_FAMILY_INDEX);
- Lisp_Object slot, list, val;
+ Lisp_Object slot;
+ FcPattern *match;
+ FcResult result;
+ FcLangSet *langset;
+ family = Fintern (Fdowncase (SYMBOL_NAME (family)), Qnil);
if (EQ (family, Qmono))
family = Qmonospace;
else if (EQ (family, Qsans) || EQ (family, Qsans__serif))
family = Qsans_serif;
slot = assq_no_quit (family, ftfont_generic_family_list);
if (! CONSP (slot))
- return null_vector;
- list = XCDR (slot);
- if (EQ (list, Qt))
- {
- /* Not yet listed. */
- FcObjectSet *objset = NULL;
- FcPattern *pattern = NULL, *pat = NULL;
- FcFontSet *fontset = NULL;
+ return Qnil;
+ if (! EQ (XCDR (slot), Qt))
+ return XCDR (slot);
+ pattern = FcPatternDuplicate (pattern);
+ if (! pattern)
+ goto err;
+ FcPatternDel (pattern, FC_FOUNDRY);
+ FcPatternDel (pattern, FC_FAMILY);
+ FcPatternAddString (pattern, FC_FAMILY, SYMBOL_FcChar8 (family));
+ if (FcPatternGetLangSet (pattern, FC_LANG, 0, &langset) != FcResultMatch)
+ {
+ /* This is to avoid the effect of locale. */
+ langset = FcLangSetCreate ();
+ FcLangSetAdd (langset, "en");
+ FcPatternAddLangSet (pattern, FC_LANG, langset);
+ FcLangSetDestroy (langset);
+ }
+ FcConfigSubstitute (NULL, pattern, FcMatchPattern);
+ FcDefaultSubstitute (pattern);
+ match = FcFontMatch (NULL, pattern, &result);
+ if (match)
+ {
FcChar8 *fam;
- int i, j;
- objset = FcObjectSetBuild (FC_FOUNDRY, FC_FAMILY, FC_WEIGHT, FC_SLANT,
- FC_WIDTH, FC_PIXEL_SIZE, FC_SPACING,
- FC_CHARSET, FC_FILE,
-#ifdef FC_FONTFORMAT
- FC_FONTFORMAT,
-#endif /* FC_FONTFORMAT */
- NULL);
- if (! objset)
- goto err;
- pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString,
- SYMBOL_FcChar8 (family), (char *) 0);
- if (! pattern)
- goto err;
- pat = FcPatternCreate ();
- if (! pat)
- goto err;
- FcConfigSubstitute (NULL, pattern, FcMatchPattern);
- for (i = 0, val = Qnil;
- FcPatternGetString (pattern, FC_FAMILY, i, &fam) == FcResultMatch;
- i++)
+ if (FcPatternGetString (match, FC_FAMILY, 0, &fam) == FcResultMatch)
+ family = intern ((char *) fam);
+ }
+ else
+ family = Qnil;
+ XSETCDR (slot, family);
+ if (match) FcPatternDestroy (match);
+ err:
+ if (pattern) FcPatternDestroy (pattern);
+ return family;
+}
+
+struct ftfont_cache_data
+{
+ FT_Face ft_face;
+ FcCharSet *fc_charset;
+};
+
+static Lisp_Object
+ftfont_lookup_cache (key, cache_for)
+ Lisp_Object key;
+ enum ftfont_cache_for cache_for;
+{
+ Lisp_Object cache, val, entity;
+ struct ftfont_cache_data *cache_data;
+
+ if (FONT_ENTITY_P (key))
+ {
+ entity = key;
+ val = assq_no_quit (QCfont_entity, AREF (entity, FONT_EXTRA_INDEX));
+ xassert (CONSP (val));
+ key = XCDR (val);
+ }
+ else
+ entity = Qnil;
+
+ if (NILP (ft_face_cache))
+ cache = Qnil;
+ else
+ cache = Fgethash (key, ft_face_cache, Qnil);
+ if (NILP (cache))
+ {
+ if (NILP (ft_face_cache))
{
- if (strcmp ((char *) fam, (char *) SYMBOL_FcChar8 (family)) == 0)
- continue;
- if (! FcPatternAddString (pat, FC_FAMILY, fam))
- goto err;
+ Lisp_Object args[2];
+
+ args[0] = QCtest;
+ args[1] = Qequal;
+ ft_face_cache = Fmake_hash_table (2, args);
+ }
+ cache_data = xmalloc (sizeof (struct ftfont_cache_data));
+ cache_data->ft_face = NULL;
+ cache_data->fc_charset = NULL;
+ val = make_save_value (NULL, 0);
+ XSAVE_VALUE (val)->integer = 0;
+ XSAVE_VALUE (val)->pointer = cache_data;
+ cache = Fcons (Qnil, val);
+ Fputhash (key, cache, ft_face_cache);
+ }
+ else
+ {
+ val = XCDR (cache);
+ cache_data = XSAVE_VALUE (val)->pointer;
+ }
+
+ if (cache_for == FTFONT_CACHE_FOR_ENTITY)
+ return cache;
+
+ if (cache_for == FTFONT_CACHE_FOR_FACE
+ ? ! cache_data->ft_face : ! cache_data->fc_charset)
+ {
+ char *filename = (char *) SDATA (XCAR (key));
+ int index = XINT (XCDR (key));
+
+ if (cache_for == FTFONT_CACHE_FOR_FACE)
+ {
+ if (! ft_library
+ && FT_Init_FreeType (&ft_library) != 0)
+ return Qnil;
+ if (FT_New_Face (ft_library, filename, index, &cache_data->ft_face)
+ != 0)
+ return Qnil;
+ }
+ else
+ {
+ FcPattern *pat = NULL;
+ FcFontSet *fontset = NULL;
+ FcObjectSet *objset = NULL;
+ FcCharSet *charset = NULL;
+
+ pat = FcPatternBuild (0, FC_FILE, FcTypeString, (FcChar8 *) filename,
+ FC_INDEX, FcTypeInteger, index, NULL);
+ if (! pat)
+ goto finish;
+ objset = FcObjectSetBuild (FC_CHARSET, FC_STYLE, NULL);
+ if (! objset)
+ goto finish;
fontset = FcFontList (NULL, pat, objset);
if (! fontset)
- goto err;
- /* Here we build the list in reverse order so that the last
- loop in this function build a list in the correct
- order. */
- for (j = 0; j < fontset->nfont; j++)
- {
- Lisp_Object entity;
-
- entity = ftfont_pattern_entity (fontset->fonts[j],
- frame, registry);
- if (! NILP (entity))
- val = Fcons (entity, val);
- }
- FcFontSetDestroy (fontset);
- fontset = NULL;
- FcPatternDel (pat, FC_FAMILY);
+ goto finish;
+ if (fontset && fontset->nfont > 0
+ && (FcPatternGetCharSet (fontset->fonts[0], FC_CHARSET, 0,
+ &charset)
+ == FcResultMatch))
+ cache_data->fc_charset = FcCharSetCopy (charset);
+ else
+ cache_data->fc_charset = FcCharSetCreate ();
+
+ finish:
+ if (fontset)
+ FcFontSetDestroy (fontset);
+ if (objset)
+ FcObjectSetDestroy (objset);
+ if (pat)
+ FcPatternDestroy (pat);
}
- list = val;
- XSETCDR (slot, list);
- err:
- if (pat) FcPatternDestroy (pat);
- if (pattern) FcPatternDestroy (pattern);
- if (fontset) FcFontSetDestroy (fontset);
- if (objset) FcObjectSetDestroy (objset);
- if (EQ (list, Qt))
- return Qnil;
}
- ASET (spec, FONT_FAMILY_INDEX, Qnil);
- for (val = Qnil; CONSP (list); list = XCDR (list))
- if (font_match_p (spec, XCAR (list)))
- val = Fcons (XCAR (list), val);
- ASET (spec, FONT_FAMILY_INDEX, family);
- return Fvconcat (1, &val);
+ return cache;
}
+FcCharSet *
+ftfont_get_fc_charset (entity)
+ Lisp_Object entity;
+{
+ Lisp_Object val, cache;
+ struct ftfont_cache_data *cache_data;
+
+ cache = ftfont_lookup_cache (entity, FTFONT_CACHE_FOR_CHARSET);
+ val = XCDR (cache);
+ cache_data = XSAVE_VALUE (val)->pointer;
+ return cache_data->fc_charset;
+}
+
+#ifdef HAVE_LIBOTF
+static OTF *
+ftfont_get_otf (ftfont_info)
+ struct ftfont_info *ftfont_info;
+{
+ OTF *otf;
+
+ if (ftfont_info->otf)
+ return ftfont_info->otf;
+ if (! ftfont_info->maybe_otf)
+ return NULL;
+ otf = OTF_open_ft_face (ftfont_info->ft_size->face);
+ if (! otf || OTF_get_table (otf, "head") < 0)
+ {
+ if (otf)
+ OTF_close (otf);
+ ftfont_info->maybe_otf = 0;
+ return NULL;
+ }
+ ftfont_info->otf = otf;
+ return otf;
+}
+#endif /* HAVE_LIBOTF */
static Lisp_Object ftfont_get_cache P_ ((FRAME_PTR));
static Lisp_Object ftfont_list P_ ((Lisp_Object, Lisp_Object));
static Lisp_Object ftfont_match P_ ((Lisp_Object, Lisp_Object));
static Lisp_Object ftfont_list_family P_ ((Lisp_Object));
-static void ftfont_free_entity P_ ((Lisp_Object));
-static struct font *ftfont_open P_ ((FRAME_PTR, Lisp_Object, int));
+static Lisp_Object ftfont_open P_ ((FRAME_PTR, Lisp_Object, int));
static void ftfont_close P_ ((FRAME_PTR, struct font *));
static int ftfont_has_char P_ ((Lisp_Object, int));
static unsigned ftfont_encode_char P_ ((struct font *, int));
@@ -277,40 +500,60 @@ static int ftfont_get_bitmap P_ ((struct font *, unsigned,
struct font_bitmap *, int));
static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
int *, int *));
+static Lisp_Object ftfont_otf_capability P_ ((struct font *));
static Lisp_Object ftfont_shape P_ ((Lisp_Object));
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
+static int ftfont_variation_glyphs P_ ((struct font *, int c,
+ unsigned variations[256]));
+#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
+
struct font_driver ftfont_driver =
{
0, /* Qfreetype */
+ 0, /* case insensitive */
ftfont_get_cache,
ftfont_list,
ftfont_match,
ftfont_list_family,
- ftfont_free_entity,
+ NULL, /* free_entity */
ftfont_open,
ftfont_close,
/* We can't draw a text without device dependent functions. */
- NULL,
- NULL,
+ NULL, /* prepare_face */
+ NULL, /* done_face */
ftfont_has_char,
ftfont_encode_char,
ftfont_text_extents,
/* We can't draw a text without device dependent functions. */
- NULL,
+ NULL, /* draw */
ftfont_get_bitmap,
- NULL,
- NULL,
- NULL,
+ NULL, /* get_bitmap */
+ NULL, /* free_bitmap */
+ NULL, /* get_outline */
ftfont_anchor_point,
+#ifdef HAVE_LIBOTF
+ ftfont_otf_capability,
+#else /* not HAVE_LIBOTF */
NULL,
- NULL,
- NULL,
- NULL,
+#endif /* not HAVE_LIBOTF */
+ NULL, /* otf_drive */
+ NULL, /* start_for_frame */
+ NULL, /* end_for_frame */
#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF)
- ftfont_shape
+ ftfont_shape,
#else /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
- NULL
+ NULL,
#endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
+ NULL, /* check */
+
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
+ ftfont_variation_glyphs,
+#else
+ NULL,
+#endif
+
+ ftfont_filter_properties, /* filter_properties */
};
extern Lisp_Object QCname;
@@ -322,6 +565,50 @@ ftfont_get_cache (f)
return freetype_font_cache;
}
+static int
+ftfont_get_charset (registry)
+ Lisp_Object registry;
+{
+ char *str = (char *) SDATA (SYMBOL_NAME (registry));
+ char *re = alloca (SBYTES (SYMBOL_NAME (registry)) * 2 + 1);
+ Lisp_Object regexp;
+ int i, j;
+
+ for (i = j = 0; i < SBYTES (SYMBOL_NAME (registry)); i++, j++)
+ {
+ if (str[i] == '.')
+ re[j++] = '\\';
+ else if (str[i] == '*')
+ re[j++] = '.';
+ re[j] = str[i];
+ if (re[j] == '?')
+ re[j] = '.';
+ }
+ re[j] = '\0';
+ regexp = make_unibyte_string (re, j);
+ for (i = 0; fc_charset_table[i].name; i++)
+ if (fast_c_string_match_ignore_case (regexp, fc_charset_table[i].name) >= 0)
+ break;
+ if (! fc_charset_table[i].name)
+ return -1;
+ if (! fc_charset_table[i].fc_charset)
+ {
+ FcCharSet *charset = FcCharSetCreate ();
+ int *uniquifier = fc_charset_table[i].uniquifier;
+
+ if (! charset)
+ return -1;
+ for (j = 0; uniquifier[j]; j++)
+ if (! FcCharSetAddChar (charset, uniquifier[j]))
+ {
+ FcCharSetDestroy (charset);
+ return -1;
+ }
+ fc_charset_table[i].fc_charset = charset;
+ }
+ return i;
+}
+
struct OpenTypeSpec
{
Lisp_Object script;
@@ -345,6 +632,15 @@ struct OpenTypeSpec
(P)[4] = '\0'; \
} while (0)
+#define OTF_TAG_SYM(SYM, TAG) \
+ do { \
+ char str[5]; \
+ \
+ OTF_TAG_STR (TAG, str); \
+ (SYM) = font_intern_prop (str, 4, 1); \
+ } while (0)
+
+
static struct OpenTypeSpec *
ftfont_get_open_type_spec (Lisp_Object otf_spec)
{
@@ -355,7 +651,7 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
if (! spec)
return NULL;
spec->script = XCAR (otf_spec);
- if (! NILP (val))
+ if (! NILP (spec->script))
{
OTF_SYM_TAG (spec->script, spec->script_tag);
val = assq_no_quit (spec->script, Votf_script_alist);
@@ -377,7 +673,7 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
{
Lisp_Object len;
- otf_spec = XCDR (otf_spec);
+ otf_spec = XCDR (otf_spec);
if (NILP (otf_spec))
break;
val = XCAR (otf_spec);
@@ -409,79 +705,77 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
return spec;
}
-static Lisp_Object
-ftfont_list (frame, spec)
- Lisp_Object frame, spec;
+static FcPattern *ftfont_spec_pattern P_ ((Lisp_Object, char *,
+ struct OpenTypeSpec **,
+ char **langname));
+
+static FcPattern *
+ftfont_spec_pattern (spec, otlayout, otspec, langname)
+ Lisp_Object spec;
+ char *otlayout;
+ struct OpenTypeSpec **otspec;
+ char **langname;
{
- Lisp_Object val, tmp, extra;
- int i;
+ Lisp_Object tmp, extra;
FcPattern *pattern = NULL;
FcCharSet *charset = NULL;
FcLangSet *langset = NULL;
- FcFontSet *fontset = NULL;
- FcObjectSet *objset = NULL;
- Lisp_Object script;
- Lisp_Object registry = Qunicode_bmp;
- struct OpenTypeSpec *otspec= NULL;
- int weight = 0;
- double dpi = -1;
- int spacing = -1;
+ int n;
+ int dpi = -1;
int scalable = -1;
- char otlayout[15]; /* For "otlayout:XXXX" */
-
- val = null_vector;
-
- if (! fc_initialized)
- {
- FcInit ();
- fc_initialized = 1;
- }
+ Lisp_Object script = Qnil;
+ Lisp_Object registry;
+ int fc_charset_idx;
- if (! NILP (AREF (spec, FONT_ADSTYLE_INDEX))
- && ! EQ (AREF (spec, FONT_ADSTYLE_INDEX), null_string))
- return val;
- if (! NILP (AREF (spec, FONT_SLANT_INDEX))
- && XINT (AREF (spec, FONT_SLANT_INDEX)) < 100)
+ if ((n = FONT_SLANT_NUMERIC (spec)) >= 0
+ && n < 100)
/* Fontconfig doesn't support reverse-italic/obligue. */
- return val;
+ return NULL;
- if (! NILP (AREF (spec, FONT_REGISTRY_INDEX)))
+ if (INTEGERP (AREF (spec, FONT_DPI_INDEX)))
+ dpi = XINT (AREF (spec, FONT_DPI_INDEX));
+ if (INTEGERP (AREF (spec, FONT_AVGWIDTH_INDEX))
+ && XINT (AREF (spec, FONT_AVGWIDTH_INDEX)) == 0)
+ scalable = 1;
+
+ registry = AREF (spec, FONT_REGISTRY_INDEX);
+ if (NILP (registry)
+ || EQ (registry, Qascii_0)
+ || EQ (registry, Qiso10646_1)
+ || EQ (registry, Qunicode_bmp))
+ fc_charset_idx = -1;
+ else
{
- registry = AREF (spec, FONT_REGISTRY_INDEX);
- if (EQ (registry, Qiso8859_1))
+ FcChar8 *lang;
+
+ fc_charset_idx = ftfont_get_charset (registry);
+ if (fc_charset_idx < 0)
+ return NULL;
+ charset = fc_charset_table[fc_charset_idx].fc_charset;
+ *langname = fc_charset_table[fc_charset_idx].lang;
+ lang = (FcChar8 *) *langname;
+ if (lang)
{
- if (! cs_iso8859_1
- && ftfont_build_basic_charsets () < 0)
- return Qnil;
- charset = cs_iso8859_1;
+ langset = FcLangSetCreate ();
+ if (! langset)
+ goto err;
+ FcLangSetAdd (langset, lang);
}
- else if (! EQ (registry, Qiso10646_1)
- && ! EQ (registry, Qunicode_bmp)
- && ! EQ (registry, Qunicode_sip))
- return val;
}
otlayout[0] = '\0';
- script = Qnil;
for (extra = AREF (spec, FONT_EXTRA_INDEX);
CONSP (extra); extra = XCDR (extra))
{
Lisp_Object key, val;
- tmp = XCAR (extra);
- key = XCAR (tmp), val = XCDR (tmp);
- if (EQ (key, QCotf))
- {
- otspec = ftfont_get_open_type_spec (val);
- if (! otspec)
- return null_vector;
- strcat (otlayout, "otlayout:");
- OTF_TAG_STR (otspec->script_tag, otlayout + 9);
- script = otspec->script;
- }
- else if (EQ (key, QClanguage))
+ key = XCAR (XCAR (extra)), val = XCDR (XCAR (extra));
+ if (EQ (key, QCdpi))
+ dpi = XINT (val);
+ else if (EQ (key, QClang))
{
- langset = FcLangSetCreate ();
+ if (! langset)
+ langset = FcLangSetCreate ();
if (! langset)
goto err;
if (SYMBOLP (val))
@@ -495,12 +789,17 @@ ftfont_list (frame, spec)
&& ! FcLangSetAdd (langset, SYMBOL_FcChar8 (XCAR (val))))
goto err;
}
+ else if (EQ (key, QCotf))
+ {
+ *otspec = ftfont_get_open_type_spec (val);
+ if (! *otspec)
+ return NULL;
+ strcat (otlayout, "otlayout:");
+ OTF_TAG_STR ((*otspec)->script_tag, otlayout + 9);
+ script = (*otspec)->script;
+ }
else if (EQ (key, QCscript))
script = val;
- else if (EQ (key, QCdpi))
- dpi = XINT (val);
- else if (EQ (key, QCspacing))
- spacing = XINT (val);
else if (EQ (key, QCscalable))
scalable = ! NILP (val);
}
@@ -509,7 +808,7 @@ ftfont_list (frame, spec)
{
Lisp_Object chars = assq_no_quit (script, Vscript_representative_chars);
- if (CONSP (chars))
+ if (CONSP (chars) && CONSP (CDR (chars)))
{
charset = FcCharSetCreate ();
if (! charset)
@@ -525,28 +824,13 @@ ftfont_list (frame, spec)
if (! pattern)
goto err;
tmp = AREF (spec, FONT_FOUNDRY_INDEX);
- if (SYMBOLP (tmp) && ! NILP (tmp)
+ if (! NILP (tmp)
&& ! FcPatternAddString (pattern, FC_FOUNDRY, SYMBOL_FcChar8 (tmp)))
goto err;
tmp = AREF (spec, FONT_FAMILY_INDEX);
- if (SYMBOLP (tmp) && ! NILP (tmp)
+ if (! NILP (tmp)
&& ! FcPatternAddString (pattern, FC_FAMILY, SYMBOL_FcChar8 (tmp)))
goto err;
- /* Emacs conventionally doesn't distinguish normal, regular, and
- medium weight, but fontconfig does. So, we can't restrict font
- listing by weight. We check it after getting a list. */
- tmp = AREF (spec, FONT_WEIGHT_INDEX);
- if (INTEGERP (tmp))
- weight = XINT (tmp);
- tmp = AREF (spec, FONT_SLANT_INDEX);
- if (INTEGERP (tmp)
- && ! FcPatternAddInteger (pattern, FC_SLANT, XINT (tmp) - 100))
- goto err;
- tmp = AREF (spec, FONT_WIDTH_INDEX);
- if (INTEGERP (tmp)
- && ! FcPatternAddInteger (pattern, FC_WIDTH, XINT (tmp)))
- goto err;
-
if (charset
&& ! FcPatternAddCharSet (pattern, FC_CHARSET, charset))
goto err;
@@ -556,113 +840,219 @@ ftfont_list (frame, spec)
if (dpi >= 0
&& ! FcPatternAddDouble (pattern, FC_DPI, dpi))
goto err;
- if (spacing >= 0
- && ! FcPatternAddInteger (pattern, FC_SPACING, spacing))
- goto err;
if (scalable >= 0
&& ! FcPatternAddBool (pattern, FC_SCALABLE, scalable ? FcTrue : FcFalse))
goto err;
+ goto finish;
+
+ err:
+ /* We come here because of unexpected error in fontconfig API call
+ (usually insufficient memory). */
+ if (pattern)
+ {
+ FcPatternDestroy (pattern);
+ pattern = NULL;
+ }
+ if (*otspec)
+ {
+ if ((*otspec)->nfeatures[0] > 0)
+ free ((*otspec)->features[0]);
+ if ((*otspec)->nfeatures[1] > 0)
+ free ((*otspec)->features[1]);
+ free (*otspec);
+ *otspec = NULL;
+ }
+
+ finish:
+ if (langset) FcLangSetDestroy (langset);
+ if (charset && fc_charset_idx < 0) FcCharSetDestroy (charset);
+ return pattern;
+}
+
+static Lisp_Object
+ftfont_list (frame, spec)
+ Lisp_Object frame, spec;
+{
+ Lisp_Object val = Qnil, family, adstyle;
+ int i;
+ FcPattern *pattern;
+ FcFontSet *fontset = NULL;
+ FcObjectSet *objset = NULL;
+ FcCharSet *charset;
+ Lisp_Object chars = Qnil;
+ FcResult result;
+ char otlayout[15]; /* For "otlayout:XXXX" */
+ struct OpenTypeSpec *otspec = NULL;
+ int spacing = -1;
+ char *langname = NULL;
+
+ if (! fc_initialized)
+ {
+ FcInit ();
+ fc_initialized = 1;
+ }
+
+ pattern = ftfont_spec_pattern (spec, otlayout, &otspec, &langname);
+ if (! pattern)
+ return Qnil;
+ if (FcPatternGetCharSet (pattern, FC_CHARSET, 0, &charset) != FcResultMatch)
+ {
+ val = assq_no_quit (QCscript, AREF (spec, FONT_EXTRA_INDEX));
+ if (! NILP (val))
+ {
+ val = assq_no_quit (XCDR (val), Vscript_representative_chars);
+ if (CONSP (val) && VECTORP (XCDR (val)))
+ chars = XCDR (val);
+ }
+ val = Qnil;
+ }
+ if (INTEGERP (AREF (spec, FONT_SPACING_INDEX)))
+ spacing = XINT (AREF (spec, FONT_SPACING_INDEX));
+ family = AREF (spec, FONT_FAMILY_INDEX);
+ if (! NILP (family))
+ {
+ Lisp_Object resolved;
+
+ resolved = ftfont_resolve_generic_family (family, pattern);
+ if (! NILP (resolved))
+ {
+ FcPatternDel (pattern, FC_FAMILY);
+ if (! FcPatternAddString (pattern, FC_FAMILY,
+ SYMBOL_FcChar8 (resolved)))
+ goto err;
+ }
+ }
+ adstyle = AREF (spec, FONT_ADSTYLE_INDEX);
+ if (! NILP (adstyle) && SBYTES (SYMBOL_NAME (adstyle)) == 0)
+ adstyle = Qnil;
objset = FcObjectSetBuild (FC_FOUNDRY, FC_FAMILY, FC_WEIGHT, FC_SLANT,
- FC_WIDTH, FC_PIXEL_SIZE, FC_SPACING,
- FC_CHARSET, FC_FILE,
+ FC_WIDTH, FC_PIXEL_SIZE, FC_SPACING, FC_SCALABLE,
+ FC_STYLE, FC_FILE, FC_INDEX,
+#ifdef FC_CAPABILITY
+ FC_CAPABILITY,
+#endif /* FC_CAPABILITY */
#ifdef FC_FONTFORMAT
FC_FONTFORMAT,
-#endif /* FC_FONTFORMAT */
+#endif
NULL);
if (! objset)
goto err;
- if (otlayout[0])
+ if (! NILP (chars))
+ FcObjectSetAdd (objset, FC_CHARSET);
+
+ fontset = FcFontList (NULL, pattern, objset);
+ if (! fontset || fontset->nfont == 0)
+ goto finish;
+#if 0
+ /* Need fix because this finds any fonts. */
+ if (fontset->nfont == 0 && ! NILP (family))
{
-#ifdef FC_CAPABILITY
- if (! FcObjectSetAdd (objset, FC_CAPABILITY))
- goto err;
-#else /* not FC_CAPABILITY */
- goto finish;
-#endif /* not FC_CAPABILITY */
+ /* Try maching with configuration. For instance, the
+ configuration may specify "Nimbus Mono L" as an alias of
+ "Courier". */
+ FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString,
+ SYMBOL_FcChar8 (family), NULL);
+ FcChar8 *fam;
+
+ if (FcConfigSubstitute (NULL, pat, FcMatchPattern) == FcTrue)
+ {
+ for (i = 0;
+ FcPatternGetString (pat, FC_FAMILY, i, &fam) == FcResultMatch;
+ i++)
+ {
+ FcPatternDel (pattern, FC_FAMILY);
+ FcPatternAddString (pattern, FC_FAMILY, fam);
+ FcFontSetDestroy (fontset);
+ fontset = FcFontList (NULL, pattern, objset);
+ if (fontset && fontset->nfont > 0)
+ break;
+ }
+ }
}
-
- fontset = FcFontList (NULL, pattern, objset);
- if (! fontset)
- goto err;
-
- if (fontset->nfont > 0)
+#endif
+ for (i = 0; i < fontset->nfont; i++)
{
- double pixel_size;
-
- if (NILP (AREF (spec, FONT_SIZE_INDEX)))
- pixel_size = 0;
- else
- pixel_size = XINT (AREF (spec, FONT_SIZE_INDEX));
+ Lisp_Object entity;
- for (i = 0, val = Qnil; i < fontset->nfont; i++)
+ if (spacing >= 0)
{
- Lisp_Object entity;
+ int this;
- if (pixel_size > 0)
- {
- double this;
+ if ((FcPatternGetInteger (fontset->fonts[i], FC_SPACING, 0, &this)
+ == FcResultMatch)
+ && spacing != this)
+ continue;
+ }
- if (FcPatternGetDouble (fontset->fonts[i], FC_PIXEL_SIZE, 0,
- &this) == FcResultMatch
- && ((this < pixel_size - FONT_PIXEL_SIZE_QUANTUM)
- || (this > pixel_size + FONT_PIXEL_SIZE_QUANTUM)))
- continue;
- }
- if (weight > 0)
- {
- int this;
-
- if (FcPatternGetInteger (fontset->fonts[i], FC_WEIGHT, 0,
- &this) != FcResultMatch
- || (this != weight
- && (weight != 100
- || this < FC_WEIGHT_REGULAR
- || this > FC_WEIGHT_MEDIUM)))
- continue;
- }
#ifdef FC_CAPABILITY
- if (otlayout[0])
- {
- FcChar8 *this;
+ if (otlayout[0])
+ {
+ FcChar8 *this;
- if (FcPatternGetString (fontset->fonts[i], FC_CAPABILITY, 0,
- &this) != FcResultMatch
- || ! strstr ((char *) this, otlayout))
- continue;
- }
+ if (FcPatternGetString (fontset->fonts[i], FC_CAPABILITY, 0, &this)
+ != FcResultMatch
+ || ! strstr ((char *) this, otlayout))
+ continue;
+ }
#endif /* FC_CAPABILITY */
#ifdef HAVE_LIBOTF
- if (otspec)
- {
- FcChar8 *file;
- OTF *otf;
+ if (otspec)
+ {
+ FcChar8 *file;
+ OTF *otf;
- if (FcPatternGetString (fontset->fonts[i], FC_FILE, 0, &file)
- != FcResultMatch)
- continue;
- otf = OTF_open ((char *) file);
- if (! otf)
- continue;
- if (OTF_check_features (otf, 1,
- otspec->script_tag, otspec->langsys_tag,
- otspec->features[0],
- otspec->nfeatures[0]) != 1
- || OTF_check_features (otf, 0,
- otspec->script_tag, otspec->langsys_tag,
- otspec->features[1],
- otspec->nfeatures[1]) != 1)
- continue;
- }
+ if (FcPatternGetString (fontset->fonts[i], FC_FILE, 0, &file)
+ != FcResultMatch)
+ continue;
+ otf = OTF_open ((char *) file);
+ if (! otf)
+ continue;
+ if (OTF_check_features (otf, 1,
+ otspec->script_tag, otspec->langsys_tag,
+ otspec->features[0],
+ otspec->nfeatures[0]) != 1
+ || OTF_check_features (otf, 0,
+ otspec->script_tag, otspec->langsys_tag,
+ otspec->features[1],
+ otspec->nfeatures[1]) != 1)
+ continue;
+ }
#endif /* HAVE_LIBOTF */
- entity = ftfont_pattern_entity (fontset->fonts[i], frame, registry);
- if (! NILP (entity))
- val = Fcons (entity, val);
+ if (VECTORP (chars))
+ {
+ int j;
+
+ if (FcPatternGetCharSet (fontset->fonts[i], FC_CHARSET, 0, &charset)
+ != FcResultMatch)
+ continue;
+ for (j = 0; j < ASIZE (chars); j++)
+ if (NATNUMP (AREF (chars, j))
+ && FcCharSetHasChar (charset, XFASTINT (AREF (chars, j))))
+ break;
+ if (j == ASIZE (chars))
+ continue;
+ }
+ if (! NILP (adstyle) || langname)
+ {
+ Lisp_Object this_adstyle = get_adstyle_property (fontset->fonts[i]);
+
+ if (! NILP (adstyle)
+ && (NILP (this_adstyle)
+ || xstrcasecmp (SDATA (SYMBOL_NAME (adstyle)),
+ SDATA (SYMBOL_NAME (this_adstyle))) != 0))
+ continue;
+ if (langname
+ && ! NILP (this_adstyle)
+ && xstrcasecmp (langname, SDATA (SYMBOL_NAME (this_adstyle))))
+ continue;
}
- val = Fvconcat (1, &val);
+ entity = ftfont_pattern_entity (fontset->fonts[i],
+ AREF (spec, FONT_EXTRA_INDEX));
+ if (! NILP (entity))
+ val = Fcons (entity, val);
}
- else if (! NILP (AREF (spec, FONT_FAMILY_INDEX)))
- val = ftfont_list_generic_family (spec, frame, registry);
+ val = Fnreverse (val);
goto finish;
err:
@@ -671,19 +1061,10 @@ ftfont_list (frame, spec)
val = Qnil;
finish:
- if (charset && charset != cs_iso8859_1) FcCharSetDestroy (charset);
+ FONT_ADD_LOG ("ftfont-list", spec, val);
if (objset) FcObjectSetDestroy (objset);
if (fontset) FcFontSetDestroy (fontset);
- if (langset) FcLangSetDestroy (langset);
if (pattern) FcPatternDestroy (pattern);
- if (otspec)
- {
- if (otspec->nfeatures[0] > 0)
- free (otspec->features[0]);
- if (otspec->nfeatures[1] > 0)
- free (otspec->features[1]);
- free (otspec);
- }
return val;
}
@@ -691,9 +1072,12 @@ static Lisp_Object
ftfont_match (frame, spec)
Lisp_Object frame, spec;
{
- Lisp_Object extra, val, entity;
- FcPattern *pattern = NULL, *match = NULL;
+ Lisp_Object entity = Qnil;
+ FcPattern *pattern, *match = NULL;
FcResult result;
+ char otlayout[15]; /* For "otlayout:XXXX" */
+ struct OpenTypeSpec *otspec = NULL;
+ char *langname = NULL;
if (! fc_initialized)
{
@@ -701,36 +1085,37 @@ ftfont_match (frame, spec)
fc_initialized = 1;
}
- extra = AREF (spec, FONT_EXTRA_INDEX);
- val = assq_no_quit (QCname, extra);
- if (! CONSP (val) || ! STRINGP (XCDR (val)))
+ pattern = ftfont_spec_pattern (spec, otlayout, &otspec, &langname);
+ if (! pattern)
return Qnil;
- entity = Qnil;
- pattern = FcNameParse (SDATA (XCDR (val)));
- if (pattern)
+ if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
{
- if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
- {
- FcValue value;
+ FcValue value;
- value.type = FcTypeDouble;
- value.u.d = XINT (AREF (spec, FONT_SIZE_INDEX));
- FcPatternAdd (pattern, FC_PIXEL_SIZE, value, FcFalse);
- }
- if (FcConfigSubstitute (NULL, pattern, FcMatchPattern) == FcTrue)
+ value.type = FcTypeDouble;
+ value.u.d = XINT (AREF (spec, FONT_SIZE_INDEX));
+ FcPatternAdd (pattern, FC_PIXEL_SIZE, value, FcFalse);
+ }
+ if (FcConfigSubstitute (NULL, pattern, FcMatchPattern) == FcTrue)
+ {
+ FcDefaultSubstitute (pattern);
+ match = FcFontMatch (NULL, pattern, &result);
+ if (match)
{
- FcDefaultSubstitute (pattern);
- match = FcFontMatch (NULL, pattern, &result);
- if (match)
- {
- entity = ftfont_pattern_entity (match, frame, Qunicode_bmp);
- FcPatternDestroy (match);
- }
+ entity = ftfont_pattern_entity (match, AREF (spec, FONT_EXTRA_INDEX));
+ FcPatternDestroy (match);
+ if (! NILP (AREF (spec, FONT_FAMILY_INDEX))
+ && NILP (assq_no_quit (AREF (spec, FONT_FAMILY_INDEX),
+ ftfont_generic_family_list))
+ && NILP (Fstring_equal (AREF (spec, FONT_FAMILY_INDEX),
+ AREF (entity, FONT_FAMILY_INDEX))))
+ entity = Qnil;
}
- FcPatternDestroy (pattern);
}
+ FcPatternDestroy (pattern);
+ FONT_ADD_LOG ("ftfont-match", spec, entity);
return entity;
}
@@ -738,7 +1123,7 @@ static Lisp_Object
ftfont_list_family (frame)
Lisp_Object frame;
{
- Lisp_Object list;
+ Lisp_Object list = Qnil;
FcPattern *pattern = NULL;
FcFontSet *fontset = NULL;
FcObjectSet *objset = NULL;
@@ -760,15 +1145,13 @@ ftfont_list_family (frame)
if (! fontset)
goto finish;
- list = Qnil;
for (i = 0; i < fontset->nfont; i++)
{
FcPattern *pat = fontset->fonts[i];
FcChar8 *str;
if (FcPatternGetString (pat, FC_FAMILY, 0, &str) == FcResultMatch)
- list = Fcons (intern_downcase ((char *) str, strlen ((char *) str)),
- list);
+ list = Fcons (intern ((char *) str), list);
}
finish:
@@ -780,17 +1163,7 @@ ftfont_list_family (frame)
}
-static void
-ftfont_free_entity (entity)
- Lisp_Object entity;
-{
- Lisp_Object val = AREF (entity, FONT_EXTRA_INDEX);
- FcPattern *pattern = XSAVE_VALUE (val)->pointer;
-
- FcPatternDestroy (pattern);
-}
-
-static struct font *
+static Lisp_Object
ftfont_open (f, entity, pixel_size)
FRAME_PTR f;
Lisp_Object entity;
@@ -798,48 +1171,41 @@ ftfont_open (f, entity, pixel_size)
{
struct ftfont_info *ftfont_info;
struct font *font;
+ struct ftfont_cache_data *cache_data;
FT_Face ft_face;
FT_Size ft_size;
FT_UInt size;
- Lisp_Object val;
- FcPattern *pattern;
- FcChar8 *file;
+ Lisp_Object val, filename, index, cache, font_object;
+ int scalable;
int spacing;
- char *name;
- int len;
+ char name[256];
+ int i, len;
+ int upEM;
- val = AREF (entity, FONT_EXTRA_INDEX);
- if (XTYPE (val) != Lisp_Misc
- || XMISCTYPE (val) != Lisp_Misc_Save_Value)
- return NULL;
- pattern = XSAVE_VALUE (val)->pointer;
- if (XSAVE_VALUE (val)->integer == 0)
- {
- /* We have not yet created FT_Face for this font. */
- if (! ft_library
- && FT_Init_FreeType (&ft_library) != 0)
- return NULL;
- if (FcPatternGetString (pattern, FC_FILE, 0, &file) != FcResultMatch)
- return NULL;
- if (FT_New_Face (ft_library, (char *) file, 0, &ft_face) != 0)
- return NULL;
- FcPatternAddFTFace (pattern, FC_FT_FACE, ft_face);
- ft_size = ft_face->size;
- }
- else
+ val = assq_no_quit (QCfont_entity, AREF (entity, FONT_EXTRA_INDEX));
+ if (! CONSP (val))
+ return Qnil;
+ val = XCDR (val);
+ cache = ftfont_lookup_cache (entity, FTFONT_CACHE_FOR_FACE);
+ if (NILP (cache))
+ return Qnil;
+ filename = XCAR (val);
+ index = XCDR (val);
+ val = XCDR (cache);
+ cache_data = XSAVE_VALUE (XCDR (cache))->pointer;
+ ft_face = cache_data->ft_face;
+ if (XSAVE_VALUE (val)->integer > 0)
{
- if (FcPatternGetFTFace (pattern, FC_FT_FACE, 0, &ft_face)
- != FcResultMatch)
- return NULL;
+ /* FT_Face in this cache is already used by the different size. */
if (FT_New_Size (ft_face, &ft_size) != 0)
- return NULL;
+ return Qnil;
if (FT_Activate_Size (ft_size) != 0)
{
FT_Done_Size (ft_size);
- return NULL;
+ return Qnil;
}
- }
-
+ }
+ XSAVE_VALUE (val)->integer++;
size = XINT (AREF (entity, FONT_SIZE_INDEX));
if (size == 0)
size = pixel_size;
@@ -847,84 +1213,97 @@ ftfont_open (f, entity, pixel_size)
{
if (XSAVE_VALUE (val)->integer == 0)
FT_Done_Face (ft_face);
- return NULL;
+ return Qnil;
}
- ftfont_info = malloc (sizeof (struct ftfont_info));
- if (! ftfont_info)
- return NULL;
- ftfont_info->ft_size = ft_size;
+ font_object = font_make_object (VECSIZE (struct ftfont_info), entity, size);
+ ASET (font_object, FONT_TYPE_INDEX, Qfreetype);
+ len = font_unparse_xlfd (entity, size, name, 256);
+ if (len > 0)
+ ASET (font_object, FONT_NAME_INDEX, make_string (name, len));
+ len = font_unparse_fcname (entity, size, name, 256);
+ if (len > 0)
+ ASET (font_object, FONT_FULLNAME_INDEX, make_string (name, len));
+ else
+ ASET (font_object, FONT_FULLNAME_INDEX,
+ AREF (font_object, FONT_NAME_INDEX));
+ ASET (font_object, FONT_FILE_INDEX, filename);
+ ASET (font_object, FONT_FORMAT_INDEX, ftfont_font_format (NULL, filename));
+ font = XFONT_OBJECT (font_object);
+ ftfont_info = (struct ftfont_info *) font;
+ ftfont_info->ft_size = ft_face->size;
+ ftfont_info->index = XINT (index);
#ifdef HAVE_LIBOTF
ftfont_info->maybe_otf = ft_face->face_flags & FT_FACE_FLAG_SFNT;
ftfont_info->otf = NULL;
#endif /* HAVE_LIBOTF */
-
- font = (struct font *) ftfont_info;
- font->format = ftfont_font_format (pattern);
- font->entity = entity;
+ /* This means that there's no need of transformation. */
+ ftfont_info->matrix.xx = 0;
font->pixel_size = size;
font->driver = &ftfont_driver;
- len = 96;
- name = malloc (len);
- while (name && font_unparse_fcname (entity, pixel_size, name, len) < 0)
- {
- char *new = realloc (name, len += 32);
-
- if (! new)
- free (name);
- name = new;
- }
- font->font.full_name = font->font.name = name;
- font->file_name = (char *) file;
- font->font.size = ft_face->size->metrics.max_advance >> 6;
- if (font->font.size <= 0)
- font->font.size = size;
- font->font.charset = font->encoding_charset = font->repertory_charset = -1;
- font->ascent = ft_face->size->metrics.ascender >> 6;
- font->descent = - ft_face->size->metrics.descender >> 6;
- font->font.height = font->ascent + font->descent;
- if (FcPatternGetInteger (pattern, FC_SPACING, 0, &spacing) != FcResultMatch)
+ font->encoding_charset = font->repertory_charset = -1;
+
+ upEM = ft_face->units_per_EM;
+ scalable = (INTEGERP (AREF (entity, FONT_AVGWIDTH_INDEX))
+ && XINT (AREF (entity, FONT_AVGWIDTH_INDEX)) == 0);
+ if (scalable)
+ {
+ font->ascent = ft_face->ascender * size / upEM;
+ font->descent = - ft_face->descender * size / upEM;
+ font->height = ft_face->height * size / upEM;
+ }
+ else
+ {
+ font->ascent = ft_face->size->metrics.ascender >> 6;
+ font->descent = - ft_face->size->metrics.descender >> 6;
+ font->height = ft_face->size->metrics.height >> 6;
+ }
+ if (INTEGERP (AREF (entity, FONT_SPACING_INDEX)))
+ spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
+ else
spacing = FC_PROPORTIONAL;
if (spacing != FC_PROPORTIONAL)
- font->font.average_width = font->font.space_width = font->font.size;
+ font->min_width = font->average_width = font->space_width
+ = (scalable ? ft_face->max_advance_width * size / upEM
+ : ft_face->size->metrics.max_advance >> 6);
else
{
- int i;
+ int n;
- font->font.average_width = font->font.space_width = 0;
- for (i = 32; i < 127; i++)
- {
- if (FT_Load_Char (ft_face, i, FT_LOAD_DEFAULT) != 0)
- break;
- if (i == 32)
- font->font.space_width = ft_face->glyph->metrics.horiAdvance >> 6;
- font->font.average_width += ft_face->glyph->metrics.horiAdvance >> 6;
- }
- if (i == 127)
- {
- /* The font contains all ASCII printable characters. */
- font->font.average_width /= 95;
- }
- else
- {
- if (i == 32)
- font->font.space_width = font->font.size;
- font->font.average_width = font->font.size;
- }
+ font->min_width = font->average_width = font->space_width = 0;
+ for (i = 32, n = 0; i < 127; i++)
+ if (FT_Load_Char (ft_face, i, FT_LOAD_DEFAULT) == 0)
+ {
+ int this_width = ft_face->glyph->metrics.horiAdvance >> 6;
+
+ if (this_width > 0
+ && (! font->min_width || font->min_width > this_width))
+ font->min_width = this_width;
+ if (i == 32)
+ font->space_width = this_width;
+ font->average_width += this_width;
+ n++;
+ }
+ if (n > 0)
+ font->average_width /= n;
}
- /* Unfortunately FreeType doesn't provide a way to get minimum char
- width. So, we use space_width instead. */
- font->min_width = font->font.space_width;
-
- font->font.baseline_offset = 0;
- font->font.relative_compose = 0;
- font->font.default_ascent = 0;
- font->font.vertical_centering = 0;
-
- (XSAVE_VALUE (val)->integer)++;
+ font->baseline_offset = 0;
+ font->relative_compose = 0;
+ font->default_ascent = 0;
+ font->vertical_centering = 0;
+ if (scalable)
+ {
+ font->underline_position = -ft_face->underline_position * size / upEM;
+ font->underline_thickness = ft_face->underline_thickness * size / upEM;
+ }
+ else
+ {
+ font->underline_position = -1;
+ font->underline_thickness = 0;
+ }
- return font;
+ return font_object;
}
static void
@@ -933,38 +1312,58 @@ ftfont_close (f, font)
struct font *font;
{
struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
- Lisp_Object entity = font->entity;
- Lisp_Object val = AREF (entity, FONT_EXTRA_INDEX);
+ Lisp_Object val, cache;
+ val = Fcons (font->props[FONT_FILE_INDEX], make_number (ftfont_info->index));
+ cache = ftfont_lookup_cache (val, FTFONT_CACHE_FOR_FACE);
+ xassert (CONSP (cache));
+ val = XCDR (cache);
(XSAVE_VALUE (val)->integer)--;
if (XSAVE_VALUE (val)->integer == 0)
{
- FT_Done_Face (ftfont_info->ft_size->face);
+ struct ftfont_cache_data *cache_data = XSAVE_VALUE (val)->pointer;
+
+ FT_Done_Face (cache_data->ft_face);
#ifdef HAVE_LIBOTF
if (ftfont_info->otf)
OTF_close (ftfont_info->otf);
#endif
+ cache_data->ft_face = NULL;
}
else
FT_Done_Size (ftfont_info->ft_size);
-
- free (font);
}
-static int
-ftfont_has_char (entity, c)
- Lisp_Object entity;
+static int
+ftfont_has_char (font, c)
+ Lisp_Object font;
int c;
{
- Lisp_Object val;
- FcPattern *pattern;
- FcCharSet *charset;
+ struct charset *cs = NULL;
+
+ if (EQ (AREF (font, FONT_ADSTYLE_INDEX), Qja)
+ && charset_jisx0208 >= 0)
+ cs = CHARSET_FROM_ID (charset_jisx0208);
+ else if (EQ (AREF (font, FONT_ADSTYLE_INDEX), Qko)
+ && charset_ksc5601 >= 0)
+ cs = CHARSET_FROM_ID (charset_ksc5601);
+ if (cs)
+ return (ENCODE_CHAR (cs, c) != CHARSET_INVALID_CODE (cs));
+
+ if (FONT_ENTITY_P (font))
+ {
+ FcCharSet *charset = ftfont_get_fc_charset (font);
- val = AREF (entity, FONT_EXTRA_INDEX);
- pattern = XSAVE_VALUE (val)->pointer;
- if (FcPatternGetCharSet (pattern, FC_CHARSET, 0, &charset) != FcResultMatch)
- return -1;
- return (FcCharSetHasChar (charset, (FcChar32) c) == FcTrue);
+ return (FcCharSetHasChar (charset, c) == FcTrue);
+ }
+ else
+ {
+ struct ftfont_info *ftfont_info;
+
+ ftfont_info = (struct ftfont_info *) XFONT_OBJECT (font);
+ return (FT_Get_Char_Index (ftfont_info->ft_size->face, (FT_ULong) c)
+ != 0);
+ }
}
static unsigned
@@ -990,18 +1389,29 @@ ftfont_text_extents (font, code, nglyphs, metrics)
struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
FT_Face ft_face = ftfont_info->ft_size->face;
int width = 0;
- int i;
+ int i, first;
if (ftfont_info->ft_size != ft_face->size)
FT_Activate_Size (ftfont_info->ft_size);
if (metrics)
bzero (metrics, sizeof (struct font_metrics));
- for (i = 0; i < nglyphs; i++)
+ for (i = 0, first = 1; i < nglyphs; i++)
{
if (FT_Load_Glyph (ft_face, code[i], FT_LOAD_DEFAULT) == 0)
{
FT_Glyph_Metrics *m = &ft_face->glyph->metrics;
+ if (first)
+ {
+ if (metrics)
+ {
+ metrics->lbearing = m->horiBearingX >> 6;
+ metrics->rbearing = (m->horiBearingX + m->width) >> 6;
+ metrics->ascent = m->horiBearingY >> 6;
+ metrics->descent = (m->height - m->horiBearingY) >> 6;
+ }
+ first = 0;
+ }
if (metrics)
{
if (metrics->lbearing > width + (m->horiBearingX >> 6))
@@ -1012,14 +1422,14 @@ ftfont_text_extents (font, code, nglyphs, metrics)
= width + ((m->horiBearingX + m->width) >> 6);
if (metrics->ascent < (m->horiBearingY >> 6))
metrics->ascent = m->horiBearingY >> 6;
- if (metrics->descent > ((m->horiBearingY + m->height) >> 6))
- metrics->descent = (m->horiBearingY + m->height) >> 6;
+ if (metrics->descent > ((m->height - m->horiBearingY) >> 6))
+ metrics->descent = (m->height - m->horiBearingY) >> 6;
}
width += m->horiAdvance >> 6;
}
else
{
- width += font->font.space_width;
+ width += font->space_width;
}
}
if (metrics)
@@ -1100,6 +1510,72 @@ ftfont_anchor_point (font, code, index, x, y)
}
#ifdef HAVE_LIBOTF
+
+static Lisp_Object
+ftfont_otf_features (gsub_gpos)
+ OTF_GSUB_GPOS *gsub_gpos;
+{
+ Lisp_Object scripts, langsyses, features, sym;
+ int i, j, k, l;
+
+ for (scripts = Qnil, i = gsub_gpos->ScriptList.ScriptCount - 1; i >= 0; i--)
+ {
+ OTF_Script *otf_script = gsub_gpos->ScriptList.Script + i;
+
+ for (langsyses = Qnil, j = otf_script->LangSysCount - 1; j >= -1; j--)
+ {
+ OTF_LangSys *otf_langsys;
+
+ if (j >= 0)
+ otf_langsys = otf_script->LangSys + j;
+ else if (otf_script->DefaultLangSysOffset)
+ otf_langsys = &otf_script->DefaultLangSys;
+ else
+ break;
+
+ for (features = Qnil, k = otf_langsys->FeatureCount - 1; k >= 0; k--)
+ {
+ l = otf_langsys->FeatureIndex[k];
+ if (l >= gsub_gpos->FeatureList.FeatureCount)
+ continue;
+ OTF_TAG_SYM (sym, gsub_gpos->FeatureList.Feature[l].FeatureTag);
+ features = Fcons (sym, features);
+ }
+ if (j >= 0)
+ OTF_TAG_SYM (sym, otf_script->LangSysRecord[j].LangSysTag);
+ else
+ sym = Qnil;
+ langsyses = Fcons (Fcons (sym, features), langsyses);
+ }
+
+ OTF_TAG_SYM (sym, gsub_gpos->ScriptList.Script[i].ScriptTag);
+ scripts = Fcons (Fcons (sym, langsyses), scripts);
+ }
+ return scripts;
+
+}
+
+
+static Lisp_Object
+ftfont_otf_capability (font)
+ struct font *font;
+{
+ struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
+ OTF *otf = ftfont_get_otf (ftfont_info);
+ Lisp_Object gsub_gpos;
+
+ if (! otf)
+ return Qnil;
+ gsub_gpos = Fcons (Qnil, Qnil);
+ if (OTF_get_table (otf, "GSUB") == 0
+ && otf->gsub->FeatureList.FeatureCount > 0)
+ XSETCAR (gsub_gpos, ftfont_otf_features (otf->gsub));
+ if (OTF_get_table (otf, "GPOS") == 0
+ && otf->gpos->FeatureList.FeatureCount > 0)
+ XSETCDR (gsub_gpos, ftfont_otf_features (otf->gpos));
+ return gsub_gpos;
+}
+
#ifdef HAVE_M17N_FLT
struct MFLTFontFT
@@ -1108,6 +1584,7 @@ struct MFLTFontFT
struct font *font;
FT_Face ft_face;
OTF *otf;
+ FT_Matrix *matrix;
};
static int
@@ -1131,6 +1608,12 @@ ftfont_get_glyph_id (font, gstring, from, to)
return 0;
}
+/* Operators for 26.6 fixed fractional pixel format */
+
+#define FLOOR(x) ((x) & -64)
+#define CEIL(x) (((x)+63) & -64)
+#define ROUND(x) (((x)+32) & -64)
+
static int
ftfont_get_metrics (font, gstring, from, to)
MFLTFont *font;
@@ -1147,21 +1630,40 @@ ftfont_get_metrics (font, gstring, from, to)
if (g->code != FONT_INVALID_CODE)
{
FT_Glyph_Metrics *m;
+ int lbearing, rbearing, ascent, descent, xadv;
if (FT_Load_Glyph (ft_face, g->code, FT_LOAD_DEFAULT) != 0)
abort ();
m = &ft_face->glyph->metrics;
-
- g->lbearing = m->horiBearingX;
- g->rbearing = m->horiBearingX + m->width;
- g->ascent = m->horiBearingY;
- g->descent = m->height - m->horiBearingY;
- g->xadv = m->horiAdvance;
+ if (flt_font_ft->matrix)
+ {
+ FT_Vector v[4];
+ int i;
+
+ v[0].x = v[1].x = m->horiBearingX;
+ v[2].x = v[3].x = m->horiBearingX + m->width;
+ v[0].y = v[2].y = m->horiBearingY;
+ v[1].y = v[3].y = m->horiBearingY - m->height;
+ for (i = 0; i < 4; i++)
+ FT_Vector_Transform (v + i, flt_font_ft->matrix);
+ g->lbearing = v[0].x < v[1].x ? FLOOR (v[0].x) : FLOOR (v[1].x);
+ g->rbearing = v[2].x > v[3].x ? CEIL (v[2].x) : CEIL (v[3].x);
+ g->ascent = v[0].y > v[2].y ? CEIL (v[0].y) : CEIL (v[2].y);
+ g->descent = v[1].y < v[3].y ? - FLOOR (v[1].y) : - FLOOR (v[3].y);
+ }
+ else
+ {
+ g->lbearing = FLOOR (m->horiBearingX);
+ g->rbearing = CEIL (m->horiBearingX + m->width);
+ g->ascent = CEIL (m->horiBearingY);
+ g->descent = - FLOOR (m->horiBearingY - m->height);
+ }
+ g->xadv = ROUND (ft_face->glyph->advance.x);
}
else
{
g->lbearing = 0;
- g->rbearing = g->xadv = flt_font_ft->font->font.space_width << 6;
+ g->rbearing = g->xadv = flt_font_ft->font->space_width << 6;
g->ascent = flt_font_ft->font->ascent << 6;
g->descent = flt_font_ft->font->descent << 6;
}
@@ -1171,7 +1673,7 @@ ftfont_get_metrics (font, gstring, from, to)
return 0;
}
-static int
+static int
ftfont_check_otf (MFLTFont *font, MFLTOtfSpec *spec)
{
struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font;
@@ -1226,16 +1728,37 @@ adjust_anchor (FT_Face ft_face, OTF_Anchor *anchor,
}
else if (anchor->AnchorFormat == 3)
{
- if (anchor->f.f2.XDeviceTable.offset)
+ if (anchor->f.f2.XDeviceTable.offset
+ && anchor->f.f2.XDeviceTable.DeltaValue)
*x += DEVICE_DELTA (anchor->f.f2.XDeviceTable, x_ppem);
- if (anchor->f.f2.YDeviceTable.offset)
+ if (anchor->f.f2.YDeviceTable.offset
+ && anchor->f.f2.YDeviceTable.DeltaValue)
*y += DEVICE_DELTA (anchor->f.f2.YDeviceTable, y_ppem);
}
}
static OTF_GlyphString otf_gstring;
-static int
+static void
+setup_otf_gstring (int size)
+{
+ if (otf_gstring.size == 0)
+ {
+ otf_gstring.glyphs = (OTF_Glyph *) xmalloc (sizeof (OTF_Glyph) * size);
+ otf_gstring.size = size;
+ }
+ else if (otf_gstring.size < size)
+ {
+ otf_gstring.glyphs = xrealloc (otf_gstring.glyphs,
+ sizeof (OTF_Glyph) * size);
+ otf_gstring.size = size;
+ }
+ otf_gstring.used = size;
+ memset (otf_gstring.glyphs, 0, sizeof (OTF_Glyph) * size);
+}
+
+
+static int
ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
MFLTFont *font;
MFLTOtfSpec *spec;
@@ -1287,19 +1810,7 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
}
}
- if (otf_gstring.size == 0)
- {
- otf_gstring.glyphs = (OTF_Glyph *) malloc (sizeof (OTF_Glyph) * len);
- otf_gstring.size = len;
- }
- else if (otf_gstring.size < len)
- {
- otf_gstring.glyphs = (OTF_Glyph *) realloc (otf_gstring.glyphs,
- sizeof (OTF_Glyph) * len);
- otf_gstring.size = len;
- }
- otf_gstring.used = len;
- memset (otf_gstring.glyphs, 0, sizeof (OTF_Glyph) * len);
+ setup_otf_gstring (len);
for (i = 0; i < len; i++)
{
otf_gstring.glyphs[i].c = in->glyphs[from + i].c;
@@ -1318,7 +1829,6 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
return -2;
for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; )
{
- OTF_Glyph *endg;
MFLTGlyph *g;
int min_from, max_to;
int j;
@@ -1451,7 +1961,7 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
base_x = otfg->f.f4.base_anchor->XCoordinate * x_scale / 0x10000;
base_y = otfg->f.f4.base_anchor->YCoordinate * y_scale / 0x10000;
mark_x = otfg->f.f4.mark_anchor->XCoordinate * x_scale / 0x10000;
- mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 0x10000;;
+ mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 0x10000;
if (otfg->f.f4.base_anchor->AnchorFormat != 1)
adjust_anchor (ft_face, otfg->f.f4.base_anchor,
@@ -1507,16 +2017,19 @@ static int m17n_flt_initialized;
extern Lisp_Object QCfamily;
-Lisp_Object
-ftfont_shape_by_flt (lgstring, font, ft_face, otf)
+static Lisp_Object
+ftfont_shape_by_flt (lgstring, font, ft_face, otf, matrix)
Lisp_Object lgstring;
struct font *font;
FT_Face ft_face;
OTF *otf;
+ FT_Matrix *matrix;
{
- EMACS_UINT len = LGSTRING_LENGTH (lgstring);
+ EMACS_UINT len = LGSTRING_GLYPH_LEN (lgstring);
EMACS_UINT i;
struct MFLTFontFT flt_font_ft;
+ MFLT *flt = NULL;
+ int with_variation_selector = 0;
if (! m17n_flt_initialized)
{
@@ -1525,24 +2038,71 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf)
}
for (i = 0; i < len; i++)
- if (NILP (LGSTRING_GLYPH (lgstring, i)))
- break;
+ {
+ Lisp_Object g = LGSTRING_GLYPH (lgstring, i);
+ int c;
+
+ if (NILP (g))
+ break;
+ c = LGLYPH_CHAR (g);
+ if (CHAR_VARIATION_SELECTOR_P (c))
+ with_variation_selector++;
+ }
len = i;
+ if (with_variation_selector)
+ {
+ setup_otf_gstring (len);
+ for (i = 0; i < len; i++)
+ {
+ Lisp_Object g = LGSTRING_GLYPH (lgstring, i);
+
+ otf_gstring.glyphs[i].c = LGLYPH_CHAR (g);
+ otf_gstring.glyphs[i].f.index.from = LGLYPH_FROM (g);
+ otf_gstring.glyphs[i].f.index.to = LGLYPH_TO (g);
+ }
+ OTF_drive_cmap (otf, &otf_gstring);
+ for (i = 0; i < otf_gstring.used; i++)
+ {
+ OTF_Glyph *otfg = otf_gstring.glyphs + i;
+ Lisp_Object g0 = LGSTRING_GLYPH (lgstring, otfg->f.index.from);
+ Lisp_Object g1 = LGSTRING_GLYPH (lgstring, otfg->f.index.to);
+
+ LGLYPH_SET_CODE (g0, otfg->glyph_id);
+ LGLYPH_SET_TO (g0, LGLYPH_TO (g1));
+ LGSTRING_SET_GLYPH (lgstring, i, g0);
+ }
+ if (len > otf_gstring.used)
+ {
+ len = otf_gstring.used;
+ LGSTRING_SET_GLYPH (lgstring, len, Qnil);
+ }
+ }
if (gstring.allocated == 0)
{
gstring.allocated = len * 2;
gstring.glyph_size = sizeof (MFLTGlyph);
- gstring.glyphs = malloc (sizeof (MFLTGlyph) * gstring.allocated);
+ gstring.glyphs = xmalloc (sizeof (MFLTGlyph) * gstring.allocated);
}
else if (gstring.allocated < len * 2)
{
gstring.allocated = len * 2;
- gstring.glyphs = realloc (gstring.glyphs,
- sizeof (MFLTGlyph) * gstring.allocated);
+ gstring.glyphs = xrealloc (gstring.glyphs,
+ sizeof (MFLTGlyph) * gstring.allocated);
}
+ memset (gstring.glyphs, 0, sizeof (MFLTGlyph) * len);
for (i = 0; i < len; i++)
- gstring.glyphs[i].c = LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, i));
+ {
+ Lisp_Object g = LGSTRING_GLYPH (lgstring, i);
+
+ gstring.glyphs[i].c = LGLYPH_CHAR (g);
+ if (with_variation_selector)
+ {
+ gstring.glyphs[i].code = LGLYPH_CODE (g);
+ gstring.glyphs[i].encoded = 1;
+ }
+ }
+
gstring.used = len;
gstring.r2l = 0;
@@ -1552,7 +2112,8 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf)
if (NILP (family))
flt_font_ft.flt_font.family = Mnil;
else
- flt_font_ft.flt_font.family = msymbol (SDATA (SYMBOL_NAME (family)));
+ flt_font_ft.flt_font.family
+ = msymbol ((char *) SDATA (Fdowncase (SYMBOL_NAME (family))));
}
flt_font_ft.flt_font.x_ppem = ft_face->size->metrics.x_ppem;
flt_font_ft.flt_font.y_ppem = ft_face->size->metrics.y_ppem;
@@ -1564,16 +2125,23 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf)
flt_font_ft.font = font;
flt_font_ft.ft_face = ft_face;
flt_font_ft.otf = otf;
+ flt_font_ft.matrix = matrix->xx != 0 ? matrix : 0;
+ if (len > 1
+ && gstring.glyphs[1].c >= 0x300 && gstring.glyphs[1].c <= 0x36F)
+ /* A little bit ad hoc. Perhaps, shaper must get script and
+ language information, and select a proper flt for them
+ here. */
+ flt = mflt_get (msymbol ("combining"));
for (i = 0; i < 3; i++)
{
- int result = mflt_run (&gstring, 0, len, &flt_font_ft.flt_font, NULL);
+ int result = mflt_run (&gstring, 0, len, &flt_font_ft.flt_font, flt);
if (result != -2)
break;
gstring.allocated += gstring.allocated;
- gstring.glyphs = realloc (gstring.glyphs,
- sizeof (MFLTGlyph) * gstring.allocated);
+ gstring.glyphs = xrealloc (gstring.glyphs,
+ sizeof (MFLTGlyph) * gstring.allocated);
}
- if (gstring.used > LGSTRING_LENGTH (lgstring))
+ if (gstring.used > LGSTRING_GLYPH_LEN (lgstring))
return Qnil;
for (i = 0; i < gstring.used; i++)
{
@@ -1622,65 +2190,166 @@ ftfont_shape (lgstring)
{
struct font *font;
struct ftfont_info *ftfont_info;
+ OTF *otf;
CHECK_FONT_GET_OBJECT (LGSTRING_FONT (lgstring), font);
ftfont_info = (struct ftfont_info *) font;
- if (! ftfont_info->maybe_otf)
+ otf = ftfont_get_otf (ftfont_info);
+ if (! otf)
return make_number (0);
- if (! ftfont_info->otf)
- {
- OTF *otf = OTF_open_ft_face (ftfont_info->ft_size->face);
+ return ftfont_shape_by_flt (lgstring, font, ftfont_info->ft_size->face, otf,
+ &ftfont_info->matrix);
+}
- if (! otf || OTF_get_table (otf, "head") < 0)
- {
- if (otf)
- OTF_close (otf);
- ftfont_info->maybe_otf = 0;
- return make_number (0);
- }
+#endif /* HAVE_M17N_FLT */
- ftfont_info->otf = otf;
- }
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
+
+static int
+ftfont_variation_glyphs (font, c, variations)
+ struct font *font;
+ int c;
+ unsigned variations[256];
+{
+ struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
+ OTF *otf = ftfont_get_otf (ftfont_info);
- return ftfont_shape_by_flt (lgstring, font, ftfont_info->ft_size->face,
- ftfont_info->otf);
+ if (! otf)
+ return 0;
+ return OTF_get_variation_glyphs (otf, c, variations);
}
-#endif /* HAVE_M17N_FLT */
+#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
#endif /* HAVE_LIBOTF */
Lisp_Object
-ftfont_font_format (FcPattern *pattern)
+ftfont_font_format (FcPattern *pattern, Lisp_Object filename)
{
FcChar8 *str;
#ifdef FC_FONTFORMAT
- if (FcPatternGetString (pattern, FC_FONTFORMAT, 0, &str) != FcResultMatch)
- return Qnil;
- if (strcmp ((char *) str, "TrueType") == 0)
- return intern ("truetype");
- if (strcmp ((char *) str, "Type 1") == 0)
- return intern ("type1");
- if (strcmp ((char *) str, "PCF") == 0)
- return intern ("pcf");
- if (strcmp ((char *) str, "BDF") == 0)
- return intern ("bdf");
-#else /* not FC_FONTFORMAT */
- if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
- return Qnil;
- if (strcasestr ((char *) str, ".ttf") == 0)
- return intern ("truetype");
- if (strcasestr ((char *) str, "pfb") == 0)
- return intern ("type1");
- if (strcasestr ((char *) str, "pcf") == 0)
- return intern ("pcf");
- if (strcasestr ((char *) str, "bdf") == 0)
- return intern ("bdf");
-#endif /* not FC_FONTFORMAT */
+ if (pattern)
+ {
+ if (FcPatternGetString (pattern, FC_FONTFORMAT, 0, &str) != FcResultMatch)
+ return Qnil;
+ if (strcmp ((char *) str, "TrueType") == 0)
+ return intern ("truetype");
+ if (strcmp ((char *) str, "Type 1") == 0)
+ return intern ("type1");
+ if (strcmp ((char *) str, "PCF") == 0)
+ return intern ("pcf");
+ if (strcmp ((char *) str, "BDF") == 0)
+ return intern ("bdf");
+ }
+#endif /* FC_FONTFORMAT */
+ if (STRINGP (filename))
+ {
+ int len = SBYTES (filename);
+
+ if (len >= 4)
+ {
+ str = (FcChar8 *) (SDATA (filename) + len - 4);
+ if (xstrcasecmp ((char *) str, ".ttf") == 0)
+ return intern ("truetype");
+ if (xstrcasecmp ((char *) str, ".pfb") == 0)
+ return intern ("type1");
+ if (xstrcasecmp ((char *) str, ".pcf") == 0)
+ return intern ("pcf");
+ if (xstrcasecmp ((char *) str, ".bdf") == 0)
+ return intern ("bdf");
+ }
+ }
return intern ("unknown");
}
-
+static const char *ftfont_booleans [] = {
+ ":antialias",
+ ":hinting",
+ ":verticallayout",
+ ":autohint",
+ ":globaladvance",
+ ":outline",
+ ":scalable",
+ ":minspace",
+ ":embolden",
+ NULL,
+};
+
+static const char *ftfont_non_booleans [] = {
+ ":family",
+ ":familylang",
+ ":style",
+ ":stylelang",
+ ":fullname",
+ ":fullnamelang",
+ ":slant",
+ ":weight",
+ ":size",
+ ":width",
+ ":aspect",
+ ":pixelsize",
+ ":spacing",
+ ":foundry",
+ ":hintstyle",
+ ":file",
+ ":index",
+ ":ftface",
+ ":rasterizer",
+ ":scale",
+ ":dpi",
+ ":rgba",
+ ":lcdfilter",
+ ":charset",
+ ":lang",
+ ":fontversion",
+ ":capability",
+ NULL,
+};
+
+static void
+ftfont_filter_properties (font, alist)
+ Lisp_Object font;
+ Lisp_Object alist;
+{
+ Lisp_Object it;
+ int i;
+
+ /* Set boolean values to Qt or Qnil */
+ for (i = 0; ftfont_booleans[i] != NULL; ++i)
+ for (it = alist; ! NILP (it); it = XCDR (it))
+ {
+ Lisp_Object key = XCAR (XCAR (it));
+ Lisp_Object val = XCDR (XCAR (it));
+ char *keystr = SDATA (SYMBOL_NAME (key));
+
+ if (strcmp (ftfont_booleans[i], keystr) == 0)
+ {
+ char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
+ if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
+ if (str == NULL) str = "true";
+
+ val = Qt;
+ if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0
+ || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0
+ || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0
+ || strcmp ("Off", str) == 0)
+ val = Qnil;
+ Ffont_put (font, key, val);
+ }
+ }
+
+ for (i = 0; ftfont_non_booleans[i] != NULL; ++i)
+ for (it = alist; ! NILP (it); it = XCDR (it))
+ {
+ Lisp_Object key = XCAR (XCAR (it));
+ Lisp_Object val = XCDR (XCAR (it));
+ char *keystr = SDATA (SYMBOL_NAME (key));
+ if (strcmp (ftfont_non_booleans[i], keystr) == 0)
+ Ffont_put (font, key, val);
+ }
+}
+
+
void
syms_of_ftfont ()
{
@@ -1701,6 +2370,9 @@ syms_of_ftfont ()
Fcons (Fcons (Qsans_serif, Qt),
Fcons (Fcons (Qsans, Qt), Qnil)));
+ staticpro (&ft_face_cache);
+ ft_face_cache = Qnil;
+
ftfont_driver.type = Qfreetype;
register_font_driver (&ftfont_driver, NULL);
}