From b1b32152c182fdb0b9494e75acb605d0486e30fa Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 8 May 2020 23:36:33 +0200 Subject: 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. --- meson.build | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 495653d0..9d468862 100644 --- a/meson.build +++ b/meson.build @@ -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) -- cgit v1.3