docs/harfbuzz-docs.xml | 1 - docs/harfbuzz-sections.txt | 10 ++++++++-- src/hb-common.h | 2 +- src/hb-directwrite.cc | 36 +++++++++++++++++++++++++++++++----- src/hb-directwrite.h | 3 +++ src/hb-subset-input.cc | 4 ++-- 6 files changed, 45 insertions(+), 11 deletions(-)
New commits: commit b292772e6ef15728dd66329e637265748df0efe1 Author: Ebrahim Byagowi <[email protected]> Date: Fri Mar 29 13:00:56 2019 -0700 [dwrite] A new API, hb_directwrite_face_get_font_face (#1600) Can be useful when using HarfBuzz for font loading and shaping but using DirectWrite for rendering. diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt index 27dc1e2d..f97902f7 100644 --- a/docs/harfbuzz-sections.txt +++ b/docs/harfbuzz-sections.txt @@ -217,6 +217,14 @@ hb_coretext_font_get_ct_font </SECTION> <SECTION> +<FILE>hb-directwrite</FILE> +hb_directwrite_face_create +hb_directwrite_face_get_font_face +<SUBSECTION Private> +hb_directwrite_shape_experimental_width +</SECTION> + +<SECTION> <FILE>hb-face</FILE> hb_face_count hb_face_t @@ -715,8 +723,6 @@ hb_unicode_script_func_t <FILE>hb-uniscribe</FILE> hb_uniscribe_font_get_hfont hb_uniscribe_font_get_logfontw -<SUBSECTION Private> -hb_directwrite_shape_experimental_width </SECTION> <SECTION> diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc index cbf04a82..d8076c92 100644 --- a/src/hb-directwrite.cc +++ b/src/hb-directwrite.cc @@ -846,10 +846,23 @@ _hb_directwrite_shape (hb_shape_plan_t *shape_plan, features, num_features, 0); } -/* - * Public [experimental] API - */ - +/** + * hb_directwrite_shape_experimental_width: + * Experimental API to test DirectWrite's justification algorithm. + * + * It inserts Kashida at wrong order so don't use the API ever. + * + * It doesn't work with cygwin/msys due to header bugs so one + * should use MSVC toolchain in order to use it for now. + * + * @font: + * @buffer: + * @features: + * @num_features: + * @width: + * + * Since: 1.4.2 + **/ hb_bool_t hb_directwrite_shape_experimental_width (hb_font_t *font, hb_buffer_t *buffer, @@ -918,6 +931,7 @@ _hb_directwrite_font_release (void *data) /** * hb_directwrite_face_create: * @font_face: + * * Since: 2.4.0 **/ hb_face_t * @@ -928,3 +942,15 @@ hb_directwrite_face_create (IDWriteFontFace *font_face) return hb_face_create_for_tables (reference_table, font_face, _hb_directwrite_font_release); } + +/** +* hb_directwrite_face_get_font_face: +* @face: +* +* Since: REPLACEME +**/ +IDWriteFontFace * +hb_directwrite_face_get_font_face (hb_face_t *face) +{ + return face->data.directwrite->fontFace; +} diff --git a/src/hb-directwrite.h b/src/hb-directwrite.h index 09776fd0..de813d06 100644 --- a/src/hb-directwrite.h +++ b/src/hb-directwrite.h @@ -37,6 +37,9 @@ hb_directwrite_shape_experimental_width (hb_font_t *font, hb_buffer_t *buffer, HB_EXTERN hb_face_t * hb_directwrite_face_create (IDWriteFontFace *font_face); +HB_EXTERN IDWriteFontFace * +hb_directwrite_face_get_font_face (hb_face_t *face); + HB_END_DECLS #endif /* HB_DIRECTWRITE_H */ commit 59f36f36820f6e6fb1d3b6da26d6b5ee7588c42f Author: Behdad Esfahbod <[email protected]> Date: Fri Mar 29 10:55:12 2019 -0700 Replace REPLACEME's left out of 2.4.0 https://github.com/harfbuzz/harfbuzz/issues/1641 diff --git a/src/hb-common.h b/src/hb-common.h index fbabd71c..371b2bfc 100644 --- a/src/hb-common.h +++ b/src/hb-common.h @@ -358,7 +358,7 @@ typedef enum /*11.0*/HB_SCRIPT_SOGDIAN = HB_TAG ('S','o','g','d'), /* - * Since REPLACEME + * Since 2.4.0 */ /*12.0*/HB_SCRIPT_ELYMAIC = HB_TAG ('E','l','y','m'), /*12.0*/HB_SCRIPT_NANDINAGARI = HB_TAG ('N','a','n','d'), diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc index 137cd56c..cbf04a82 100644 --- a/src/hb-directwrite.cc +++ b/src/hb-directwrite.cc @@ -918,7 +918,7 @@ _hb_directwrite_font_release (void *data) /** * hb_directwrite_face_create: * @font_face: - * Since: REPLACEME + * Since: 2.4.0 **/ hb_face_t * hb_directwrite_face_create (IDWriteFontFace *font_face) diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 693c9c21..4d203b54 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -152,7 +152,7 @@ hb_subset_input_get_desubroutinize (hb_subset_input_t *subset_input) * hb_subset_input_set_retain_gids: * @subset_input: a subset_input. * @retain_gids: If true the subsetter will not renumber glyph ids. - * Since: REPLACEME + * Since: 2.4.0 **/ HB_EXTERN void hb_subset_input_set_retain_gids (hb_subset_input_t *subset_input, @@ -164,7 +164,7 @@ hb_subset_input_set_retain_gids (hb_subset_input_t *subset_input, /** * hb_subset_input_get_retain_gids: * Returns: value of retain_gids. - * Since: REPLACEME + * Since: 2.4.0 **/ HB_EXTERN hb_bool_t hb_subset_input_get_retain_gids (hb_subset_input_t *subset_input) commit fe570bc043ca2c6be71b18f7401c8f06e73527e0 Author: Behdad Esfahbod <[email protected]> Date: Fri Mar 29 10:51:38 2019 -0700 [docs] Remove unexisting section diff --git a/docs/harfbuzz-docs.xml b/docs/harfbuzz-docs.xml index 0c462f38..f4ad134e 100644 --- a/docs/harfbuzz-docs.xml +++ b/docs/harfbuzz-docs.xml @@ -150,7 +150,6 @@ <index id="api-index-1-5-0" role="1.5.0"><title>Index of new symbols in 1.5.0</title><xi:include href="xml/api-index-1.5.0.xml"><xi:fallback /></xi:include></index> <index id="api-index-1-4-3" role="1.4.3"><title>Index of new symbols in 1.4.3</title><xi:include href="xml/api-index-1.4.3.xml"><xi:fallback /></xi:include></index> <index id="api-index-1-4-2" role="1.4.2"><title>Index of new symbols in 1.4.2</title><xi:include href="xml/api-index-1.4.2.xml"><xi:fallback /></xi:include></index> - <index id="api-index-1-4-0" role="1.4.0"><title>Index of new symbols in 1.4.0</title><xi:include href="xml/api-index-1.4.0.xml"><xi:fallback /></xi:include></index> <index id="api-index-1-3-3" role="1.3.3"><title>Index of new symbols in 1.3.3</title><xi:include href="xml/api-index-1.3.3.xml"><xi:fallback /></xi:include></index> <index id="api-index-1-2-3" role="1.2.3"><title>Index of new symbols in 1.2.3</title><xi:include href="xml/api-index-1.2.3.xml"><xi:fallback /></xi:include></index> <index id="api-index-1-1-3" role="1.1.3"><title>Index of new symbols in 1.1.3</title><xi:include href="xml/api-index-1.1.3.xml"><xi:fallback /></xi:include></index> _______________________________________________ HarfBuzz mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/harfbuzz
