summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-05-14 00:56:39 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-05-14 00:56:39 +0000
commit9f09571a932149e77ceeb7ccec8bd7bdea6aac4a (patch)
treeb95f4ef2d8c4a3934f2b80c964438c736b07240f
parent426b1f1fbc453a6d42bcf3cc3acc53634d437219 (diff)
downloadpango-9f09571a932149e77ceeb7ccec8bd7bdea6aac4a.tar.gz
Add --language.
2007-05-13 Behdad Esfahbod <behdad@gnome.org> * pango-view/viewer-render.c (do_output), (parse_options): Add --language. svn path=/trunk/; revision=2283
-rw-r--r--ChangeLog5
-rw-r--r--pango-view/viewer-render.c9
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d76be462..e36067d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-13 Behdad Esfahbod <behdad@gnome.org>
+
+ * pango-view/viewer-render.c (do_output), (parse_options):
+ Add --language.
+
2007-05-10 Behdad Esfahbod <behdad@gnome.org>
* modules/arabic/arabic-fc.c (maybe_add_gsub_feature),
diff --git a/pango-view/viewer-render.c b/pango-view/viewer-render.c
index 2bad63d6..1c29c4e6 100644
--- a/pango-view/viewer-render.c
+++ b/pango-view/viewer-render.c
@@ -65,6 +65,7 @@ PangoWrapMode opt_wrap = PANGO_WRAP_WORD_CHAR;
gboolean opt_wrap_set = FALSE;
const char *opt_pangorc = NULL;
const PangoViewer *opt_viewer = NULL;
+const char *opt_language = NULL;
/* Text (or markup) to render */
static char *text;
@@ -273,7 +274,9 @@ do_output (PangoContext *context,
set_transform (context, transform_cb, cb_context, cb_data, NULL);
- pango_context_set_language (context, pango_language_get_default ());
+ pango_context_set_language (context,
+ opt_language ? pango_language_from_string (opt_language)
+ : pango_language_get_default ());
pango_context_set_base_dir (context,
opt_rtl ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR);
@@ -562,7 +565,7 @@ show_version(const char *name,
void
parse_options (int argc, char *argv[])
{
- gchar *backend_options = backends_to_string();
+ gchar *backend_options = backends_to_string ();
GOptionFlags backend_flag = backends_get_count () > 1 ? 0 : G_OPTION_FLAG_HIDDEN;
gchar *backend_desc = backend_description ();
GOptionEntry entries[] =
@@ -593,6 +596,8 @@ parse_options (int argc, char *argv[])
"Width in points to indent paragraphs", "points"},
{"justify", 0, 0, G_OPTION_ARG_NONE, &opt_justify,
"Align paragraph lines to be justified", NULL},
+ {"language", 0, 0, G_OPTION_ARG_STRING, &opt_language,
+ "Language to use for font selection", "en_US/etc"},
{"margin", 0, 0, G_OPTION_ARG_INT, &opt_margin,
"Set the margin on the output in pixels", "pixels"},
{"markup", 0, 0, G_OPTION_ARG_NONE, &opt_markup,