1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 05:01:02 -08:00
Commit graph

73 commits

Author SHA1 Message Date
Kenichi Handa
3299c55202 (ftfont_open): Genarate a multibyte string if given
names are utf-8.
2008-12-19 05:39:44 +00:00
Kenichi Handa
7b6494787a (fc_charset_table): Add "unicode-sip".
(ftfont_spec_pattern): Lookup fc_charset_table for the regisry
Qunicode_sip.
2008-12-10 06:01:44 +00:00
Kenichi Handa
7bf1bb2124 (ftfont_shape_by_flt): Use "combining" flt if the
second character is a combining character.
2008-12-05 12:26:58 +00:00
Chong Yidong
76d126ecc5 (ftfont_list_family): Initialize list var earlier. 2008-12-03 05:00:52 +00:00
Chong Yidong
bf39cdd818 (ftfont_resolve_generic_family): Avoid using uninitialized var. 2008-12-03 04:57:58 +00:00
Chong Yidong
a3c15670b4 (ftfont_match): Initialize entity variable. 2008-12-03 04:52:42 +00:00
Kenichi Handa
064766f2e8 (ftfont_otf_features): Fix previous change.
(ftfont_otf_capability): Check FeatureList.FeatureCount before
calling ftfont_otf_features.
2008-10-24 13:12:55 +00:00
Kenichi Handa
393566216f (ftfont_otf_features): Fix indexing
gsub_gpos->FeatureList.Feature.  Check the validity of indices.
2008-10-17 02:20:31 +00:00
Andreas Schwab
990a73f049 * ftfont.c (ftfont_shape_by_flt): Make static.
* ftfont.h (ftfont_shape_by_flt): Don't declare.
2008-10-12 12:50:00 +00:00
Kenichi Handa
fdf906797d (ftfont_shape_by_flt): Downcase family name. 2008-09-17 11:48:15 +00:00
Kenichi Handa
da2cf48856 (ftfont_shape_by_flt): Use "combining" FLT for ASCII characters. 2008-09-09 02:29:02 +00:00
Kenichi Handa
7c4bd58d24 (ftfont_spec_pattern): Don't create a charset of the
representative chars of the script is a vector.
(ftfont_list): Handle the case the representative chars of the
script is a vector.
2008-09-01 02:46:23 +00:00
Kenichi Handa
89a95b7cf7 Include composite.h.
(ftfont_resolve_generic_family): Add langset "en" to pattern.
(ftfont_shape_by_flt): Use LGSTRING_GLYPH_LEN, not
LGSTRING_LENGTH.
2008-08-29 07:56:10 +00:00
Kenichi Handa
d90bfd1cec *** empty log message *** 2008-07-21 02:23:57 +00:00
Andreas Schwab
bb6588648f (ftfont_resolve_generic_family): Remove foundry from
pattern before matching the generic family.
2008-07-10 13:13:21 +00:00
Kenichi Handa
e5d0597856 (ftfont_text_extents): Fix initial setting of metrics. 2008-07-09 07:38:38 +00:00
Kenichi Handa
e302a2919e (struct ftfont_info): New member index, delete member
fc_charset_idx.  Make the member order compatible with struct
xftfont_info.
(fc_charset_table): Change charset names to registry names.
(ftfont_pattern_entity): Delete the args registry and
fc_charset_idx.  Change the value of :font-entity property
to (FONTNAME . INDEX).  Always set :registry property to
`iso10646-1'.
(struct ftfont_cache_data): New struct.
(ftfont_lookup_cache): New arg for_face.
(ftfont_get_fc_charset, ftfont_get_otf): New functions.
(ftfont_driver): Set the member otf_capability.
(ftfont_get_charset): Adjust it for the change of
fc_charset_table.
(OTF_TAG_SYM): New macro.
(ftfont_spec_pattern): Delete the arg fc_charset_idx.  Adjust it
for the change of fc_charset_table.
(ftfont_list): Adjust it for the change of ftfont_spec_pattern and
ftfont_pattern_entity.  Add FC_INDEX to objset.
(ftfont_match): Adjust it for the change of ftfont_spec_pattern
and ftfont_pattern_entity.
(ftfont_open): Adjust it for the change of ftfont_lookup_cache,
font_make_object, struct ftfont_info.
(ftfont_has_char): Use ftfont_get_fc_charset.
(ftfont_otf_features, ftfont_otf_capability): New functions.
(ftfont_shape): Use ftfont_get_otf.
2008-07-09 00:31:42 +00:00
Kenichi Handa
7d7ad10e33 (fc_charset_table): New member lang.
(ftfont_resolve_generic_family): New arg pattern.
(ftfont_spec_pattern): Check fc_cahrset_table[]->lang.
(ftfont_list): Call ftfont_resolve_generic_family with `pattern'.
(ftfont_open): Fix args to ftfont_font_format.
(ftfont_font_format): New arg filename.
2008-06-30 07:39:14 +00:00
Kenichi Handa
4ffe34a4ed (ftfont_pattern_entity): New arg extra. Caller changed.
(ftfont_spec_pattern): Don't check QCfc_unknown_spec and QCname.
(ftfont_list) [FC_FONTFORMAT]: Include FC_FONTFORMAT in objset.
2008-06-19 00:42:11 +00:00
Kenichi Handa
2f4c3d6df6 (ftfont_font_format) [! FC_FONTFORMAT]: Declare "int len;". 2008-06-11 01:13:48 +00:00
Kenichi Handa
a1a9410256 (ftfont_pattern_entity): Adjusted for the change of font_intern_prop. 2008-06-10 02:07:53 +00:00
Kenichi Handa
770835fda4 (ftfont_spec_pattern): Accept the registry `ascii-0'. 2008-06-09 07:16:15 +00:00
Juanma Barranquero
2a46904e0e Fix typo in comment. 2008-06-01 21:26:53 +00:00
Kenichi Handa
719b3d63d3 (ftfont_font_format): Don't use strcasestr. 2008-05-31 02:29:58 +00:00
Kenichi Handa
5d376f741b (ftfont_spec_pattern): Don't set FC_SPACING to pattern.
(ftfont_list): Check spacing here.  Don't include FC_CHARSET in
objset.
2008-05-28 11:45:29 +00:00
Kenichi Handa
de24e3eb51 (ftfont_spec_pattern): Free charset if necessary. 2008-05-23 02:11:22 +00:00
Kenichi Handa
318548bef0 (ftfont_resolve_generic_family): Renamed from
ftfont_list_generic_family.  Return a single family for each
generic family.
(ftfont_spec_pattern): Add FC_FAMILY to pattern.
(ftfont_list): Adjusted for the change of
ftfont_resolve_generic_family.  Call font_add_log.
(ftfont_match): Call font_add_log.
2008-05-22 02:27:17 +00:00
Kenichi Handa
21988a0804 (cs_iso8859_1): Deleted.
(ft_face_cache): New variable.
(struct ftfont_info): New member fc_charset_idx;
(ftfont_build_basic_charsets): Deleted.
(fc_charset_table): New variable.
(ftfont_pattern_entity): New arg fc_charset_idx.  Store (FILENAME
. FC_CHARSET_IDX) as :font-entity property in the font entity.
Callers changed.
(ftfont_lookup_cache, ftfont_get_charset): New funcitons.
(ftfont_spec_pattern): New argument fc_charset_idx.  Check
registry more rigidly.  Callers changed.
(ftfont_open, ftfont_close, ftfont_has_char): Adjustd for the
change of :font-entity property of the font.
2008-05-19 07:21:25 +00:00
Kenichi Handa
66d3a50d6d (ftfont_list): Downcase family name to check generic families. 2008-05-15 06:44:06 +00:00
Glenn Morris
9ec0b715e2 Switch to recommended form of GPLv3 permissions notice. 2008-05-14 07:50:26 +00:00
Kenichi Handa
42984a746c (ftfont_pattern_entity): Argument FRAME removed. Make
a font-entity by font_make_entity.  Use font_intern_prop instead
of intern_downcase.  Use FONT_SET_STYLE to set a style-related
font property.  If a font is scalable, set avgwidth property to 0.
Set font-entity property by font_put_extra.
(ftfont_list_generic_family): Argument SPEC and REGISTRY removed.
(ffont_driver): Adjusted for the change of struct font_driver.
(ftfont_spec_pattern): New function.
(ftfont_list): Return a list, not vector.
(ftfont_match): Use ftfont_spec_pattern to get a pattern.
(ftfont_list_family): Don't downcase names.
(ftfont_free_entity): Deleted.
(ftfont_open): Return a font-ojbect.  Adjusted for the change of
struct font.  Get underline_thickness and underline_position from
font property.  Don't update dpyinfo->smallest_font_height and
dpyinfo->smallest_char_width.
(ftfont_close): Don't free `struct font'.
(ftfont_has_char): Adjusted for the format change of font-entity.
(ftfont_encode_char, ftfont_text_extents): Likewise.
2008-05-14 01:28:01 +00:00
Jason Rumney
43f4f91cef (ftfont_get_open_type_spec): Check spec->script, not val. 2008-04-03 08:17:15 +00:00
Andreas Schwab
f907fb2ebe (ftfont_pattern_entity): Fix aliasing violations. 2008-03-02 21:13:09 +00:00
Kenichi Handa
550826426f (ftfont_match): Explicitly set pixelsize in pattern. 2008-02-28 12:54:46 +00:00
Kenichi Handa
4cc1c8060a (ftfont_shape): Return Lispy number. 2008-02-16 12:40:42 +00:00
Kenichi Handa
06a1ab15d6 (ftfont_open): Fix previous change. 2008-02-07 01:13:18 +00:00
Kenichi Handa
1a2bd6faa2 (ftfont_open): Fix calculation of font->font.averange_width. 2008-02-06 11:52:58 +00:00
Glenn Morris
77ad4cfe12 Update copyright years and GPL version. 2008-02-06 04:24:36 +00:00
Kenichi Handa
637ac44c57 (ftfont_driver): Set ftfont_shape in ftfont_driver only
when both HAVE_M17N_FLT and HAVE_LIBOTF are defined.
2008-01-07 02:08:28 +00:00
Kenichi Handa
7d2fd54518 (ftfont_drive_otf): Fix setting of FROM and TO slots of
glyphs.
2007-12-27 01:15:39 +00:00
Kenichi Handa
4cec60619a (ftfont_encode_char): Use the macro FONT_INVALID_CODE.
(ftfont_shape_by_flt): If an element of lgstring is nil, make a
Lispy glyph and store it in the lgstring.
2007-12-25 10:32:26 +00:00
Kenichi Handa
771752281d (ftfont_get_cache): Adjust the argument type. 2007-12-18 11:47:33 +00:00
Kenichi Handa
169638172b (struct OpenTypeSpec): Members script_tag renamed to
script, langsys_tag renamed to langsys, new member script.
(OTF_TAG_STR): Terminate by '\0'.
(ftfont_get_open_type_spec): If :otf prop is is spec, Limit the
listing to the script specified in that property.  Fix arg to
OTF_check_features.
2007-12-09 12:29:51 +00:00
Kenichi Handa
7eb5d3d7a2 (OTF_SYM_TAG, OTF_TAG_STR): Fix argument names. 2007-12-06 07:25:29 +00:00
Kenichi Handa
f192035123 (struct OpenTypeSpec): New struct.
(OTF_SYM_TAG, OTF_TAG_STR): New macros.
(ftfont_get_open_type_spec): New function.
(ftfont_list) [HAVE_LIBOTF]: Check otf-spec property.
2007-12-05 12:03:13 +00:00
Kenichi Handa
cc63eaf948 (struct OpenTypeSpec): New struct.
(OTF_SYM_TAG, OTF_TAG_STR): New macros.
(ftfont_get_open_type_spec): New function.
(ftfont_list) [HAVE_LIBOTF]: Check otf-spec property.
2007-12-05 12:02:27 +00:00
Kenichi Handa
0d674a059d (ftfont_open): Set members maybe_otf and otf of
ftfont_info only when HAVE_LIBOTF is defined.
2007-12-03 01:42:01 +00:00
Kenichi Handa
de023c40ad Don't include Freetype headers. Include "ftfont.h".
(struct ftfont_info) [HAVE_LIBOTF]: New members maybe_otf and otf.
(ftfont_open) [HAVE_LIBOTF]: Initialize the above members.
(ftfont_driver) [HAVE_LIBOTF, HAVE_M17N_FLT]: Don't set
font_otf_capability and font_drive_otf, set ftfont_shape.
(ftfont_list): Adjusted for the change of :otf property value.
(struct MFLTFontFT) [HAVE_LIBOTF, HAVE_M17N_FLT]: New struct.
(ftfont_get_glyph_id, ftfont_get_metrics, ftfont_check_otf)
(adjust_anchor, ftfont_drive_otf, ftfont_shape_by_flt)
(ftfont_shape) [HAVE_LIBOTF, HAVE_M17N_FLT]: New function.s
(DEVICE_DELTA) [HAVE_LIBOTF, HAVE_M17N_FLT]: New macro.
(otf_gstring, gstring, m17n_flt_initialized): New variables.
2007-12-01 02:39:27 +00:00
Kenichi Handa
b51e5112fa (ftfont_get_bitmap): Set bitmap->bits_per_pixel. 2007-11-19 05:02:49 +00:00
Jason Rumney
48875afe4a (ftfont_font_format): Typo fix. 2007-06-21 23:33:35 +00:00