texinfo/tp t/paragraph.t Texinfo/Convert/Paragr...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/11/14 21:30:26

Modified files:
        tp/t           : paragraph.t 
        tp/Texinfo/Convert: Paragraph.pm 

Log message:
        Test indentation and paragraph.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/paragraph.t?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Paragraph.pm?cvsroot=texinfo&r1=1.5&r2=1.6

Patches:
Index: t/paragraph.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/paragraph.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/paragraph.t       9 Nov 2010 23:02:46 -0000       1.5
+++ t/paragraph.t       14 Nov 2010 21:30:26 -0000      1.6
@@ -9,7 +9,7 @@
 
 #use Test;
 use Test::More;
-BEGIN { plan tests => 82 };
+BEGIN { plan tests => 91 };
 use lib '../texi2html/lib/Unicode-EastAsianWidth/lib/';
 #push @INC, '../texi2html/lib/Unicode-EastAsianWidth/lib/';
 use Texinfo::Convert::Paragraph;
@@ -36,8 +36,11 @@
     $result .= $para->add_text($arg);
   }
   $result .= $para->end();
+  if (defined($reference)) {
   is ($result, $reference, $name);
-  #print STDERR "$result\n";
+  } else {
+    print STDERR "$result\n";
+  }
 }
 
 test_para(['word'], "word\n", 'word');
@@ -66,6 +69,64 @@
 test_para(["\x{7b2c}\x{4e00} ",'other'], "\x{7b2c}\n\x{4e00}\nother\n", 
'east_asian', {'max' => 2});
 test_para(['word.  other'], "word. other\n", 'two_words_dot_frenchspacing', 
{'frenchspacing' => 1});
 test_para(["aa.)\x{7b2c} b"], "aa.)\x{7b2c} b\n", 'end_sentence_east_asian');
+test_para(["aaaa bbbbbbb cccccccc dddddddddddd eeeeeeeeeeee fffffffff 
ggggggg"],
+"   aaaa
+ bbbbbbb
+ cccccccc
+ dddddddddddd
+ eeeeeeeeeeee
+ fffffffff
+ ggggggg
+",
+   'indent_indent_next', {'max' => 6, 'indent_length' => 3, 
'indent_length_next' => 1});
+test_para(["aaaa bbbbbbb cccccccc dddddddddddd eeeeeeeeeeee fffffffff 
ggggggg"], 
+"    aaaa
+bbbbbbb
+cccccccc
+dddddddddddd
+eeeeeeeeeeee
+fffffffff
+ggggggg
+",
+   'indent_no_indent_next', {'max' => 12, 'indent_length' => 4, 
'indent_length_next' => 0});
+test_para(["aaaa bbbbbbb cccccccc dddddddddddd eeeeeeeeeeee fffffffff 
ggggggg"],
+"    aaaa
+    bbbbbbb
+    cccccccc
+    dddddddddddd
+    eeeeeeeeeeee
+    fffffffff
+    ggggggg
+",
+   'indent_undef_indent_next', {'max' => 12, 'indent_length' => 4});
+test_para(["aaaa bbbbbbb cccccccc dddddddddddd eeeeeeeeeeee fffffffff 
ggggggg"], 
+"aaaa bbbbbbb
+   cccccccc
+   dddddddddddd
+   eeeeeeeeeeee
+   fffffffff
+   ggggggg
+",
+   'indent_next_no_indent', {'max' => 12, 'indent_length' => 0, 
'indent_length_next' => 3});
+test_para(["aaaa bbbbbbb cccccccc dddddddddddd eeeeeeeeeeee fffffffff 
ggggggg"],
+"aaaa bbbbbbb
+   cccccccc
+   dddddddddddd
+   eeeeeeeeeeee
+   fffffffff
+   ggggggg
+",
+   'indent_next_undef_indent', {'max' => 12, 'indent_length_next' => 3});
+test_para(["aaaa"], "  aaaa\n", 'indent_and_counter_lower', 
+  {'indent_length' => 8, 'counter' => 6});
+test_para(["aaaa"], "aaaa\n", 'indent_zero_and_counter', 
+  {'indent_length' => 0, 'counter' => 6});
+test_para(["aaaa"], "aaaa\n", 'indent_and_counter_higher', 
+  {'indent_length' => 3, 'counter' => 6});
+test_para(["aaaa bbbbbbb cccccccc dddddddddddd"],
+  "aaaa bbbbbbb\ncccccccc dddddddddddd\n",
+  "counter_and_line", {'counter' => 60});
+
 
 my $para = Texinfo::Convert::Paragraph->new();
 my $result = '';

Index: Texinfo/Convert/Paragraph.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Texinfo/Convert/Paragraph.pm        12 Nov 2010 01:10:43 -0000      1.5
+++ Texinfo/Convert/Paragraph.pm        14 Nov 2010 21:30:26 -0000      1.6
@@ -62,7 +62,7 @@
   return '' if ($paragraph->{'protected_spaces'});
   $paragraph->{'counter'} = 0;
   $paragraph->{'space'} = '';
-  if ($paragraph->{'indent_length_next'}) {
+  if (defined($paragraph->{'indent_length_next'})) {
     $paragraph->{'indent_length'} = $paragraph->{'indent_length_next'};
     delete $paragraph->{'indent_length_next'};        
   }