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

[subset] Add hb-subset-input.hh and make hb-subset.hh toplevel include

This commit is contained in:
Behdad Esfahbod 2018-08-31 13:25:19 -07:00
parent 18d01eac7f
commit aba0a945c5
15 changed files with 70 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.sources
View File

@ -213,6 +213,7 @@ HB_SUBSET_sources = \
hb-subset-glyf.cc \ hb-subset-glyf.cc \
hb-subset-glyf.hh \ hb-subset-glyf.hh \
hb-subset-input.cc \ hb-subset-input.cc \
hb-subset-input.hh \
hb-subset-plan.cc \ hb-subset-plan.cc \
hb-subset-plan.hh \ hb-subset-plan.hh \
$(NULL) $(NULL)

2
src/hb-ot-cmap-table.hh
View File

@ -29,7 +29,7 @@
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-set.hh" #include "hb-set.hh"
#include "hb-subset-plan.hh" #include "hb-subset.hh"
/* /*
* cmap -- Character to Glyph Index Mapping * cmap -- Character to Glyph Index Mapping

2
src/hb-ot-glyf-table.hh
View File

@ -30,8 +30,6 @@
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-ot-head-table.hh" #include "hb-ot-head-table.hh"
#include "hb-subset-glyf.hh" #include "hb-subset-glyf.hh"
#include "hb-subset-plan.hh"
#include "hb-subset.hh"
namespace OT { namespace OT {

2
src/hb-ot-hdmx-table.hh
View File

@ -28,7 +28,7 @@
#define HB_OT_HDMX_TABLE_HH #define HB_OT_HDMX_TABLE_HH
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-subset-plan.hh" #include "hb-subset.hh"
/* /*
* hdmx -- Horizontal Device Metrics * hdmx -- Horizontal Device Metrics

2
src/hb-ot-hmtx-table.hh
View File

@ -31,7 +31,7 @@
#include "hb-ot-hhea-table.hh" #include "hb-ot-hhea-table.hh"
#include "hb-ot-os2-table.hh" #include "hb-ot-os2-table.hh"
#include "hb-ot-var-hvar-table.hh" #include "hb-ot-var-hvar-table.hh"
#include "hb-subset-plan.hh" #include "hb-subset.hh"
/* /*
* hmtx -- Horizontal Metrics * hmtx -- Horizontal Metrics

2
src/hb-ot-maxp-table.hh
View File

@ -28,7 +28,7 @@
#define HB_OT_MAXP_TABLE_HH #define HB_OT_MAXP_TABLE_HH
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-subset-plan.hh" #include "hb-subset.hh"
namespace OT { namespace OT {

2
src/hb-ot-os2-table.hh
View File

@ -29,7 +29,7 @@
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-ot-os2-unicode-ranges.hh" #include "hb-ot-os2-unicode-ranges.hh"
#include "hb-subset-plan.hh" #include "hb-subset.hh"
namespace OT { namespace OT {

2
src/hb-ot-post-table.hh
View File

@ -28,7 +28,7 @@
#define HB_OT_POST_TABLE_HH #define HB_OT_POST_TABLE_HH
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-subset-plan.hh" #include "hb-subset.hh"
#define HB_STRING_ARRAY_NAME format1_names #define HB_STRING_ARRAY_NAME format1_names
#define HB_STRING_ARRAY_LIST "hb-ot-post-macroman.hh" #define HB_STRING_ARRAY_LIST "hb-ot-post-macroman.hh"

1
src/hb-subset-glyf.cc
View File

@ -28,7 +28,6 @@
#include "hb-ot-glyf-table.hh" #include "hb-ot-glyf-table.hh"
#include "hb-set.h" #include "hb-set.h"
#include "hb-subset-glyf.hh" #include "hb-subset-glyf.hh"
#include "hb-subset-plan.hh"
static bool static bool
_calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf, _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,

2
src/hb-subset-glyf.hh
View File

@ -29,7 +29,7 @@
#include "hb.hh" #include "hb.hh"
#include "hb-subset-plan.hh" #include "hb-subset.hh"
HB_INTERNAL bool HB_INTERNAL bool
hb_subset_glyf_and_loca (hb_subset_plan_t *plan, hb_subset_glyf_and_loca (hb_subset_plan_t *plan,

57
src/hb-subset-input.hh Normal file
View File

@ -0,0 +1,57 @@
/*
* 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, Roderick Sheeter
*/
#ifndef HB_SUBSET_INPUT_HH
#define HB_SUBSET_INPUT_HH
#include "hb.hh"
#include "hb-subset.h"
#include "hb-font.hh"
struct hb_subset_input_t
{
hb_object_header_t header;
ASSERT_POD ();
hb_set_t *unicodes;
hb_set_t *glyphs;
bool drop_hints : 1;
bool drop_layout : 1;
/* TODO
*
* features
* lookups
* nameIDs
* ...
*/
};
#endif /* HB_SUBSET_INPUT_HH */

3
src/hb-subset-plan.cc
View File

@ -24,11 +24,10 @@
* Google Author(s): Garret Rieger, Roderick Sheeter * Google Author(s): Garret Rieger, Roderick Sheeter
*/ */
#include "hb-subset-plan.hh"
#include "hb-map.hh" #include "hb-map.hh"
#include "hb-subset.hh"
#include "hb-set.hh" #include "hb-set.hh"
#include "hb-subset-plan.hh"
#include "hb-ot-cmap-table.hh" #include "hb-ot-cmap-table.hh"
#include "hb-ot-glyf-table.hh" #include "hb-ot-glyf-table.hh"

2
src/hb-subset-plan.hh
View File

@ -30,7 +30,7 @@
#include "hb.hh" #include "hb.hh"
#include "hb-subset.h" #include "hb-subset.h"
#include "hb-subset.hh" #include "hb-subset-input.hh"
#include "hb-map.hh" #include "hb-map.hh"

3
src/hb-subset.cc
View File

@ -27,9 +27,8 @@
#include "hb.hh" #include "hb.hh"
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-subset-glyf.hh"
#include "hb-subset.hh" #include "hb-subset.hh"
#include "hb-subset-plan.hh" #include "hb-subset-glyf.hh"
#include "hb-open-file.hh" #include "hb-open-file.hh"
#include "hb-ot-cmap-table.hh" #include "hb-ot-cmap-table.hh"

21
src/hb-subset.hh
View File

@ -32,26 +32,9 @@
#include "hb-subset.h" #include "hb-subset.h"
#include "hb-font.hh" #include "hb-subset-input.hh"
#include "hb-subset-plan.hh"
struct hb_subset_input_t
{
hb_object_header_t header;
ASSERT_POD ();
hb_set_t *unicodes;
hb_set_t *glyphs;
bool drop_hints : 1;
bool drop_layout : 1;
/* TODO
*
* features
* lookups
* nameIDs
* ...
*/
};
#endif /* HB_SUBSET_HH */ #endif /* HB_SUBSET_HH */