util/options.cc | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
New commits:
commit 76d57331117be8e0c2d4a2aee8341969b62b6888
Merge: 89cbd4d 9ee176e
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Mon Apr 13 23:40:35 2015 -0700
Merge pull request #86 from cpfair/hb-shape-output-help-improvement
Improve hb-shape/hb-view's help text w.r.t. output options
commit 9ee176ee978e6668c4faf00028811ce70979122e
Author: Collin Fair <c...@cpfx.ca>
Date: Sat Feb 14 09:59:44 2015 -0500
Stop hb-shape docs leaking into hb-view
diff --git a/util/options.cc b/util/options.cc
index fb74b1a..5d03caa 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -444,9 +444,7 @@ output_options_t::add_options (option_parser_t *parser)
else
{
char *items = g_strjoinv ("/", const_cast<char **> (supported_formats));
- text = g_strdup_printf ("Set output serialization format\n\n Supported
output formats are: %s\n%s", items,
- " text: [<glyph name or index>=<glyph cluster index within
input>@<horizontal displacement>,<vertical displacement>+<horizontal
advance>,<vertical advance>|...]\n"
- " json: [{\"g\": <glyph name or index>, \"ax\": <horizontal
advance>, \"ay\": <vertical advance>, \"dx\": <horizontal displacement>,
\"dy\": <vertical displacement>, \"cl\": <glyph cluster index within input>},
...]");
+ text = g_strdup_printf ("Set output format\n\n Supported output formats
are: %s", items);
g_free (items);
parser->free_later ((char *) text);
}
@@ -459,7 +457,7 @@ output_options_t::add_options (option_parser_t *parser)
};
parser->add_group (entries,
"output",
- "Output detination & format options:",
+ "Output destination & format options:",
"Options controlling the destination and form of the
output",
this);
}
@@ -706,9 +704,12 @@ format_options_t::add_options (option_parser_t *parser)
{NULL}
};
parser->add_group (entries,
- "output-content",
- "Output content options (refer to --help-output for output
syntax):",
- "Options controlling the content of the output",
+ "output-syntax",
+ "Output syntax:\n"
+ " text: [<glyph name or index>=<glyph cluster index within
input>@<horizontal displacement>,<vertical displacement>+<horizontal
advance>,<vertical advance>|...]\n"
+ " json: [{\"g\": <glyph name or index>, \"ax\": <horizontal
advance>, \"ay\": <vertical advance>, \"dx\": <horizontal displacement>,
\"dy\": <vertical displacement>, \"cl\": <glyph cluster index within input>},
...]\n"
+ "\nOutput syntax options:",
+ "Options controlling the syntax of the output",
this);
}
commit 952b8dbdf61da9b4814e09ad3c1b9b76483bef5c
Author: Collin Fair <c...@cpfx.ca>
Date: Sat Feb 14 09:44:00 2015 -0500
'All' of the above, not 'each'
diff --git a/util/options.cc b/util/options.cc
index 799ac4f..fb74b1a 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -699,10 +699,10 @@ format_options_t::add_options (option_parser_t *parser)
{"show-text", 0, 0, G_OPTION_ARG_NONE, &this->show_text, "Prefix each line
of output with its corresponding input text", NULL},
{"show-unicode", 0, 0, G_OPTION_ARG_NONE, &this->show_unicode, "Prefix
each line of output with its corresponding input codepoint(s)", NULL},
{"show-line-num", 0, 0, G_OPTION_ARG_NONE, &this->show_line_num, "Prefix
each line of output with its corresponding input line number", NULL},
- {"verbose", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer)
&parse_verbose, "Prefix each line of output with each of the above", NULL},
+ {"verbose", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer)
&parse_verbose, "Prefix each line of output with all of the above", NULL},
{"no-glyph-names", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_glyph_names, "Output glyph indices instead of names", NULL},
{"no-positions", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_positions, "Do not output glyph positions", NULL},
- {"no-clusters", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_clusters, "Do not output cluster indices", NULL},
+ {"no-clusters", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_clusters, "Do not output cluster indices", NULL},
{NULL}
};
parser->add_group (entries,
commit 9e867b64467c46eea5cc9b1d5a9404a1221bbbfc
Author: Collin Fair <c...@cpfx.ca>
Date: Sat Feb 14 09:32:04 2015 -0500
Remove reference to --help-output-content in --help-output (as
--help-output-format's options aren't available in hb-view)
diff --git a/util/options.cc b/util/options.cc
index c5b619d..799ac4f 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -459,7 +459,7 @@ output_options_t::add_options (option_parser_t *parser)
};
parser->add_group (entries,
"output",
- "Output detination & format options (refer to
--help-output-content for content options):",
+ "Output detination & format options:",
"Options controlling the destination and form of the
output",
this);
}
commit 1d55ffeb66381889f11ebb9039ca4ec2ca5efbab
Author: Collin Fair <c...@cpfx.ca>
Date: Sat Feb 14 09:29:35 2015 -0500
Add serialization syntax documentation. Clarify naming and wording in
--help-output/--help-format
diff --git a/util/options.cc b/util/options.cc
index 7387a56..c5b619d 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -440,11 +440,13 @@ output_options_t::add_options (option_parser_t *parser)
const char *text;
if (NULL == supported_formats)
- text = "Set output format";
+ text = "Set output serialization format";
else
{
char *items = g_strjoinv ("/", const_cast<char **> (supported_formats));
- text = g_strdup_printf ("Set output format\n\n Supported output formats
are: %s", items);
+ text = g_strdup_printf ("Set output serialization format\n\n Supported
output formats are: %s\n%s", items,
+ " text: [<glyph name or index>=<glyph cluster index within
input>@<horizontal displacement>,<vertical displacement>+<horizontal
advance>,<vertical advance>|...]\n"
+ " json: [{\"g\": <glyph name or index>, \"ax\": <horizontal
advance>, \"ay\": <vertical advance>, \"dx\": <horizontal displacement>,
\"dy\": <vertical displacement>, \"cl\": <glyph cluster index within input>},
...]");
g_free (items);
parser->free_later ((char *) text);
}
@@ -457,8 +459,8 @@ output_options_t::add_options (option_parser_t *parser)
};
parser->add_group (entries,
"output",
- "Output options:",
- "Options controlling the output",
+ "Output detination & format options (refer to
--help-output-content for content options):",
+ "Options controlling the destination and form of the
output",
this);
}
@@ -694,19 +696,19 @@ format_options_t::add_options (option_parser_t *parser)
{
GOptionEntry entries[] =
{
- {"no-glyph-names", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_glyph_names, "Use glyph indices instead of names", NULL},
- {"no-positions", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_positions, "Do not show glyph positions", NULL},
- {"no-clusters", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_clusters, "Do not show cluster mapping", NULL},
- {"show-text", 0, 0, G_OPTION_ARG_NONE,
&this->show_text, "Show input text", NULL},
- {"show-unicode", 0, 0, G_OPTION_ARG_NONE,
&this->show_unicode, "Show input Unicode codepoints", NULL},
- {"show-line-num", 0, 0, G_OPTION_ARG_NONE,
&this->show_line_num, "Show line numbers", NULL},
- {"verbose", 0, G_OPTION_FLAG_NO_ARG,
G_OPTION_ARG_CALLBACK,(gpointer) &parse_verbose, "Show everything",
NULL},
+ {"show-text", 0, 0, G_OPTION_ARG_NONE, &this->show_text, "Prefix each line
of output with its corresponding input text", NULL},
+ {"show-unicode", 0, 0, G_OPTION_ARG_NONE, &this->show_unicode, "Prefix
each line of output with its corresponding input codepoint(s)", NULL},
+ {"show-line-num", 0, 0, G_OPTION_ARG_NONE, &this->show_line_num, "Prefix
each line of output with its corresponding input line number", NULL},
+ {"verbose", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer)
&parse_verbose, "Prefix each line of output with each of the above", NULL},
+ {"no-glyph-names", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_glyph_names, "Output glyph indices instead of names", NULL},
+ {"no-positions", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_positions, "Do not output glyph positions", NULL},
+ {"no-clusters", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&this->show_clusters, "Do not output cluster indices", NULL},
{NULL}
};
parser->add_group (entries,
- "format",
- "Format options:",
- "Options controlling the formatting of buffer contents",
+ "output-content",
+ "Output content options (refer to --help-output for output
syntax):",
+ "Options controlling the content of the output",
this);
}
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/harfbuzz
