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