[HarfBuzz] harfbuzz: Branch 'master' - 3 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Sat Oct 27 07:44:00 UTC 2018
docs/harfbuzz-docs.xml | 46 ++++++++++++++++++++++++++++++++++-----
docs/harfbuzz-sections.txt | 21 +++++++++++++++++
src/hb-ot-color.cc | 2 -
src/hb-ot-shape-complex-indic.cc | 2 +
src/hb-ot-shape-normalize.cc | 1
5 files changed, 65 insertions(+), 7 deletions(-)
New commits:
commit ca645accb97841e01846e45cda32e6bd2ad15940
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Oct 27 00:39:31 2018 -0700
Comment
diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 918e0d7e..dfb67cfb 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -788,6 +788,8 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
*
* We could use buffer->sort() for this, if there was no special
* reordering of pre-base stuff happening later...
+ * We don't want to merge_clusters all of that, which buffer->sort()
+ * would.
*/
if (indic_plan->is_old_spec || end - start > 127)
buffer->merge_clusters (base, end);
commit 7f5941e162bf7806299656edafd452a47b5a55b9
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Oct 27 00:06:48 2018 -0700
Remove stale comment
Ugliness was fixed in 30eab97a0072fbc22d353082249e0e6e546cd86b
But yeah, my smell detector was working. Ugliness was buggy.
diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index d5600f9f..82bb24b7 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -222,7 +222,6 @@ handle_variation_selector_cluster (const hb_ot_shape_normalize_context_t *c,
hb_font_t * const font = c->font;
for (; buffer->idx < end - 1 && buffer->successful;) {
if (unlikely (buffer->unicode->is_variation_selector (buffer->cur(+1).codepoint))) {
- /* The next two lines are some ugly lines... But work. */
if (font->get_variation_glyph (buffer->cur().codepoint, buffer->cur(+1).codepoint, &buffer->cur().glyph_index()))
{
hb_codepoint_t unicode = buffer->cur().codepoint;
commit e7400c0275cad4f584eeaf21ce6d5c6adca29bbb
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Fri Oct 26 22:09:17 2018 -0700
[docs] Hook up new symbols
diff --git a/docs/harfbuzz-docs.xml b/docs/harfbuzz-docs.xml
index 9452a92a..3488ccb7 100644
--- a/docs/harfbuzz-docs.xml
+++ b/docs/harfbuzz-docs.xml
@@ -104,8 +104,12 @@
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
</index>
- <index id="api-index-0-9-2" role="0.9.2">
- <title>Index of new symbols in 0.9.2</title>
+ <index id="deprecated-api-index" role="deprecated">
+ <title>Index of deprecated API</title>
+ <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+ </index>
+
+ <index id="api-index-0-9-2" role="0.9.2"><title>Index of new symbols in 0.9.2</title>
<xi:include href="xml/api-index-0.9.2.xml"><xi:fallback /></xi:include>
</index>
<index id="api-index-0-9-5" role="0.9.5">
@@ -184,6 +188,10 @@
<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-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-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>
@@ -200,9 +208,37 @@
<title>Index of new symbols in 1.6.0</title>
<xi:include href="xml/api-index-1.6.0.xml"><xi:fallback /></xi:include>
</index>
- <index id="deprecated-api-index" role="deprecated">
- <title>Index of deprecated API</title>
- <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+ <index id="api-index-1-7-5" role="1.7.5">
+ <title>Index of new symbols in 1.7.5</title>
+ <xi:include href="xml/api-index-1.7.5.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-index-1-7-7" role="1.7.7">
+ <title>Index of new symbols in 1.7.7</title>
+ <xi:include href="xml/api-index-1.7.7.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-index-1-8-0" role="1.8.0">
+ <title>Index of new symbols in 1.8.0</title>
+ <xi:include href="xml/api-index-1.8.0.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-index-1-8-1" role="1.8.1">
+ <title>Index of new symbols in 1.8.1</title>
+ <xi:include href="xml/api-index-1.8.1.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-index-1-8-5" role="1.8.5">
+ <title>Index of new symbols in 1.8.5</title>
+ <xi:include href="xml/api-index-1.8.5.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-index-1-8-6" role="1.8.6">
+ <title>Index of new symbols in 1.8.6</title>
+ <xi:include href="xml/api-index-1.8.6.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-index-1-9-0" role="1.9.0">
+ <title>Index of new symbols in 1.9.0</title>
+ <xi:include href="xml/api-index-1.9.0.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-index-2-0-0" role="2.0.0">
+ <title>Index of new symbols in 2.0.0</title>
+ <xi:include href="xml/api-index-2.0.0.xml"><xi:fallback /></xi:include>
</index>
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 7bca7ca2..8229d466 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -3,6 +3,8 @@
<SUBSECTION Private>
HB_H_IN
HB_EXTERN
+HB_DEPRECATED
+HB_DEPRECATED_FOR
</SECTION>
<SECTION>
@@ -358,6 +360,7 @@ HB_GOBJECT_TYPE_FONT_FUNCS
HB_GOBJECT_TYPE_GLYPH_FLAGS
HB_GOBJECT_TYPE_MAP
HB_GOBJECT_TYPE_MEMORY_MODE
+HB_GOBJECT_TYPE_OT_COLOR_PALETTE_FLAGS
HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS
HB_GOBJECT_TYPE_OT_MATH_CONSTANT
HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART
@@ -390,6 +393,7 @@ hb_gobject_font_get_type
hb_gobject_glyph_flags_get_type
hb_gobject_map_get_type
hb_gobject_memory_mode_get_type
+hb_gobject_ot_color_palette_flags_get_type
hb_gobject_ot_layout_glyph_class_get_type
hb_gobject_ot_math_constant_get_type
hb_gobject_ot_math_glyph_part_get_type
@@ -459,6 +463,12 @@ HB_OT_H_IN
<SECTION>
<FILE>hb-ot-color</FILE>
+hb_color_t
+HB_COLOR
+hb_color_get_alpha
+hb_color_get_blue
+hb_color_get_green
+hb_color_get_red
hb_ot_color_glyph_get_layers
hb_ot_color_has_layers
hb_ot_color_has_palettes
@@ -477,6 +487,16 @@ hb_ot_font_set_funcs
</SECTION>
<SECTION>
+<FILE>hb-ot-name</FILE>
+hb_name_id_t
+HB_NAME_ID_INVALID
+hb_ot_name_get_names
+hb_ot_name_get_utf16
+hb_ot_name_get_utf32
+hb_ot_name_get_utf8
+</SECTION>
+
+<SECTION>
<FILE>hb-ot-shape</FILE>
hb_ot_shape_glyphs_closure
</SECTION>
@@ -487,6 +507,7 @@ HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX
HB_OT_LAYOUT_NO_FEATURE_INDEX
HB_OT_LAYOUT_NO_SCRIPT_INDEX
HB_OT_LAYOUT_NO_VARIATIONS_INDEX
+HB_OT_TAG_BASE
HB_OT_TAG_GDEF
HB_OT_TAG_GPOS
HB_OT_TAG_GSUB
diff --git a/src/hb-ot-color.cc b/src/hb-ot-color.cc
index 229b6e66..3f492cc1 100644
--- a/src/hb-ot-color.cc
+++ b/src/hb-ot-color.cc
@@ -115,7 +115,7 @@ hb_ot_color_palette_get_count (hb_face_t *face)
/**
* hb_ot_color_palette_get_name_id:
* @face: a font face.
- * @palette: the index of the color palette whose name is being requested.
+ * @palette_index: the index of the color palette whose name is being requested.
*
* Retrieves the name id of a color palette. For example, a color font can
* have themed palettes like "Spring", "Summer", "Fall", and "Winter".
More information about the HarfBuzz
mailing list