[7630] call Texinfo::Convert::Paragraph->new directly

[gavinsmith0123]

Revision: 7630
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7630
Author:   gavin
Date:     2017-01-14 17:37:18 -0500 (Sat, 14 Jan 2017)
Log Message:
-----------
call Texinfo::Convert::Paragraph->new directly

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Plaintext.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-01-14 22:22:58 UTC (rev 7629)
+++ trunk/ChangeLog     2017-01-14 22:37:18 UTC (rev 7630)
@@ -1,5 +1,11 @@
 2017-01-14  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/Plaintext.pm (new_formatter): Call 
+       Texinfo::Convert::Paragraph::new directly instead of using 
+       Texinfo::Convert::Line or Texinfo::Convert::UnFilled.
+
+2017-01-14  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/Plaintext.pm (_convert, _convert_element)
        (_process_text): Remove debugging statements.
 

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2017-01-14 22:22:58 UTC (rev 
7629)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2017-01-14 22:37:18 UTC (rev 
7630)
@@ -44,10 +44,7 @@
 *get_pending = \&Texinfo::Convert::Paragraph::get_pending;
 
 use Texinfo::Convert::Text;
-use Texinfo::Convert::Line;
-use Texinfo::Convert::UnFilled;
 
-
 use Carp qw(cluck);
 
 require Exporter;
@@ -625,11 +622,23 @@
   }
     
   if ($type eq 'line') {
-    $container = Texinfo::Convert::Line->new($container_conf);
+    $container_conf->{'max'} = 10000001;
+    $container_conf->{'keep_end_lines'} = 1;
+    $container_conf->{'no_final_newline'} = 1;
+    $container_conf->{'add_final_space'} = 1;
+
+    $container = Texinfo::Convert::Paragraph->new($container_conf);
   } elsif ($type eq 'paragraph') {
     $container = Texinfo::Convert::Paragraph->new($container_conf);
   } elsif ($type eq 'unfilled') {
-    $container = Texinfo::Convert::UnFilled->new($container_conf);
+    $container_conf->{'max'} = 10000000;
+    $container_conf->{'ignore_columns'} = 1;
+    $container_conf->{'keep_end_lines'} = 1;
+    $container_conf->{'frenchspacing'} = 1;
+    $container_conf->{'unfilled'} = 1;
+    $container_conf->{'no_final_newline'} = 1;
+
+    $container = Texinfo::Convert::Paragraph->new($container_conf);
   } else {
     die "Unknown container type $type\n";
   }