[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/04/03 14:10:38

Modified files:
        .              : ChangeLog TODO texi2html.init texi2html.pl 
        test/formatting/res/table_in_table_item: table_in_table_item.2 
                                                 table_in_table_item.html 

Log message:
                * texi2html.pl: add a user hook for closed empty preformatted.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.366&r2=1.367
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.181&r2=1.182
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.267&r2=1.268
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/table_in_table_item/table_in_table_item.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/table_in_table_item/table_in_table_item.html?cvsroot=texi2html&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -b -r1.366 -r1.367
--- ChangeLog   2 Apr 2009 09:13:47 -0000       1.366
+++ ChangeLog   3 Apr 2009 14:10:37 -0000       1.367
@@ -1,3 +1,7 @@
+2009-04-03  Patrice Dumas  <address@hidden>
+
+       * texi2html.pl: add a user hook for closed empty preformatted.
+
 2009-04-02  Patrice Dumas  <address@hidden>
 
        * texi2html.pl, texi2html.init, examples/: modify directly the 

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- TODO        2 Apr 2009 09:13:47 -0000       1.85
+++ TODO        3 Apr 2009 14:10:37 -0000       1.86
@@ -46,6 +46,7 @@
   $Texi2HTML::THISDOC{'do_about'}
   $Texi2HTML::THISDOC{'split_level'}
 
+  $empty_preformatted
   $copying_comment, $titlepage better and $documentdescription
   $program_string, $footnote_texi
   $heading arguments $begin_paragraph_texi $tab_item_texi $begin_style_texi
@@ -427,9 +428,6 @@
 
 * @image in info, remove last end of line in file.txt
 
-* formatting/table_in_table_item.texi could have better error messages, 
-  not sure the @asis related messages are right.
-
 * have a special debug more where text processing is traced. It means
   that PASS_TEXT/SCAN_TEXT is shown and substitute_line (and maybe 
   other like substitute_text) and shown, now that there is a nice 

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- texi2html.init      2 Apr 2009 09:13:47 -0000       1.181
+++ texi2html.init      3 Apr 2009 14:10:37 -0000       1.182
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.181 2009/04/02 09:13:47 pertusus Exp $
+# $Id: texi2html.init,v 1.182 2009/04/03 14:10:37 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -5524,7 +5524,6 @@
     my $item_cmd = shift;
     my $formatted_index_entry = shift;
 
-    #print STDERR "-> $format (@$style_stack)\n";
 #    if (defined($text_formatted) and !exists 
$special_list_commands{$format}->{$command})
 #    {
 #        $text = $text_formatted_leading_spaces . $text_formatted 
.$text_formatted_trailing_spaces;
@@ -5658,7 +5657,7 @@
            $result_line = "address@hidden $line\n";
         }
     }
-    if (defined($prepended) and $prepended ne '')
+    elsif (defined($prepended) and $prepended ne '')
     {
          $prepended =~ s/^\s*//;
          $prepended =~ s/\s*$//;

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -b -r1.267 -r1.268
--- texi2html.pl        2 Apr 2009 13:42:26 -0000       1.267
+++ texi2html.pl        3 Apr 2009 14:10:38 -0000       1.268
@@ -79,7 +79,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.267 2009/04/02 13:42:26 pertusus Exp $
+# $Id: texi2html.pl,v 1.268 2009/04/03 14:10:38 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -442,6 +442,7 @@
 $element_heading
 $paragraph
 $preformatted
+$empty_preformatted
 $foot_line_and_ref
 $foot_section
 $address
@@ -13001,8 +13002,8 @@
         ($index_entry, $formatted_index_entry, $index_label) = 
do_index_entry_label($format->{'format'}, $state,$line_nr, 
$format->{'texi_line'});
         print STDERR "Bug: no index entry for $term->{'text'}\n" unless 
defined($index_label);
     }
-#    add_prev($text, $stack, &$Texi2HTML::Config::table_item($term->{'text'}, 
$index_label,$format->{'format'},$format->{'command'}, $formatted_command, 
$state->{'command_stack'}, $term_formatted, $leading_spaces, $trailing_spaces, 
$format->{'item_cmd'}));
-    add_prev($text, $stack, &$Texi2HTML::Config::table_item($term->{'text'}, 
$index_label,$format->{'format'},$format->{'command'}, 
$state->{'command_stack'}, $format->{'item_cmd'}, $formatted_index_entry));
+    my $item_result = &$Texi2HTML::Config::table_item($term->{'text'}, 
$index_label,$format->{'format'},$format->{'command'}, 
$state->{'command_stack'}, $format->{'item_cmd'}, $formatted_index_entry);
+    add_prev($text, $stack, $item_result);
     #$state->{'no_paragraph'}--;
     return $format;
 }
@@ -13774,6 +13775,10 @@
        and ($stack->[-1]->{'format'} eq 'preformatted')
        and ($stack->[-1]->{'text'} !~ /\S/))
     {
+        if (defined($Texi2HTML::Config::empty_preformatted))
+        {
+           return if 
(&$Texi2HTML::Config::empty_preformatted($stack->[-1]->{'text'}));
+        }
         pop @$stack;
     }
 }

Index: test/formatting/res/table_in_table_item/table_in_table_item.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/table_in_table_item/table_in_table_item.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res/table_in_table_item/table_in_table_item.2       2 Apr 
2009 09:14:36 -0000       1.2
+++ test/formatting/res/table_in_table_item/table_in_table_item.2       3 Apr 
2009 14:10:38 -0000       1.3
@@ -1,22 +1,14 @@
 ** Unknown command address@hidden' (left as is) 
 *** '}' without opening '{' before:  
-** Unknown command address@hidden' (left as is) (l. 10)
-*** '}' without opening '{' before:  in nested table item (l. 10)
 ** closing @-command asis (l. 12)
 ** Unknown command address@hidden' (left as is) 
 *** '}' without opening '{' before:  
-** Unknown command address@hidden' (left as is) (l. 21)
-*** '}' without opening '{' before:  in table in table item (l. 21)
 ** closing @-command asis (l. 23)
 ** Unknown command address@hidden' (left as is) 
 *** '}' without opening '{' before:  
-** Unknown command address@hidden' (left as is) (l. 32)
-*** '}' without opening '{' before:  in table in table item in preformatted 
(l. 32)
 ** closing @-command asis (l. 34)
 ** Unknown command address@hidden' (left as is) 
 *** '}' without opening '{' before:  
-** Unknown command address@hidden' (left as is) (l. 45)
-*** '}' without opening '{' before:  in table in table item in preformatted 
(l. 45)
 ** closing @-command code (l. 47)
 ** Bad nesting of @asis and @code (l. 47)
 ** closing @-command asis (l. 47)

Index: test/formatting/res/table_in_table_item/table_in_table_item.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/table_in_table_item/table_in_table_item.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/formatting/res/table_in_table_item/table_in_table_item.html    2 Apr 
2009 09:14:36 -0000       1.5
+++ test/formatting/res/table_in_table_item/table_in_table_item.html    3 Apr 
2009 14:10:38 -0000       1.6
@@ -47,7 +47,7 @@
 
 <dl compact="compact">
 <dt>item <dl compact="compact">
-<dt>@asis in nested table item</dt>
+<dt>in nested table item</dt>
 <dd><p>   in nested table line
    </p></dd>
 </dl></dt>
@@ -60,7 +60,7 @@
 <p><code>
 </code></p><dl compact="compact">
 <dt>item <dl compact="compact">
-<dt>@asis in table in table item</dt>
+<dt>in table in table item</dt>
 <dd><p><code>   in nested table line
    </code></p></dd>
 </dl></dt>
@@ -71,7 +71,7 @@
 </p>
 <table><tr><td>&nbsp;</td><td><dl compact="compact">
 <dt><tt>item in preformatted <dl compact="compact">
-<dt><tt>@asis in table in table item in preformatted</tt></dt>
+<dt><tt>in table in table item in preformatted</tt></dt>
 <dd><pre class="example">   in nested table line in preformatted
    </pre></dd>
 </dl></tt></dt>
@@ -85,7 +85,7 @@
 </code></p><table><tr><td>&nbsp;</td><td><dl compact="compact">
 <dt><tt>item in preformatted <dl compact="compact">
 <dd><pre class="example"><code>   </code></pre></dd>
-<dt><tt>@asis in table in table item in preformatted</tt></dt>
+<dt><tt>in table in table item in preformatted</tt></dt>
 <dd><pre class="example"><code>   in nested table line in preformatted
    </code></pre></dd>
 </dl>