[Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl texi2html...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/04/16 21:57:30

Modified files:
        .              : ChangeLog TODO texi2html.pl texi2html.init 

Log message:
                * texi2html.pl: really pass the original @-command for @def*.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.370&r2=1.371
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.271&r2=1.272
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.183&r2=1.184

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -b -r1.370 -r1.371
--- ChangeLog   16 Apr 2009 08:37:15 -0000      1.370
+++ ChangeLog   16 Apr 2009 21:57:29 -0000      1.371
@@ -1,5 +1,9 @@
 2009-04-16   Patrice Dumas  <address@hidden>
 
+       * texi2html.pl: really pass the original @-command for @def*.
+
+2009-04-16   Patrice Dumas  <address@hidden>
+
        * texi2html.pl: normalize the inter-spaces in definition arguments.
 
 2009-04-14   Patrice Dumas  <address@hidden>

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- TODO        13 Apr 2009 23:06:16 -0000      1.88
+++ TODO        16 Apr 2009 21:57:29 -0000      1.89
@@ -55,6 +55,7 @@
   is not up to date.
   new arguments and return args of index_summary_letter
   new argument of def
+  new argument of def_item
 
 * document the 'math' in 'args', in style_map, and simple_*math*. It
   could also be more flexible and similar with other environments, that

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -b -r1.271 -r1.272
--- texi2html.pl        16 Apr 2009 08:37:15 -0000      1.271
+++ texi2html.pl        16 Apr 2009 21:57:29 -0000      1.272
@@ -79,7 +79,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.271 2009/04/16 08:37:15 pertusus Exp $
+# $Id: texi2html.pl,v 1.272 2009/04/16 21:57:29 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -8910,7 +8910,7 @@
     {
         close_stack($text, $stack, $state, $line_nr, 'deff_item')
            unless ($format_ref->{'format'} eq 'deff_item');
-        add_prev($text, $stack, 
&$Texi2HTML::Config::def_item($format_ref->{'text'}, 
$format_ref->{'only_inter_commands'}));
+        add_prev($text, $stack, 
&$Texi2HTML::Config::def_item($format_ref->{'text'}, 
$format_ref->{'only_inter_commands'}, $format_ref->{'orig_command'}));
         $format_ref = pop @$stack; # pop deff
         ######################################### debug
         if (!defined($format_ref->{'format'}) or 
!defined($Texi2HTML::Config::def_map{$format_ref->{'format'}}))
@@ -9195,6 +9195,7 @@
     if (defined($Texi2HTML::Config::def_map{$macro}))
     {
         my $top_format = top_format($stack);
+        my $orig_command = $macro;
         if (defined($top_format) and ("$top_format->{'format'}x" eq $macro))
         {
           # this is a matching @DEFx command.
@@ -9203,17 +9204,13 @@
              pop @{$state->{'command_stack'}};
              $macro =~ s/x$//o;
              my $deff_item = pop @$stack;
-             if ($deff_item->{'text'} !~ /s^\*$/)
-             {
                   add_prev($text, $stack, 
-                      &$Texi2HTML::Config::def_item($deff_item->{'text'}, 
$deff_item->{'only_inter_commands'}));
-             }
+                &$Texi2HTML::Config::def_item($deff_item->{'text'}, 
$deff_item->{'only_inter_commands'}, $deff_item->{'orig_command'}));
              #print STDERR "DEFx $macro\n";
         }
         else
         {
              # a new @def.
-             my $orig_command = $macro;
              $macro =~ s/x$//o;
              # we remove what is on the stack and put it back,
              # to make sure that it is the form without x.
@@ -9285,9 +9282,9 @@
         my $class_category = 
&$Texi2HTML::Config::definition_category($category, $class, $style, $command);
         my $class_name = &$Texi2HTML::Config::definition_index_entry($name, 
$class, $style, $command);
         my ($index_entry, $formatted_index_entry, $index_label) = 
do_index_entry_label($macro, $state, $line_nr, $class_name_texi, $line);
-        add_prev($text, $stack, &$Texi2HTML::Config::def_line($class_category, 
$name, $type, $arguments, $index_label, address@hidden, $args_type_array, 
$args_array, $command, $class_name, $category, $class, $style, $macro));
+        add_prev($text, $stack, &$Texi2HTML::Config::def_line($class_category, 
$name, $type, $arguments, $index_label, address@hidden, $args_type_array, 
$args_array, $command, $class_name, $category, $class, $style, $orig_command));
         $line = '';
-        push @$stack, { 'format' => 'deff_item', 'text' => '', 
'only_inter_commands' => 1, 'format_ref' => $top_format};
+        push @$stack, { 'format' => 'deff_item', 'text' => '', 
'only_inter_commands' => 1, 'format_ref' => $top_format, 'orig_command' => 
$orig_command};
         begin_paragraph_after_command($state, $stack, $macro, $line);
     }
     elsif (exists ($Texi2HTML::Config::complex_format_map->{$macro}))

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- texi2html.init      13 Apr 2009 23:06:16 -0000      1.183
+++ texi2html.init      16 Apr 2009 21:57:30 -0000      1.184
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.183 2009/04/13 23:06:16 pertusus Exp $
+# $Id: texi2html.init,v 1.184 2009/04/16 21:57:30 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -4951,10 +4951,11 @@
 #
 # $DEF_TABLE should be used to distinguish between @def formatted as table
 # and as definition lists.
-sub t2h_default_def_item($$)
+sub t2h_default_def_item($$$)
 {
     my $text = shift;
     my $only_inter_item_commands = shift;
+    my $command = shift;
     if ($text =~ /\S/)
     {
         if (! $DEF_TABLE)