From 21a181af2bf1582991c55de5f9281494733c5d12 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Tue, 10 Apr 2018 15:40:24 -0700
Subject: [PATCH] [subset] sketch out support for a call that lists all
 codepoints present in a font. Implement support for it in format 4 cmap sub
 table.

---
 src/hb-ot-cmap-table.hh                       |  37 ++++++++++-
 src/hb-subset.cc                              |  14 +++++
 src/hb-subset.h                               |   5 +-
 test/api/Makefile.am                          |   2 +
 test/api/fonts/Roboto-Regular.abc.format4.ttf | Bin 0 -> 2424 bytes
 test/api/test-subset-codepoints.c             |  59 ++++++++++++++++++
 6 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 test/api/fonts/Roboto-Regular.abc.format4.ttf
 create mode 100644 test/api/test-subset-codepoints.c

diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index c2bfe4b5e..f94dc0687 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -127,6 +127,13 @@ struct CmapSubtableFormat4
       return true;
     }
 
+    static inline void get_all_codepoints_func (const void *obj, hb_set_t *out)
+    {
+      const accelerator_t *thiz = (const accelerator_t *) obj;
+      for (unsigned int i = 0; i < thiz->segCount - 1; i++) // Skip the last segment (0xFFFF)
+	hb_set_add_range (out, thiz->startCount[i], thiz->endCount[i]);
+    }
+
     const HBUINT16 *endCount;
     const HBUINT16 *startCount;
     const HBUINT16 *idDelta;
@@ -667,20 +674,30 @@ struct cmap
 
       this->get_glyph_data = subtable;
       if (unlikely (symbol))
+      {
 	this->get_glyph_func = get_glyph_from_symbol<OT::CmapSubtable>;
-      else
+	this->get_all_codepoints_func = null_get_all_codepoints_func;
+      } else {
 	switch (subtable->u.format) {
 	/* Accelerate format 4 and format 12. */
-	default: this->get_glyph_func = get_glyph_from<OT::CmapSubtable>;		break;
-	case 12: this->get_glyph_func = get_glyph_from<OT::CmapSubtableFormat12>;	break;
+	default:
+	  this->get_glyph_func = get_glyph_from<OT::CmapSubtable>;
+	  this->get_all_codepoints_func = null_get_all_codepoints_func;
+	  break;
+	case 12:
+	  this->get_glyph_func = get_glyph_from<OT::CmapSubtableFormat12>;
+	  this->get_all_codepoints_func = null_get_all_codepoints_func;
+	  break;
 	case  4:
 	  {
 	    this->format4_accel.init (&subtable->u.format4);
 	    this->get_glyph_data = &this->format4_accel;
 	    this->get_glyph_func = this->format4_accel.get_glyph_func;
+	    this->get_all_codepoints_func = this->format4_accel.get_all_codepoints_func;
 	  }
 	  break;
 	}
+      }
     }
 
     inline void fini (void)
@@ -710,10 +727,22 @@ struct cmap
       return get_nominal_glyph (unicode, glyph);
     }
 
+    inline void get_all_codepoints (hb_set_t *out) const
+    {
+      this->get_all_codepoints_func (get_glyph_data, out);
+    }
+
     protected:
     typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj,
 					      hb_codepoint_t codepoint,
 					      hb_codepoint_t *glyph);
+    typedef void (*hb_cmap_get_all_codepoints_func_t) (const void *obj,
+						       hb_set_t *out);
+
+    static inline void null_get_all_codepoints_func (const void *obj, hb_set_t *out)
+    {
+      // NOOP
+    }
 
     template <typename Type>
     static inline bool get_glyph_from (const void *obj,
@@ -749,6 +778,8 @@ struct cmap
     private:
     hb_cmap_get_glyph_func_t get_glyph_func;
     const void *get_glyph_data;
+    hb_cmap_get_all_codepoints_func_t get_all_codepoints_func;
+
     OT::CmapSubtableFormat4::accelerator_t format4_accel;
 
     const OT::CmapSubtableFormat14 *uvs_table;
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index b253817eb..5da46c797 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -371,3 +371,17 @@ hb_subset (hb_face_t *source,
   hb_subset_plan_destroy (plan);
   return result;
 }
+
+/**
+ * hb_subset_get_all_codepoints:
+ * @source: font face data to load.
+ * @out: set to add the all codepoints covered by font face, source.
+ */
+void
+hb_subset_get_all_codepoints (hb_face_t *source, hb_set_t *out)
+{
+  OT::cmap::accelerator_t cmap;
+  cmap.init (source);
+  cmap.get_all_codepoints (out);
+  cmap.fini();
+}
diff --git a/src/hb-subset.h b/src/hb-subset.h
index 55ce25b0a..409581c76 100644
--- a/src/hb-subset.h
+++ b/src/hb-subset.h
@@ -72,12 +72,15 @@ HB_EXTERN hb_bool_t *
 hb_subset_input_drop_hints (hb_subset_input_t *subset_input);
 
 /* hb_subset() */
-
 HB_EXTERN hb_face_t *
 hb_subset (hb_face_t *source,
 	   hb_subset_profile_t *profile,
            hb_subset_input_t *input);
 
+/* hb_subset_get_all_codepoints */
+HB_EXTERN void
+hb_subset_get_all_codepoints (hb_face_t *source, hb_set_t *out);
+
 HB_END_DECLS
 
 #endif /* HB_SUBSET_H */
diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 0f7c82f77..65ceeda3c 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -32,6 +32,7 @@ TEST_PROGS = \
 	test-set \
 	test-shape \
 	test-subset \
+	test-subset-codepoints \
 	test-subset-cmap \
 	test-subset-glyf \
 	test-subset-hdmx \
@@ -44,6 +45,7 @@ TEST_PROGS = \
 	$(NULL)
 
 test_subset_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
+test_subset_codepoints_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_cmap_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_glyf_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_hdmx_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
diff --git a/test/api/fonts/Roboto-Regular.abc.format4.ttf b/test/api/fonts/Roboto-Regular.abc.format4.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ccb074a8e7566eefed943c575625b6f7345e25bd
GIT binary patch
literal 2424
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

literal 0
HcmV?d00001

diff --git a/test/api/test-subset-codepoints.c b/test/api/test-subset-codepoints.c
new file mode 100644
index 000000000..c4f9c0ee6
--- /dev/null
+++ b/test/api/test-subset-codepoints.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger
+ */
+
+#include "hb-test.h"
+#include "hb-subset-test.h"
+
+static void
+test_get_all_codepoints_format4 (void)
+{
+  hb_face_t *face = hb_subset_test_open_font("fonts/Roboto-Regular.abc.format4.ttf");
+  hb_set_t *codepoints = hb_set_create();
+
+  hb_subset_get_all_codepoints (face, codepoints);
+
+  hb_codepoint_t cp = HB_SET_VALUE_INVALID;
+  g_assert (hb_set_next (codepoints, &cp));
+  g_assert_cmpuint (0x61, ==, cp);
+  g_assert (hb_set_next (codepoints, &cp));
+  g_assert_cmpuint (0x62, ==, cp);
+  g_assert (hb_set_next (codepoints, &cp));
+  g_assert_cmpuint (0x63, ==, cp);
+  g_assert (!hb_set_next (codepoints, &cp));
+
+  hb_set_destroy (codepoints);
+  hb_face_destroy (face);
+}
+
+int
+main (int argc, char **argv)
+{
+  hb_test_init (&argc, &argv);
+
+  hb_test_add (test_get_all_codepoints_format4);
+
+  return hb_test_run();
+}