pango r2537 - in trunk: . pango-view

[behdad svn gnome org]

Author: behdad
Date: Tue Jan  8 21:32:27 2008
New Revision: 2537
URL: http://svn.gnome.org/viewvc/pango?rev=2537&view=rev

Log:
2008-01-08  Behdad Esfahbod  <behdad gnome org>

        Bug 508007 â Add option for single-paragraph mode to pango-view

        * pango-view/viewer-render.c (make_layout), (parse_options): Add
        --single-par option to pango-view.



Modified:
   trunk/ChangeLog
   trunk/pango-view/viewer-render.c

Modified: trunk/pango-view/viewer-render.c
==============================================================================
--- trunk/pango-view/viewer-render.c	(original)
+++ trunk/pango-view/viewer-render.c	Tue Jan  8 21:32:27 2008
@@ -66,6 +66,7 @@
 const char *opt_pangorc = NULL;
 const PangoViewer *opt_viewer = NULL;
 const char *opt_language = NULL;
+gboolean opt_single_par = FALSE;
 
 /* Text (or markup) to render */
 static char *text;
@@ -115,6 +116,7 @@
   pango_layout_set_auto_dir (layout, opt_auto_dir);
   pango_layout_set_ellipsize (layout, opt_ellipsize);
   pango_layout_set_justify (layout, opt_justify);
+  pango_layout_set_single_paragraph_mode (layout, opt_single_par);
 
   font_description = get_font_description ();
   if (size > 0)
@@ -612,6 +614,8 @@
      "Angle at which to rotate results",			   "degrees"},
     {"runs",		'n', 0, G_OPTION_ARG_INT,			&opt_runs,
      "Run Pango layout engine this many times",			   "integer"},
+    {"single-par",	0, 0, G_OPTION_ARG_NONE,			&opt_single_par,
+     "Enable single-paragraph mode",					NULL},
     {"text",		't', 0, G_OPTION_ARG_STRING,			&opt_text,
      "Text to display (instead of a file)",			    "string"},
     {"version",		0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &show_version,