Commit a31741fa authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Merge branch 'matthiasc/for-main' into 'main'

Don't replace | with hyphens

Closes #630

See merge request !516
parents 0eb9ca5a 8d6d0230
Pipeline #334920 passed with stages
in 7 minutes and 10 seconds
......@@ -2,4 +2,4 @@
set -e
PATH=_build/pango:$PATH _build/utils/pango-list --verbose --metrics > _build/fontlist.txt
PATH=_build/pango:$PATH _build/utils/pango-list --verbose --metrics > _build/fontlist.txt || true
......@@ -2,4 +2,4 @@
set -e
PATH=_build/pango:$PATH _build/utils/pango-view --no-display --output _build/hello.png utils/HELLO.txt
PATH=_build/pango:$PATH _build/utils/pango-view --no-display --output _build/hello.png utils/HELLO.txt || true
......@@ -402,13 +402,16 @@ if build_pangoft2
pango_deps += freetype_dep
endif
build_pangoxft = false
xft_dep = dependency('xft', version: xft_req_version, required: get_option('xft'))
if xft_dep.found() and fontconfig_dep.found() and freetype_dep.found()
pango_conf.set('HAVE_XFT', 1)
pango_deps += dependency('xrender', required: false)
pango_deps += xft_dep
build_pangoxft = true
endif
has_core_text = false
if host_system == 'darwin'
has_core_text = cc.links('''#include <CoreText/CoreText.h>
int main (void) {
......@@ -653,3 +656,25 @@ endif
if not meson.is_subproject()
meson.add_dist_script('build-aux/meson/dist-docs.py')
endif
summary('Font backends', pango_font_backends)
summary('Cairo support', cairo_dep.found(), section: 'Features')
summary('Fontconfig support', fontconfig_dep.found(), section: 'Features')
summary('Freetype support', freetype_dep.found(), section: 'Features')
summary('Thai support', thai_dep.found(), section: 'Features')
summary('Sysprof support', libsysprof_capture_dep.found(), section: 'Features')
summary('Compiler', cc.get_id(), section: 'Toolchain')
summary('Linker', cc.get_linker_id(), section: 'Toolchain')
summary('Debugging', get_option('debug'), section: 'Build')
summary('Optimization', get_option('optimization'), section: 'Build')
summary('Introspection', get_option('introspection').enabled(), section: 'Build')
summary('Documentation', get_option('gtk_doc'), section: 'Build')
summary('Install tests', get_option('install-tests'), section: 'Build')
summary('prefix', pango_prefix, section: 'Directories')
summary('includedir', pango_includedir, section: 'Directories')
summary('libdir', pango_libdir, section: 'Directories')
summary('datadir', pango_datadir, section: 'Directories')
......@@ -1624,8 +1624,7 @@ default_break (const char *text,
else
attrs[i].break_inserts_hyphen = insert_hyphens;
if (prev_wc == 0x007C || /* Vertical Line */
prev_wc == 0x2027) /* Hyphenation point */
if (prev_wc == 0x2027) /* Hyphenation point */
{
attrs[i].break_inserts_hyphen = TRUE;
attrs[i].break_removes_preceding = TRUE;
......
......@@ -4,4 +4,4 @@ Whitespace: x w
Sentences: bs e b
Words: bs e s be bs be bs be b
Graphemes: b b b b b b b b b b b b b b b b b b b b b b b b b
Hyphens: i ri i i i ri i i i i i i i i i i i
Hyphens: i ri i i i i i i i i i i i i i i
......@@ -28,7 +28,7 @@ i=3, index=17, paragraph-start=1, dir=ltr ''
--- runs
i=1, index=0, chars=13, level=0, gravity=south, flags=4, font=OMITTED, script=latin, language=en-us, 'some|bla|bla|'
i=1, index=0, chars=13, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'some|bla|bla|'
i=2, index=13, no run, line end
i=3, index=13, chars=3, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'bla'
i=4, index=16, no run, line end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment