提交 8e7887ca 编写于 作者: B Behdad Esfahbod

Merge branch 'master' into iter

...@@ -33,13 +33,14 @@ HarfBuzz release walk-through checklist: ...@@ -33,13 +33,14 @@ HarfBuzz release walk-through checklist:
That's what happened to 2.0.0 going out with 1.8.0 hb-version.h... So, that's That's what happened to 2.0.0 going out with 1.8.0 hb-version.h... So, that's
a clue. a clue.
7. "make release-files". Enter your GPG password. This creates a sha256 hash 7. Now that you have release files, commit NEWS, configure.ac, and src/hb-version.h,
and signs it.
8. Now that you have release files, commit NEWS, configure.ac, and src/hb-version.h,
as well as any REPLACEME changes you made. The commit message is simply the as well as any REPLACEME changes you made. The commit message is simply the
release number. Eg. "1.4.7" release number. Eg. "1.4.7"
8. "make dist" again to get a tarball with your new commit in the ChangeLog. Then
"make release-files". Enter your GPG password. This creates a sha256 hash
and signs it. Check the size of the three resulting files.
9. Tag the release and sign it: Eg. "git tag -s 1.4.7 -m 1.4.7". Enter your 9. Tag the release and sign it: Eg. "git tag -s 1.4.7 -m 1.4.7". Enter your
GPG password again. GPG password again.
......
...@@ -150,7 +150,6 @@ ...@@ -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-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-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-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-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-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> <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>
......
...@@ -216,6 +216,14 @@ hb_coretext_face_get_cg_font ...@@ -216,6 +216,14 @@ hb_coretext_face_get_cg_font
hb_coretext_font_get_ct_font hb_coretext_font_get_ct_font
</SECTION> </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> <SECTION>
<FILE>hb-face</FILE> <FILE>hb-face</FILE>
hb_face_count hb_face_count
...@@ -715,8 +723,6 @@ hb_unicode_script_func_t ...@@ -715,8 +723,6 @@ hb_unicode_script_func_t
<FILE>hb-uniscribe</FILE> <FILE>hb-uniscribe</FILE>
hb_uniscribe_font_get_hfont hb_uniscribe_font_get_hfont
hb_uniscribe_font_get_logfontw hb_uniscribe_font_get_logfontw
<SUBSECTION Private>
hb_directwrite_shape_experimental_width
</SECTION> </SECTION>
<SECTION> <SECTION>
......
...@@ -358,7 +358,7 @@ typedef enum ...@@ -358,7 +358,7 @@ typedef enum
/*11.0*/HB_SCRIPT_SOGDIAN = HB_TAG ('S','o','g','d'), /*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_ELYMAIC = HB_TAG ('E','l','y','m'),
/*12.0*/HB_SCRIPT_NANDINAGARI = HB_TAG ('N','a','n','d'), /*12.0*/HB_SCRIPT_NANDINAGARI = HB_TAG ('N','a','n','d'),
......
...@@ -846,10 +846,23 @@ _hb_directwrite_shape (hb_shape_plan_t *shape_plan, ...@@ -846,10 +846,23 @@ _hb_directwrite_shape (hb_shape_plan_t *shape_plan,
features, num_features, 0); 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_bool_t
hb_directwrite_shape_experimental_width (hb_font_t *font, hb_directwrite_shape_experimental_width (hb_font_t *font,
hb_buffer_t *buffer, hb_buffer_t *buffer,
...@@ -918,7 +931,8 @@ _hb_directwrite_font_release (void *data) ...@@ -918,7 +931,8 @@ _hb_directwrite_font_release (void *data)
/** /**
* hb_directwrite_face_create: * hb_directwrite_face_create:
* @font_face: * @font_face:
* Since: REPLACEME *
* Since: 2.4.0
**/ **/
hb_face_t * hb_face_t *
hb_directwrite_face_create (IDWriteFontFace *font_face) hb_directwrite_face_create (IDWriteFontFace *font_face)
...@@ -928,3 +942,15 @@ hb_directwrite_face_create (IDWriteFontFace *font_face) ...@@ -928,3 +942,15 @@ hb_directwrite_face_create (IDWriteFontFace *font_face)
return hb_face_create_for_tables (reference_table, font_face, return hb_face_create_for_tables (reference_table, font_face,
_hb_directwrite_font_release); _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;
}
...@@ -37,6 +37,9 @@ hb_directwrite_shape_experimental_width (hb_font_t *font, hb_buffer_t *buffer, ...@@ -37,6 +37,9 @@ hb_directwrite_shape_experimental_width (hb_font_t *font, hb_buffer_t *buffer,
HB_EXTERN hb_face_t * HB_EXTERN hb_face_t *
hb_directwrite_face_create (IDWriteFontFace *font_face); hb_directwrite_face_create (IDWriteFontFace *font_face);
HB_EXTERN IDWriteFontFace *
hb_directwrite_face_get_font_face (hb_face_t *face);
HB_END_DECLS HB_END_DECLS
#endif /* HB_DIRECTWRITE_H */ #endif /* HB_DIRECTWRITE_H */
...@@ -152,7 +152,7 @@ hb_subset_input_get_desubroutinize (hb_subset_input_t *subset_input) ...@@ -152,7 +152,7 @@ hb_subset_input_get_desubroutinize (hb_subset_input_t *subset_input)
* hb_subset_input_set_retain_gids: * hb_subset_input_set_retain_gids:
* @subset_input: a subset_input. * @subset_input: a subset_input.
* @retain_gids: If true the subsetter will not renumber glyph ids. * @retain_gids: If true the subsetter will not renumber glyph ids.
* Since: REPLACEME * Since: 2.4.0
**/ **/
HB_EXTERN void HB_EXTERN void
hb_subset_input_set_retain_gids (hb_subset_input_t *subset_input, 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, ...@@ -164,7 +164,7 @@ hb_subset_input_set_retain_gids (hb_subset_input_t *subset_input,
/** /**
* hb_subset_input_get_retain_gids: * hb_subset_input_get_retain_gids:
* Returns: value of retain_gids. * Returns: value of retain_gids.
* Since: REPLACEME * Since: 2.4.0
**/ **/
HB_EXTERN hb_bool_t HB_EXTERN hb_bool_t
hb_subset_input_get_retain_gids (hb_subset_input_t *subset_input) hb_subset_input_get_retain_gids (hb_subset_input_t *subset_input)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册