harfbuzzjs 0.2.1 → 0.3.0

package/.github/workflows/build.yml

@@ -0,0 +1,45 @@
+name: Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  EM_VERSION: 3.1.16
+  EM_CACHE_FOLDER: 'emsdk-cache'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Setup cache
+        id: cache-system-libraries
+        uses: actions/cache@v3
+        with:
+          path: ${{env.EM_CACHE_FOLDER}}
+          key: ${{env.EM_VERSION}}-${{runner.os}}
+      - name: Setup Emscripten
+        uses: mymindstorm/setup-emsdk@v11
+        with:
+          version: ${{env.EM_VERSION}}
+          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
+      - name: Build hb.wasm
+        run: ./build.sh
+      - name: Build hb-subset.wasm
+        run: ./build-subset.sh
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+      - name: Test hb.wasm
+        run: node examples/hbjs.example.node.js
+      - name: Test hb-subset.wasm
+        run: node examples/hb-subset.example.node.js

package/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "harfbuzz"]
+	path = harfbuzz
+	url = https://github.com/harfbuzz/harfbuzz.git

package/LICENSE

@@ -1,6 +1,5 @@
 Apache license for Zephyr libc implementations (zephyr-string.c),
 emmalloc.cpp (from emscripten project) and MIT for rest of the project
-raqm.js uses fribidi (GPLv3) and libraqm (MIT)
 
 Copyright (c) 2019 Ebrahim Byagowi
 

package/README.md

@@ -5,13 +5,9 @@ library for client/server side JavaScript projects.
 See the demo [here](https://harfbuzz.github.io/harfbuzzjs/).
 
 ## Building
-1. Install clang, lld and git
+1. Install emscripten
 2. `./build.sh`
 
-Note that if building on Mac OS X, clang 11.0 needs to be installed from Homebrew (`brew install clang`). Also note that Homebrew clang is not in
-the path by default, so you need to add `/usr/local/opt/llvm/bin` to your
-path or you will get weird compiled errors.
-
 ## Download
 Download the pack from [releases tab](https://github.com/harfbuzz/harfbuzzjs/releases)
 of the project, or just download the [demo page](https://harfbuzz.github.io/harfbuzzjs/) (the
@@ -24,8 +20,6 @@ demo source is in [gh-pages](https://github.com/harfbuzz/harfbuzzjs/tree/gh-page
 ```javascript
 hb = require("hbjs.js")
 WebAssembly.instantiateStreaming(fetch("hb.wasm")).then(function (result) {
-  // WebAssembly needs its own heap - allocate 400 16k pages to do our work in.
-  result.instance.exports.memory.grow(400);
   fetch('myfont.ttf').then(function (data) {
     return data.arrayBuffer();
   }).then(function (fontdata) {
@@ -84,7 +78,7 @@ how to use it.
 harfbuzzjs uses a stripped-down version of Harfbuzz generated by compiling Harfbuzz with `-DHB_TINY`. This may mean that some functions you need are not available. Look at `src/hb-config.hh` in the Harfbuzz source directory to see what has been removed. For example, `HB_TINY` defines `HB_LEAN` which (amongst other things) defines `HB_NO_OT_GLYPH_NAMES`. If, for example, you really need to get at the glyph names:
 
 1. First, undefine the macro in question, by adding e.g. `#undef HB_NO_OT_GLYPH_NAMES` to `config-override.h`.
-2. Next, export any function that you need by adding a line to `build.sh`; in this case `-Wl,--export=hb_ot_get_glyph_name`.
+2. Next, export any function that you need by adding a line to `hbjs.symbols`; in this case `_hb_ot_get_glyph_name`.
 3. Now the function will be exported through the WASM object, but you need to add Javascript to bridge to it - in this case, handling the memory allocation of the `char *` parameter `name` and marshalling it to a JavaScript string with `heapu8.subarray`. The best way to do this is to look at `hbjs.js` for functions which use similar signatures.
 
 If you have extended harfbuzzjs in ways that you think others will also benefit from, please raise a pull request. If there are parts of Harfbuzz that you need but the instructions above don't work, describe what you are trying to do in an issue.

package/build-subset.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+em++ \
+	-std=c++11 \
+	-fno-exceptions \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-flto \
+	-Oz \
+	-I. \
+	-DHB_TINY \
+	-DHB_USE_INTERNAL_QSORT \
+	-DHB_CONFIG_OVERRIDE_H=\"config-override-subset.h\" \
+	-DHB_EXPERIMENTAL_API \
+	--no-entry \
+	-s EXPORTED_FUNCTIONS=@hb-subset.symbols \
+	-s INITIAL_MEMORY=65MB \
+	-o hb-subset.wasm \
+	harfbuzz/src/harfbuzz.cc \
+	harfbuzz/src/hb-subset*.cc

package/build.sh

@@ -1,61 +1,21 @@
 #!/bin/bash
 set -e
 
-[ -x "$(command -v git)" ] || (echo "Please install git from your package manager" && exit 1)
-[ -x "$(command -v clang)" ] || (echo "Please install clang from your package manager" && exit 1)
-
-[ -d harfbuzz/src ] || git clone https://github.com/harfbuzz/harfbuzz
-(cd harfbuzz; git checkout 3.0.0)
-
-clang \
-    -I./libc/include -Oz \
-	-fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden \
-	--target=wasm32 \
-	-nostdlib -nostdinc \
-	-Wno-builtin-requires-header \
+em++ \
+	-std=c++11 \
+	-fno-exceptions \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
 	-flto \
-	-DHB_TINY -DHB_USE_INTERNAL_QSORT \
-	-Wl,--no-entry \
-	-Wl,--strip-all \
-	-Wl,--lto-O3 \
-	-Wl,--gc-sections \
-	-Wl,--export=malloc \
-	-Wl,--export=hb_blob_create \
-	-Wl,--export=hb_blob_get_data \
-	-Wl,--export=hb_blob_get_length \
-	-Wl,--export=hb_face_create \
-	-Wl,--export=hb_face_reference_table \
-	-Wl,--export=hb_font_create \
-	-Wl,--export=hb_buffer_create \
-	-Wl,--export=hb_buffer_add_utf8 \
-	-Wl,--export=hb_buffer_add_utf16 \
-	-Wl,--export=hb_buffer_guess_segment_properties \
-	-Wl,--export=hb_buffer_set_direction \
-	-Wl,--export=hb_buffer_set_cluster_level \
-	-Wl,--export=hb_buffer_set_flags \
-	-Wl,--export=hb_buffer_set_script \
-	-Wl,--export=hb_script_from_string \
-	-Wl,--export=hb_buffer_set_language \
-	-Wl,--export=hb_language_from_string \
-	-Wl,--export=hb_shape \
-	-Wl,--export=hb_buffer_get_glyph_infos \
-	-Wl,--export=hb_buffer_get_glyph_positions \
-	-Wl,--export=hb_buffer_get_length \
-	-Wl,--export=hb_buffer_destroy \
-	-Wl,--export=hb_font_destroy \
-	-Wl,--export=hb_face_destroy \
-	-Wl,--export=hb_face_get_upem \
-	-Wl,--export=hb_blob_destroy \
-	-Wl,--export=hb_blob_get_length \
-	-Wl,--export=hb_font_set_scale \
-	-Wl,--export=hb_face_get_upem \
-	-Wl,--export=hbjs_glyph_svg \
-	-Wl,--export=hbjs_shape_with_trace \
-	-Wl,--export=hb_ot_var_get_axis_infos \
-	-Wl,--export=hb_font_set_variations \
-	-Wl,--export=free \
-	-Wl,--export=free_ptr \
-	-Wl,--export=__heap_base \
-	hbjs.c -DHAVE_CONFIG_OVERRIDE_H -I. -DHB_EXPERIMENTAL_API \
-	libc/malloc.cc libc/zephyr-string.c libc/prf.c libc/strtol.c libc/sprintf.c libc/main.c harfbuzz/src/harfbuzz.cc \
-	-o hb.wasm $@
+	-Oz \
+	-I. \
+	-DHB_TINY \
+	-DHB_USE_INTERNAL_QSORT \
+	-DHB_CONFIG_OVERRIDE_H=\"config-override.h\" \
+	-DHB_EXPERIMENTAL_API \
+	--no-entry \
+	-s EXPORTED_FUNCTIONS=@hbjs.symbols \
+	-s INITIAL_MEMORY=65MB \
+	-o hb.wasm \
+	hbjs.cc

package/config-override.h

@@ -1,7 +1,7 @@
-// Maybe enable these two also
-// #undef HB_NO_CFF
-// #undef HB_NO_OT_FONT_CFF
+#undef HB_NO_CFF
+#undef HB_NO_OT_FONT_CFF
 #undef HB_NO_DRAW
 #undef HB_NO_BUFFER_MESSAGE
 #undef HB_NO_BUFFER_SERIALIZE
 #undef HB_NO_VAR
+#undef HB_NO_OT_FONT_GLYPH_NAMES

package/{subset/test.js → examples/hb-subset.example.node.js}

@@ -5,9 +5,8 @@ const readFileAsync = require('util').promisify(fs.readFile);
 const writeFileAsync = require('util').promisify(fs.writeFile);
 
 (async () => {
-    const { instance: { exports } } = await WebAssembly.instantiate(await readFileAsync(__dirname + '/hb-subset.wasm'));
-    exports.memory.grow(400); // each page is 64kb in size
-    const fontBlob = await readFileAsync(__dirname + '/roboto-black.ttf');
+    const { instance: { exports } } = await WebAssembly.instantiate(await readFileAsync(__dirname + '/../hb-subset.wasm'));
+    const fontBlob = await readFileAsync(__dirname + '/Roboto-Black.ttf');
 
     const heapu8 = new Uint8Array(exports.memory.buffer);
     const fontBuffer = exports.malloc(fontBlob.byteLength);
@@ -26,7 +25,7 @@ const writeFileAsync = require('util').promisify(fs.writeFile);
     exports.hb_set_add(unicode_set, 'c'.charCodeAt(0));
 
     // exports.hb_subset_input_set_drop_hints(input, true);
-    const subset = exports.hb_subset(face, input);
+    const subset = exports.hb_subset_or_fail(face, input);
 
     /* Clean up */
     exports.hb_subset_input_destroy(input);
@@ -37,7 +36,8 @@ const writeFileAsync = require('util').promisify(fs.writeFile);
     const data = exports.hb_blob_get_data(result, 0);
     const subsetFontBlob = heapu8.subarray(data, data + exports.hb_blob_get_length(result));
 
-    await writeFileAsync(__dirname + '/roboto-black-subset-js.ttf', subsetFontBlob);
+    await writeFileAsync(__dirname + '/Roboto-Black.subset.ttf', subsetFontBlob);
+    console.log(`Wrote subset to: ${__dirname}/Roboto-Black.subset.ttf`);
 
     /* Clean up */
     exports.hb_blob_destroy(result);

package/examples/hbjs.example.html

@@ -3,7 +3,6 @@
 <script>
 // instantiateStreaming isn't supported in Safari yet, see nohbjs.html
 WebAssembly.instantiateStreaming(fetch("../hb.wasm")).then(function (result) {
-  result.instance.exports.memory.grow(400); // each page is 64kb in size
   fetch('Roboto.abc.ttf').then(function (x) {
     return x.arrayBuffer();
   }).then(function (blob) {

package/examples/hbjs.example.js

@@ -1,4 +1,4 @@
-function example(hb, fontBlob) {
+function example(hb, fontBlob, text) {
   var blob = hb.createBlob(fontBlob);
   var face = hb.createFace(blob, 0);
   // console.log(face.getAxisInfos());
@@ -7,7 +7,7 @@ function example(hb, fontBlob) {
   font.setScale(1000, 1000); // Optional, if not given will be in font upem
 
   var buffer = hb.createBuffer();
-  buffer.addText('abc');
+  buffer.addText(text || 'abc');
   buffer.guessSegmentProperties();
   // buffer.setDirection('ltr'); // optional as can be set by guessSegmentProperties also
   hb.shape(font, buffer); // features are not supported yet
@@ -18,6 +18,7 @@ function example(hb, fontBlob) {
   result.forEach(function (x) {
     if (glyphs[x.g]) return;
     glyphs[x.g] = {
+      name: font.glyphName(x.g),
       path: font.glyphToPath(x.g),
       json: font.glyphToJson(x.g)
     };

package/examples/hbjs.example.node.js

@@ -4,4 +4,6 @@ var example = require('./hbjs.example.js');
 
 require('../').then(function (hbjs) {
   console.log(example(hbjs, new Uint8Array(fs.readFileSync(path.resolve(__dirname, 'Roboto.abc.ttf')))));
+  console.log(example(hbjs, new Uint8Array(fs.readFileSync(path.resolve(__dirname, 'Roboto-Black.ttf')))));
+  console.log(example(hbjs, new Uint8Array(fs.readFileSync(path.resolve(__dirname, 'Mada.abjad.otf'))), "أبجد"));
 }, console.log);

package/examples/nohbjs.html

@@ -9,7 +9,6 @@ fetch("../hb.wasm").then(function (x) {
   return WebAssembly.instantiate(wasm);
 }).then(function (result) {
   var exports = result.instance.exports;
-  exports.memory.grow(400); // each page is 64kb in size
 
   fetch('Roboto.abc.ttf').then(function (x) {
     return x.arrayBuffer();

package/harfbuzz.ts

@@ -223,7 +223,6 @@ export function loadHarfbuzz(webAssemblyUrl: string): Promise<void> {
     return WebAssembly.instantiate(wasm);
   }).then(result => {
     //@ts-ignore
-    result.instance.exports.memory.grow(1000); // each page is 64kb in size => 64mb allowed for webassembly, maybe we need more... 
     hb = new HarfBuzzExports(result.instance.exports);
   });
 }

package/hb-subset.symbols

@@ -0,0 +1,28 @@
+_hb_blob_create
+_hb_blob_destroy
+_hb_blob_get_data
+_hb_blob_get_length
+_hb_face_create
+_hb_face_destroy
+_hb_face_get_empty
+_hb_face_reference_blob
+_hb_set_add
+_hb_set_clear
+_hb_set_create
+_hb_set_del
+_hb_set_destroy
+_hb_set_invert
+_hb_set_union
+_hb_subset_input_create_or_fail
+_hb_subset_input_destroy
+_hb_subset_input_get_flags
+_hb_subset_input_get_user_data
+_hb_subset_input_glyph_set
+_hb_subset_input_reference
+_hb_subset_input_set
+_hb_subset_input_set_flags
+_hb_subset_input_set_user_data
+_hb_subset_input_unicode_set
+_hb_subset_or_fail
+_malloc
+_free

package/hbjs.cc

@@ -0,0 +1,256 @@
+#include "harfbuzz/src/harfbuzz.cc"
+
+HB_BEGIN_DECLS
+
+int
+hbjs_glyph_svg (hb_font_t *font, hb_codepoint_t glyph, char *buf, unsigned buf_size);
+
+unsigned
+hbjs_shape_with_trace (hb_font_t *font, hb_buffer_t* buf,
+                       char* featurestring,
+                       unsigned int stop_at, unsigned int stop_phase,
+                       char *outbuf, unsigned buf_size);
+
+void *free_ptr(void);
+
+HB_END_DECLS
+
+
+void *free_ptr(void) { return (void *) free; }
+
+enum {
+  HB_SHAPE_DONT_STOP,
+  HB_SHAPE_GSUB_PHASE,
+  HB_SHAPE_GPOS_PHASE
+};
+
+struct user_data_t {
+  user_data_t(char *str_,
+              unsigned size_,
+              unsigned stop_at_ = 0,
+              unsigned stop_phase_ = 0)
+    : str(str_)
+    , size(size_)
+    , stop_at(stop_at_)
+    , stop_phase(stop_phase_)
+  {}
+  char *str = nullptr;
+  unsigned size = 0;
+  unsigned consumed = 0;
+  hb_bool_t failure = false;
+  unsigned stop_at = 0;
+  unsigned stop_phase = 0;
+  hb_bool_t stopping = false;
+  unsigned current_phase = 0;
+};
+
+
+static void
+_user_data_printf (user_data_t *data, const char *format, ...)
+{
+#define BUFSIZE 1000
+  char buf[BUFSIZE];
+  int len;
+  va_list va;
+
+  if (!data || data->failure)
+    return;
+
+  va_start(va, format);
+  len = vsnprintf(buf, BUFSIZE, format, va);
+  va_end(va);
+
+  if (data->consumed + len >= data->size || len < 0 || len > BUFSIZE)
+  {
+      data->failure = true;
+      return;
+  }
+
+  memcpy (data->str + data->consumed, buf, len);
+  data->consumed += len;
+#undef BUFSIZE
+}
+
+static void
+move_to (hb_draw_funcs_t *dfuncs, user_data_t *draw_data, hb_draw_state_t *,
+	 float to_x, float to_y,
+	 void *)
+{
+  _user_data_printf (draw_data, "M%g,%g", (double)to_x, (double)to_y);
+}
+
+static void
+line_to (hb_draw_funcs_t *dfuncs, user_data_t *draw_data, hb_draw_state_t *,
+	 float to_x, float to_y,
+	 void *)
+{
+  _user_data_printf (draw_data, "L%g,%g", (double)to_x, (double)to_y);
+}
+
+static void
+quadratic_to (hb_draw_funcs_t *dfuncs, user_data_t *draw_data, hb_draw_state_t *,
+	      float control_x, float control_y,
+	      float to_x, float to_y,
+	      void *)
+{
+  _user_data_printf (draw_data, "Q%g,%g %g,%g",
+                     (double)control_x,
+                     (double)control_y,
+                     (double)to_x,
+                     (double)to_y);
+}
+
+static void
+cubic_to (hb_draw_funcs_t *dfuncs, user_data_t *draw_data, hb_draw_state_t *,
+	  float control1_x, float control1_y,
+	  float control2_x, float control2_y,
+	  float to_x, float to_y,
+	  void *)
+{
+  _user_data_printf (draw_data, "C%g,%g %g,%g %g,%g",
+                     (double)control1_x,
+                     (double)control1_y,
+                     (double)control2_x,
+                     (double)control2_y,
+                     (double)to_x,
+                     (double)to_y);
+}
+
+static void
+close_path (hb_draw_funcs_t *dfuncs, user_data_t *draw_data, hb_draw_state_t *, void *)
+{
+  _user_data_printf (draw_data, "Z");
+}
+
+static hb_draw_funcs_t *funcs = 0;
+
+int
+hbjs_glyph_svg (hb_font_t *font, hb_codepoint_t glyph, char *buf, unsigned buf_size)
+{
+  if (funcs == 0) /* not the best pattern for multi-threaded apps which is not a concern here */
+  {
+    funcs = hb_draw_funcs_create (); /* will be leaked */
+    hb_draw_funcs_set_move_to_func (funcs, (hb_draw_move_to_func_t) move_to, nullptr, nullptr);
+    hb_draw_funcs_set_line_to_func (funcs, (hb_draw_line_to_func_t) line_to, nullptr, nullptr);
+    hb_draw_funcs_set_quadratic_to_func (funcs, (hb_draw_quadratic_to_func_t) quadratic_to, nullptr, nullptr);
+    hb_draw_funcs_set_cubic_to_func (funcs, (hb_draw_cubic_to_func_t) cubic_to, nullptr, nullptr);
+    hb_draw_funcs_set_close_path_func (funcs, (hb_draw_close_path_func_t) close_path, nullptr, nullptr);
+  }
+
+  user_data_t draw_data(buf, buf_size);
+  hb_font_get_glyph_shape (font, glyph, funcs, &draw_data);
+  if (draw_data.failure)
+    return -1;
+
+  buf[draw_data.consumed] = '\0';
+  return draw_data.consumed;
+}
+
+static hb_bool_t do_trace (hb_buffer_t *buffer,
+                           hb_font_t   *font,
+                           const char  *message,
+                           user_data_t *user_data) {
+  unsigned int consumed;
+  unsigned int num_glyphs = hb_buffer_get_length (buffer);
+
+  if (strcmp(message, "start table GSUB") == 0) {
+    user_data->current_phase = HB_SHAPE_GSUB_PHASE;
+  } else if (strcmp(message, "start table GPOS") == 0) {
+    user_data->current_phase = HB_SHAPE_GPOS_PHASE;
+  }
+
+
+  if (user_data->current_phase != user_data->stop_phase) {
+    user_data->stopping = false;
+  }
+
+  // If we overflowed, keep going anyway.
+  if (user_data->failure) return 1;
+
+  if (user_data->stop_phase != HB_SHAPE_DONT_STOP) {
+    // Do we need to start stopping?
+    char buf[12];
+    snprintf (buf, 12, "%d", user_data->stop_at);
+    if ((user_data->current_phase == user_data->stop_phase) &&
+        (strncmp(message, "end lookup ", 11) == 0) &&
+        (strcmp(message + 11, buf) == 0)) {
+      user_data->stopping = true;
+    }
+  }
+
+  // If we need to stop, stop.
+  if (user_data->stopping) return 0;
+
+  _user_data_printf (user_data, "{\"m\":\"%s\",\"t\":", message);
+  hb_buffer_serialize_glyphs(buffer, 0, num_glyphs,
+    user_data->str + user_data->consumed,
+    user_data->size - user_data->consumed,
+    &consumed,
+    font,
+    HB_BUFFER_SERIALIZE_FORMAT_JSON,
+    HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES);
+  user_data->consumed += consumed;
+  _user_data_printf (user_data, "},\n");
+
+  return 1;
+}
+
+unsigned
+hbjs_shape_with_trace (hb_font_t *font, hb_buffer_t* buf,
+                       char* featurestring,
+                       unsigned int stop_at, unsigned int stop_phase,
+                       char *outbuf, unsigned buf_size) {
+  user_data_t user_data(outbuf, buf_size, stop_at, stop_phase);
+
+  int num_features = 0;
+  hb_feature_t* features = nullptr;
+
+  if (*featurestring) {
+    /* count the features first, so we can allocate memory */
+    char* p = featurestring;
+    do {
+      num_features++;
+      p = strchr (p, ',');
+      if (p)
+        p++;
+    } while (p);
+
+    features = (hb_feature_t *) calloc (num_features, sizeof (*features));
+
+    /* now do the actual parsing */
+    p = featurestring;
+    num_features = 0;
+    while (p && *p) {
+      char *end = strchr (p, ',');
+      if (hb_feature_from_string (p, end ? end - p : -1, &features[num_features]))
+        num_features++;
+      p = end ? end + 1 : nullptr;
+    }
+  }
+
+  hb_buffer_set_message_func (buf, (hb_buffer_message_func_t)do_trace, &user_data, nullptr);
+  user_data.str[user_data.consumed++] = '[';
+  hb_shape(font, buf, features, num_features);
+
+  if (user_data.failure) return -1;
+
+  user_data.str[user_data.consumed-2] = ']';
+  user_data.str[user_data.consumed-1] = '\0';
+  return user_data.consumed;
+}
+
+#ifdef MAIN
+#include <stdio.h>
+int main() {
+    hb_blob_t *blob = hb_blob_create_from_file ("/home/ebrahim/Desktop/harfbuzzjs/harfbuzz/test/subset/data/fonts/Roboto-Regular.ttf");
+    hb_face_t *face = hb_face_create (blob, 0);
+    hb_blob_destroy (blob);
+    hb_font_t *font = hb_font_create (face);
+    hb_face_destroy (face);
+    char buf[1024];
+    buf[0] = '\0';
+    printf ("%d %d\n", hb_blob_get_length (blob), hbjs_ot_glyph_svg (font, 0, buf, sizeof (buf)));
+    puts (buf);
+    hb_font_destroy (font);
+}
+#endif

package/hbjs.js

@@ -110,6 +110,9 @@ function hbjs(instance) {
   var pathBufferSize = 65536; // should be enough for most glyphs
   var pathBuffer = exports.malloc(pathBufferSize); // permanently allocated
 
+  var nameBufferSize = 256; // should be enough for most glyphs
+  var nameBuffer = exports.malloc(nameBufferSize); // permanently allocated
+
   /**
   * Create an object representing a Harfbuzz font.
   * @param {object} blob An object returned from `createFace`.
@@ -126,8 +129,24 @@ function hbjs(instance) {
       return svgLength > 0 ? utf8Decoder.decode(heapu8.subarray(pathBuffer, pathBuffer + svgLength)) : "";
     }
 
+    /**
+     * Return glyph name.
+     * @param {number} glyphId ID of the requested glyph in the font.
+     **/
+    function glyphName(glyphId) {
+      exports.hb_font_glyph_to_string(
+        ptr,
+        glyphId,
+        nameBuffer,
+        nameBufferSize
+      );
+      var array = heapu8.subarray(nameBuffer, nameBuffer + nameBufferSize);
+      return utf8Decoder.decode(array.slice(0, array.indexOf(0)));
+    }
+
     return {
       ptr: ptr,
+      glyphName: glyphName,
       glyphToPath: glyphToPath,
       /**
       * Return a glyph as a JSON path string
@@ -287,12 +306,14 @@ function hbjs(instance) {
       *   - ax: Advance width (width to advance after this glyph is painted)
       *   - ay: Advance height (height to advance after this glyph is painted)
       *   - dx: X displacement (adjustment in X dimension when painting this glyph)
-      *   - d5: Y displacement (adjustment in Y dimension when painting this glyph)
+      *   - dy: Y displacement (adjustment in Y dimension when painting this glyph)
+      *   - flags: Glyph flags like `HB_GLYPH_FLAG_UNSAFE_TO_BREAK` (0x1)
       **/
-      json: function (font) {
+      json: function () {
         var length = exports.hb_buffer_get_length(ptr);
         var result = [];
-        var infosPtr32 = exports.hb_buffer_get_glyph_infos(ptr, 0) / 4;
+        var infosPtr = exports.hb_buffer_get_glyph_infos(ptr, 0);
+        var infosPtr32 = infosPtr / 4;
         var positionsPtr32 = exports.hb_buffer_get_glyph_positions(ptr, 0) / 4;
         var infos = heapu32.subarray(infosPtr32, infosPtr32 + 5 * length);
         var positions = heapi32.subarray(positionsPtr32, positionsPtr32 + 5 * length);
@@ -303,7 +324,8 @@ function hbjs(instance) {
             ax: positions[i * 5 + 0],
             ay: positions[i * 5 + 1],
             dx: positions[i * 5 + 2],
-            dy: positions[i * 5 + 3]
+            dy: positions[i * 5 + 3],
+            flags: exports.hb_glyph_info_get_glyph_flags(infosPtr + i * 20)
           });
         }
         return result;