From eb724f75baef16868d59ea0f2f1e1976af5c97ed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 21 May 2021 06:40:55 -0400 Subject: docs: Add a missing backtick --- pango/pango-context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pango/pango-context.c b/pango/pango-context.c index 561f55bf..7fa0d7b1 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -38,7 +38,7 @@ * A `PangoContext` stores global information used to control the * itemization process. * - * The information stored by `PangoContext includes the fontmap used + * The information stored by `PangoContext` includes the fontmap used * to look up fonts, and default values such as the default language, * default gravity, or default font. * -- cgit v1.2.1 From 65404213f278a2b80794e4d46458f786cd9b70b3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 23 May 2021 12:11:48 -0400 Subject: Only build pango-segmentation if we have cairo --- utils/meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/meson.build b/utils/meson.build index 12968ef7..74d8668b 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -79,11 +79,11 @@ if cairo_dep.found() '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), ]) -endif + pango_segmentation = executable('pango-segmentation', + 'pango-segmentation.c', + dependencies: [ libpango_dep, libpangocairo_dep ], + include_directories: [ root_inc ], + install: false, + ) -pango_segmentation = executable('pango-segmentation', - 'pango-segmentation.c', - dependencies: [ libpango_dep, libpangocairo_dep ], - include_directories: [ root_inc ], - install: false, - ) +endif -- cgit v1.2.1 From 2f07e562fc1fe370d3c7d9ce70158480a33d3a0a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 23 May 2021 12:21:22 -0400 Subject: pango-list: Add --version --- utils/pango-list.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/utils/pango-list.c b/utils/pango-list.c index 6e81fd6e..82a5647c 100644 --- a/utils/pango-list.c +++ b/utils/pango-list.c @@ -46,10 +46,12 @@ main (int argc, gboolean opt_verbose = FALSE; gboolean opt_metrics = FALSE; gboolean opt_variations = FALSE; + gboolean opt_version = FALSE; GOptionEntry entries[] = { - {"verbose", 0, 0, G_OPTION_ARG_NONE, &opt_verbose, "Print verbose information", NULL }, - {"metrics", 0, 0, G_OPTION_ARG_NONE, &opt_metrics, "Print font metrics", NULL }, - {"variations", 0, 0, G_OPTION_ARG_NONE, &opt_variations, "Print font variations", NULL }, + { "verbose", 0, 0, G_OPTION_ARG_NONE, &opt_verbose, "Print verbose information", NULL }, + { "metrics", 0, 0, G_OPTION_ARG_NONE, &opt_metrics, "Print font metrics", NULL }, + { "variations", 0, 0, G_OPTION_ARG_NONE, &opt_variations, "Print font variations", NULL }, + { "version", 0, 0, G_OPTION_ARG_NONE, &opt_version, "Show version" }, { NULL, } }; GOptionContext *context; @@ -77,6 +79,12 @@ main (int argc, g_option_context_free (context); + if (opt_version) + { + g_print ("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION); + exit (0); + } + /* Use PangoCairo to get default fontmap so it works on every platform. */ fontmap = pango_cairo_font_map_get_default (); ctx = pango_font_map_create_context (fontmap); -- cgit v1.2.1 From 5df00b86e178c1c66049f1b482451df53e656997 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 23 May 2021 12:30:43 -0400 Subject: pango-segmentation: Fixes Only build pango-segmentation if we have cairo. And add --version here too. --- utils/meson.build | 21 +++++++++++++++++---- utils/pango-segmentation.c | 14 ++++++++++++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/utils/meson.build b/utils/meson.build index 74d8668b..6d06dbec 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -79,11 +79,24 @@ if cairo_dep.found() '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), ]) + pango_segmentation_sources = [ + 'pango-segmentation.c', + ] + + pango_segmentation_deps = [ + pango_deps, + libpango_dep, + libpangocairo_dep + ] + pango_segmentation = executable('pango-segmentation', - 'pango-segmentation.c', - dependencies: [ libpango_dep, libpangocairo_dep ], + pango_segmentation_sources, + dependencies: pango_segmentation_deps, include_directories: [ root_inc ], - install: false, - ) + install: true, + c_args: [ + '-DPACKAGE_NAME="@0@"'.format(meson.project_name()), + '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), + ]) endif diff --git a/utils/pango-segmentation.c b/utils/pango-segmentation.c index 3e774167..6931d180 100644 --- a/utils/pango-segmentation.c +++ b/utils/pango-segmentation.c @@ -151,15 +151,19 @@ show_segmentation (const char *input, int main (int argc, char *argv[]) { - setlocale (LC_ALL, ""); char *opt_kind = "grapheme"; + gboolean opt_version = FALSE; GOptionEntry entries[] = { { "kind", 0, 0, G_OPTION_ARG_STRING, &opt_kind, "Kind of boundary (grapheme/word/line/sentence)", "KIND" }, + { "version", 0, 0, G_OPTION_ARG_NONE, &opt_version, "Show version" }, { NULL, }, }; GOptionContext *context; GError *error = NULL; + g_set_prgname ("pango-segmentation"); + setlocale (LC_ALL, ""); + context = g_option_context_new ("TEXT"); g_option_context_add_main_entries (context, entries, NULL); g_option_context_set_description (context, @@ -170,9 +174,15 @@ main (int argc, char *argv[]) exit (1); } + if (opt_version) + { + g_print ("%s (%s) %s\n", g_get_prgname (), PACKAGE_NAME, PACKAGE_VERSION); + exit (0); + } + if (argc < 2) { - g_printerr ("Usage: pango-segmentation [OPTIONS…] TEXT"); + g_printerr ("Usage: pango-segmentation [OPTIONS…] TEXT\n"); exit (1); } -- cgit v1.2.1