texi2html-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Texi2html-cvs] texi2html ChangeLog MySimple.pm TODO texi2html....


From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html ChangeLog MySimple.pm TODO texi2html....
Date: Wed, 26 Nov 2008 19:09:06 +0000

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        08/11/26 19:09:06

Modified files:
        .              : ChangeLog MySimple.pm TODO texi2html.init 
                         texi2html.pl 
        doc            : texi2html.html 
        examples       : info.init 
        test/macros    : tests.txt 
        test/nested_formats/res/nested_cartouche: nested_formats.html 
        test/nested_formats/res/nested_deffn: nested_formats.html 
        test/nested_formats/res/nested_enumerate: nested_formats.html 
        test/nested_formats/res/nested_example: nested_formats.html 
        test/nested_formats/res/nested_flushright: nested_formats.html 
        test/nested_formats/res/nested_group: nested_formats.html 
        test/nested_formats/res/nested_itemize: nested_formats.html 
        test/nested_formats/res/nested_menu: nested_formats.html 
        test/nested_formats/res/nested_multitable: nested_formats.html 
        test/nested_formats/res/nested_quotation: nested_formats.html 
        test/nested_formats/res/nested_table: nested_formats.html 
        test/tar_manual/res/tar: tar.html 

Log message:
                * texi2html.pl, texi2html.init: add hooks for user functions at
                @-command beginning for commands taking arguments, at paragraph
                beginning and when @item or @tab appears.
                Use it to determine the number of paragraph in cell.
                * MySimple.pm: add a sentence about -- being the same as -.
                Report from Werner LEMBERG.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.340&r2=1.341
http://cvs.savannah.gnu.org/viewcvs/texi2html/MySimple.pm?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.170&r2=1.171
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.246&r2=1.247
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/tests.txt?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_cartouche/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_deffn/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_enumerate/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_example/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_flushright/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_group/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_itemize/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_menu/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_multitable/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_quotation/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_table/nested_formats.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/tar/tar.html?cvsroot=texi2html&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -b -r1.340 -r1.341
--- ChangeLog   20 Nov 2008 12:02:35 -0000      1.340
+++ ChangeLog   26 Nov 2008 19:09:01 -0000      1.341
@@ -1,3 +1,12 @@
+2008-11-26  Patrice Dumas  <address@hidden>
+
+       * texi2html.pl, texi2html.init: add hooks for user functions at 
+       @-command beginning for commands taking arguments, at paragraph
+       beginning and when @item or @tab appears.
+       Use it to determine the number of paragraph in cell.
+       * MySimple.pm: add a sentence about -- being the same as -.
+       Report from Werner LEMBERG.
+
 2008-11-20  Patrice Dumas  <address@hidden>
 
        * texi2html.pl: replace an empty macro by an empty string instead

Index: MySimple.pm
===================================================================
RCS file: /cvsroot/texi2html/texi2html/MySimple.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MySimple.pm 17 Apr 2006 23:11:09 -0000      1.5
+++ MySimple.pm 26 Nov 2008 19:09:01 -0000      1.6
@@ -20,7 +20,7 @@
 
 # --------------------------------------------------------------------------
 # Locally modified by obachman (Display type instead of env, order by cmp)
-# $Id: MySimple.pm,v 1.5 2006/04/17 23:11:09 pertusus Exp $
+# $Id: MySimple.pm,v 1.6 2008/11/26 19:09:01 pertusus Exp $
 
 # use strict;
 # no strict 'refs';
@@ -211,7 +211,8 @@
        }
 
        print <<EOT;
-Note: 'Options' may be abbreviated. 'Type' specifications mean:
+Note: 'Options' may be abbreviated. -- prefix may be replaced by a single -.
+'Type' specifications mean:
  <none>| !    no argument: variable is set to 1 on -foo (or, to 0 on -nofoo)
     =s | :s   mandatory (or, optional)  string argument
     =i | :i   mandatory (or, optional)  integer argument

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- TODO        20 Nov 2008 12:11:27 -0000      1.71
+++ TODO        26 Nov 2008 19:09:01 -0000      1.72
@@ -48,7 +48,7 @@
 
   $copying_comment, $titlepage better and $documentdescription
   $program_string
-  $heading arguments.
+  $heading arguments $begin_paragraph_texi $tab_item_texi $begin_style_texi
   Also element formatting documentation, especially print_foot_navigation
   is not up to date.
   new arguments and return args of index_summary_letter
@@ -143,6 +143,7 @@
 
 * a FIXME in Tests/formatting/detailmenus.texi with a warning missing 
   for a menu entry for a spurious entry with no corresponding node entry.
+  more precisely the node is not among the direct subsections.
 
 * roff is certainly not uptodate. At least the @quote* and @guillem*
 
@@ -320,7 +321,7 @@
   should alo be passed down
 
 * makeinfo has a lot of other short command line switches, but implement
-  only those that are documented, in --hel or info makeinfo.
+  only those that are documented, in --help or info makeinfo.
 
 * -I can take paths (separated by : or ;) not only directories.
 
@@ -371,8 +372,6 @@
   after @item, but to be careful with things prepended or commands used
   in for the whole line.
 
-* second paragraph in cell should be taken into account.
-
 * add --command command line that gives inserted lines.
 
 * @ogonek has 2 test files, and is in coverage. Maybe add it to encoding/*
@@ -395,3 +394,8 @@
   in @*headings, it could be better to delay @macro expansion to allow for
   different expansions at different places in the document, something that 
   cannot be done with texi2html -E.
+
+* add 0x7F as a comment character (ignore to eol).
+
+* add as a filter when things come from STDIN, and there is no file in 
+  argument. If there is no setfilename, file name is stdin.info.

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- texi2html.init      11 Nov 2008 13:29:11 -0000      1.170
+++ texi2html.init      26 Nov 2008 19:09:01 -0000      1.171
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.170 2008/11/11 13:29:11 pertusus Exp $
+# $Id: texi2html.init,v 1.171 2008/11/26 19:09:01 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -4413,6 +4413,7 @@
 $preserve_misc_command      = \&t2h_default_preserve_misc_command;
 $format_list_item_texi      = \&t2h_default_format_list_item_texi;
 $begin_format_texi          = \&t2h_default_begin_format_texi;
+$tab_item_texi              = \&t2h_default_tab_item_texi;
 $insertcopying              = \&t2h_default_insertcopying;
 $colon_command              = \&t2h_default_colon_command;
 
@@ -4503,7 +4504,9 @@
     my $line = shift;
     my $state = shift;
 
-    push (@t2h_default_multitable_stack, -1) if ($command eq 'multitable');
+    # first array element is the number of cell in a row
+    # second is the number of paragraphs in a cell
+    push (@t2h_default_multitable_stack, [-1,-1]) if ($command eq 
'multitable');
 
     return $line;
 }
@@ -5524,7 +5527,7 @@
     $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
 
     # this is used to keep the cell number
-    $t2h_default_multitable_stack[-1] = -1;
+    $t2h_default_multitable_stack[-1]->[0] = -1;
 
     if ($text =~ /\S/)
     {
@@ -5551,8 +5554,8 @@
 
     $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
 
-    $t2h_default_multitable_stack[-1]++;
-    my $cell_nr = $t2h_default_multitable_stack[-1];
+    $t2h_default_multitable_stack[-1]->[0]++;
+    my $cell_nr = $t2h_default_multitable_stack[-1]->[0];
     my $fractions = '';
 
     if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
@@ -5784,15 +5787,13 @@
     my $top_stack = '';
     $top_stack = $command_stack_at_begin->[-1] if (scalar 
(@$command_stack_at_begin));
     if ($top_stack eq 'multitable')
-# FIXME
-# paragraph_number is not by cell, so it is not possible to know if it
-# is the first paragraph in cell. Also currently there is no hook for a
-# cell beginning which means that it is not possible to reset the cell 
-# paragraph count at a cell beginning
-# and (!defined($paragraph_number) or !defined($$paragraph_number) or 
$$paragraph_number == 1))
+    {
+       $t2h_default_multitable_stack[-1]->[1]++;
+       if ($t2h_default_multitable_stack[-1]->[1] == 0)
     {
        return $text;
     }
+    }
 
     my $open = '<p>';
     if ($align)
@@ -6576,4 +6577,20 @@
    return $punctuation_character;
 }
 
+sub t2h_default_tab_item_texi($$$$$$)
+{
+   my $comand = shift;
+   my $commands_stack = shift;
+   my $state = shift;
+   my $stack = shift;
+   my $line = shift;
+   my $line_nr = shift;
+
+   if (defined($commands_stack) and @$commands_stack and $commands_stack->[-1] 
eq 'multitable' and @t2h_default_multitable_stack)
+   {
+      $t2h_default_multitable_stack[-1]->[1] = -1;
+   }
+   return undef;
+}
+
 1;

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- texi2html.pl        20 Nov 2008 12:02:36 -0000      1.246
+++ texi2html.pl        26 Nov 2008 19:09:02 -0000      1.247
@@ -60,7 +60,7 @@
 #--##########################################################################
 
 # CVS version:
-# $Id: texi2html.pl,v 1.246 2008/11/20 12:02:36 pertusus Exp $
+# $Id: texi2html.pl,v 1.247 2008/11/26 19:09:02 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -468,6 +468,9 @@
 $index_element_heading_texi
 $format_list_item_texi
 $begin_format_texi
+$begin_style_texi
+$begin_paragraph_texi
+$tab_item_texi
 $colon_command
 
 $PRE_ABOUT
@@ -8633,28 +8636,29 @@
     my $stack = shift;
     my $state = shift;
 
-    my $command = 1;
+    my $command = { };
     my $top_format = top_format($stack);
     if (defined($top_format))
     {
         $command = $top_format;
     }
-    else
-    {
-        $command = { };
-    }
     $command->{'stack_at_beginning'} = [ @{$state->{'command_stack'}} ];
+    my $paragraph_or_preformatted = 'paragraph';
     if ($state->{'preformatted'})
     {
-        push @$stack, {'format' => 'preformatted', 'text' => '' };
+        $paragraph_or_preformatted = 'preformatted';
         $state->{'preformatted_context'} = $command;
-        push @$stack, @{$state->{'paragraph_macros'}} if 
$state->{'paragraph_macros'};
-        delete $state->{'paragraph_macros'};
-        return;
     }
+    else
+    {
     $state->{'paragraph_context'} = $command;
     $state->{'paragraph_nr'}++;
-    push @$stack, {'format' => 'paragraph', 'text' => '' };
+    }
+    push @$stack, {'format' => $paragraph_or_preformatted, 'text' => '' };
+    # FIXME give line, and modify line?
+    &$Texi2HTML::Config::begin_paragraph_texi($paragraph_or_preformatted,
+      $state->{'paragraph_macros'}, $command, $state, $stack)
+        if (defined($Texi2HTML::Config::begin_paragraph_texi));
     # if there are macros which weren't closed when the previous 
     # paragraph was closed we reopen them here
     push @$stack, @{$state->{'paragraph_macros'}} if 
$state->{'paragraph_macros'};
@@ -12124,6 +12128,9 @@
                      push (@{$state->{'command_stack'}}, $macro);
                      #print STDERR "# Stacked $macro 
(@{$state->{'command_stack'}})\n" if ($T2H_DEBUG); 
                 }
+                # FIXME give line, and modify line?
+                &$Texi2HTML::Config::begin_style_texi($macro, $state, $stack)
+                  if (defined($Texi2HTML::Config::begin_style_texi));
                 next;
             }
 
@@ -12336,6 +12343,12 @@
                 abort_empty_preformatted($stack, $state);
                 # FIXME let the user be able not to close the paragraph
                 close_paragraph($text, $stack, $state, $line_nr);
+
+                if (defined($Texi2HTML::Config::tab_item_texi))
+                {
+                   my $resline = &$Texi2HTML::Config::tab_item_texi($macro, 
$state->{'command_stack'}, $stack, $state, $cline, $line_nr);
+                   $cline = $resline if (defined($resline));
+                }
                    #print STDERR "ITEM after close para: $cline";
                    #dump_stack($text, $stack, $state);
                 # these functions return the format if in the right context
@@ -12390,11 +12403,18 @@
                 }
                 next;
             }
+
             if ($macro eq 'tab')
             {
                 abort_empty_preformatted($stack, $state);
                 # FIXME let the user be able not to close the paragraph?
                 close_paragraph($text, $stack, $state, $line_nr);
+
+                if (defined($Texi2HTML::Config::tab_item_texi))
+                {
+                   my $resline = &$Texi2HTML::Config::tab_item_texi($macro, 
$state->{'command_stack'}, $stack, $state, $cline, $line_nr);
+                   $cline = $resline if (defined($resline));
+                }
                 my $format = add_cell ($text, $stack, $state);
                 if (!$format)
                 {

Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- doc/texi2html.html  11 Nov 2008 13:29:12 -0000      1.102
+++ doc/texi2html.html  26 Nov 2008 19:09:03 -0000      1.103
@@ -40,7 +40,7 @@
 permission notice may be stated in a translation approved
 by the Free Software Foundation.
  -->
-<!-- Created on November 11, 2008 by texi2html 1.79
+<!-- Created on November 26, 2008 by texi2html 1.79
 texi2html was written by: 
             Lionel Cons <address@hidden> (original author)
             Karl Berry  <address@hidden>
@@ -755,8 +755,8 @@
 node2 text
 </pre></td></tr></table>
 
-second element:
-
+<p>second element:
+</p>
 <table><tr><td>&nbsp;</td><td><pre class="example">@node node3
 node3 text
 @chapter node 3
@@ -768,14 +768,14 @@
 node1 text
 </pre></td></tr></table>
 
-second element:
-
+<p>second element:
+</p>
 <table><tr><td>&nbsp;</td><td><pre class="example">@node node2
 node2 text
 </pre></td></tr></table>
 
-third element:
-
+<p>third element:
+</p>
 <table><tr><td>&nbsp;</td><td><pre class="example">@node node3
 node3 text
 @chapter node 3
@@ -7718,7 +7718,7 @@
 </tr></table>
 <h1>About This Document</h1>
 <p>
-  This document was generated by <em>Patrice Dumas</em> on <em>November 11, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>November 26, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
 </p>
 <p>
   The buttons in the navigation panels have the following meaning:
@@ -7820,7 +7820,7 @@
 <hr size="1">
 <p>
  <font size="-1">
-  This document was generated by <em>Patrice Dumas</em> on <em>November 11, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>November 26, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
  </font>
  <br>
 

Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- examples/info.init  22 Nov 2008 14:47:51 -0000      1.2
+++ examples/info.init  26 Nov 2008 19:09:03 -0000      1.3
@@ -238,8 +238,20 @@
    my $state = shift;
    my $command_stack = shift;
 
+   if (defined($style->{'function'}))
+   {
+      $text = &{$style->{'function'}}($command, $args, $command_stack, $state, 
$line_nr);
+   }
+   if (defined($style->{'begin'}) and !$no_open)
+   {
+      $text = $style->{'begin'} . $text;
+   }
+   if (defined($style->{'end'}) and !$no_close)
+   {
+      $text = $text . $style->{'end'};
+   }
    info_default_close_command($command_stack, $command, $no_close, $no_open, 
$line_nr);
-   return &$default_style_reference(@orig_args);
+   return $text;
 }
 
 my $info_default_offset_in_file;

Index: test/macros/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/tests.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/macros/tests.txt       20 Nov 2008 12:02:37 -0000      1.5
+++ test/macros/tests.txt       26 Nov 2008 19:09:04 -0000      1.6
@@ -29,6 +29,7 @@
 texi macro_in_pass_texi_commands.texi
 texi macro_commands_in_pass_texi_commands.texi
 texi empty_macro.texi
+texi cond.texi --ifhtml --ifinfo --no-iftex
 test_include test_include.texi
 # in the texinfo test suite, the default is info, and there is also a 
 # test with --html which doesn't make much sense here, replaced with --xml

Index: test/nested_formats/res/nested_cartouche/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_cartouche/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_cartouche/nested_formats.html        3 Nov 
2008 12:33:22 -0000       1.7
+++ test/nested_formats/res/nested_cartouche/nested_formats.html        26 Nov 
2008 19:09:04 -0000      1.8
@@ -1155,22 +1155,22 @@
 <p>in format_command
 </p></td></tr></table>
 
-Something
-
-Something
-<table class="cartouche" border="1"><tr><td>
+<p>Something
+</p>
+<p>Something
+</p><table class="cartouche" border="1"><tr><td>
 <p>in group
 </p></td></tr></table>
 
-Something2
-After
-
-Something2
-<table class="cartouche" border="1"><tr><td>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><table class="cartouche" border="1"><tr><td>
 <p>in group
 </p></td></tr></table>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1290,22 +1290,22 @@
 <p>in format_command
 </p></td></tr></table>
 
-Something
-
-Something
-<table class="cartouche" border="1"><tr><td>
+<p>Something
+</p>
+<p>Something
+</p><table class="cartouche" border="1"><tr><td>
 <p>in group
 </p></td></tr></table>
 
-Something2
-After
-
-Something2
-<table class="cartouche" border="1"><tr><td>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><table class="cartouche" border="1"><tr><td>
 <p>in group
 </p></td></tr></table>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_deffn/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_deffn/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_deffn/nested_formats.html    3 Nov 2008 
12:33:23 -0000       1.7
+++ test/nested_formats/res/nested_deffn/nested_formats.html    26 Nov 2008 
19:09:04 -0000      1.8
@@ -1282,30 +1282,30 @@
 <dd><p>in format_command
 </p></dd></dl>
 
-Something
-<dl>
+<p>Something
+</p><dl>
 <dt><a name="index-arg-77"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 </dl>
 
-Something
-<dl>
+<p>Something
+</p><dl>
 <dt><a name="index-arg-78"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 <dd><p>in group
 </p></dd></dl>
 
-Something2
-<dl>
+<p>Something2
+</p><dl>
 <dt><a name="index-arg-79"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 </dl>
-After
-
-Something2
-<dl>
+<p>After
+</p>
+<p>Something2
+</p><dl>
 <dt><a name="index-arg-80"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 <dd><p>in group
 </p></dd></dl>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1432,30 +1432,30 @@
 <dd><p>in format_command
 </p></dd></dl>
 
-Something
-<dl>
+<p>Something
+</p><dl>
 <dt><a name="index-arg-86"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 </dl>
 
-Something
-<dl>
+<p>Something
+</p><dl>
 <dt><a name="index-arg-87"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 <dd><p>in group
 </p></dd></dl>
 
-Something2
-<dl>
+<p>Something2
+</p><dl>
 <dt><a name="index-arg-88"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 </dl>
-After
-
-Something2
-<dl>
+<p>After
+</p>
+<p>Something2
+</p><dl>
 <dt><a name="index-arg-89"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
 <dd><p>in group
 </p></dd></dl>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_enumerate/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_enumerate/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_enumerate/nested_formats.html        3 Nov 
2008 12:33:23 -0000       1.7
+++ test/nested_formats/res/nested_enumerate/nested_formats.html        26 Nov 
2008 19:09:04 -0000      1.8
@@ -1155,22 +1155,22 @@
 <li>in format_command
 </li></ol>
 
-Something
-
-Something
-<ol>
+<p>Something
+</p>
+<p>Something
+</p><ol>
 <li>in group
 </li></ol>
 
-Something2
-After
-
-Something2
-<ol>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><ol>
 <li>in group
 </li></ol>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1290,22 +1290,22 @@
 <li>in format_command
 </li></ol>
 
-Something
-
-Something
-<ol>
+<p>Something
+</p>
+<p>Something
+</p><ol>
 <li>in group
 </li></ol>
 
-Something2
-After
-
-Something2
-<ol>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><ol>
 <li>in group
 </li></ol>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_example/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_example/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_example/nested_formats.html  3 Nov 2008 
12:33:23 -0000       1.7
+++ test/nested_formats/res/nested_example/nested_formats.html  26 Nov 2008 
19:09:04 -0000      1.8
@@ -1103,20 +1103,20 @@
 <table><tr><td>&nbsp;</td><td><pre class="example">in format_command
 </pre></td></tr></table>
 
-Something
-
-Something
-<table><tr><td>&nbsp;</td><td><pre class="example">in group
+<p>Something
+</p>
+<p>Something
+</p><table><tr><td>&nbsp;</td><td><pre class="example">in group
 </pre></td></tr></table>
 
-Something2
-After
-
-Something2
-<table><tr><td>&nbsp;</td><td><pre class="example">in group
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><table><tr><td>&nbsp;</td><td><pre class="example">in group
 </pre></td></tr></table>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1232,20 +1232,20 @@
 <table><tr><td>&nbsp;</td><td><pre class="example">in format_command
 </pre></td></tr></table>
 
-Something
-
-Something
-<table><tr><td>&nbsp;</td><td><pre class="example">in group
+<p>Something
+</p>
+<p>Something
+</p><table><tr><td>&nbsp;</td><td><pre class="example">in group
 </pre></td></tr></table>
 
-Something2
-After
-
-Something2
-<table><tr><td>&nbsp;</td><td><pre class="example">in group
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><table><tr><td>&nbsp;</td><td><pre class="example">in group
 </pre></td></tr></table>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_flushright/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_flushright/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_flushright/nested_formats.html       3 Nov 
2008 12:33:23 -0000       1.7
+++ test/nested_formats/res/nested_flushright/nested_formats.html       26 Nov 
2008 19:09:04 -0000      1.8
@@ -1051,18 +1051,18 @@
 
 <p align="right">in format_command
 </p>
-Something
-
-Something
-<p align="right">in group
+<p>Something
+</p>
+<p>Something
+</p><p align="right">in group
+</p>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><p align="right">in group
+</p><p>After
 </p>
-Something2
-After
-
-Something2
-<p align="right">in group
-</p>After
-
 
 <br>
 <br>
@@ -1175,18 +1175,18 @@
 
 <p align="right">in format_command
 </p>
-Something
-
-Something
-<p align="right">in group
+<p>Something
+</p>
+<p>Something
+</p><p align="right">in group
+</p>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><p align="right">in group
+</p><p>After
 </p>
-Something2
-After
-
-Something2
-<p align="right">in group
-</p>After
-
 
 <br>
 <br>

Index: test/nested_formats/res/nested_group/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_group/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_group/nested_formats.html    3 Nov 2008 
12:33:23 -0000       1.7
+++ test/nested_formats/res/nested_group/nested_formats.html    26 Nov 2008 
19:09:05 -0000      1.8
@@ -1051,18 +1051,18 @@
 
 <p>in format_command
 </p>
-Something
-
-Something
-<p>in group
+<p>Something
+</p>
+<p>Something
+</p><p>in group
+</p>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><p>in group
+</p><p>After
 </p>
-Something2
-After
-
-Something2
-<p>in group
-</p>After
-
 
 <br>
 <br>
@@ -1175,18 +1175,18 @@
 
 <p>in format_command
 </p>
-Something
-
-Something
-<p>in group
+<p>Something
+</p>
+<p>Something
+</p><p>in group
+</p>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><p>in group
+</p><p>After
 </p>
-Something2
-After
-
-Something2
-<p>in group
-</p>After
-
 
 <br>
 <br>

Index: test/nested_formats/res/nested_itemize/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_itemize/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_itemize/nested_formats.html  3 Nov 2008 
12:33:24 -0000       1.7
+++ test/nested_formats/res/nested_itemize/nested_formats.html  26 Nov 2008 
19:09:05 -0000      1.8
@@ -1205,26 +1205,26 @@
 <li>in format_command
 </li></ul>
 
-Something
-<ul>
+<p>Something
+</p><ul>
 </ul>
 
-Something
-<ul>
+<p>Something
+</p><ul>
 <li>in group
 </li></ul>
 
-Something2
-<ul>
+<p>Something2
+</p><ul>
 </ul>
-After
-
-Something2
-<ul>
+<p>After
+</p>
+<p>Something2
+</p><ul>
 <li>in group
 </li></ul>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1346,26 +1346,26 @@
 <li>in format_command
 </li></ul>
 
-Something
-<ul>
+<p>Something
+</p><ul>
 </ul>
 
-Something
-<ul>
+<p>Something
+</p><ul>
 <li>in group
 </li></ul>
 
-Something2
-<ul>
+<p>Something2
+</p><ul>
 </ul>
-After
-
-Something2
-<ul>
+<p>After
+</p>
+<p>Something2
+</p><ul>
 <li>in group
 </li></ul>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_menu/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_menu/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_menu/nested_formats.html     3 Nov 2008 
12:33:24 -0000       1.7
+++ test/nested_formats/res/nested_menu/nested_formats.html     26 Nov 2008 
19:09:05 -0000      1.8
@@ -1149,22 +1149,22 @@
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in 
format_command
 </pre></th></tr></table>
 
-Something
-
-Something
-<table class="menu" border="0" cellspacing="0">
+<p>Something
+</p>
+<p>Something
+</p><table class="menu" border="0" cellspacing="0">
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in 
group
 </pre></th></tr></table>
 
-Something2
-After
-
-Something2
-<table class="menu" border="0" cellspacing="0">
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><table class="menu" border="0" cellspacing="0">
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in 
group
 </pre></th></tr></table>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1284,22 +1284,22 @@
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in 
format_command
 </pre></th></tr></table>
 
-Something
-
-Something
-<table class="menu" border="0" cellspacing="0">
+<p>Something
+</p>
+<p>Something
+</p><table class="menu" border="0" cellspacing="0">
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in 
group
 </pre></th></tr></table>
 
-Something2
-After
-
-Something2
-<table class="menu" border="0" cellspacing="0">
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><table class="menu" border="0" cellspacing="0">
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in 
group
 </pre></th></tr></table>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_multitable/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_multitable/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_multitable/nested_formats.html       3 Nov 
2008 12:33:24 -0000       1.7
+++ test/nested_formats/res/nested_multitable/nested_formats.html       26 Nov 
2008 19:09:05 -0000      1.8
@@ -439,11 +439,11 @@
 Something
 
 Something2
-After
-
+<p>After
+</p>
 Something2
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -512,11 +512,11 @@
 Something
 
 Something2
-After
-
+<p>After
+</p>
 Something2
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_quotation/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_quotation/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_quotation/nested_formats.html        3 Nov 
2008 12:33:24 -0000       1.7
+++ test/nested_formats/res/nested_quotation/nested_formats.html        26 Nov 
2008 19:09:05 -0000      1.8
@@ -1128,22 +1128,22 @@
 <blockquote><p>in format_command
 </p></blockquote>
 
-Something
-<blockquote></blockquote>
+<p>Something
+</p><blockquote></blockquote>
 
-Something
-<blockquote><p>in group
+<p>Something
+</p><blockquote><p>in group
 </p></blockquote>
 
-Something2
-<blockquote></blockquote>
-After
-
-Something2
-<blockquote><p>in group
+<p>Something2
+</p><blockquote></blockquote>
+<p>After
+</p>
+<p>Something2
+</p><blockquote><p>in group
 </p></blockquote>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1260,22 +1260,22 @@
 <blockquote><p>in format_command
 </p></blockquote>
 
-Something
-<blockquote></blockquote>
+<p>Something
+</p><blockquote></blockquote>
 
-Something
-<blockquote><p>in group
+<p>Something
+</p><blockquote><p>in group
 </p></blockquote>
 
-Something2
-<blockquote></blockquote>
-After
-
-Something2
-<blockquote><p>in group
+<p>Something2
+</p><blockquote></blockquote>
+<p>After
+</p>
+<p>Something2
+</p><blockquote><p>in group
 </p></blockquote>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/nested_formats/res/nested_table/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_table/nested_formats.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/nested_formats/res/nested_table/nested_formats.html    3 Nov 2008 
12:33:24 -0000       1.7
+++ test/nested_formats/res/nested_table/nested_formats.html    26 Nov 2008 
19:09:05 -0000      1.8
@@ -1207,24 +1207,24 @@
 </p></dd>
 </dl>
 
-Something
-
-Something
-<dl compact="compact">
+<p>Something
+</p>
+<p>Something
+</p><dl compact="compact">
 <dd><p>in group
 </p></dd>
 </dl>
 
-Something2
-After
-
-Something2
-<dl compact="compact">
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><dl compact="compact">
 <dd><p>in group
 </p></dd>
 </dl>
-After
-
+<p>After
+</p>
 
 <br>
 <br>
@@ -1348,24 +1348,24 @@
 </p></dd>
 </dl>
 
-Something
-
-Something
-<dl compact="compact">
+<p>Something
+</p>
+<p>Something
+</p><dl compact="compact">
 <dd><p>in group
 </p></dd>
 </dl>
 
-Something2
-After
-
-Something2
-<dl compact="compact">
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><dl compact="compact">
 <dd><p>in group
 </p></dd>
 </dl>
-After
-
+<p>After
+</p>
 
 <br>
 <br>

Index: test/tar_manual/res/tar/tar.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/tar_manual/res/tar/tar.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/tar_manual/res/tar/tar.html    3 Nov 2008 23:24:31 -0000       1.12
+++ test/tar_manual/res/tar/tar.html    26 Nov 2008 19:09:05 -0000      1.13
@@ -4337,9 +4337,10 @@
 <tr><td width="20%">-o</td><td width="80%">When creating, <a 
href="#g_t_002d_002dno_002dsame_002downer">--no-same-owner</a>, when extracting 
&mdash;
 <a href="#g_t_002d_002dportability">--portability</a>. 
 
-The later usage is deprecated.  It is retained for compatibility with
+<p>The later usage is deprecated.  It is retained for compatibility with
 the earlier versions of <acronym>GNU</acronym> <code>tar</code>.  In the 
future releases
-&lsquo;<samp>-o</samp>&rsquo; will be equivalent to 
&lsquo;<samp>--no-same-owner</samp>&rsquo; only.</td></tr>
+&lsquo;<samp>-o</samp>&rsquo; will be equivalent to 
&lsquo;<samp>--no-same-owner</samp>&rsquo; only.
+</p></td></tr>
 <tr><td width="20%">-p</td><td width="80%"><a 
href="#g_t_002d_002dpreserve_002dpermissions">--preserve-permissions</a>.</td></tr>
 <tr><td width="20%">-r</td><td width="80%"><a 
href="#g_t_002d_002dappend">--append</a>.</td></tr>
 <tr><td width="20%">-s</td><td width="80%"><a 
href="#g_t_002d_002dsame_002dorder">--same-order</a>.</td></tr>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]