[HarfBuzz] harfbuzz: Branch 'master' - 3 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Tue Oct 4 21:47:16 UTC 2016
docs/harfbuzz-docs.xml | 6 +++---
docs/harfbuzz-sections.txt | 12 ++++++------
src/hb-ot-layout.cc | 27 +++++++++------------------
src/hb-ot-math.h | 10 +++++-----
test/api/Makefile.am | 10 ++++++++++
5 files changed, 33 insertions(+), 32 deletions(-)
New commits:
commit 34fc4a2cfa61089b7ec2d9510d99cdc4c13bceb4
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Sep 28 19:17:27 2016 +0200
Fix dist
diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 58f4914..d514a6f 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -54,6 +54,16 @@ TEST_PROGS += \
$(NULL)
test_ot_math_LDADD = $(LDADD) $(FREETYPE_LIBS)
test_ot_math_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
+EXTRA_DIST += \
+ fonts/MathTestFontEmpty.otf \
+ fonts/MathTestFontFull.otf \
+ fonts/MathTestFontFull.ttx \
+ fonts/MathTestFontNone.otf \
+ fonts/MathTestFontPartial1.otf \
+ fonts/MathTestFontPartial2.otf \
+ fonts/MathTestFontPartial3.otf \
+ fonts/MathTestFontPartial4.otf \
+ $(NULL)
endif # HAVE_FREETYPE
endif # HAVE_OT
commit d1c62370a0c2bdb365a1468dc8d782b9a7245946
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Sep 28 19:11:22 2016 +0200
Aim math API for 1.3.3 instead of 1.4.0
diff --git a/docs/harfbuzz-docs.xml b/docs/harfbuzz-docs.xml
index ea99732..7a42d23 100644
--- a/docs/harfbuzz-docs.xml
+++ b/docs/harfbuzz-docs.xml
@@ -180,9 +180,9 @@
<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-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 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="deprecated-api-index" role="deprecated">
<title>Index of deprecated API</title>
diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 75d7492..270c87c 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -427,19 +427,19 @@ Xhb_ot_layout_lookup_substitute
HB_OT_TAG_MATH
HB_OT_MATH_SCRIPT
hb_ot_math_constant_t
+hb_ot_math_kern_t
+hb_ot_math_glyph_variant_t
hb_ot_math_glyph_part_flags_t
hb_ot_math_glyph_part_t
-hb_ot_math_glyph_variant_t
+hb_ot_math_has_data
hb_ot_math_get_constant
-hb_ot_math_get_glyph_assembly
hb_ot_math_get_glyph_italics_correction
-hb_ot_math_get_glyph_kerning
hb_ot_math_get_glyph_top_accent_attachment
+hb_ot_math_get_glyph_kerning
+hb_ot_math_is_glyph_extended_shape
hb_ot_math_get_glyph_variants
hb_ot_math_get_min_connector_overlap
-hb_ot_math_has_data
-hb_ot_math_is_glyph_extended_shape
-hb_ot_math_kern_t
+hb_ot_math_get_glyph_assembly
</SECTION>
<SECTION>
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 0826607..0501181 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -1237,7 +1237,7 @@ hb_ot_layout_substitute_lookup (OT::hb_apply_context_t *c,
*
* Return value: #TRUE if face has a MATH table and #FALSE otherwise
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
hb_bool_t
hb_ot_math_has_data (hb_face_t *face)
@@ -1258,7 +1258,7 @@ hb_ot_math_has_data (hb_face_t *face)
*
* Return value: the requested constant or 0
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
hb_position_t
hb_ot_math_get_constant (hb_font_t *font,
@@ -1275,7 +1275,7 @@ hb_ot_math_get_constant (hb_font_t *font,
*
* Return value: the italics correction of the glyph or 0
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
hb_position_t
hb_ot_math_get_glyph_italics_correction (hb_font_t *font,
@@ -1292,7 +1292,7 @@ hb_ot_math_get_glyph_italics_correction (hb_font_t *font,
*
* Return value: the top accent attachment of the glyph or 0
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
hb_position_t
hb_ot_math_get_glyph_top_accent_attachment (hb_font_t *font,
@@ -1309,7 +1309,7 @@ hb_ot_math_get_glyph_top_accent_attachment (hb_font_t *font,
*
* Return value: #TRUE if the glyph is an extended shape and #FALSE otherwise
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
hb_bool_t
hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
@@ -1334,7 +1334,7 @@ hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
*
* Return value: requested kerning or 0
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
hb_position_t
hb_ot_math_get_glyph_kerning (hb_font_t *font,
@@ -1363,7 +1363,7 @@ hb_ot_math_get_glyph_kerning (hb_font_t *font,
*
* Return value: the total number of size variants available or 0
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
unsigned int
hb_ot_math_get_glyph_variants (hb_font_t *font,
@@ -1392,7 +1392,7 @@ hb_ot_math_get_glyph_variants (hb_font_t *font,
*
* Return value: requested min connector overlap or 0
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
hb_position_t
hb_ot_math_get_min_connector_overlap (hb_font_t *font,
@@ -1420,7 +1420,7 @@ hb_ot_math_get_min_connector_overlap (hb_font_t *font,
*
* Return value: the total number of parts in the glyph assembly
*
- * Since: 1.4.0
+ * Since: 1.3.3
**/
unsigned int
hb_ot_math_get_glyph_assembly (hb_font_t *font,
diff --git a/src/hb-ot-math.h b/src/hb-ot-math.h
index 0fc251b..521a5ca 100644
--- a/src/hb-ot-math.h
+++ b/src/hb-ot-math.h
@@ -50,7 +50,7 @@ HB_BEGIN_DECLS
/**
* hb_ot_math_constant_t:
*
- * Since: 1.4.0
+ * Since: 1.3.3
*/
typedef enum {
HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN = 0,
@@ -114,7 +114,7 @@ typedef enum {
/**
* hb_ot_math_kern_t:
*
- * Since: 1.4.0
+ * Since: 1.3.3
*/
typedef enum {
HB_OT_MATH_KERN_TOP_RIGHT = 0,
@@ -126,7 +126,7 @@ typedef enum {
/**
* hb_ot_math_glyph_variant_t:
*
- * Since: 1.4.0
+ * Since: 1.3.3
*/
typedef struct hb_ot_math_glyph_variant_t {
hb_codepoint_t glyph;
@@ -136,7 +136,7 @@ typedef struct hb_ot_math_glyph_variant_t {
/**
* hb_ot_math_glyph_part_flags_t:
*
- * Since: 1.4.0
+ * Since: 1.3.3
*/
typedef enum { /*< flags >*/
HB_MATH_GLYPH_PART_FLAG_EXTENDER = 0x00000001u /* Extender glyph */
@@ -145,7 +145,7 @@ typedef enum { /*< flags >*/
/**
* hb_ot_math_glyph_part_t:
*
- * Since: 1.4.0
+ * Since: 1.3.3
*/
typedef struct hb_ot_math_glyph_part_t {
hb_codepoint_t glyph;
commit 7adbc5dd62ca03a65d1886e0f32e7026964dc5e5
Author: Khaled Hosny <khaledhosny at eglug.org>
Date: Fri Sep 30 04:01:24 2016 -0700
Fix building math docs (#335)
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 6c8a9c4..0826607 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -1229,7 +1229,6 @@ hb_ot_layout_substitute_lookup (OT::hb_apply_context_t *c,
/**
* hb_ot_math_has_data:
- *
* @face: #hb_face_t to test
*
* This function allows to verify the presence of an OpenType MATH table on the
@@ -1248,7 +1247,6 @@ hb_ot_math_has_data (hb_face_t *face)
/**
* hb_ot_math_get_constant:
- *
* @font: #hb_font_t from which to retrieve the value
* @constant: #hb_ot_math_constant_t the constant to retrieve
*
@@ -1272,7 +1270,6 @@ hb_ot_math_get_constant (hb_font_t *font,
/**
* hb_ot_math_get_glyph_italics_correction:
- *
* @font: #hb_font_t from which to retrieve the value
* @glyph: glyph index from which to retrieve the value
*
@@ -1290,7 +1287,6 @@ hb_ot_math_get_glyph_italics_correction (hb_font_t *font,
/**
* hb_ot_math_get_glyph_top_accent_attachment:
- *
* @font: #hb_font_t from which to retrieve the value
* @glyph: glyph index from which to retrieve the value
*
@@ -1308,7 +1304,6 @@ hb_ot_math_get_glyph_top_accent_attachment (hb_font_t *font,
/**
* hb_ot_math_is_glyph_extended_shape:
- *
* @font: a #hb_font_t to test
* @glyph: a glyph index to test
*
@@ -1326,7 +1321,6 @@ hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
/**
* hb_ot_math_get_glyph_kerning:
- *
* @font: #hb_font_t from which to retrieve the value
* @glyph: glyph index from which to retrieve the value
* @kern: the #hb_ot_math_kern_t from which to retrieve the value
@@ -1354,7 +1348,6 @@ hb_ot_math_get_glyph_kerning (hb_font_t *font,
/**
* hb_ot_math_get_glyph_variants:
- *
* @font: #hb_font_t from which to retrieve the values
* @glyph: index of the glyph to stretch
* @direction: direction of the stretching
@@ -1389,7 +1382,6 @@ hb_ot_math_get_glyph_variants (hb_font_t *font,
/**
* hb_ot_math_get_min_connector_overlap:
- *
* @font: #hb_font_t from which to retrieve the value
* @direction: direction of the stretching
*
@@ -1412,7 +1404,6 @@ hb_ot_math_get_min_connector_overlap (hb_font_t *font,
/**
* hb_ot_math_get_glyph_assembly:
- *
* @font: #hb_font_t from which to retrieve the values
* @glyph: index of the glyph to stretch
* @direction: direction of the stretching
More information about the HarfBuzz
mailing list