c91a7b
diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
c91a7b
--- paps-0.6.8.orig/src/paps.c	2007-04-13 14:04:14.000000000 +0900
c91a7b
+++ paps-0.6.8/src/paps.c	2007-11-16 12:28:11.000000000 +0900
c91a7b
@@ -723,9 +723,12 @@ split_text_into_paragraphs (PangoContext
c91a7b
       pango_layout_set_alignment (para->layout,
c91a7b
                                   page_layout->pango_dir == PANGO_DIRECTION_LTR
c91a7b
                                       ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
c91a7b
-      pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
c91a7b
-      
c91a7b
-      pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
c91a7b
+      if (page_layout->do_wordwrap) {
c91a7b
+        pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
c91a7b
+        pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
c91a7b
+      } else {
c91a7b
+        pango_layout_set_width (para->layout, -1);
c91a7b
+      }
c91a7b
       para->height = 0;
c91a7b
       
c91a7b
       result = g_list_prepend (result, para);
c91a7b
@@ -754,9 +757,13 @@ split_text_into_paragraphs (PangoContext
c91a7b
               pango_layout_set_alignment (para->layout,
c91a7b
                                           page_layout->pango_dir == PANGO_DIRECTION_LTR
c91a7b
                                           ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
c91a7b
-              pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
c91a7b
+              if (page_layout->do_wordwrap) {
c91a7b
+                pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
c91a7b
+                pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
c91a7b
+              } else {
c91a7b
+                pango_layout_set_width (para->layout, -1);
c91a7b
+              }
c91a7b
 
c91a7b
-              pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
c91a7b
               para->height = 0;
c91a7b
 
c91a7b
               last_para = next;