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

[util/hb-subset] Fix --version and --help again 

38ad093216
This commit is contained in:
Behdad Esfahbod 2021-08-30 18:35:08 -06:00
parent 5c4c173b06
commit 04cf6212d7
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/hb-subset.cc
View File

@ -60,6 +60,7 @@ struct subset_main_t : option_parser_t, face_options_t, output_options_t<false>
{nullptr} {nullptr}
}; };
parser.add_main_group (entries, &face_opts); parser.add_main_group (entries, &face_opts);
parser.add_options ();
g_option_context_set_ignore_unknown_options (parser.context, true); g_option_context_set_ignore_unknown_options (parser.context, true);
g_option_context_set_help_enabled (parser.context, false); g_option_context_set_help_enabled (parser.context, false);
@ -79,9 +80,20 @@ struct subset_main_t : option_parser_t, face_options_t, output_options_t<false>
void parse (int argc, char **argv) void parse (int argc, char **argv)
{ {
/* Do a preliminary parse to load font-face, such that we can use it bool help = false;
* during main option parsing. */ for (auto i = 1; i < argc; i++)
parse_face (argc, argv); if (!strncmp ("--help", argv[i], 6))
{
help = true;
break;
}
if (likely (!help))
{
/* Do a preliminary parse to load font-face, such that we can use it
* during main option parsing. */
parse_face (argc, argv);
}
add_options (); add_options ();
option_parser_t::parse (&argc, &argv); option_parser_t::parse (&argc, &argv);