walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename invisible_codepoint to invisible_glyph in API 

Deleted recently added API:
    hb_buffer_set_invisible_codepoint()
    hb_buffer_get_invisible_codepoint()

    hb-shape / hb-view --invisible-codepoint

New API:
    hb_buffer_set_invisible_glyph()
    hb_buffer_get_invisible_glyph()

    hb-shape / hb-view --invisible-glyph

Fixes https://github.com/harfbuzz/harfbuzz/issues/1216
This commit is contained in:
Behdad Esfahbod 2018-10-07 20:46:11 -04:00
parent 2a5cb37fdb
commit e42cd58c99
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/harfbuzz-sections.txt
View File

@ -67,8 +67,8 @@ hb_buffer_set_user_data
hb_buffer_get_user_data hb_buffer_get_user_data
hb_buffer_get_glyph_infos hb_buffer_get_glyph_infos
hb_buffer_get_glyph_positions hb_buffer_get_glyph_positions
hb_buffer_get_invisible_codepoint hb_buffer_get_invisible_glyph
hb_buffer_set_invisible_codepoint hb_buffer_set_invisible_glyph
hb_buffer_set_replacement_codepoint hb_buffer_set_replacement_codepoint
hb_buffer_get_replacement_codepoint hb_buffer_get_replacement_codepoint
hb_buffer_normalize_glyphs hb_buffer_normalize_glyphs

12
src/hb-buffer.cc
View File

@ -1179,7 +1179,7 @@ hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer)
/** /**
* hb_buffer_set_invisible_codepoint: * hb_buffer_set_invisible_glyph:
* @buffer: an #hb_buffer_t. * @buffer: an #hb_buffer_t.
* @invisible: the invisible #hb_codepoint_t * @invisible: the invisible #hb_codepoint_t
* *
@ -1191,8 +1191,8 @@ hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer)
* Since: REPLACEME * Since: REPLACEME
**/ **/
void void
hb_buffer_set_invisible_codepoint (hb_buffer_t *buffer, hb_buffer_set_invisible_glyph (hb_buffer_t *buffer,
hb_codepoint_t invisible) hb_codepoint_t invisible)
{ {
if (unlikely (hb_object_is_inert (buffer))) if (unlikely (hb_object_is_inert (buffer)))
return; return;
@ -1201,10 +1201,10 @@ hb_buffer_set_invisible_codepoint (hb_buffer_t *buffer,
} }
/** /**
* hb_buffer_get_invisible_codepoint: * hb_buffer_get_invisible_glyph:
* @buffer: an #hb_buffer_t. * @buffer: an #hb_buffer_t.
* *
* See hb_buffer_set_invisible_codepoint(). * See hb_buffer_set_invisible_glyph().
* *
* Return value: * Return value:
* The @buffer invisible #hb_codepoint_t. * The @buffer invisible #hb_codepoint_t.
@ -1212,7 +1212,7 @@ hb_buffer_set_invisible_codepoint (hb_buffer_t *buffer,
* Since: REPLACEME * Since: REPLACEME
**/ **/
hb_codepoint_t hb_codepoint_t
hb_buffer_get_invisible_codepoint (hb_buffer_t *buffer) hb_buffer_get_invisible_glyph (hb_buffer_t *buffer)
{ {
return buffer->invisible; return buffer->invisible;
} }

6
src/hb-buffer.h
View File

@ -342,11 +342,11 @@ HB_EXTERN hb_codepoint_t
hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer); hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer);
HB_EXTERN void HB_EXTERN void
hb_buffer_set_invisible_codepoint (hb_buffer_t *buffer, hb_buffer_set_invisible_glyph (hb_buffer_t *buffer,
hb_codepoint_t invisible); hb_codepoint_t invisible);
HB_EXTERN hb_codepoint_t HB_EXTERN hb_codepoint_t
hb_buffer_get_invisible_codepoint (hb_buffer_t *buffer); hb_buffer_get_invisible_glyph (hb_buffer_t *buffer);
HB_EXTERN void HB_EXTERN void

2
util/options.cc
View File

@ -415,7 +415,7 @@ shape_options_t::add_options (option_parser_t *parser)
{"eot", 0, 0, G_OPTION_ARG_NONE, &this->eot, "Treat text as end-of-paragraph", nullptr}, {"eot", 0, 0, G_OPTION_ARG_NONE, &this->eot, "Treat text as end-of-paragraph", nullptr},
{"preserve-default-ignorables",0, 0, G_OPTION_ARG_NONE, &this->preserve_default_ignorables, "Preserve Default-Ignorable characters", nullptr}, {"preserve-default-ignorables",0, 0, G_OPTION_ARG_NONE, &this->preserve_default_ignorables, "Preserve Default-Ignorable characters", nullptr},
{"remove-default-ignorables",0, 0, G_OPTION_ARG_NONE, &this->remove_default_ignorables, "Remove Default-Ignorable characters", nullptr}, {"remove-default-ignorables",0, 0, G_OPTION_ARG_NONE, &this->remove_default_ignorables, "Remove Default-Ignorable characters", nullptr},
{"invisible-codepoint",0, 0, G_OPTION_ARG_INT, &this->invisible_codepoint, "Value to replace Default-Ignorables with", nullptr}, {"invisible-glyph", 0, 0, G_OPTION_ARG_INT, &this->invisible_glyph, "Glyph value to replace Default-Ignorables with", nullptr},
{"utf8-clusters", 0, 0, G_OPTION_ARG_NONE, &this->utf8_clusters, "Use UTF8 byte indices, not char indices", nullptr}, {"utf8-clusters", 0, 0, G_OPTION_ARG_NONE, &this->utf8_clusters, "Use UTF8 byte indices, not char indices", nullptr},
{"cluster-level", 0, 0, G_OPTION_ARG_INT, &this->cluster_level, "Cluster merging level (default: 0)", "0/1/2"}, {"cluster-level", 0, 0, G_OPTION_ARG_INT, &this->cluster_level, "Cluster merging level (default: 0)", "0/1/2"},
{"normalize-glyphs",0, 0, G_OPTION_ARG_NONE, &this->normalize_glyphs, "Rearrange glyph clusters in nominal order", nullptr}, {"normalize-glyphs",0, 0, G_OPTION_ARG_NONE, &this->normalize_glyphs, "Rearrange glyph clusters in nominal order", nullptr},

6
util/options.hh
View File

@ -155,7 +155,7 @@ struct shape_options_t : option_group_t
num_features = 0; num_features = 0;
shapers = nullptr; shapers = nullptr;
utf8_clusters = false; utf8_clusters = false;
invisible_codepoint = 0; invisible_glyph = 0;
cluster_level = HB_BUFFER_CLUSTER_LEVEL_DEFAULT; cluster_level = HB_BUFFER_CLUSTER_LEVEL_DEFAULT;
normalize_glyphs = false; normalize_glyphs = false;
verify = false; verify = false;
@ -186,7 +186,7 @@ struct shape_options_t : option_group_t
(preserve_default_ignorables ? HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES : 0) | (preserve_default_ignorables ? HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES : 0) |
(remove_default_ignorables ? HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES : 0) | (remove_default_ignorables ? HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES : 0) |
0)); 0));
hb_buffer_set_invisible_codepoint (buffer, invisible_codepoint); hb_buffer_set_invisible_glyph (buffer, invisible_glyph);
hb_buffer_set_cluster_level (buffer, cluster_level); hb_buffer_set_cluster_level (buffer, cluster_level);
hb_buffer_guess_segment_properties (buffer); hb_buffer_guess_segment_properties (buffer);
} }
@ -437,7 +437,7 @@ struct shape_options_t : option_group_t
unsigned int num_features; unsigned int num_features;
char **shapers; char **shapers;
hb_bool_t utf8_clusters; hb_bool_t utf8_clusters;
hb_codepoint_t invisible_codepoint; hb_codepoint_t invisible_glyph;
hb_buffer_cluster_level_t cluster_level; hb_buffer_cluster_level_t cluster_level;
hb_bool_t normalize_glyphs; hb_bool_t normalize_glyphs;
hb_bool_t verify; hb_bool_t verify;