GitLab

(font_parse_name): Likewise.
(LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE, check_gstring): Define
them unconditionally.
(font_matching_entity): New function.
(font_open_by_name): Try font_matching_entity if exact match is
not found.
(font_update_drivers): Delete the arg FONT.  Return a list of
actually used backends.  Don't free faces, font caches here.
Don't store data in frame parameters.  Don't call x_set_font.
(Ffont_spec): Store :name property as is.
(Ffont_get): Check HAVE_LIBOTF before calling font_otf_capability.
(Ffont_otf_gsub): Call font->driver->otf_gsub instead of
font_otf_gsub.
(Ffont_otf_gpos): Call font->driver->otf_gpos instead of
font_otf_gpos.
(Ffont_otf_alternates): Check if the driver has otf_gsub function.
Call font->driver->otf_gsub instead of font_otf_gsub.

langsys.
(parse_gsub_gpos_spec): Type changed to void.  New arg nbytes.
Check the contents of SPEC.
(LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE): New macros.
(check_gstring): New function.
(REPLACEMENT_CHARACTER): New macro.
(font_otf_gsub): New arg alternate_subst.  Be sure to set all
glyph codes of GSTRING.
(font_otf_gpos): Be sure to set all glyph codes of GSTRING.
(font_prepare_composition): Set cmp->glyph_len.
(font_open_entity): Set font->scalable.
(Ffont_get): Handle :otf property.
(Ffont_otf_gsub, Ffont_otf_gpos, Ffont_otf_alternates): New
functions.
(Fquery_font): Use font->font.full_name.
(syms_of_font): Defsubr Sfont_otf_gsub, Sfont_otf_gpos, and
Sfont_otf_alternates.

(font_list_entities): Check driver_list->on.
(register_font_driver): Initalize `on' member to 0.
(font_update_drivers): New function.
(Fclear_font_cache): Check driver_list->on.

(font_lispy_object): New function.
(font_prepare_composition): Check LGLYPH_FORM (g) to detect the
end of valid glyph.
(font_close_object): Fix getting (struct font *).
(font_at): New function.
(Ffont_get): If FONT is a font-object, get entity from it.
(Ffont_make_gstring): Initialize elements of glyphs with nil.
(Ffont_fill_gstring): Use macro LGSTRING_XXX and LGLYPH_XXX.  Fix
range check.
(Ffont_at): New function.
(syms_of_font): Defsubr Sfont_at.

card.
(DEVICE_DELTA): Fix typo.
(font_otf_gpos): Adjusted for the change of LGLYPH format.
(font_prepare_composition): Likewise.

(syms_of_font): Initialize them.
(font_pixel_size): Allow float value in dpi.
(font_prop_validate_type): Deleted.
(font_prop_validate_symbol, font_prop_validate_style): Argument
changed.  Caller changed.
(font_prop_validate_non_neg): Renamed from
font_prop_validate_size.
(font_prop_validate_extra): Deleted.
(font_prop_validate_spacing): New function.
(font_property_table): Add elements for all known properties.
(get_font_prop_index): Renamed from check_font_prop_name.  New
argument FROM.  Caller changed.
(font_prop_validate): Validate all known properties.
(font_put_extra): Argument force deleted.  Caller changed.
(font_expand_wildcards): Make it static.  Fix the way of shrinking
the possible range.
(font_parse_xlfd): Arguemnt merge deleted.  Fix handling of RESX,
RESY, SPACING, and AVGWIDTH.  Don't validate property values here.
Caller changed.
(font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
(font_parse_fcname): Arguemnt merge deleted.  Fix parsing of point
size.  Don't validate properties values here.  Caller changed.
(font_unparse_fcname): Handle dpi, spacing, and scalable
properties.
(font_open_by_name): Delete unused variable.
(Ffont_spec): Likewise.  Validate property values.
(Ffont_match_p): New function.

(font_has_char): Accept font-object too.
(font_find_for_lface): Try at first with a size specified in face.

(QCspacing, QCdpi): New variables.
(syms_of_font): Initialize them.
(font_pixel_size): New function.
(font_put_extra): New function.
(font_parse_xlfd): Fix handling of font size.  Add QCdpi property
in FONT_EXTRA.
(font_parse_fcname): Handle enumenrated values (e.g. bold).  Fix
handling font size.  Add QCname property that contains only
unknown properties.
(font_score): Change argument.  Caller changed.  Pay attention to
FONT_PIXEL_SIZE_QUANTUM.
(font_sort_entites): Fix handling of font size.
(font_list_entities): Likewise.
(font_find_for_lface): Likewise.
(font_open_for_lface): Likewise.
(font_open_by_name): Likewise.
(Ffont_spec): Add QCname property that contains only unknown
properties.

(font_unparse_fcname): Produce symbolic names for style
properties.
(font_list_entities): Handle float size correctly.
(font_open_by_name): Prefer `normal' property values if the name
doesn't specify them.

(XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it.
(font_expand_wildcards): Fix handling ENCODING field.  Avoid
unnecessary checks for weight, slant, and swidth.
(font_parse_fcname): New function.
(font_unparse_fcname): New function.
(font_parse_name): New function.
(font_match_p): New function.
(font_get_name): Return value changed to Lisp string.
(font_get_spec): New function.
(Qunspecified, Qignore_defface): Don't extern them.
(font_find_for_lface): Assume that LFACE is fully specified.
(font_load_for_face): If lface[LFACE_FONT_INDEX] is an font
object, use it for FACE.
(font_open_by_name): Call Ffont_spec with QCname prop.  Don't call
driver->parse_name.
(Ffont_spec): Call font_parse_name, not font_parse_xlfd.

XLFD_XXX_INDEX.
(enum xlfd_field_mask): New enum.
(intern_font_field): Argument changed.  Caller changed.  If digits
are followed by non-digits, return a symbol.
(font_expand_wildcards): New function.
(font_parse_xlfd): Fix wildcard handling.
(Ffont_spec): If :name is specified, reflect the info in the other
properties.

ftfont.c.
(font_unparse_xlfd): Fix argument type declaration.  Append "*" if
registry doesn't specify encoding part.
(font_find_for_lface): Pay attention to LFACE_FONT_INDEX.
(font_open_by_name): At first try parsing the name.
(syms_of_font): Declare Qiso8859_1, Qiso10646_1, and Qunicode_bmp
as Lisp symbols.