unicode-precompose: use fcft's precompose functionality

This allows us more options when determining whether to use a
pre-composed character or not:

We now only use the pre-composed character if it's from the primary
font, or if at least one of the base or combining characters are from
a fallback font.

I.e. use glyphs from the primary font if possible. But, if one or more
of the decomposed glyphs are from a fallback font, use the
pre-composed character anyway.
This commit is contained in:
Daniel Eklöf 2020-05-08 23:36:33 +02:00
parent c090a0664f
commit b1b32152c1
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 26 additions and 33878 deletions

View file

@ -92,17 +92,6 @@ foreach prot : [
command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
endforeach
if get_option('unicode-precompose')
generate_unicode_precompose_sh = files('scripts/generate-unicode-precompose.sh')
unicode_data = custom_target(
'unicode-data',
input: 'UnicodeData.txt',
output: 'unicode-compose-table.h',
command: [generate_unicode_precompose_sh, '@INPUT@', '@OUTPUT@'])
else
unicode_data = []
endif
generate_version_sh = files('generate-version.sh')
version = custom_target(
'generate_version',
@ -138,7 +127,7 @@ executable(
'tokenize.c', 'tokenize.h',
'vt.c', 'vt.h',
'wayland.c', 'wayland.h',
wl_proto_src + wl_proto_headers, version, unicode_data,
wl_proto_src + wl_proto_headers, version,
dependencies: [math, threads, pixman, wayland_client, wayland_cursor, xkb, tllist, fcft],
install: true)