Merge pull request #3135 from harfbuzz/post-parse

[util] Clean up option parsing some more and implement missing featuress
2021-08-11 23:05:11 -06:00 · 2021-08-11 23:05:11 -06:00 · 302bde0bfb
parent 43722cc9f4 23282c9c9d
commit 302bde0bfb
1003 changed files with 979 additions and 679 deletions
--- a/configure.ac
+++ b/configure.ac
@ -425,11 +425,11 @@ util/Makefile
 test/Makefile
 test/api/Makefile
 test/fuzzing/Makefile
-test/shaping/Makefile
-test/shaping/data/Makefile
-test/shaping/data/aots/Makefile
-test/shaping/data/in-house/Makefile
-test/shaping/data/text-rendering-tests/Makefile
+test/shape/Makefile
+test/shape/data/Makefile
+test/shape/data/aots/Makefile
+test/shape/data/in-house/Makefile
+test/shape/data/text-rendering-tests/Makefile
 test/subset/Makefile
 test/subset/data/Makefile
 test/subset/data/repack_tests/Makefile
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -2,7 +2,7 @@

 NULL =
 EXTRA_DIST =
-SUBDIRS = api shaping fuzzing subset
+SUBDIRS = api shape subset fuzzing

 EXTRA_DIST += \
 	meson.build \
--- a/test/meson.build
+++ b/test/meson.build
@ -1,4 +1,4 @@
 subdir('api')
-subdir('fuzzing')
-subdir('shaping')
+subdir('shape')
 subdir('subset')
+subdir('fuzzing')
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
--- a/test/shaping/README.md
+++ b/test/shaping/README.md
--- a/test/shaping/data/Makefile.am
+++ b/test/shaping/data/Makefile.am
--- a/test/shaping/data/aots/COPYING
+++ b/test/shaping/data/aots/COPYING
--- a/test/shaping/data/aots/Makefile.am
+++ b/test/shaping/data/aots/Makefile.am
--- a/test/shaping/data/aots/Makefile.sources
+++ b/test/shaping/data/aots/Makefile.sources
--- a/test/shaping/data/aots/fonts/classdef1_font1.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font1.otf
--- a/test/shaping/data/aots/fonts/classdef1_font2.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font2.otf
--- a/test/shaping/data/aots/fonts/classdef1_font3.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font3.otf
--- a/test/shaping/data/aots/fonts/classdef1_font4.otf
+++ b/test/shaping/data/aots/fonts/classdef1_font4.otf
--- a/test/shaping/data/aots/fonts/classdef2_font1.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font1.otf
--- a/test/shaping/data/aots/fonts/classdef2_font2.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font2.otf
--- a/test/shaping/data/aots/fonts/classdef2_font3.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font3.otf
--- a/test/shaping/data/aots/fonts/classdef2_font4.otf
+++ b/test/shaping/data/aots/fonts/classdef2_font4.otf
--- a/test/shaping/data/aots/fonts/cmap0_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap0_font1.otf
--- a/test/shaping/data/aots/fonts/cmap10_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap10_font1.otf
--- a/test/shaping/data/aots/fonts/cmap10_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap10_font2.otf
--- a/test/shaping/data/aots/fonts/cmap12_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap12_font1.otf
--- a/test/shaping/data/aots/fonts/cmap14_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap14_font1.otf
--- a/test/shaping/data/aots/fonts/cmap2_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap2_font1.otf
--- a/test/shaping/data/aots/fonts/cmap4_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font1.otf
--- a/test/shaping/data/aots/fonts/cmap4_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font2.otf
--- a/test/shaping/data/aots/fonts/cmap4_font3.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font3.otf
--- a/test/shaping/data/aots/fonts/cmap4_font4.otf
+++ b/test/shaping/data/aots/fonts/cmap4_font4.otf
--- a/test/shaping/data/aots/fonts/cmap6_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap6_font1.otf
--- a/test/shaping/data/aots/fonts/cmap6_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap6_font2.otf
--- a/test/shaping/data/aots/fonts/cmap8_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap8_font1.otf
--- a/test/shaping/data/aots/fonts/cmap_composition_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap_composition_font1.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font1.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font1.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font2.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font2.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font3.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font3.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font4.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font4.otf
--- a/test/shaping/data/aots/fonts/cmap_subtableselection_font5.otf
+++ b/test/shaping/data/aots/fonts/cmap_subtableselection_font5.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f3.otf
--- a/test/shaping/data/aots/fonts/gpos1_1_simple_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos1_1_simple_f4.otf
--- a/test/shaping/data/aots/fonts/gpos1_2_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos1_2_font1.otf
--- a/test/shaping/data/aots/fonts/gpos1_2_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos1_2_font2.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_font6.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_font6.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_font7.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_font7.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_next_glyph_f2.otf
--- a/test/shaping/data/aots/fonts/gpos2_1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font1.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font2.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font3.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font3.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font4.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font4.otf
--- a/test/shaping/data/aots/fonts/gpos2_2_font5.otf
+++ b/test/shaping/data/aots/fonts/gpos2_2_font5.otf
--- a/test/shaping/data/aots/fonts/gpos3_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos3_font1.otf
--- a/test/shaping/data/aots/fonts/gpos3_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos3_font2.otf
--- a/test/shaping/data/aots/fonts/gpos3_font3.otf
+++ b/test/shaping/data/aots/fonts/gpos3_font3.otf
--- a/test/shaping/data/aots/fonts/gpos4_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos4_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos4_lookupflag_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos4_lookupflag_f2.otf
--- a/test/shaping/data/aots/fonts/gpos4_multiple_anchors_1.otf
+++ b/test/shaping/data/aots/fonts/gpos4_multiple_anchors_1.otf
--- a/test/shaping/data/aots/fonts/gpos4_simple_1.otf
+++ b/test/shaping/data/aots/fonts/gpos4_simple_1.otf
--- a/test/shaping/data/aots/fonts/gpos5_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos5_font1.otf
--- a/test/shaping/data/aots/fonts/gpos6_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos6_font1.otf
--- a/test/shaping/data/aots/fonts/gpos7_1_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos7_1_font1.otf
--- a/test/shaping/data/aots/fonts/gpos9_font1.otf
+++ b/test/shaping/data/aots/fonts/gpos9_font1.otf
--- a/test/shaping/data/aots/fonts/gpos9_font2.otf
+++ b/test/shaping/data/aots/fonts/gpos9_font2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining1_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining1_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_multiple_subrules_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining2_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining2_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f3.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f3.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f4.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_boundary_f4.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_lookupflag_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_next_glyph_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_simple_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_simple_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_simple_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_simple_f2.otf
--- a/test/shaping/data/aots/fonts/gpos_chaining3_successive_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_chaining3_successive_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_boundary_f1.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_boundary_f1.otf
--- a/test/shaping/data/aots/fonts/gpos_context1_boundary_f2.otf
+++ b/test/shaping/data/aots/fonts/gpos_context1_boundary_f2.otf
--- a/Show More
+++ b/Show More